[jboss-cvs] JBossAS SVN: r60233 - in branches/Branch_4_2: ejb3/docs and 962 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2007-02-03 05:13:23 -0500 (Sat, 03 Feb 2007)
New Revision: 60233

Added:
   branches/Branch_4_2/ejb3/build-test-wls.xml
   branches/Branch_4_2/ejb3/component-info.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/roles.properties
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/security.html
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/users.properties
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java
   branches/Branch_4_2/ejb3/docs/embedded.html
   branches/Branch_4_2/ejb3/docs/embedded.wiki
   branches/Branch_4_2/ejb3/docs/examples/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/appserver.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/jboss.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/orion.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/database.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mysql.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/postgres.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/jalopy.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/junit/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/junit/junit.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/ant.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/optional.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/c3p0.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/cglib.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/hibernate.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/jcs.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/odmg.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xalan.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xerces.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xml-apis.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.java2html/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.java2html/j2h.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.mysql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.mysql/mysql-connector-java-bin.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh/sitemesh.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/webwork.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/xercesImpl.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.pointbase/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.pointbase/pbclient.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.sap/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.sap/sapdbc.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/aelfred.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy-ant.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/ccl.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/javancss.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/jhbasic.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/activation.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/ejb3-persistence.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/j2ee.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-annotations-ejb3.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3x.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/mail.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/servlet.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/aspectjrt.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus-ant.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/commons-httpclient.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/httpunit.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-beanutils.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-collections.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-dbcp.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-digester.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-fileupload.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-lang.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-logging.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-pool.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-resources.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-services.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-validator.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j/log4j.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro/jakarta-oro.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-bean.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_0.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_1.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-html.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-logic.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-nested.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-template.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-tiles.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/tiles-config.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validation_1_1.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules_1_1.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_2.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_3.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/antlr-runtime.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/velocity.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/werken.xpath.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb/hsqldb.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.jdom/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.jdom/jdom.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee-anttask.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.postgresql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.postgresql/postgresql.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-apache-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-bea-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-ejb-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-hibernate-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jboss-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jmx-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-orion-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-web-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-webwork-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xdoclet-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc-uc.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-ejb.zargo
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-servlet.zargo
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.sh
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/css/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/css/style.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-domain.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-services.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-web.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files_total.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss_total.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/pageflow.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-domain.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-web.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/sflogo.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/usecases.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/lcp.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/ooffice/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/ooffice/metrics.sxc
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/front.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/index.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/packages.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/stylesheet.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/velocity.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.vsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.sh
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/lcp.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql/data.sql
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-decorator.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-page.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-bean.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-html.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-logic.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-nested.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-tiles.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css/style.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog5.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog6.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/lizard1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/snake1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/birds_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-sidebar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_add_to_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_checkout.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_continue.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_next.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_prev.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_previous.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_proceed.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_register_now.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_remove.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_submit.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_update_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cartHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cats_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/dogs_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/fish_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/help.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/helpHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/logo-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_account.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_accountHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/poweredby.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/reptiles_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/search.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/separator.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sflogo.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-in.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-inHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-out.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-outHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/splash.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/struts-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/xdoclet.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/cart.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/category.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/checkout.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/confirmation.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/customerEditor.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/default.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/footer.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/header.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/navigation.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/index.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/item.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/myaccount.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/product.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/register.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/search.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/signon.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/Untitled 1
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.sh
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/lcp.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql/data.sql
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-decorator.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-page.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css/style.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog5.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog6.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/lizard1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/snake1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/birds_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-sidebar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_add_to_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_checkout.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_continue.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_next.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_prev.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_previous.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_proceed.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_register_now.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_remove.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_submit.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_update_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cartHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cats_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/dogs_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/fish_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/help.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/helpHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/logo-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_account.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_accountHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/poweredby.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/reptiles_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/search.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/separator.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sflogo.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-in.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-inHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-out.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-outHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/splash.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/struts-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/velocity-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/webwork-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/xdoclet.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/default.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/footer.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/header.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/navigation.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/index.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/cart.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/category.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/checkout.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/confirmation.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/customerEditor.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/errors.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/index.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/item.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/myaccount.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/product.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/register.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/search.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/signon.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml
   branches/Branch_4_2/ejb3/docs/reference/.cvsignore
   branches/Branch_4_2/ejb3/docs/reference/reference/en/images/
   branches/Branch_4_2/ejb3/docs/reference/reference/en/images/empty.dir
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/references.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml
   branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html
   branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOn.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOnMBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client/Client.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.jar
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.sar
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.html
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.html
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jacc-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/roles.properties
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/users.properties
   branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.html
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.class
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client/Client.class
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/tutorial.jar
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.html
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/application.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.html
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.html
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.keystore
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.truststore
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/roles.properties
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.html
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/users.properties
   branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/Calculator.class
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/CalculatorBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client/Client.class
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/tutorial.jar
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/config.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java
   branches/Branch_4_2/ejb3/jbossbuild.xml
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContextLifecycleCallback.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultEjbEncFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultPersistenceProperties.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentScope.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbEncFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentScopeImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCClientKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/SFSBFileCacheLoader.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/.cvsignore
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceXmlLoader.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionalCacheFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/injection/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityDomainManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ValueEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java
   branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
   branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-service.xml
   branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml
   branches/Branch_4_2/ejb3/src/resources/ejb3-connectors-service.xml
   branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-beans.xml
   branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml
   branches/Branch_4_2/ejb3/src/resources/schema/
   branches/Branch_4_2/ejb3/src/resources/schema/application-client_5.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/application_5.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/ejb-jar_3_0.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/javaee_5.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_1_2.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_client_1_2.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.dtd
   branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd
   branches/Branch_4_2/ejb3/src/resources/security/
   branches/Branch_4_2/ejb3/src/resources/security/tst.policy
   branches/Branch_4_2/ejb3/src/resources/standalone/dist/
   branches/Branch_4_2/ejb3/src/resources/standalone/dist/log4j.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties
   branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-integration.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-jacorb.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossts-common.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.class
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/
   branches/Branch_4_2/ejb3/src/resources/test/appclient/Manifest
   branches/Branch_4_2/ejb3/src/resources/test/appclient/application-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/jboss-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/
   branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/application-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/arjuna/
   branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/bmt/
   branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/classloader/
   branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j-113.jar
   branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties
   branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/
   branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/composite/
   branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/composite2/
   branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/consumer/
   branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/application-client-test1.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/another/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/mydatasource-ds.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependent/
   branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ear/
   branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/
   branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/
   branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/entity/
   branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/entitycallback/
   branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/entityexception/
   branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/enventry/
   branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/
   branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/iiop/
   branches/Branch_4_2/ejb3/src/resources/test/iiop/custom.jndi.properties
   branches/Branch_4_2/ejb3/src/resources/test/iiop/jndi.properties
   branches/Branch_4_2/ejb3/src/resources/test/initial/
   branches/Branch_4_2/ejb3/src/resources/test/initial/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/initial/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors3/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/jacc/
   branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/jaxws/
   branches/Branch_4_2/ejb3/src/resources/test/jaxws/TestService.wsdl
   branches/Branch_4_2/ejb3/src/resources/test/jca/
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/jms/
   branches/Branch_4_2/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/joininheritance/
   branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/jsp/
   branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml
   branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp
   branches/Branch_4_2/ejb3/src/resources/test/lob/
   branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/longlived/
   branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/mail/
   branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/manytomany/
   branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming-errors/
   branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/pkg/
   branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/regression/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/
   branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/
   branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/schema/
   branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp
   branches/Branch_4_2/ejb3/src/resources/test/seam/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml
   branches/Branch_4_2/ejb3/src/resources/test/seam/jboss-seam.jar
   branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties
   branches/Branch_4_2/ejb3/src/resources/test/secondary/
   branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/
   branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/service-xmbean.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/servlet/servlet-security-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/singletable/
   branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/
   branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/deployer.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/kernel-test.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/security/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/security/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/standalone/security/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/testjms.xml
   branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/
   branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/marker.txt
   branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/
   branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/webservices/
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/application-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl
   branches/Branch_4_2/ejb3/src/resources/test/wls/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml
   branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/test/JNDIView.jsp
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/DBSetup.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/unit/ApplicationClientXmlTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitEmbeddedTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitEmbeddedTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTTxNotSupportedTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Entity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java
   branches/Branch_4_2/ejb3x/component-info.xml
   branches/Branch_4_2/ejb3x/jbossbuild.xml
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/Generated.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/NoSuchEJBException.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java
Removed:
   branches/Branch_4_2/ejb3/Migrating.html
   branches/Branch_4_2/ejb3/README.html
   branches/Branch_4_2/ejb3/RELEASE_NOTES.html
   branches/Branch_4_2/ejb3/docs/RELEASE_NOTES.html
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/roles.properties
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/security.html
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/users.properties
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/build.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/appserver.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/jboss.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/orion.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/database.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mysql.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/postgres.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/jalopy.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/junit/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/junit/junit.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/ant.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/optional.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/c3p0.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/cglib.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/hibernate.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/jcs.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/odmg.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xalan.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xerces.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xml-apis.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.java2html/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.java2html/j2h.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.mysql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.mysql/mysql-connector-java-bin.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh/sitemesh.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/webwork.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/xercesImpl.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.pointbase/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.pointbase/pbclient.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.sap/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.sap/sapdbc.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/aelfred.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy-ant.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/ccl.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/javancss.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/jhbasic.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.svg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/activation.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/ejb3-persistence.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/j2ee.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-annotations-ejb3.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3x.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/mail.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/servlet.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/aspectjrt.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus-ant.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/commons-httpclient.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/httpunit.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-beanutils.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-collections.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-dbcp.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-digester.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-fileupload.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-lang.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-logging.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-pool.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-resources.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-services.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-validator.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j/log4j.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro/jakarta-oro.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-bean.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_0.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_1.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-html.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-logic.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-nested.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-template.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-tiles.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/tiles-config.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validation_1_1.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules_1_1.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_2.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_3.dtd
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/antlr-runtime.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/velocity.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/werken.xpath.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb/hsqldb.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.jdom/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.jdom/jdom.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee-anttask.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.postgresql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.postgresql/postgresql.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-apache-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-bea-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-ejb-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-hibernate-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jboss-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jmx-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-orion-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-web-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-webwork-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xdoclet-module.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc-uc.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet.jar
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-ejb.zargo
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-servlet.zargo
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.sh
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/css/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/css/style.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-domain.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-services.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-web.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files_total.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss_total.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/pageflow.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-domain.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-web.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/sflogo.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/usecases.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/lcp.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/ooffice/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/ooffice/metrics.sxc
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/front.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/index.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/packages.html
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/stylesheet.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/velocity.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.vsl
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.sh
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/lcp.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql/data.sql
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-decorator.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-page.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-bean.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-html.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-logic.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-nested.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-tiles.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css/style.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog5.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog6.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/lizard1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/snake1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/birds_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-sidebar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_add_to_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_checkout.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_continue.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_next.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_prev.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_previous.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_proceed.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_register_now.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_remove.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_submit.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_update_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cartHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cats_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/dogs_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/fish_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/help.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/helpHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/logo-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_account.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_accountHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/poweredby.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/reptiles_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/search.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/separator.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sflogo.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-in.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-inHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-out.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-outHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/splash.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/struts-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/xdoclet.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/cart.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/category.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/checkout.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/confirmation.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/customerEditor.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/default.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/footer.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/header.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/navigation.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/index.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/item.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/myaccount.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/product.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/register.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/search.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/signon.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/Untitled 1
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.sh
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/lcp.bat
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql/data.sql
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-decorator.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-page.tld
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css/style.css
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog5.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog6.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish2.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish3.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish4.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/lizard1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/snake1.jpg
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/birds_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-sidebar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_add_to_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_checkout.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_continue.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_next.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_prev.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_previous.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_proceed.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_register_now.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_remove.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_submit.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_update_cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cart.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cartHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cats_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/dogs_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/fish_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/help.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/helpHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/logo-topbar.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_account.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_accountHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/poweredby.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/reptiles_icon.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/search.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/separator.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sflogo.png
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-in.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-inHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-out.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-outHL.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_birds.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_cats.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_dogs.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_fish.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_reptiles.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/splash.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/struts-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/velocity-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/webwork-power.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/xdoclet.gif
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/default.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/footer.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/header.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/navigation.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/index.jsp
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/cart.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/category.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/checkout.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/confirmation.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/customerEditor.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/errors.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/index.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/item.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/myaccount.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/product.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/register.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/search.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/signon.vm
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml
   branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/images/
   branches/Branch_4_2/ejb3/docs/reference/reference/en/images/empty.dir
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml
   branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.properties
   branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html
   branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOn.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOnMBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client/Client.class
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.jar
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.sar
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.html
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/
   branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.html
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.html
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jacc-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/roles.properties
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity-security/users.properties
   branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.html
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/
   branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.class
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client/Client.class
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/tutorial.jar
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html
   branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/local.properties
   branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.html
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/application.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/
   branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.html
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/
   branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.html
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.keystore
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.truststore
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/roles.properties
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl-service.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.html
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/ssl/users.properties
   branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html
   branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html
   branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/Calculator.class
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/CalculatorBean.class
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client/Client.class
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/tutorial.jar
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/config.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/jndi.properties
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/log4j.xml
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/
   branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java
   branches/Branch_4_2/ejb3/src/etc/component-info.xml
   branches/Branch_4_2/ejb3/src/main/javax/
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RolesReferencedImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EAR.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbTimerUtil.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxEARImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationTreeCache.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfigProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ApplicationExceptionList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/AssemblyDescriptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ClusterConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmpField.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmrField.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Consumer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ContainerTransaction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CurrentMessage.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDD.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbLocalRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelation.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelationshipRole.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBeans.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EntityEnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnvEntry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeClassInterceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeDefaultInterceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Inject.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Injectable.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InjectionTarget.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorBinding.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorOrder.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/JBossDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestinationRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageProperties.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Method.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodAttributes.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodPermission.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceContextRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceUnitRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Producer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Query.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/QueryMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RelationshipRoleSource.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Relationships.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceEnvRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityIdentity.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityRole.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Service.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SessionEnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/WebServiceRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/DLQHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessageInflowLocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ValueEncInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/
   branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml
   branches/Branch_4_2/ejb3/src/resources/schema/
   branches/Branch_4_2/ejb3/src/resources/schema/application-client_5.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/application_5.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/ejb-jar_3_0.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/javaee_5.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_1_2.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_client_1_2.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.dtd
   branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.xsd
   branches/Branch_4_2/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd
   branches/Branch_4_2/ejb3/src/resources/security/
   branches/Branch_4_2/ejb3/src/resources/security/tst.policy
   branches/Branch_4_2/ejb3/src/resources/standalone/bootstrap.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/dist/log4j.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties
   branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml
   branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-integration.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-jacorb.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossts-common.jar
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat55.sar/
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web/
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.class
   branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/Manifest
   branches/Branch_4_2/ejb3/src/resources/test/appclient/application-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/jboss-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/
   branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/application-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/arjuna/
   branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/bmt/
   branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/classloader/
   branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j-113.jar
   branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties
   branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/
   branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/composite/
   branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/composite2/
   branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/consumer/
   branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/another/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/mydatasource-ds.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/dependent/
   branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/
   branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/
   branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/entity/
   branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/entitycallback/
   branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/entityexception/
   branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/enventry/
   branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/
   branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/iiop/
   branches/Branch_4_2/ejb3/src/resources/test/iiop/custom.jndi.properties
   branches/Branch_4_2/ejb3/src/resources/test/iiop/jndi.properties
   branches/Branch_4_2/ejb3/src/resources/test/initial/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/initial/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/jacc/
   branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/jaxws/TestService.wsdl
   branches/Branch_4_2/ejb3/src/resources/test/jca/
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml
   branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/jms/
   branches/Branch_4_2/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/joininheritance/
   branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/jsp/
   branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml
   branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp
   branches/Branch_4_2/ejb3/src/resources/test/lob/
   branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/longlived/
   branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/mail/
   branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/manytomany/
   branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming-errors/
   branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/reference21_30/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/regression/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/
   branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/
   branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/schema/
   branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp
   branches/Branch_4_2/ejb3/src/resources/test/seam/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties
   branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml
   branches/Branch_4_2/ejb3/src/resources/test/seam/jboss-seam.jar
   branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties
   branches/Branch_4_2/ejb3/src/resources/test/secondary/
   branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/securitydomain/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/service-xmbean.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/servlet/servlet-security-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/singletable/
   branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/
   branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/deployer.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/kernel-test.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/security/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/security/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/standalone/security/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/
   branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml
   branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/testjms.xml
   branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/marker.txt
   branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/
   branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties
   branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/users.properties
   branches/Branch_4_2/ejb3/src/resources/test/webservices/
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/application-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/
   branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl
   branches/Branch_4_2/ejb3/src/resources/test/wls/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/
   branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml
   branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/CacheUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/NestedBeanUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/MyResource.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Resource.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/User.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/simplecluster/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesReferenced.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java
   branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java
Modified:
   branches/Branch_4_2/ejb3/
   branches/Branch_4_2/ejb3/.classpath
   branches/Branch_4_2/ejb3/.cvsignore
   branches/Branch_4_2/ejb3/.project
   branches/Branch_4_2/ejb3/INSTALL.html
   branches/Branch_4_2/ejb3/build-test.xml
   branches/Branch_4_2/ejb3/build.xml
   branches/Branch_4_2/ejb3/docs/index.html
   branches/Branch_4_2/ejb3/docs/reference/
   branches/Branch_4_2/ejb3/docs/reference/reference/en/master.xml
   branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/entity_configuration.xml
   branches/Branch_4_2/ejb3/docs/tutorial/asynch/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/blob/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/clustering/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/composite/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/consumer/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/ear/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java
   branches/Branch_4_2/ejb3/docs/tutorial/entity/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/injection/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/installing.html
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/Confirmation.java
   branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/join.html
   branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/mdb/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/merge/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/merge/merge.html
   branches/Branch_4_2/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/relationships/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/security/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/service/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/single.html
   branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateful/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java
   branches/Branch_4_2/ejb3/docs/tutorial/stateless/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/stateless/src/org/jboss/tutorial/stateless/bean/CalculatorBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/build.xml
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java
   branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/table.html
   branches/Branch_4_2/ejb3/docs/tutorial/timer/build.xml
   branches/Branch_4_2/ejb3/local.properties
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Clustered.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Service.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AbstractPool.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Container.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocationWrapper.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3HandlerFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Module.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/SessionContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationEvictionPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulCacheLoader.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulEvictionPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InvocationContextImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/AuthenticationInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityActions.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceMBeanDelegate.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainerInvocation.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/Ejb3TxPolicy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/UserTransactionImpl.java
   branches/Branch_4_2/ejb3/src/resources/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml
   branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-service.xml
   branches/Branch_4_2/ejb3/src/resources/ejb3-interceptors-aop.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/bank/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-cache-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml
   branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/BankBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/Tester.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/StatefulUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite2/unit/CompositeUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/BMPBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ExQueueBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ObjectMessageBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TXTimeOutBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TopicBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/ClasspathServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/SecureEJBServletMT.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/Util.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependent/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entitycallback/unit/EntityCallbackUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/unit/EntityExceptionTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/unit/FactoryUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/lob/unit/BlobUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/manytomany/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TopicTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/microbench/unit/BenchUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EmeddedIdUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EntityManagerPassivationUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/InheritanceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/ReentrantUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/unit/HHH275UnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/relationships/unit/RelationshipUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/secondary/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/Session.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/BusinessInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/unit/SSLUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/BusinessInterface.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/unit/SSLUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/unit/RemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/unit/TxExceptionsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/xmlcfg/unit/EntityUnitTestCase.java
   branches/Branch_4_2/ejb3x/
   branches/Branch_4_2/ejb3x/.classpath
   branches/Branch_4_2/ejb3x/.cvsignore
   branches/Branch_4_2/ejb3x/build.sh
   branches/Branch_4_2/ejb3x/build.xml
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resource.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resources.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesAllowed.java
   branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RunAs.java
   branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeClassInterceptors.java
   branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java
   branches/Branch_4_2/ejb3x/src/main/javax/interceptor/InvocationContext.java
Log:
Merged JBoss_5_EJB3_RC10 into Branch_4_2



Property changes on: branches/Branch_4_2/ejb3
___________________________________________________________________
Name: svn:ignore
   - output
build.log
.settings
run.tstamp
junit*.properties

   + output
build.log
.settings
run.tstamp
junit191723717.properties
junit*.properties


Modified: branches/Branch_4_2/ejb3/.classpath
===================================================================
--- branches/Branch_4_2/ejb3/.classpath	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main"/>
+	<classpathentry excluding="org/jboss/ejb3/MC*|org/jboss/ejb3/client/|org/jboss/ejb3/clientmodule/|org/jboss/ejb3/deployers/|org/jboss/ejb3/embedded/" kind="src" path="src/main"/>
+	<classpathentry kind="src" path="docs/tutorial/ssl/src"/>
+	<classpathentry excluding="org/jboss/ejb3/test/**/*EmbeddedTest.java|org/jboss/ejb3/test/appclient/|org/jboss/ejb3/test/clusteredentity/|org/jboss/ejb3/test/clusteredservice/|org/jboss/ejb3/test/clusteredsession/|org/jboss/ejb3/test/standalone/" kind="src" output="output/eclipse-test-classes" path="src/test"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/archive/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/archive-by-resource/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/deploy-dir/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/embedded-war/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/mdb-standalone/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/simple-deployment/src"/>
+	<classpathentry excluding="*" kind="src" path="docs/embedded-tutorial/test-with-junit/src"/>
+	<classpathentry kind="src" path="docs/tutorial/consumer_deployment_descriptor/src"/>
+	<classpathentry kind="src" path="docs/tutorial/ejb21_client_adaptors/src"/>
+	<classpathentry kind="src" path="docs/tutorial/extended_pc/src"/>
+	<classpathentry kind="src" path="docs/tutorial/jboss_deployment_descriptor/src"/>
+	<classpathentry kind="src" path="docs/tutorial/packaging/src"/>
+	<classpathentry kind="src" path="docs/tutorial/service_deployment_descriptor/src"/>
+	<classpathentry kind="src" path="docs/tutorial/clusteredentity/src"/>
+	<classpathentry kind="src" path="docs/tutorial/asynch/src"/>
+	<classpathentry kind="src" path="docs/tutorial/blob/src"/>
+	<classpathentry kind="src" path="docs/tutorial/callbacks/src"/>
+	<classpathentry kind="src" path="docs/tutorial/clustering/src"/>
+	<classpathentry kind="src" path="docs/tutorial/composite/src"/>
+	<classpathentry kind="src" path="docs/tutorial/consumer/src"/>
+	<classpathentry kind="src" path="docs/tutorial/dependent/src"/>
+	<classpathentry kind="src" path="docs/tutorial/ear/src"/>
+	<classpathentry kind="src" path="docs/tutorial/entity/src"/>
+	<classpathentry kind="src" path="docs/tutorial/injection/src"/>
+	<classpathentry kind="src" path="docs/tutorial/interceptor/src"/>
+	<classpathentry kind="src" path="docs/tutorial/jndibinding/src"/>
+	<classpathentry kind="src" path="docs/tutorial/joininheritance/src"/>
+	<classpathentry kind="src" path="docs/tutorial/mdb/src"/>
+	<classpathentry kind="src" path="docs/tutorial/mdb_deployment_descriptor/src"/>
+	<classpathentry kind="src" path="docs/tutorial/merge/src"/>
+	<classpathentry kind="src" path="docs/tutorial/relationships/src"/>
+	<classpathentry kind="src" path="docs/tutorial/secondary/src"/>
+	<classpathentry kind="src" path="docs/tutorial/security/src"/>
+	<classpathentry kind="src" path="docs/tutorial/service/src"/>
+	<classpathentry kind="src" path="docs/tutorial/singleinheritance/src"/>
+	<classpathentry kind="src" path="docs/tutorial/stateful/src"/>
+	<classpathentry kind="src" path="docs/tutorial/stateful_deployment_descriptor/src"/>
+	<classpathentry kind="src" path="docs/tutorial/stateless/src"/>
+	<classpathentry kind="src" path="docs/tutorial/stateless_deployment_descriptor/src"/>
+	<classpathentry kind="src" path="docs/tutorial/tableperinheritance/src"/>
+	<classpathentry kind="src" path="docs/tutorial/timer/src"/>
 	<classpathentry kind="src" path="/ejb3x"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
@@ -20,21 +65,32 @@
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/server"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate-entitymanager/lib/ejb3-persistence.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate-entitymanager/lib/hibernate-entitymanager.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/quartz/lib/quartz-all-1.5.2.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxrpc.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxws.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/connector"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/iiop"/>
 	<classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/quartz/lib/quartz-all-1.5.2.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
+	<classpathentry kind="lib" path="src/resources/test"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxws.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-saaj.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-client.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/dom4j-jarjar/lib/dom4j-jarjar.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/test"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/Branch_4_2/ejb3/.cvsignore
===================================================================
--- branches/Branch_4_2/ejb3/.cvsignore	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/.cvsignore	2007-02-03 10:13:23 UTC (rev 60233)
@@ -2,4 +2,5 @@
 build.log
 .settings
 run.tstamp
+junit191723717.properties
 junit*.properties

Modified: branches/Branch_4_2/ejb3/.project
===================================================================
--- branches/Branch_4_2/ejb3/.project	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -3,7 +3,6 @@
 	<name>ejb3</name>
 	<comment></comment>
 	<projects>
-		<project>iiop</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

Modified: branches/Branch_4_2/ejb3/INSTALL.html
===================================================================
--- branches/Branch_4_2/ejb3/INSTALL.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/INSTALL.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +1,35 @@
 <html>
 <body>
 <p>
-<h2>Installing EJB 3.0 RC7 with JBoss 4.0.4.GA installer</h2>
+<h2>Installing EJB 3.0 RC10</h2>
 <p>
-The EJB 3.0 RC7 implementation is only usable with JBoss 4.0.4.GA.  The EJB 3.0 implementation that comes packaged with the JBoss 4.0.4.GA installer is the same as the standalone EJB 3.0 RC7 distribution with one exception.  The standalone distribution has been patched to fix the <a href="http://jira.jboss.com/jira/browse/EJBTHREE-573">EJBTHREE-573</a> JIRA bug.  Also the JBoss Remoting jar has been patched to fix the SSL problems in the 4.0.4.GA release.  If you don't need these fixes, then installing with the installer is fine.
+EJB 3.0 RC2 has been tested with JBoss 4.0.2, JBoss 4.0.3RC1, JBoss 4.0.3RC2, JBoss 4.0.3 Final.  You might
+want to download the graphical JBoss 4.0.3 installer to install EJB3.
 </p>
 <hr>
-<h2>Installing into JBoss AS 4.0.4.GA</h2>
+<h2>Installing into JBoss AS 4.0.3 Final</h2>
 <p>
+EJB 3.0 comes with 4.0.3 if you use the graphical installer
+</p>
+<hr>
+<h2>Installing into JBoss AS 4.0.2, JBoss AS 4.0.3RC1, JBoss AS 4.0.3RC2</h2>
+<p>
+Note, the ejb 3.0 installation with JBoss AS 4.0.3RC2 is old, you should
+download the latest EJB3 RC2 impl and follow these directions.
 <ol>
 <li> Download <a
 href="http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=16942">JBoss
-4.0.4.GA</a>.</li>
+4.0.2 (or 4.0.3RC1 or 4.0.3RC2)</a>.</li>
 
-<li> Download <a href="http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=132063">EJB 3.0 RC7</a>.</li>
+<li> Download <a href="http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=132063">EJB 3.0 RC2</a>.</li>
 <li> Unzip both of these downloads</li>
 
-<li> Copy <tt>ejb3.deployer</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
+reqg,gw/<li> Copy <tt>ejb3.deployer</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>ejb3-clustered-sfsbcache-service.xml</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>ejb3-entity-cache-service.xml</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>ejb3-interceptors-aop.xml</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>jboss-aop-jdk50.deployer</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
-<li> Copy <tt>quartz-ra.rar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
-<li> Copy <tt>jboss-remoting.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>hibernate-annotations.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>hibernate-entitymanager.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>ejb3-persistence.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>quartz-all-1.5.2.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>jboss-ejb3-client.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/client</tt></li>
-<li> Copy <tt>jboss-annotations-ejb3.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/client</tt></li>
-<li> Copy <tt>hibernate-client.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/client</tt></li>
+<li> Copy <tt>jboss-xb.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
 <li> Remove <tt>jboss-aop.deployer/</tt> from <tt>jboss-4.0.x/server/all/deploy</tt></li>
 
 <li> Start jboss up with the <tt>all</tt> configuration <tt>run.sh -c all</tt></li>

Deleted: branches/Branch_4_2/ejb3/Migrating.html
===================================================================
--- branches/Branch_4_2/ejb3/Migrating.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/Migrating.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<html>
-<body>
-<h1>Migrating</h1>
-<p>
-Please see our WIKI for more details.  Please add to this information!
-</p>
-<p>
-<a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=EJB3">EJB 3.0 WIKI</a>
-</body>
-</html>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/README.html
===================================================================
--- branches/Branch_4_2/ejb3/README.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/README.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<html>
-<body>
-<p>
-<h2>EJB 3.0 Documentation</h2>
-<p>
-EJB 3.0 documentation for JBoss does not come with this distribution.  It is available in the following places:
-<ol>
-<li> Download <a href="http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=132063">EJB 3.0 RC5 - PFD</a>.  This is a 
-standalone distribution of EJB 3.0 that has full documentation as well as a set of over 30 tutorials that you can build and run</li>
-<li> Look on our website for <a href="http://docs.jboss.org/ejb3">EJB 3.0 documentation</a></li>
-<li> Look on our <a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=EJB3">EJB 3.0 WIKI</a></li>
-</ol>
-</body>
-</html>

Deleted: branches/Branch_4_2/ejb3/RELEASE_NOTES.html
===================================================================
--- branches/Branch_4_2/ejb3/RELEASE_NOTES.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/RELEASE_NOTES.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,214 +0,0 @@
-<html>
-<body>
-
-
-Release Notes - EJB 3.0 - Version EJB 3.0 RC7 - FD
-
-<h2>Feature Request</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-521'>EJBTHREE-521</a>] - Use org.jboss.serial.io.MarshalledObjectForLocalCalls on in-vm call-by-value operations</li>
-</ul>
-
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-235'>EJBTHREE-235</a>] - Incorrect PreDestroy method handling with StrictMaxPool</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-352'>EJBTHREE-352</a>] - EJB Containers should be scoped per deployment</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-440'>EJBTHREE-440</a>] - ClassCastException with SerializableProxy on lazy attributes</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-474'>EJBTHREE-474</a>] - please remove unused XML elements from jboss_5_0.xsd and JBossDDObjectFactory.java</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-484'>EJBTHREE-484</a>] - EQL: COUNT(*) => Integer instead of Long</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-486'>EJBTHREE-486</a>] - SELECT COUNT(...) returns Integer. Must be Long</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-502'>EJBTHREE-502</a>] - env-entry does not work for Message Driven Beans</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-504'>EJBTHREE-504</a>] - resource-ref not processed from ejb-jar.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-514'>EJBTHREE-514</a>] - None of the ejb3 jars include the version manifest headers</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-515'>EJBTHREE-515</a>] - @EJB injection into @Service stopped working</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-519'>EJBTHREE-519</a>] - calling a @Remove method inside rolled back tx causes exception</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-520'>EJBTHREE-520</a>] - injecting em in @Service is null in start()</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-528'>EJBTHREE-528</a>] - deploying ejbs with large number of methods is slow.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-533'>EJBTHREE-533</a>] - Cache regions not being removed.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-537'>EJBTHREE-537</a>] - Transaction demarcation does not affect session management for looked up EM.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-540'>EJBTHREE-540</a>] - RegisterSynchronization fails if the transaction is already marked for rollback</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-541'>EJBTHREE-541</a>] - An MDB with a jboss.xml-specified destination misbehaves, trying to create wrong destination</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-542'>EJBTHREE-542</a>] - Rewrap of EJBExceptions</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-543'>EJBTHREE-543</a>] - problems injecting with @Depends</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-550'>EJBTHREE-550</a>] - @Depends fails in embedded</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-554'>EJBTHREE-554</a>] - ejb-ref/ejb-local-ref ine web.xml fails with RemoteHome/LocalHome fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-565'>EJBTHREE-565</a>] - Invalid webservice namespace usage</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-573'>EJBTHREE-573</a>] - scoping of thrown exceptions not done with inVM @Remote invocation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-574'>EJBTHREE-574</a>] - postActivate incorrectly called after failover</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-581'>EJBTHREE-581</a>] - Possible NPE in StatefulEvictionPolicy</li>
-</ul>
-
-<h2>Task</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-126'>EJBTHREE-126</a>] - Create Docbook for Session/MDBs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-293'>EJBTHREE-293</a>] - JACC tutorial for Entity Beans</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-294'>EJBTHREE-294</a>] - Docbook for JACC integration</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-467'>EJBTHREE-467</a>] - move interceptors to javax.interceptor and change InvocationContext API to match spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-470'>EJBTHREE-470</a>] - Boot profiling and optimizations.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-475'>EJBTHREE-475</a>] - autodocument jboss_5_0.xsd</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-532'>EJBTHREE-532</a>] - implement @AspectDomain in jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-539'>EJBTHREE-539</a>] - complete <loader-repository> implementation for jboss.xml. Annotation?</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-547'>EJBTHREE-547</a>] - create test for <depends></li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-548'>EJBTHREE-548</a>] - implement <ignore-dependency> in jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-555'>EJBTHREE-555</a>] - write test for unsecured ejb calling secured ejb to test principal/credential propagation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-562'>EJBTHREE-562</a>] - make sure all custom jboss annotations have XML counterpart</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-568'>EJBTHREE-568</a>] - Refactored clusteredsession tests</li>
-</ul>
-
-
-Release Notes - EJB 3.0 - Version EJB 3.0 RC6 - PFD
-
-<h2>Feature Request</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-241'>EJBTHREE-241</a>] - Remote interface should be optional for WS endpoints</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-317'>EJBTHREE-317</a>] - Update binding manager.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-381'>EJBTHREE-381</a>] - add mappedName() support for @EJB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-411'>EJBTHREE-411</a>] - schema validation for ejb-jar.xml and jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-443'>EJBTHREE-443</a>] - EJBContext should be bound into ENC</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-482'>EJBTHREE-482</a>] - Enable support for file-based HSQLDB manager</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-516'>EJBTHREE-516</a>] - update to final schema</li>
-</ul>
-
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-239'>EJBTHREE-239</a>] - toString can't be part of business interface (see also EJBTHREE-192)</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-359'>EJBTHREE-359</a>] - Timer.getInfo() in stateless session bean method annotated with @PostConstruct  throws IllegalStateException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-376'>EJBTHREE-376</a>] - Inherited bean class @AroundInvoke method problem</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-416'>EJBTHREE-416</a>] - ejb-jar.xml not up to latest schema from spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-417'>EJBTHREE-417</a>] - schema validation for ejb-jar.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-418'>EJBTHREE-418</a>] - Injected session should not raise TransactionRequiredException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-422'>EJBTHREE-422</a>] - SFSB call entityManager.close() inside the transaction after @Remove</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-437'>EJBTHREE-437</a>] - OptimisticLockException is not supported</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-438'>EJBTHREE-438</a>] - NPE em.createEntityManagerFactory("puname")</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-445'>EJBTHREE-445</a>] - EJB3 deployment fails silently when deploying with an old version of persistence.xml (pre-RC4/5)</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-447'>EJBTHREE-447</a>] - EJB injection into Service fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-448'>EJBTHREE-448</a>] - Incorrect package of PostConstruct and PreDestroy annotations</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-452'>EJBTHREE-452</a>] - CLONE -EJB client: NullPointerException in StatelessLocalProxy</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-453'>EJBTHREE-453</a>] - stateless test fails with internet access for j2ee_web_services_client_1_1.xsd</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-454'>EJBTHREE-454</a>] - Conflict when same ejb-jar is deployed in multiple ears</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-457'>EJBTHREE-457</a>] - EJBContext.lookup("XXX") fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-458'>EJBTHREE-458</a>] - @PersistenceUnit/@PersistenceContext on bean class does not work</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-460'>EJBTHREE-460</a>] - ServiceMBeanDelegate.java:170 - 1.2.4.7 - Casts Throwable into Exception causes ClassCastException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-461'>EJBTHREE-461</a>] - missing antlr jar in embeddable EJB distribution</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-462'>EJBTHREE-462</a>] - assembly-descriptor required to get proper SFSB remove-method behavior</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-463'>EJBTHREE-463</a>] - Fix JACC stuff following updates to EJB3</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-464'>EJBTHREE-464</a>] - Bean injection fails in MDB during deploy of EAR if JMS messages already exist in queue</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-469'>EJBTHREE-469</a>] - @Stateful(mappedName) is missing</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-473'>EJBTHREE-473</a>] - incomplete jboss_5_0.xsd</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-490'>EJBTHREE-490</a>] - flush() syncrhonization not done on SLSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-491'>EJBTHREE-491</a>] - @RunAs + @Management/Service not working - @SecurityDomain ignored?</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-492'>EJBTHREE-492</a>] - Service bean with @SecurityDomain fails to start</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-507'>EJBTHREE-507</a>] - NamingContext for beans remains bound in global jndi tree after undeploy</li>
-</ul>
-
-<h2>Task</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-302'>EJBTHREE-302</a>] - Create unit tests for @AspectDomain, @CallByValue, @DefaultActivationSpecs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-332'>EJBTHREE-332</a>] - Update spring-int use Interceptors instead of CallbackHandler as per the latest spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-343'>EJBTHREE-343</a>] - INFO logging level is overused</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-426'>EJBTHREE-426</a>] - hibernate-client.jar should contain org.hibernate.proxy.SerializableProxy</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-459'>EJBTHREE-459</a>] - implement SessionContext.getInvokedBusinessInterface()</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-493'>EJBTHREE-493</a>] - Create tutorial for EJB30/EJB2.x refs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-497'>EJBTHREE-497</a>] - EJB3 with Java5 server and Java1.4.x client</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-511'>EJBTHREE-511</a>] - Renamed clustered session bean testsuite</li>
-</ul>
-
-Release Notes - EJB 3.0 - Version EJB 3.0 RC5 - PFD
-        
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-428'>EJBTHREE-428</a>] - EJB3 remoting connector needs ${jboss.bind.address}</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-429'>EJBTHREE-429</a>] - HA-JMS + MDB problem:  MDB Container not reconnecting properly.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-430'>EJBTHREE-430</a>] - Not setting correct datasource dependency</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-431'>EJBTHREE-431</a>] - SFSB Activation is not closing file so it cannot delete old passivated bean</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-432'>EJBTHREE-432</a>] - @PersistenceContext on class not working</li>
-</ul>
-
-                        
-Release Notes - EJB 3.0 - Version EJB 3.0 RC4 - PFD
-    
-<h2>Feature Request</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-187'>EJBTHREE-187</a>] - SFSB's don't have to implement Serializable/Externalizable</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-279'>EJBTHREE-279</a>] - Update to latest interceptors draft</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-298'>EJBTHREE-298</a>] - Transaction timeout at method level for EJB3 session bean</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-300'>EJBTHREE-300</a>] - Support for client side interceptor payload propagation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-310'>EJBTHREE-310</a>] - implement message-destination-link</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-346'>EJBTHREE-346</a>] - Add client to stack trace of exception</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-351'>EJBTHREE-351</a>] - MDB with BMT: Message ack on RuntimeException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-353'>EJBTHREE-353</a>] - @SerializedConcurrentAccess allows blocking instead of exception for an SFSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-355'>EJBTHREE-355</a>] - implement and test <depends> element in jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-390'>EJBTHREE-390</a>] - Implement <application-exception></li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-393'>EJBTHREE-393</a>] - Change default JNDI binding to EJBNAME/remote, EJBNAME/local</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-394'>EJBTHREE-394</a>] - Output better exceptions when failing to bind into JNDI</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-395'>EJBTHREE-395</a>] - make sure all the Java Mail injection requirements are satisfied</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-397'>EJBTHREE-397</a>] - allow .jar instead of .ejb3 and .par</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-398'>EJBTHREE-398</a>] - support latest PFD persistence.xml format</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-412'>EJBTHREE-412</a>] - embeddable should output non-resolved dependencies after a deploy</li>
-</ul>
-    
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-250'>EJBTHREE-250</a>] - EJBs need to publish dependencies</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-251'>EJBTHREE-251</a>] - EJB deployment should abort if create/start fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-270'>EJBTHREE-270</a>] - Redeployment of stateful bean fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-295'>EJBTHREE-295</a>] - org.hibernate.dialect.IngresDialect no longer works with paged queries</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-296'>EJBTHREE-296</a>] - EAR datasource does not deploy in time for par.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-315'>EJBTHREE-315</a>] - Underscored method names in Session beans cause exception</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-316'>EJBTHREE-316</a>] - Extended PC cannot be passivated in SFSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-318'>EJBTHREE-318</a>] - Problem with injection remove the message from the queue</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-320'>EJBTHREE-320</a>] - BMT doesn't work if you define it within XML</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-321'>EJBTHREE-321</a>] - BMT tx.suspend() behavior broken: BMT in general broken</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-324'>EJBTHREE-324</a>] - NullPointerException end unnecessary passivate in stateful EJB3 Session Bean</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-328'>EJBTHREE-328</a>] - default persistence.properties should not specify the dialect</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-330'>EJBTHREE-330</a>] - <jta-datasource>blah</jta-dasource> ignored unless you override hibernate.connection.datasource</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-333'>EJBTHREE-333</a>] - Unexpected Principal (Security Identity) Propagation Switch</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-334'>EJBTHREE-334</a>] - injection-target for resource-ref is ignored</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-337'>EJBTHREE-337</a>] - EJBException should set cause</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-356'>EJBTHREE-356</a>] - @TransactionAttribute has no effect when specified at the top level of an SFSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-357'>EJBTHREE-357</a>] - Extended persistence context not propagated across SFSB instantiation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-362'>EJBTHREE-362</a>] - Incorrect attribute name "activateConfig" in annotation @MessageDriven.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-365'>EJBTHREE-365</a>] - Env-entry needs to be fully tested to see if it conforms to spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-366'>EJBTHREE-366</a>] - Error create ejb-ref</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-373'>EJBTHREE-373</a>] - MDBs on Temporary Queues do not receive messages</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-374'>EJBTHREE-374</a>] - jboss.xml should override destination-jndi-name, mdb-user and mdb-passwd for MDBs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-375'>EJBTHREE-375</a>] - Improve dd/mdb tests</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-377'>EJBTHREE-377</a>] - NullPointerException in RunAsSecurityInterceptor called from @Timeout method</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-382'>EJBTHREE-382</a>] - default ejb-name should be unqualified bean class, not fully qualitifed name of class</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-383'>EJBTHREE-383</a>] - Inadvertent use of immutable list causes EJBException with null message, null detail, no useful stack trace</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-384'>EJBTHREE-384</a>] - Security Problem - Server fails to clear user authentication after standalone client disconnects</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-385'>EJBTHREE-385</a>] - javax.ejb.EJBContext.lookup() should look relative to the bean's ENC.  Currently it is a global JNDI lookup</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-386'>EJBTHREE-386</a>] - invocations through collocated remote interfaces in separate isolated classloaders causes CCE's</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-387'>EJBTHREE-387</a>] - PersistenceInfo.getEntityclassNames should be PersistenceInfo.getEntityClassNames</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-391'>EJBTHREE-391</a>] - empty string named persistence unit seems to not deploy within an .ejb3 jar.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-401'>EJBTHREE-401</a>] - Cannot deploy solo jboss.xml with jndi override</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-403'>EJBTHREE-403</a>] - ejbjar with @Entity gets CNF exceptions when deployed in a scoped EAR</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-404'>EJBTHREE-404</a>] - Statefull beans looses security context after activation from passivated state</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-415'>EJBTHREE-415</a>] - ejb21 adaptor tutorial is broken, returns null values</li>
-</ul>
-    
-<h2>Task</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-309'>EJBTHREE-309</a>] - unitTest message-destination-ref XML element</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-331'>EJBTHREE-331</a>] - Passivating non-serializable inerceptors using JBoss Cache as SFSB cache gives NotSerializableException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-336'>EJBTHREE-336</a>] - remove default hibernate schema export from EJB3 (don't use hbm2ddl=create)</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-339'>EJBTHREE-339</a>] - DD xml binding does not differentiate between methods with no parameters and not specified parameters</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-341'>EJBTHREE-341</a>] - Configure @Service and @Consumer the same way as @Stateless, @Stateful, @MessageDriven</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-345'>EJBTHREE-345</a>] - test env-entry injection</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-349'>EJBTHREE-349</a>] - docbook for JCA RAR inflow integration</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-354'>EJBTHREE-354</a>] - Document @SerializedConcurrentAccess</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-360'>EJBTHREE-360</a>] - UserTransaction needs to be bound in embeddable</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-364'>EJBTHREE-364</a>] - support jboss.xml resource-manager tags</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-369'>EJBTHREE-369</a>] - HEM now set tx.flush_before_completion to true => the container should not flush anymore</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-392'>EJBTHREE-392</a>] - document SSL integration</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-399'>EJBTHREE-399</a>] - Security bug needs different patch</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-409'>EJBTHREE-409</a>] - create tutorials for jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-410'>EJBTHREE-410</a>] - cleanup jboss.xml in tests</li>
-</ul>
-        
-<h2>Patch</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-363'>EJBTHREE-363</a>] - <security-domain> in jboss.xml is ignored when there is no <assembly-descriptor> in ejb-jar.xml</li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/build-test-wls.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/build-test-wls.xml)
===================================================================
--- branches/Branch_4_2/ejb3/build-test-wls.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/build-test-wls.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,153 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="deploy-war" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src/test"/>
+   <property name="build.dir" value="${basedir}/output"/>
+   <property name="reports.dir" value="${build.dir}/reports"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="output/lib/embeddable/lib"/>
+   <property name="conf.dir" value="output/lib/embeddable/conf"/>
+   <property name="deploy.dir" value="/bea/weblogic90/server/jbossConfig"/>
+   <property name="resources.dir" value="${basedir}/src/resources/test/wls/embeddedwar"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- Client classpath -->
+   <path id="client.classpath">
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${reports.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**/wls/**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Create the jndi test war                                                      -->
+   <!-- =================================================================== -->
+   <target name="jndi-war" depends="prepare">
+      <war warfile="${build.dir}/jndi-test.war"
+         webxml="${resources.dir}/WEB-INF/jndi-web.xml">
+         <fileset dir="${src.dir}/org/jboss/ejb3/test/wls/embeddedwar">
+            <include name="JndiTest.jsp"/>
+         </fileset>
+      </war>
+      <copy todir="${deploy.dir}" filtering="yes">
+         <fileset dir="${build.dir}">
+            <include name="jndi-test.war"/>
+         </fileset>
+      </copy>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Create the war                                                      -->
+   <!-- =================================================================== -->
+   <target name="war" depends="compile">
+      <jar jarfile="${build.dir}/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="${resources.dir}">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+      <war warfile="${build.dir}/standalone.war"
+         webxml="${resources.dir}/WEB-INF/web.xml">
+	   <!--webinf dir="${resources.dir}/WEB-INF">
+            <include name="weblogic.xml"/>
+         </webinf-->
+         <lib dir="${lib.dir}">
+            <include name="*.jar"/>
+         </lib>
+         <lib dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </lib>
+         <classes dir="${resources.dir}/conf">
+            <include name="*.xml"/>
+         </classes>
+         <classes dir="${conf.dir}">
+            <include name="*.xml"/>
+            <include name="*.properties"/>
+         </classes>
+         <fileset dir="${src.dir}/org/jboss/ejb3/test/wls/embeddedwar">
+            <include name="EmbeddedEJB3.jsp"/>
+         </fileset>
+      </war>
+   </target>
+
+
+  <!-- =================================================================== -->
+  <!--  deploy the WAR file                                                 -->
+  <!-- =================================================================== -->
+  <target name="deploy-war" depends="war">
+     <copy todir="${deploy.dir}" filtering="yes">
+         <fileset dir="${build.dir}">
+            <include name="standalone.war"/>
+         </fileset>
+      </copy>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Run the client                                                      -->
+   <!-- =================================================================== -->
+   <target name="run" depends="war">
+      <junit printsummary="yes" fork="yes" showoutput="false">
+         <classpath refid="client.classpath" />
+         <formatter type="xml" />
+         <batchtest todir="${build.dir}/reports">
+           <fileset dir="${build.classes.dir}">
+             <include name="**/wls/**/*TestCase.class" />
+           </fileset>
+         </batchtest>
+      </junit>
+    <junitreport todir="${build.dir}/reports">
+        <report todir="${build.dir}/reports"/>
+    </junitreport>
+   </target>
+
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -2884,6 +2884,16 @@
    </target>
 
 
+   <target name="start-stop-jboss" depends="init" description="Start and stop jboss">
+
+      <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <wait-on-host/>
+
+      <stop-jboss jboss.dist="${ejb3.dist}"/>
+      <wait-on-shutdown conf="all"/>
+   </target>
+
+
    <target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
       <antcall target="test" inheritRefs="true">
          <param name="test" value="webservices"/>

Modified: branches/Branch_4_2/ejb3/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -56,7 +56,7 @@
       | should contain module specific configuration elements.
     -->
 
-   <target name="configure" unless="configure.disable">
+   <target name="configure" unless="configure.disable"> 
 
       <!-- =================== -->
       <!-- Basic Configuration -->
@@ -72,7 +72,6 @@
       <property name="ejb3.vendor" value="JBoss"/>
       <property name="ejb3.url" value="http://www.jboss.com/products/ejb3"/>
 
-
       <!-- ========= -->
       <!-- Libraries -->
       <!-- ========= -->
@@ -91,15 +90,19 @@
          <path refid="xdoclet.xdoclet.classpath"/>
          <path refid="apache.ant.classpath"/>
          <path refid="oswego.concurrent.classpath"/>
-         <path refid="quartz.quartz.classpath"/>
          <path refid="junit.junit.classpath"/>
          <path refid="jboss.remoting.classpath"/>
          <path refid="apache.logging.classpath"/>
          <path refid="jboss.serialization.classpath"/>
          <path refid="jboss.microcontainer.classpath"/>
+         <!--path refid="jboss.jboss.vfs.classpath"/-->
+         <path refid="quartz.quartz.classpath"/>
          <path refid="jboss.jbossws.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
          <path refid="jacorb.jacorb.classpath"/>
+         <path refid="dom4j.dom4j.classpath"/>
+         <!-- FIXME: temporary for EJBTHREE-485 -->
+         <path refid="cglib.classpath"/>
       </path>
 
       <!-- ======= -->
@@ -112,18 +115,28 @@
       <path id="dependentmodule.classpath">
          <path refid="jboss.j2ee.classpath"/>
          <path refid="jboss.jmx.classpath"/>
+         <!--path refid="jboss.j2se.classpath"/-->
          <path refid="jboss.aop.classpath"/>
          <path refid="jboss.cache.classpath"/>
          <path refid="jboss.aspects.classpath"/>
          <path refid="jboss.ejb3x.classpath"/>
          <path refid="jboss.common.classpath"/>
+         <!--
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
+         -->
          <path refid="jboss.cluster.classpath"/>
          <path refid="jboss.system.classpath"/>
+         <!--path refid="jboss.systemjmx.classpath"/-->
+         <!--path refid="jboss.mbeans.classpath"/-->
          <path refid="jboss.naming.classpath"/>
          <path refid="jboss.transaction.classpath"/>
          <path refid="jboss.security.classpath"/>
          <path refid="jboss.server.classpath"/>
          <path refid="jboss.messaging.classpath"/>
+         <path refid="jboss.jca.classpath"/>
          <path refid="jboss.iiop.classpath"/>
       </path>
 
@@ -171,6 +184,7 @@
       <!-- The classpath required to build javadocs. -->
       <path id="javadoc.classpath">
          <path refid="javac.classpath"/>
+         <path refid="jboss.ejb3.classpath"/>
       </path>
 
       <!-- Packages to include when generating api documentation -->
@@ -221,14 +235,18 @@
          target="1.5"
          depend="${javac.depend}"
          verbose="${javac.verbose}"
-         deprecation="${javac.deprecation}"
          includeAntRuntime="${javac.include.ant.runtime}"
          includeJavaRuntime="${javac.include.java.runtime}"
+         deprecation="${javac.deprecation}"
          failonerror="${javac.fail.onerror}">
          <src path="${source.java}"/>
          <classpath refid="javac.classpath"/>
          <include name="${javac.includes}"/>
          <exclude name="${javac.excludes}"/>
+         <exclude name="org/jboss/ejb3/client/**"/>
+         <exclude name="org/jboss/ejb3/clientmodule/**"/>
+         <exclude name="org/jboss/ejb3/deployers/**"/>
+         <exclude name="org/jboss/ejb3/embedded/**"/>
       </javac>
    </target>
 
@@ -270,46 +288,39 @@
       <!-- jboss-ejb3.jar -->
       <jar jarfile="${build.lib}/jboss-ejb3.jar" manifest="${build.etc}/default.mf">
          <fileset dir="${build.classes}">
-	    <!-- javax/jws is needed just in case webservices isn't installed -->
-            <include name="javax/jws/**"/>
-            <include name="javax/xml/ws/*.class"/>
             <include name="org/jboss/**"/>
+            <!-- fix cyclic dependency with webservice module -->
+            <include name="javax/jws/*.class"/>
+            <include name="javax/xml/ws/*.class"/>
             <exclude name="org/jboss/ejb3/test/**"/>
             <exclude name="org/jboss/annotation/**"/>
          </fileset>
-          <fileset dir="${jboss.j2ee.root}/classes">
-              <!-- seems to not be included with 4.0.3SP1 dist -->
-              <include name="javax/xml/rpc/handler/MessageContext.class"/>
-          </fileset>
          <fileset dir="${resources}">
             <include name="schema/*.xsd"/>
-         </fileset>
+         </fileset>         
       </jar>
 
       <!-- build hibernate-client.jar -->
-      <unjar src="${hibernate.hibernate.lib}/hibernate3.jar"
-         dest="${build.classes}" />
+      <!-- <unjar src="${hibernate.hibernate.lib}/hibernate3.jar"
+         dest="${build.classes}" />  -->
       <jar jarfile="${build.lib}/hibernate-client.jar">
-         <fileset dir="${build.classes}">
+         <zipfileset src="${hibernate.hibernate.lib}/hibernate3.jar">
             <include name="org/hibernate/AssertionFailure.class"/>
             <include name="org/hibernate/**/*Exception.class"/>
             <include name="org/hibernate/collection/**"/>
             <include name="org/hibernate/exception/Nestable*.class"/>
             <include name="org/hibernate/exception/ExceptionUtils.class"/>
             <include name="org/hibernate/engine/SessionImplementor.class"/>
-            <include name="org/hibernate/loader/CollectionAliases.class"/>
-            <include name="org/hibernate/persister/collection/**"/>
+            <include name="org/hibernate/loader/CollectionAliases.class"/>            
+            <include name="org/hibernate/persister/collection/**"/>           
             <include name="org/hibernate/pretty/MessageHelper.class"/>
-            <include name="org/hibernate/proxy/*.class"/>
-            <include name="org/hibernate/type/Abstract*.class"/>
             <include name="org/hibernate/type/Type.class"/>
             <include name="org/hibernate/EntityMode.class"/>
             <include name="org/hibernate/util/**"/>
-            <include name="org/hibernate/proxy/pojo/**"/>
-            <include name="org/hibernate/property/**"/>
-         </fileset>
+            <include name="org/hibernate/proxy/**"/>
+         </zipfileset>
       </jar>
-      <delete dir="${build.classes}/org/hibernate"/>
+      
 
       <!-- build client-jar -->
       <jar jarfile="${build.lib}/jboss-ejb3-client.jar" manifest="${build.etc}/default.mf">
@@ -333,17 +344,24 @@
             <include name="org/jboss/ejb3/proxy/**/*.class"/>
             <include name="org/jboss/ejb3/*ServiceServer*.class"/>
             <include name="org/jboss/ejb3/*KernelAbstraction*.class"/>
-
+            <include name="org/jboss/ejb3/statistics/*.class"/>
+            
             <!-- EJBTHREE-485: include java assist proxy stuff -->
             <include name="org/jboss/ejb3/stateless/Javassist*.class"/>
             
             <!-- EJBTHREE-667: include object factory -->
             <include name="org/jboss/ejb3/naming/client/**/*.class"/>
             <include name="org/jboss/ejb3/naming/BrainlessContext.class"/>
+
+         	<!-- EJBTHREE-718: client container -->
+         	<include name="org/jboss/ejb3/client/**/*.class"/>
+         	<include name="org/jboss/ejb3/metamodel/**/*.class"/>
+         	<include name="org/jboss/injection/**/*.class"/>
+         	<include name="org/jboss/ejb3/ThreadLocalENCFactory.class"/>
          </fileset>
       </jar>
 
-
+      
       <!-- jboss-annotations-ejb3.jar -->
       <jar jarfile="${build.lib}/jboss-annotations-ejb3.jar" manifest="${build.etc}/default.mf">
          <fileset dir="${build.classes}">
@@ -363,15 +381,19 @@
             <include name="jboss-ejb3x.jar"/>
          </fileset>
          <fileset dir="${resources}">
+            <!--include name="META-INF/ejb3-deployers-beans.xml"/-->
             <include name="META-INF/jboss-service.xml"/>
             <include name="META-INF/persistence.properties"/>
          </fileset>
       </copy>
       <copy todir="${build.lib}" file="${resources}/ejb3-interceptors-aop.xml"/>
-      <copy todir="${build.lib}" file="${resources}/ejb3-clustered-sfsbcache-service.xml"/>
-      <copy todir="${build.lib}" file="${resources}/ejb3-entity-cache-service.xml"/>
-   </target>
-
+      <copy todir="${build.lib}" file="${resources}/ejb3-clustered-sfsbcache-beans.xml"/>
+      <copy todir="${build.lib}" file="${resources}/ejb3-entity-cache-beans.xml"/>
+      <copy todir="${build.lib}" file="${resources}/ejb3-timer-service.xml"/>
+      <copy todir="${build.lib}" file="${resources}/ejb3-connectors-service.xml"/>
+  </target>
+  
+  
    <!-- ================================================================== -->
    <!-- Install & Release                                                  -->
    <!-- ================================================================== -->
@@ -398,11 +420,13 @@
       description="Builds a distribution for each archive type."
       depends="release-zip, release-tgz"/>
 
-   <target name="release-docs">
+   <target name="dist" depends="init">
+      <unjar src="${jboss.aspects.lib}/jboss-aop-jdk50.deployer"
+         dest="${build.lib}/jboss-aop-jdk50.deployer" />
         <javadoc
-        	packagenames="org.jboss.annotation, javax.ejb"
+        	packagenames="org.jboss.annotation"
         	classpathref="javac.classpath"
-        	destdir="docs/api"
+        	destdir="output/api"
         	use="true"
         	protected="true"
         	version="true"
@@ -412,98 +436,38 @@
              <include name="org/jboss/annotation/**"/>
              <exclude name="org/jboss/annotation/**/*Impl*"/>
           </fileset>
-          <fileset dir="../ejb3x/src/main" defaultexcludes="yes">
-             <include name="javax/**/*"/>
-          </fileset>
         </javadoc>
-        <mkdir dir="docs/reference/reference/en/images"/>
-        <ant antfile="build.xml" dir="docs/reference"/>
-   </target>
-
-   <target name="dist" depends="init, release-docs">
-      <property name="ejb3.zip.version" value="jboss-EJB-3.0_RC7-FD"/>
-      <echo message="${jboss.common.lib}"/>
-      <zip zipfile="${ejb3.zip.version}.zip">
-         <zipfileset dir="." prefix="${ejb3.zip.version}">
+      <property name="ejb3.version" value="jboss-EJB-3.0_RC2"/>
+      <zip zipfile="${ejb3.version}.zip">
+         <zipfileset dir="." prefix="${ejb3.version}">
             <include name="INSTALL.html"/>
-            <include name="Migrating.html"/>
             <include name="RELEASE_NOTES.txt"/>
          </zipfileset>
-        <zipfileset dir="${hibernate.entitymanager.lib}" prefix="${ejb3.zip.version}/lib">
-           <include name="*.jar"/>
-        </zipfileset>
-        <zipfileset dir="${hibernate.annotations.lib}" prefix="${ejb3.zip.version}/lib">
-           <include name="*.jar"/>
-        </zipfileset>
-        <zipfileset dir="${hibernate.hibernate.lib}" prefix="${ejb3.zip.version}/lib">
-           <include name="hibernate3.jar"/>
-        </zipfileset>
-         <zipfileset dir="${jboss.aspects.lib}" prefix="${ejb3.zip.version}/lib">
-            <include name="jboss-aop-jdk50.deployer/**"/>
+         <zipfileset dir="output/api" prefix="${ejb3.version}/docs/api">
+             <include name="**"/>
          </zipfileset>
-         <zipfileset dir="../connector/output/lib" prefix="${ejb3.zip.version}/lib">
-            <include name="quartz-ra.rar"/>
+         <zipfileset dir="${jboss.jbossxb.lib}" prefix="${ejb3.version}/lib">
+            <include name="jboss-xb.jar"/>
          </zipfileset>
-         <zipfileset dir="${quartz.quartz.lib}" prefix="${ejb3.zip.version}/lib">
-            <include name="quartz.jar"/>
-         </zipfileset>
-         <zipfileset dir="${jboss.remoting.lib}" prefix="${ejb3.zip.version}/lib">
-            <include name="jboss-remoting.jar"/>
-         </zipfileset>
-         <zipfileset dir="${build.lib}" prefix="${ejb3.zip.version}/lib">
+         <zipfileset dir="${build.lib}" prefix="${ejb3.version}/lib">
             <include name="jboss-aop-jdk50.deployer/**"/>
             <include name="ejb3.deployer/**"/>
             <include name="ejb3-interceptors-aop.xml"/>
-            <include name="ejb3-clustered-sfsbcache-service.xml"/>
-            <include name="ejb3-entity-cache-service.xml"/>
+            <include name="ejb3-clustered-sfsbcache-beans.xml"/>
+            <include name="ejb3-entity-cache-beans.xml"/>
+            <include name="ejb3-timer-service.xml"/>
          </zipfileset>
-         <zipfileset dir="docs" prefix="${ejb3.zip.version}/docs">
+         <zipfileset dir="docs" prefix="${ejb3.version}/docs">
             <include name="**"/>
             <exclude name="**/CVS/**"/>
             <exclude name="**/*.wiki"/>
+            <exclude name="docs/embedded*/**"/>
             <exclude name="docs/reference/build.xml"/>
             <exclude name="docs/reference/reference/**"/>
          </zipfileset>
       </zip>
    </target>
 
-  <!-- Build the repository.jboss.com ejb3 deployer contents needed for
-  the jems installer
-  -->
-  <target name="repository-zip" depends="jars"
-    description="Create the repository.jboss.com jboss/ejb3 component contents">
-    <!-- The binary component version -->
-    <property name="comp-version" value="1.0.0.CR7-jboss4" />
-    <!-- Pack the ejb3.deployer -->
-    <zip destfile="${build.lib}/ejb3-deployer.zip">
-      <zipfileset dir="${build.lib}">
-        <include name="ejb3.deployer/**" />
-      </zipfileset>
-    </zip>
-    <!-- Create a zip file with the 1.0.0.CR7-jboss4 component structure -->
-    <zip destfile="${build.lib}/jboss-ejb3-repo.zip">
-      <!-- The component-info.xml -->
-      <zipfileset dir="${build.etc}" prefix="${comp-version}">
-        <include name="component-info.xml" />
-      </zipfileset>
-      <!-- The bin/ejb3.deployer -->
-      <zipfileset dir="${build.lib}" fullpath="${comp-version}/bin/ejb3.deployer">
-        <include name="ejb3-deployer.zip" />
-      </zipfileset>
-      <!-- The lib client jars -->
-      <zipfileset dir="${build.lib}" prefix="${comp-version}/lib">
-        <include name="hibernate-client.jar" />
-        <include name="jboss-ejb3-client.jar" />
-      </zipfileset>
-      <!-- The resources deploy descriptors -->
-      <zipfileset dir="${build.lib}" prefix="${comp-version}/resources">
-        <include name="ejb3-clustered-sfsbcache-service.xml" />
-        <include name="ejb3-entity-cache-service.xml" />
-        <include name="ejb3-interceptors-aop.xml" />
-      </zipfileset>
-    </zip>
-  </target>
-
    <!-- ================================================================== -->
    <!-- Cleaning                                                           -->
    <!-- ================================================================== -->

Copied: branches/Branch_4_2/ejb3/component-info.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/component-info.xml)
===================================================================
--- branches/Branch_4_2/ejb3/component-info.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/component-info.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,26 @@
+<project name="ejb3-component-info">
+   <!-- ============================================================ -->
+   <!-- ejb3                                                        -->
+   <!-- ============================================================ -->
+
+   <component id="ejb3"
+              module="jboss-ejb3"
+              version="4.2-SNAPSHOT"
+   >
+      <artifact id="jboss-ejb3.jar"/>   
+      <artifact id="jboss-annotations-ejb3.jar"/>
+      <artifact id="embeddable" artifacttype="dir"/> 
+      <artifact id="ejb3.deployer" artifacttype="dir"/>             
+      <artifact id="lib" artifacttype="dir"/>             
+      <artifact id="conf" artifacttype="dir"/> 
+      <artifact id="ejb3-clustered-sfsbcache-service.xml" outputpath="resources"/>
+      <artifact id="ejb3-entity-cache-service.xml" outputpath="resources"/>
+      <artifact id="ejb3-interceptors-aop.xml" outputpath="resources"/>
+      <artifact id="persistence.properties" outputpath="resources/META-INF"/>
+      <artifact id="default.persistence.properties" outputpath="resources/META-INF"/>
+      <export>
+         <include input="jboss-ejb3.jar"/> 
+         <include input="jboss-annotations-ejb3.jar"/>
+      </export>
+   </component>
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/RELEASE_NOTES.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/RELEASE_NOTES.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/RELEASE_NOTES.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,214 +0,0 @@
-<html>
-<body>
-
-
-Release Notes - EJB 3.0 - Version EJB 3.0 RC7 - FD
-
-<h2>Feature Request</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-521'>EJBTHREE-521</a>] - Use org.jboss.serial.io.MarshalledObjectForLocalCalls on in-vm call-by-value operations</li>
-</ul>
-
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-235'>EJBTHREE-235</a>] - Incorrect PreDestroy method handling with StrictMaxPool</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-352'>EJBTHREE-352</a>] - EJB Containers should be scoped per deployment</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-440'>EJBTHREE-440</a>] - ClassCastException with SerializableProxy on lazy attributes</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-474'>EJBTHREE-474</a>] - please remove unused XML elements from jboss_5_0.xsd and JBossDDObjectFactory.java</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-484'>EJBTHREE-484</a>] - EQL: COUNT(*) => Integer instead of Long</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-486'>EJBTHREE-486</a>] - SELECT COUNT(...) returns Integer. Must be Long</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-502'>EJBTHREE-502</a>] - env-entry does not work for Message Driven Beans</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-504'>EJBTHREE-504</a>] - resource-ref not processed from ejb-jar.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-514'>EJBTHREE-514</a>] - None of the ejb3 jars include the version manifest headers</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-515'>EJBTHREE-515</a>] - @EJB injection into @Service stopped working</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-519'>EJBTHREE-519</a>] - calling a @Remove method inside rolled back tx causes exception</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-520'>EJBTHREE-520</a>] - injecting em in @Service is null in start()</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-528'>EJBTHREE-528</a>] - deploying ejbs with large number of methods is slow.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-533'>EJBTHREE-533</a>] - Cache regions not being removed.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-537'>EJBTHREE-537</a>] - Transaction demarcation does not affect session management for looked up EM.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-540'>EJBTHREE-540</a>] - RegisterSynchronization fails if the transaction is already marked for rollback</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-541'>EJBTHREE-541</a>] - An MDB with a jboss.xml-specified destination misbehaves, trying to create wrong destination</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-542'>EJBTHREE-542</a>] - Rewrap of EJBExceptions</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-543'>EJBTHREE-543</a>] - problems injecting with @Depends</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-550'>EJBTHREE-550</a>] - @Depends fails in embedded</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-554'>EJBTHREE-554</a>] - ejb-ref/ejb-local-ref ine web.xml fails with RemoteHome/LocalHome fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-565'>EJBTHREE-565</a>] - Invalid webservice namespace usage</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-573'>EJBTHREE-573</a>] - scoping of thrown exceptions not done with inVM @Remote invocation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-574'>EJBTHREE-574</a>] - postActivate incorrectly called after failover</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-581'>EJBTHREE-581</a>] - Possible NPE in StatefulEvictionPolicy</li>
-</ul>
-
-<h2>Task</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-126'>EJBTHREE-126</a>] - Create Docbook for Session/MDBs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-293'>EJBTHREE-293</a>] - JACC tutorial for Entity Beans</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-294'>EJBTHREE-294</a>] - Docbook for JACC integration</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-467'>EJBTHREE-467</a>] - move interceptors to javax.interceptor and change InvocationContext API to match spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-470'>EJBTHREE-470</a>] - Boot profiling and optimizations.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-475'>EJBTHREE-475</a>] - autodocument jboss_5_0.xsd</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-532'>EJBTHREE-532</a>] - implement @AspectDomain in jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-539'>EJBTHREE-539</a>] - complete <loader-repository> implementation for jboss.xml. Annotation?</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-547'>EJBTHREE-547</a>] - create test for <depends></li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-548'>EJBTHREE-548</a>] - implement <ignore-dependency> in jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-555'>EJBTHREE-555</a>] - write test for unsecured ejb calling secured ejb to test principal/credential propagation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-562'>EJBTHREE-562</a>] - make sure all custom jboss annotations have XML counterpart</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-568'>EJBTHREE-568</a>] - Refactored clusteredsession tests</li>
-</ul>
-
-
-Release Notes - EJB 3.0 - Version EJB 3.0 RC6 - PFD
-
-<h2>Feature Request</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-241'>EJBTHREE-241</a>] - Remote interface should be optional for WS endpoints</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-317'>EJBTHREE-317</a>] - Update binding manager.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-381'>EJBTHREE-381</a>] - add mappedName() support for @EJB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-411'>EJBTHREE-411</a>] - schema validation for ejb-jar.xml and jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-443'>EJBTHREE-443</a>] - EJBContext should be bound into ENC</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-482'>EJBTHREE-482</a>] - Enable support for file-based HSQLDB manager</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-516'>EJBTHREE-516</a>] - update to final schema</li>
-</ul>
-
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-239'>EJBTHREE-239</a>] - toString can't be part of business interface (see also EJBTHREE-192)</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-359'>EJBTHREE-359</a>] - Timer.getInfo() in stateless session bean method annotated with @PostConstruct  throws IllegalStateException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-376'>EJBTHREE-376</a>] - Inherited bean class @AroundInvoke method problem</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-416'>EJBTHREE-416</a>] - ejb-jar.xml not up to latest schema from spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-417'>EJBTHREE-417</a>] - schema validation for ejb-jar.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-418'>EJBTHREE-418</a>] - Injected session should not raise TransactionRequiredException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-422'>EJBTHREE-422</a>] - SFSB call entityManager.close() inside the transaction after @Remove</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-437'>EJBTHREE-437</a>] - OptimisticLockException is not supported</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-438'>EJBTHREE-438</a>] - NPE em.createEntityManagerFactory("puname")</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-445'>EJBTHREE-445</a>] - EJB3 deployment fails silently when deploying with an old version of persistence.xml (pre-RC4/5)</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-447'>EJBTHREE-447</a>] - EJB injection into Service fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-448'>EJBTHREE-448</a>] - Incorrect package of PostConstruct and PreDestroy annotations</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-452'>EJBTHREE-452</a>] - CLONE -EJB client: NullPointerException in StatelessLocalProxy</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-453'>EJBTHREE-453</a>] - stateless test fails with internet access for j2ee_web_services_client_1_1.xsd</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-454'>EJBTHREE-454</a>] - Conflict when same ejb-jar is deployed in multiple ears</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-457'>EJBTHREE-457</a>] - EJBContext.lookup("XXX") fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-458'>EJBTHREE-458</a>] - @PersistenceUnit/@PersistenceContext on bean class does not work</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-460'>EJBTHREE-460</a>] - ServiceMBeanDelegate.java:170 - 1.2.4.7 - Casts Throwable into Exception causes ClassCastException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-461'>EJBTHREE-461</a>] - missing antlr jar in embeddable EJB distribution</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-462'>EJBTHREE-462</a>] - assembly-descriptor required to get proper SFSB remove-method behavior</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-463'>EJBTHREE-463</a>] - Fix JACC stuff following updates to EJB3</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-464'>EJBTHREE-464</a>] - Bean injection fails in MDB during deploy of EAR if JMS messages already exist in queue</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-469'>EJBTHREE-469</a>] - @Stateful(mappedName) is missing</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-473'>EJBTHREE-473</a>] - incomplete jboss_5_0.xsd</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-490'>EJBTHREE-490</a>] - flush() syncrhonization not done on SLSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-491'>EJBTHREE-491</a>] - @RunAs + @Management/Service not working - @SecurityDomain ignored?</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-492'>EJBTHREE-492</a>] - Service bean with @SecurityDomain fails to start</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-507'>EJBTHREE-507</a>] - NamingContext for beans remains bound in global jndi tree after undeploy</li>
-</ul>
-
-<h2>Task</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-302'>EJBTHREE-302</a>] - Create unit tests for @AspectDomain, @CallByValue, @DefaultActivationSpecs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-332'>EJBTHREE-332</a>] - Update spring-int use Interceptors instead of CallbackHandler as per the latest spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-343'>EJBTHREE-343</a>] - INFO logging level is overused</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-426'>EJBTHREE-426</a>] - hibernate-client.jar should contain org.hibernate.proxy.SerializableProxy</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-459'>EJBTHREE-459</a>] - implement SessionContext.getInvokedBusinessInterface()</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-493'>EJBTHREE-493</a>] - Create tutorial for EJB30/EJB2.x refs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-497'>EJBTHREE-497</a>] - EJB3 with Java5 server and Java1.4.x client</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-511'>EJBTHREE-511</a>] - Renamed clustered session bean testsuite</li>
-</ul>
-
-Release Notes - EJB 3.0 - Version EJB 3.0 RC5 - PFD
-        
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-428'>EJBTHREE-428</a>] - EJB3 remoting connector needs ${jboss.bind.address}</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-429'>EJBTHREE-429</a>] - HA-JMS + MDB problem:  MDB Container not reconnecting properly.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-430'>EJBTHREE-430</a>] - Not setting correct datasource dependency</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-431'>EJBTHREE-431</a>] - SFSB Activation is not closing file so it cannot delete old passivated bean</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-432'>EJBTHREE-432</a>] - @PersistenceContext on class not working</li>
-</ul>
-
-                        
-Release Notes - EJB 3.0 - Version EJB 3.0 RC4 - PFD
-    
-<h2>Feature Request</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-187'>EJBTHREE-187</a>] - SFSB's don't have to implement Serializable/Externalizable</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-279'>EJBTHREE-279</a>] - Update to latest interceptors draft</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-298'>EJBTHREE-298</a>] - Transaction timeout at method level for EJB3 session bean</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-300'>EJBTHREE-300</a>] - Support for client side interceptor payload propagation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-310'>EJBTHREE-310</a>] - implement message-destination-link</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-346'>EJBTHREE-346</a>] - Add client to stack trace of exception</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-351'>EJBTHREE-351</a>] - MDB with BMT: Message ack on RuntimeException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-353'>EJBTHREE-353</a>] - @SerializedConcurrentAccess allows blocking instead of exception for an SFSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-355'>EJBTHREE-355</a>] - implement and test <depends> element in jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-390'>EJBTHREE-390</a>] - Implement <application-exception></li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-393'>EJBTHREE-393</a>] - Change default JNDI binding to EJBNAME/remote, EJBNAME/local</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-394'>EJBTHREE-394</a>] - Output better exceptions when failing to bind into JNDI</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-395'>EJBTHREE-395</a>] - make sure all the Java Mail injection requirements are satisfied</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-397'>EJBTHREE-397</a>] - allow .jar instead of .ejb3 and .par</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-398'>EJBTHREE-398</a>] - support latest PFD persistence.xml format</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-412'>EJBTHREE-412</a>] - embeddable should output non-resolved dependencies after a deploy</li>
-</ul>
-    
-<h2>Bug</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-250'>EJBTHREE-250</a>] - EJBs need to publish dependencies</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-251'>EJBTHREE-251</a>] - EJB deployment should abort if create/start fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-270'>EJBTHREE-270</a>] - Redeployment of stateful bean fails</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-295'>EJBTHREE-295</a>] - org.hibernate.dialect.IngresDialect no longer works with paged queries</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-296'>EJBTHREE-296</a>] - EAR datasource does not deploy in time for par.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-315'>EJBTHREE-315</a>] - Underscored method names in Session beans cause exception</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-316'>EJBTHREE-316</a>] - Extended PC cannot be passivated in SFSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-318'>EJBTHREE-318</a>] - Problem with injection remove the message from the queue</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-320'>EJBTHREE-320</a>] - BMT doesn't work if you define it within XML</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-321'>EJBTHREE-321</a>] - BMT tx.suspend() behavior broken: BMT in general broken</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-324'>EJBTHREE-324</a>] - NullPointerException end unnecessary passivate in stateful EJB3 Session Bean</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-328'>EJBTHREE-328</a>] - default persistence.properties should not specify the dialect</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-330'>EJBTHREE-330</a>] - <jta-datasource>blah</jta-dasource> ignored unless you override hibernate.connection.datasource</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-333'>EJBTHREE-333</a>] - Unexpected Principal (Security Identity) Propagation Switch</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-334'>EJBTHREE-334</a>] - injection-target for resource-ref is ignored</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-337'>EJBTHREE-337</a>] - EJBException should set cause</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-356'>EJBTHREE-356</a>] - @TransactionAttribute has no effect when specified at the top level of an SFSB</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-357'>EJBTHREE-357</a>] - Extended persistence context not propagated across SFSB instantiation</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-362'>EJBTHREE-362</a>] - Incorrect attribute name "activateConfig" in annotation @MessageDriven.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-365'>EJBTHREE-365</a>] - Env-entry needs to be fully tested to see if it conforms to spec</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-366'>EJBTHREE-366</a>] - Error create ejb-ref</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-373'>EJBTHREE-373</a>] - MDBs on Temporary Queues do not receive messages</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-374'>EJBTHREE-374</a>] - jboss.xml should override destination-jndi-name, mdb-user and mdb-passwd for MDBs</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-375'>EJBTHREE-375</a>] - Improve dd/mdb tests</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-377'>EJBTHREE-377</a>] - NullPointerException in RunAsSecurityInterceptor called from @Timeout method</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-382'>EJBTHREE-382</a>] - default ejb-name should be unqualified bean class, not fully qualitifed name of class</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-383'>EJBTHREE-383</a>] - Inadvertent use of immutable list causes EJBException with null message, null detail, no useful stack trace</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-384'>EJBTHREE-384</a>] - Security Problem - Server fails to clear user authentication after standalone client disconnects</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-385'>EJBTHREE-385</a>] - javax.ejb.EJBContext.lookup() should look relative to the bean's ENC.  Currently it is a global JNDI lookup</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-386'>EJBTHREE-386</a>] - invocations through collocated remote interfaces in separate isolated classloaders causes CCE's</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-387'>EJBTHREE-387</a>] - PersistenceInfo.getEntityclassNames should be PersistenceInfo.getEntityClassNames</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-391'>EJBTHREE-391</a>] - empty string named persistence unit seems to not deploy within an .ejb3 jar.</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-401'>EJBTHREE-401</a>] - Cannot deploy solo jboss.xml with jndi override</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-403'>EJBTHREE-403</a>] - ejbjar with @Entity gets CNF exceptions when deployed in a scoped EAR</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-404'>EJBTHREE-404</a>] - Statefull beans looses security context after activation from passivated state</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-415'>EJBTHREE-415</a>] - ejb21 adaptor tutorial is broken, returns null values</li>
-</ul>
-    
-<h2>Task</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-309'>EJBTHREE-309</a>] - unitTest message-destination-ref XML element</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-331'>EJBTHREE-331</a>] - Passivating non-serializable inerceptors using JBoss Cache as SFSB cache gives NotSerializableException</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-336'>EJBTHREE-336</a>] - remove default hibernate schema export from EJB3 (don't use hbm2ddl=create)</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-339'>EJBTHREE-339</a>] - DD xml binding does not differentiate between methods with no parameters and not specified parameters</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-341'>EJBTHREE-341</a>] - Configure @Service and @Consumer the same way as @Stateless, @Stateful, @MessageDriven</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-345'>EJBTHREE-345</a>] - test env-entry injection</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-349'>EJBTHREE-349</a>] - docbook for JCA RAR inflow integration</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-354'>EJBTHREE-354</a>] - Document @SerializedConcurrentAccess</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-360'>EJBTHREE-360</a>] - UserTransaction needs to be bound in embeddable</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-364'>EJBTHREE-364</a>] - support jboss.xml resource-manager tags</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-369'>EJBTHREE-369</a>] - HEM now set tx.flush_before_completion to true => the container should not flush anymore</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-392'>EJBTHREE-392</a>] - document SSL integration</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-399'>EJBTHREE-399</a>] - Security bug needs different patch</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-409'>EJBTHREE-409</a>] - create tutorials for jboss.xml</li>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-410'>EJBTHREE-410</a>] - cleanup jboss.xml in tests</li>
-</ul>
-        
-<h2>Patch</h2>
-<ul>
-<li>[<a href='http://jira.jboss.com/jira/browse/EJBTHREE-363'>EJBTHREE-363</a>] - <security-domain> in jboss.xml is ignored when there is no <assembly-descriptor> in ejb-jar.xml</li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../../lib"/>
-   <property name="conf.dir" value="../../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </fileset>
-      </path>
-
-      <java classname="org.jboss.tutorial.archive.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../../lib"/>
+   <property name="conf.dir" value="../../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </fileset>
+      </path>
+
+      <java classname="org.jboss.tutorial.archive.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archive;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GenerationType;
-import javax.persistence.GeneratedValue;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   @GeneratedValue(strategy= GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archive;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GenerationType;
+import javax.persistence.GeneratedValue;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archive;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      Customer cust = new Customer();
-      cust.setName(name);
-      em.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archive;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      Customer cust = new Customer();
+      cust.setName(name);
+      em.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archive;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archive;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archive;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archive;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,92 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archive;
-
-import java.net.URL;
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-
-      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
-      URL archive = getArchiveURL();
-      deployer.getArchives().add(archive);
-
-      deployer.create();
-      deployer.start();
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-      System.out.println("This is the archive deployed from: ");
-      System.out.print("    ");
-      System.out.println(archive);
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface: " + cust.getName());
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface: " + cust.getName());
-      System.out.println("----------------------------------------------------------");
-
-      deployer.stop();
-      deployer.destroy();
-   }
-
-   public static URL getArchiveURL() throws Exception
-   {
-      // Usually you would hardcode your URL.  This is just a way to make it easier for the tutorial
-      // code to configure where the resource is.
-      URL res = Thread.currentThread().getContextClassLoader().getResource("META-INF/persistence.xml");
-      return EJB3StandaloneDeployer.getContainingUrlFromResource(res, "META-INF/persistence.xml");
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive/src/org/jboss/tutorial/archive/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archive;
+
+import java.net.URL;
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+
+      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
+      URL archive = getArchiveURL();
+      deployer.getArchives().add(archive);
+
+      deployer.create();
+      deployer.start();
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+      System.out.println("This is the archive deployed from: ");
+      System.out.print("    ");
+      System.out.println(archive);
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface: " + cust.getName());
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface: " + cust.getName());
+      System.out.println("----------------------------------------------------------");
+
+      deployer.stop();
+      deployer.destroy();
+   }
+
+   public static URL getArchiveURL() throws Exception
+   {
+      // Usually you would hardcode your URL.  This is just a way to make it easier for the tutorial
+      // code to configure where the resource is.
+      URL res = Thread.currentThread().getContextClassLoader().getResource("META-INF/persistence.xml");
+      return EJB3StandaloneDeployer.getContainingUrlFromResource(res, "META-INF/persistence.xml");
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../../lib"/>
-   <property name="conf.dir" value="../../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </fileset>
-      </path>
-
-      <java classname="org.jboss.tutorial.archivebyresource.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../../lib"/>
+   <property name="conf.dir" value="../../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </fileset>
+      </path>
+
+      <java classname="org.jboss.tutorial.archivebyresource.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archivebyresource;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GenerationType;
-import javax.persistence.GeneratedValue;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   @GeneratedValue(strategy= GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archivebyresource;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GenerationType;
+import javax.persistence.GeneratedValue;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archivebyresource;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      Customer cust = new Customer();
-      cust.setName(name);
-      em.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archivebyresource;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      Customer cust = new Customer();
+      cust.setName(name);
+      em.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archivebyresource;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archivebyresource;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archivebyresource;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archivebyresource;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.archivebyresource;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-
-      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
-      deployer.getArchivesByResource().add("META-INF/persistence.xml");
-
-      deployer.create();
-      deployer.start();
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-      System.out.println("We will search for all archives with META-INF/persistence.xml to deploy them.");
-      System.out.println("    ");
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-
-      deployer.stop();
-      deployer.destroy();
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/archive-by-resource/src/org/jboss/tutorial/archivebyresource/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.archivebyresource;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+
+      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
+      deployer.getArchivesByResource().add("META-INF/persistence.xml");
+
+      deployer.create();
+      deployer.start();
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+      System.out.println("We will search for all archives with META-INF/persistence.xml to deploy them.");
+      System.out.println("    ");
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+
+      deployer.stop();
+      deployer.destroy();
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../../lib"/>
-   <property name="conf.dir" value="../../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <mkdir dir="${build.dir}/deploy"/>
-      <jar jarfile="${build.dir}/deploy/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}/deploy">
-            <include name="tutorial.jar"/>
-         </fileset>
-      </path>
-
-      <java classname="org.jboss.tutorial.deploydir.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../../lib"/>
+   <property name="conf.dir" value="../../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <mkdir dir="${build.dir}/deploy"/>
+      <jar jarfile="${build.dir}/deploy/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}/deploy">
+            <include name="tutorial.jar"/>
+         </fileset>
+      </path>
+
+      <java classname="org.jboss.tutorial.deploydir.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.deploydir;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GenerationType;
-import javax.persistence.GeneratedValue;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   @GeneratedValue(strategy= GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.deploydir;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GenerationType;
+import javax.persistence.GeneratedValue;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.deploydir;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      Customer cust = new Customer();
-      cust.setName(name);
-      em.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.deploydir;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      Customer cust = new Customer();
+      cust.setName(name);
+      em.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.deploydir;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.deploydir;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.deploydir;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.deploydir;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.deploydir;
-
-import java.net.URL;
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-
-      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
-      URL deployDir = getDeployDirURL();
-      deployer.getDeployDirs().add(deployDir);
-
-      deployer.create();
-      deployer.start();
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-      System.out.println("This is the deploy dir that will be searched deployed from: ");
-      System.out.print("    ");
-      System.out.println(deployDir);
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-
-      deployer.stop();
-      deployer.destroy();
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   public static URL getDeployDirURL() throws Exception
-   {
-      // Usually you would hardcode your URL.  This is just a way to make it easier for the tutorial
-      // code to configure where the resource is.
-      URL res = Thread.currentThread().getContextClassLoader().getResource("META-INF/persistence.xml");
-      return EJB3StandaloneDeployer.getDeployDirFromResource(res, "META-INF/persistence.xml");
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir/src/org/jboss/tutorial/deploydir/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.deploydir;
+
+import java.net.URL;
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+
+      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
+      URL deployDir = getDeployDirURL();
+      deployer.getDeployDirs().add(deployDir);
+
+      deployer.create();
+      deployer.start();
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+      System.out.println("This is the deploy dir that will be searched deployed from: ");
+      System.out.print("    ");
+      System.out.println(deployDir);
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+
+      deployer.stop();
+      deployer.destroy();
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   public static URL getDeployDirURL() throws Exception
+   {
+      // Usually you would hardcode your URL.  This is just a way to make it easier for the tutorial
+      // code to configure where the resource is.
+      URL res = Thread.currentThread().getContextClassLoader().getResource("META-INF/persistence.xml");
+      return EJB3StandaloneDeployer.getDeployDirFromResource(res, "META-INF/persistence.xml");
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../../lib"/>
-   <property name="conf.dir" value="../../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <mkdir dir="${build.dir}/deploy"/>
-      <jar jarfile="${build.dir}/deploy/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}/deploy">
-            <include name="tutorial.jar"/>
-         </fileset>
-      </path>
-
-      <java classname="org.jboss.tutorial.dirbyresource.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../../lib"/>
+   <property name="conf.dir" value="../../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <mkdir dir="${build.dir}/deploy"/>
+      <jar jarfile="${build.dir}/deploy/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}/deploy">
+            <include name="tutorial.jar"/>
+         </fileset>
+      </path>
+
+      <java classname="org.jboss.tutorial.dirbyresource.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.dirbyresource;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   @GeneratedValue(strategy= GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dirbyresource;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.dirbyresource;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      Customer cust = new Customer();
-      cust.setName(name);
-      em.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dirbyresource;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      Customer cust = new Customer();
+      cust.setName(name);
+      em.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.dirbyresource;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dirbyresource;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.dirbyresource;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dirbyresource;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,80 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.dirbyresource;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-
-      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
-      deployer.getDeployDirsByResource().add("META-INF/persistence.xml");
-
-      deployer.create();
-      deployer.start();
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-
-      deployer.stop();
-      deployer.destroy();
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/deploy-dir-by-resource/src/org/jboss/tutorial/dirbyresource/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dirbyresource;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+
+      EJB3StandaloneDeployer deployer = EJB3StandaloneBootstrap.createDeployer();
+      deployer.getDeployDirsByResource().add("META-INF/persistence.xml");
+
+      deployer.create();
+      deployer.start();
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+
+      deployer.stop();
+      deployer.destroy();
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../../lib"/>
-   <property name="conf.dir" value="../../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </fileset>
-         <!-- add local conf dir so we can pick up ejb3-deployment.xml -->
-         <pathelement location="conf"/>
-      </path>
-
-      <java classname="org.jboss.tutorial.mcdeploy.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../../lib"/>
+   <property name="conf.dir" value="../../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </fileset>
+         <!-- add local conf dir so we can pick up ejb3-deployment.xml -->
+         <pathelement location="conf"/>
+      </path>
+
+      <java classname="org.jboss.tutorial.mcdeploy.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-
-   <bean name="EJBDeployment" class="org.jboss.ejb3.embedded.EJB3StandaloneDeployer">
-      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
-      <property name="archivesByResource" >
-         <set class="java.util.HashSet" elementClass="java.lang.String">
-             <value>META-INF/persistence.xml</value>
-         </set>
-      </property>
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-   </bean>
-
-</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/conf/ejb3-deployment.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+
+   <bean name="EJBDeployment" class="org.jboss.ejb3.embedded.EJB3StandaloneDeployer">
+      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
+      <property name="archivesByResource" >
+         <set class="java.util.HashSet" elementClass="java.lang.String">
+             <value>META-INF/persistence.xml</value>
+         </set>
+      </property>
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+   </bean>
+
+</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.mcdeploy;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GenerationType;
-import javax.persistence.GeneratedValue;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   @GeneratedValue(strategy= GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mcdeploy;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GenerationType;
+import javax.persistence.GeneratedValue;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.mcdeploy;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      Customer cust = new Customer();
-      cust.setName(name);
-      em.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mcdeploy;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      Customer cust = new Customer();
+      cust.setName(name);
+      em.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.mcdeploy;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mcdeploy;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.mcdeploy;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mcdeploy;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.mcdeploy;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.deployXmlResource("ejb3-deployment.xml");
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/advanced-deployment/microcontainer-deployment/src/org/jboss/tutorial/mcdeploy/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mcdeploy;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.deployXmlResource("ejb3-deployment.xml");
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="war" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../lib"/>
-   <property name="conf.dir" value="../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="war" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <war warfile="${build.dir}/standalone.war"
-         webxml="resources/web.xml">
-         <lib dir="${lib.dir}">
-            <include name="*.jar"/>
-         </lib>
-         <lib dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </lib>
-         <classes dir="conf">
-            <include name="*.xml"/>
-         </classes>
-         <classes dir="${conf.dir}">
-            <include name="*.xml"/>
-            <include name="*.properties"/>
-         </classes>
-         <fileset dir="src">
-            <include name="EmbeddedEJB3.jsp"/>
-         </fileset>
-      </war>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="war" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../lib"/>
+   <property name="conf.dir" value="../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="war" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+      <war warfile="${build.dir}/standalone.war"
+         webxml="resources/web.xml">
+         <lib dir="${lib.dir}">
+            <include name="*.jar"/>
+         </lib>
+         <lib dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </lib>
+         <classes dir="conf">
+            <include name="*.xml"/>
+         </classes>
+         <classes dir="${conf.dir}">
+            <include name="*.xml"/>
+            <include name="*.properties"/>
+         </classes>
+         <fileset dir="src">
+            <include name="EmbeddedEJB3.jsp"/>
+         </fileset>
+      </war>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/conf)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName"><value>mdbtest</value></property>
-   </bean>
-
-   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName"><value>topictest</value></property>
-   </bean>
-
-</deployment>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/conf/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName"><value>mdbtest</value></property>
+   </bean>
+
+   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName"><value>topictest</value></property>
+   </bean>
+
+</deployment>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <description>Standalone EJB3</description>
-
-   <context-param>
-      <param-name>jboss-kernel-deployments</param-name>
-      <param-value>embedded-jboss-beans.xml, jboss-jms-beans.xml, testjms.xml</param-value>
-   </context-param>
-
-   <listener>
-      <listener-class>org.jboss.ejb3.embedded.ServletBootstrapListener</listener-class>
-   </listener>
-
-</web-app>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/resources/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+   <description>Standalone EJB3</description>
+
+   <context-param>
+      <param-name>jboss-kernel-deployments</param-name>
+      <param-value>embedded-jboss-beans.xml, jboss-jms-beans.xml, testjms.xml</param-value>
+   </context-param>
+
+   <listener>
+      <listener-class>org.jboss.ejb3.embedded.ServletBootstrapListener</listener-class>
+   </listener>
+
+</web-app>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,110 +0,0 @@
-<%@ page import="java.util.Hashtable,
-                 javax.jms.Queue" %>
-<%@ page import="javax.jms.QueueConnection" %>
-<%@ page import="javax.jms.QueueConnectionFactory" %>
-<%@ page import="javax.jms.QueueSender" %>
-<%@ page import="javax.jms.QueueSession" %>
-<%@ page import="javax.jms.TextMessage" %>
-<%@ page import="javax.jms.Topic" %>
-<%@ page import="javax.jms.TopicConnection" %>
-<%@ page import="javax.jms.TopicConnectionFactory" %>
-<%@ page import="javax.jms.TopicPublisher" %>
-<%@ page import="javax.jms.TopicSession" %>
-<%@ page import="javax.naming.InitialContext" %>
-<%@ page import="org.jboss.tutorial.embeddedwar.Customer" %>
-<%@ page import="org.jboss.tutorial.embeddedwar.CustomerDAOLocal" %>
-<%@ page import="org.jboss.tutorial.embeddedwar.CustomerDAORemote" %>
-
-<%!
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-
-
-   private static void executeQueue()
-           throws Exception
-   {
-
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-
-      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
-      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createSender(queue);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      session.close();
-      cnn.close();
-   }
-
-   private static void executeTopic()
-           throws Exception
-   {
-
-      TopicConnection cnn = null;
-      TopicPublisher sender = null;
-      TopicSession session = null;
-
-      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
-      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createTopicConnection();
-      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createPublisher(topic);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      session.close();
-      cnn.close();
-   }
-%>
-
-<html>
-<body>
-<%
-   InitialContext ctx = getInitialContext();
-   CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup(CustomerDAOLocal.class.getName());
-   CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup(CustomerDAORemote.class.getName());
-
-   int id = local.createCustomer("Gavin");
-   Customer cust = local.findCustomer(id);
-%>
-<p>
-   Successfully created and found Gavin from @Local interface: <%=cust.getName()%>
-</p>
-<%
-   id = remote.createCustomer("Emmanuel");
-   cust = remote.findCustomer(id);
-%>
-
-<p>
-   Successfully created and found Emmanuel from @Remote interface
-</p>
-
-<%
-   executeQueue();
-   executeTopic();
-%>
-DONE!
-</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/EmbeddedEJB3.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,110 @@
+<%@ page import="java.util.Hashtable,
+                 javax.jms.Queue" %>
+<%@ page import="javax.jms.QueueConnection" %>
+<%@ page import="javax.jms.QueueConnectionFactory" %>
+<%@ page import="javax.jms.QueueSender" %>
+<%@ page import="javax.jms.QueueSession" %>
+<%@ page import="javax.jms.TextMessage" %>
+<%@ page import="javax.jms.Topic" %>
+<%@ page import="javax.jms.TopicConnection" %>
+<%@ page import="javax.jms.TopicConnectionFactory" %>
+<%@ page import="javax.jms.TopicPublisher" %>
+<%@ page import="javax.jms.TopicSession" %>
+<%@ page import="javax.naming.InitialContext" %>
+<%@ page import="org.jboss.tutorial.embeddedwar.Customer" %>
+<%@ page import="org.jboss.tutorial.embeddedwar.CustomerDAOLocal" %>
+<%@ page import="org.jboss.tutorial.embeddedwar.CustomerDAORemote" %>
+
+<%!
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+
+
+   private static void executeQueue()
+           throws Exception
+   {
+
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
+      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      session.close();
+      cnn.close();
+   }
+
+   private static void executeTopic()
+           throws Exception
+   {
+
+      TopicConnection cnn = null;
+      TopicPublisher sender = null;
+      TopicSession session = null;
+
+      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
+      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createTopicConnection();
+      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createPublisher(topic);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      session.close();
+      cnn.close();
+   }
+%>
+
+<html>
+<body>
+<%
+   InitialContext ctx = getInitialContext();
+   CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup(CustomerDAOLocal.class.getName());
+   CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup(CustomerDAORemote.class.getName());
+
+   int id = local.createCustomer("Gavin");
+   Customer cust = local.findCustomer(id);
+%>
+<p>
+   Successfully created and found Gavin from @Local interface: <%=cust.getName()%>
+</p>
+<%
+   id = remote.createCustomer("Emmanuel");
+   cust = remote.findCustomer(id);
+%>
+
+<p>
+   Successfully created and found Emmanuel from @Remote interface
+</p>
+
+<%
+   executeQueue();
+   executeTopic();
+%>
+DONE!
+</body>
+</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.embeddedwar;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.embeddedwar;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.embeddedwar;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      try 
-      {
-         java.lang.reflect.Method[] methods = EntityManager.class.getDeclaredMethods();
-         
-         Customer cust = new Customer();
-         cust.setName(name);
-         em.persist(cust);
-         return cust.getId();
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-      
-      return -1;
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.embeddedwar;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      try 
+      {
+         java.lang.reflect.Method[] methods = EntityManager.class.getDeclaredMethods();
+         
+         Customer cust = new Customer();
+         cust.setName(name);
+         em.persist(cust);
+         return cust.getId();
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+      
+      return -1;
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.embeddedwar;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.embeddedwar;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.embeddedwar;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.embeddedwar;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.embeddedwar;
-
-import java.net.URL;
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-
-      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
-      URL archive = getArchiveURL();
-      deployer.getArchives().add(archive);
-
-      // need to set the InitialContext properties that deployer will use
-      // to initial EJB containers
-      deployer.setJndiProperties(getInitialContextProperties());
-
-      deployer.create();
-      deployer.start();
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-      System.out.println("This is the archive deployed from: ");
-      System.out.print("    ");
-      System.out.println(archive);
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-
-      deployer.stop();
-      deployer.destroy();
-   }
-
-   public static URL getArchiveURL() throws Exception
-   {
-      // Usually you would hardcode your URL.  This is just a way to make it easier for the tutorial
-      // code to configure where the resource is.
-      URL res = Thread.currentThread().getContextClassLoader().getResource("META-INF/persistence.xml");
-      return EJB3StandaloneDeployer.getContainingUrlFromResource(res, "META-INF/persistence.xml");
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.embeddedwar;
+
+import java.net.URL;
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+
+      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
+      URL archive = getArchiveURL();
+      deployer.getArchives().add(archive);
+
+      // need to set the InitialContext properties that deployer will use
+      // to initial EJB containers
+      deployer.setJndiProperties(getInitialContextProperties());
+
+      deployer.create();
+      deployer.start();
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+      System.out.println("This is the archive deployed from: ");
+      System.out.print("    ");
+      System.out.println(archive);
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+
+      deployer.stop();
+      deployer.destroy();
+   }
+
+   public static URL getArchiveURL() throws Exception
+   {
+      // Usually you would hardcode your URL.  This is just a way to make it easier for the tutorial
+      // code to configure where the resource is.
+      URL res = Thread.currentThread().getContextClassLoader().getResource("META-INF/persistence.xml");
+      return EJB3StandaloneDeployer.getContainingUrlFromResource(res, "META-INF/persistence.xml");
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.embeddedwar;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
-        })
-public class QueueTestMDB implements MessageListener
-{
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("QueueTestMDB onMessage");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.embeddedwar;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
+        })
+public class QueueTestMDB implements MessageListener
+{
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("QueueTestMDB onMessage");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.embeddedwar;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/topictest")
-        })
-public class TopicTestMDB implements MessageListener
-{
-
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("TopicTestMDB onMessage");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/embedded-war/src/org/jboss/tutorial/embeddedwar/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.embeddedwar;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/topictest")
+        })
+public class TopicTestMDB implements MessageListener
+{
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("TopicTestMDB onMessage");
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../lib"/>
-   <property name="conf.dir" value="../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </fileset>
-         <!-- so we can locate testjms.xml -->
-         <pathelement location="conf"/>
-         <pathelement location="${lib.dir}"/>
-      </path>
-
-      <java classname="org.jboss.tutorial.mdbstandalone.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../lib"/>
+   <property name="conf.dir" value="../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </fileset>
+         <!-- so we can locate testjms.xml -->
+         <pathelement location="conf"/>
+         <pathelement location="${lib.dir}"/>
+      </path>
+
+      <java classname="org.jboss.tutorial.mdbstandalone.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/conf)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName">mdbtest</property>
-   </bean>
-
-   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName">topictest</property>
-   </bean>
-
-</deployment>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/conf/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName">mdbtest</property>
+   </bean>
+
+   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName">topictest</property>
+   </bean>
+
+</deployment>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,122 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.mdbstandalone;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Queue;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TextMessage;
-import javax.jms.TopicConnection;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.jms.Topic;
-import javax.jms.TopicConnectionFactory;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      // initialize JBoss MQ core services
-      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
-      // initialize configured test queue and topic
-      EJB3StandaloneBootstrap.deployXmlResource("testjms.xml");
-      // scan classpath for ejbs and MDBs
-      EJB3StandaloneBootstrap.scanClasspath();
-
-      executeQueue();
-      executeTopic();
-
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   private static void executeQueue()
-           throws Exception
-   {
-
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-
-      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
-      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createSender(queue);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      session.close();
-      cnn.close();
-   }
-
-   private static void executeTopic()
-           throws Exception
-   {
-
-      TopicConnection cnn = null;
-      TopicPublisher sender = null;
-      TopicSession session = null;
-
-      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
-      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createTopicConnection();
-      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createPublisher(topic);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      session.close();
-      cnn.close();
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,122 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mdbstandalone;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import javax.jms.QueueConnection;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Queue;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.TextMessage;
+import javax.jms.TopicConnection;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSession;
+import javax.jms.Topic;
+import javax.jms.TopicConnectionFactory;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      // initialize JBoss MQ core services
+      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+      // initialize configured test queue and topic
+      EJB3StandaloneBootstrap.deployXmlResource("testjms.xml");
+      // scan classpath for ejbs and MDBs
+      EJB3StandaloneBootstrap.scanClasspath();
+
+      executeQueue();
+      executeTopic();
+
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   private static void executeQueue()
+           throws Exception
+   {
+
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
+      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      session.close();
+      cnn.close();
+   }
+
+   private static void executeTopic()
+           throws Exception
+   {
+
+      TopicConnection cnn = null;
+      TopicPublisher sender = null;
+      TopicSession session = null;
+
+      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
+      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createTopicConnection();
+      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createPublisher(topic);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      session.close();
+      cnn.close();
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.mdbstandalone;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
-        })
-public class QueueTestMDB implements MessageListener
-{
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("QueueTestMDB onMessage");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mdbstandalone;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
+        })
+public class QueueTestMDB implements MessageListener
+{
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("QueueTestMDB onMessage");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.mdbstandalone;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/topictest")
-        })
-public class TopicTestMDB implements MessageListener
-{
-
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("TopicTestMDB onMessage");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/mdb-standalone/src/org/jboss/tutorial/mdbstandalone/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mdbstandalone;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/topictest")
+        })
+public class TopicTestMDB implements MessageListener
+{
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("TopicTestMDB onMessage");
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../lib"/>
-   <property name="conf.dir" value="../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="*.properties"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </fileset>
-      </path>
-
-      <java classname="org.jboss.etutorial.security.client.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../lib"/>
+   <property name="conf.dir" value="../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="*.properties"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </fileset>
+      </path>
+
+      <java classname="org.jboss.etutorial.security.client.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-kabir=student

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+kabir=student

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/security.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/security.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/security.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<html>
-<body>
-<h2>Security</h2>
-<p>
-Security is configured like JBoss Application server but within the Embeddable EJB 3.0 distribution direction conf/login-config.xml.  You must also deploy the security-beans.xml file.  See the example for more details.
-</p>
-</body>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/security.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/security.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/security.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/security.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<html>
+<body>
+<h2>Security</h2>
+<p>
+Security is configured like JBoss Application server but within the Embeddable EJB 3.0 distribution direction conf/login-config.xml.  You must also deploy the security-beans.xml file.  See the example for more details.
+</p>
+</body>
+</body>
+</html>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.etutorial.security.bean;
-
-
-
-public interface Calculator
-{
-   int add(int x, int y);
-
-   int subtract(int x, int y);
-
-   int divide(int x, int y);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.etutorial.security.bean;
+
+
+
+public interface Calculator
+{
+   int add(int x, int y);
+
+   int subtract(int x, int y);
+
+   int divide(int x, int y);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.etutorial.security.bean;
-
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.security.SecurityDomain;
-
- at Stateless
- at SecurityDomain("other")
-public class CalculatorBean implements Calculator
-{
-   @PermitAll
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public int add(int x, int y)
-   {
-      return x + y;
-   }
-
-   @RolesAllowed({"student"})
-   public int subtract(int x, int y)
-   {
-      return x - y;
-   }
-
-   @RolesAllowed({"teacher"})
-   public int divide(int x, int y)
-   {
-      return x / y;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.etutorial.security.bean;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.annotation.security.SecurityDomain;
+
+ at Stateless
+ at SecurityDomain("other")
+public class CalculatorBean implements Calculator
+{
+   @PermitAll
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public int add(int x, int y)
+   {
+      return x + y;
+   }
+
+   @RolesAllowed({"student"})
+   public int subtract(int x, int y)
+   {
+      return x - y;
+   }
+
+   @RolesAllowed({"teacher"})
+   public int divide(int x, int y)
+   {
+      return x / y;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.etutorial.security.client;
-
-import java.util.Properties;
-import javax.ejb.EJBAccessException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import org.jboss.etutorial.security.bean.Calculator;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-
-/**
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
-      EJB3StandaloneBootstrap.scanClasspath();
-
-      // Establish the proxy with an incorrect security identity
-      Properties env = new Properties();
-      env.setProperty(Context.SECURITY_PRINCIPAL, "kabir");
-      env.setProperty(Context.SECURITY_CREDENTIALS, "invalidpassword");
-      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
-      InitialContext ctx = new InitialContext(env);
-      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/local");
-
-      System.out.println("Kabir is a student.");
-      System.out.println("Kabir types in the wrong password");
-      try
-      {
-         System.out.println("1 + 1 = " + calculator.add(1, 1));
-      }
-      catch (EJBAccessException ex)
-      {
-         System.out.println("Saw expected SecurityException: " + ex.getMessage());
-      }
-
-      System.out.println("Kabir types in correct password.");
-      System.out.println("Kabir does unchecked addition.");
-
-      // Re-establish the proxy with the correct security identity
-      env.setProperty(Context.SECURITY_CREDENTIALS, "validpassword");
-      ctx = new InitialContext(env);
-      calculator = (Calculator) ctx.lookup("CalculatorBean/local");
-
-      System.out.println("1 + 1 = " + calculator.add(1, 1));
-
-      System.out.println("Kabir is not a teacher so he cannot do division");
-      try
-      {
-         calculator.divide(16, 4);
-      }
-      catch (javax.ejb.EJBAccessException  ex)
-      {
-         System.out.println(ex.getMessage());
-      }
-
-      System.out.println("Students are allowed to do subtraction");
-      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/src/org/jboss/etutorial/security/client/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.etutorial.security.client;
+
+import java.util.Properties;
+import javax.ejb.EJBAccessException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import org.jboss.etutorial.security.bean.Calculator;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+
+/**
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
+      EJB3StandaloneBootstrap.scanClasspath();
+
+      // Establish the proxy with an incorrect security identity
+      Properties env = new Properties();
+      env.setProperty(Context.SECURITY_PRINCIPAL, "kabir");
+      env.setProperty(Context.SECURITY_CREDENTIALS, "invalidpassword");
+      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      InitialContext ctx = new InitialContext(env);
+      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/local");
+
+      System.out.println("Kabir is a student.");
+      System.out.println("Kabir types in the wrong password");
+      try
+      {
+         System.out.println("1 + 1 = " + calculator.add(1, 1));
+      }
+      catch (EJBAccessException ex)
+      {
+         System.out.println("Saw expected SecurityException: " + ex.getMessage());
+      }
+
+      System.out.println("Kabir types in correct password.");
+      System.out.println("Kabir does unchecked addition.");
+
+      // Re-establish the proxy with the correct security identity
+      env.setProperty(Context.SECURITY_CREDENTIALS, "validpassword");
+      ctx = new InitialContext(env);
+      calculator = (Calculator) ctx.lookup("CalculatorBean/local");
+
+      System.out.println("1 + 1 = " + calculator.add(1, 1));
+
+      System.out.println("Kabir is not a teacher so he cannot do division");
+      try
+      {
+         calculator.divide(16, 4);
+      }
+      catch (javax.ejb.EJBAccessException  ex)
+      {
+         System.out.println(ex.getMessage());
+      }
+
+      System.out.println("Students are allowed to do subtraction");
+      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-kabir=validpassword
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/security/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/security/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+kabir=validpassword
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../lib"/>
-   <property name="conf.dir" value="../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </fileset>
-      </path>
-
-      <java classname="org.jboss.tutorial.simple.Main" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../lib"/>
+   <property name="conf.dir" value="../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </fileset>
+      </path>
+
+      <java classname="org.jboss.tutorial.simple.Main" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.simple;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.simple;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.simple;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      Customer cust = new Customer();
-      cust.setName(name);
-      em.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.simple;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      Customer cust = new Customer();
+      cust.setName(name);
+      em.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.simple;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.simple;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.simple;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.simple;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.simple;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Main
-{
-   public static void main(String[] args) throws Exception
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.scanClasspath();
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-      System.out.println("This test scans the System Property java.class.path for all annotated EJB3 classes");
-      System.out.print("    ");
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/simple-deployment/src/org/jboss/tutorial/simple/Main.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.simple;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Main
+{
+   public static void main(String[] args) throws Exception
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.scanClasspath();
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal)ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote)ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+      System.out.println("This test scans the System Property java.class.path for all annotated EJB3 classes");
+      System.out.print("    ");
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-   <property name="lib.dir" value="../../../lib"/>
-   <property name="optional.lib.dir" value="../../../optional-lib"/>
-   <property name="conf.dir" value="../../../conf"/>
-
-   <!-- Build classpath -->
-   <path id="build.classpath">
-      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
-   -->
-      <fileset dir="${lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${optional.lib.dir}">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${conf.dir}"/>
-   </path>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="build.classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir="resources">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <path id="junit.classpath">
-         <path refid="build.classpath"/>
-         <fileset dir="${build.dir}">
-            <include name="tutorial.jar"/>
-         </fileset>
-      </path>
-
-
-      <junit printsummary="yes" fork="yes" haltonfailure="no">
-         <classpath>
-            <path refid="junit.classpath"/>
-         </classpath>
-         <formatter type="plain"/>
-         <test fork="yes" name="org.jboss.tutorial.junit.EmbeddedEjb3TestCase"/>
-      </junit>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+   <property name="lib.dir" value="../../../lib"/>
+   <property name="optional.lib.dir" value="../../../optional-lib"/>
+   <property name="conf.dir" value="../../../conf"/>
+
+   <!-- Build classpath -->
+   <path id="build.classpath">
+      <!-- So that we can get jndi.properties for InitialContext and log4j.xml
+   -->
+      <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${optional.lib.dir}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${conf.dir}"/>
+   </path>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="build.classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir="resources">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <path id="junit.classpath">
+         <path refid="build.classpath"/>
+         <fileset dir="${build.dir}">
+            <include name="tutorial.jar"/>
+         </fileset>
+      </path>
+
+
+      <junit printsummary="yes" fork="yes" haltonfailure="no">
+         <classpath>
+            <path refid="junit.classpath"/>
+         </classpath>
+         <formatter type="plain"/>
+         <test fork="yes" name="org.jboss.tutorial.junit.EmbeddedEjb3TestCase"/>
+      </junit>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+
+</project>
+

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/resources)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="custdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/EntityManagers/custdb"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/resources/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="custdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/EntityManagers/custdb"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit)

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.junit;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.junit;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.junit;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      Customer cust = new Customer();
-      cust.setName(name);
-      em.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.junit;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      Customer cust = new Customer();
+      cust.setName(name);
+      em.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.junit;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.junit;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.junit;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.junit;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,149 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.junit;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
-import javax.transaction.TransactionManager;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.extensions.TestSetup;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EmbeddedEjb3TestCase extends TestCase
-{
-   public EmbeddedEjb3TestCase()
-   {
-      super("EmbeddedEjb3TestCase");
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(EmbeddedEjb3TestCase.class);
-
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-         EJB3StandaloneBootstrap.boot(null);
-         EJB3StandaloneBootstrap.scanClasspath("tutorial.jar");
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   public void testEJBs() throws Exception
-   {
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-      System.out.println("This test scans the System Property java.class.path for all annotated EJB3 classes");
-      System.out.print("    ");
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      assertNotNull(cust);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      assertNotNull(cust);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-   }
-
-   public void testEntityManager() throws Exception
-   {
-      // This is a transactionally aware EntityManager and must be accessed within a JTA transaction
-      // Why aren't we using javax.persistence.Persistence?  Well, our persistence.xml file uses
-      // jta-datasource which means that it is created by the EJB container/embedded JBoss.
-      // using javax.persistence.Persistence will just cause us an error
-      EntityManager em = (EntityManager) getInitialContext().lookup("java:/EntityManagers/custdb");
-
-      // Obtain JBoss transaction
-      TransactionManager tm = (TransactionManager) getInitialContext().lookup("java:/TransactionManager");
-
-      tm.begin();
-
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      em.persist(cust);
-
-      assertTrue(cust.getId() > 0);
-
-      int id = cust.getId();
-
-      System.out.println("created bill in DB with id: " + id);
-
-      tm.commit();
-
-      tm.begin();
-      cust = em.find(Customer.class, id);
-      assertNotNull(cust);
-      tm.commit();
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded-tutorial/test-with-junit/src/org/jboss/tutorial/junit/EmbeddedEjb3TestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,149 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.junit;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import javax.persistence.EntityManager;
+import javax.transaction.TransactionManager;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.extensions.TestSetup;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EmbeddedEjb3TestCase extends TestCase
+{
+   public EmbeddedEjb3TestCase()
+   {
+      super("EmbeddedEjb3TestCase");
+   }
+
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(EmbeddedEjb3TestCase.class);
+
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+         EJB3StandaloneBootstrap.boot(null);
+         EJB3StandaloneBootstrap.scanClasspath("tutorial.jar");
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   public void testEJBs() throws Exception
+   {
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+      System.out.println("This test scans the System Property java.class.path for all annotated EJB3 classes");
+      System.out.print("    ");
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      assertNotNull(cust);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      assertNotNull(cust);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+   }
+
+   public void testEntityManager() throws Exception
+   {
+      // This is a transactionally aware EntityManager and must be accessed within a JTA transaction
+      // Why aren't we using javax.persistence.Persistence?  Well, our persistence.xml file uses
+      // jta-datasource which means that it is created by the EJB container/embedded JBoss.
+      // using javax.persistence.Persistence will just cause us an error
+      EntityManager em = (EntityManager) getInitialContext().lookup("java:/EntityManagers/custdb");
+
+      // Obtain JBoss transaction
+      TransactionManager tm = (TransactionManager) getInitialContext().lookup("java:/TransactionManager");
+
+      tm.begin();
+
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      em.persist(cust);
+
+      assertTrue(cust.getId() > 0);
+
+      int id = cust.getId();
+
+      System.out.println("created bill in DB with id: " + id);
+
+      tm.commit();
+
+      tm.begin();
+      cust = em.find(Customer.class, id);
+      assertNotNull(cust);
+      tm.commit();
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/embedded.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,255 @@
+<html>
+<body>
+<p>
+<h2>Embeddable EJB 3.0</h2>
+
+JBoss EJB 3.0 supports an embeddable version that can be run outside of the application server in standalone applications,
+junit tests, Tomcat, or even other non-jboss application servers.  The full JBoss JEMS suite is not all embeddable yet, but here's what is available.
+</p><p>
+<ul>
+<li> Local JNDI</li>
+<li> Transaction Manager</li>
+<li> JMS</li>
+<li> Local TX datasource/connection pool</li>
+<li> Stateful, Stateless, Service, Consumer, Producer, and MDBs</li>
+<li> EJB 3 Persistence</li>
+<li> Hibernate integration</li>
+<li> EJB Security</li>
+</ul>
+</p><p>
+These are the limitations
+</p><p>
+<ul>
+<li> We have only sparsely tested the embedded stack.  Consider it an alpha release</li>
+<li> The Embedded stack is based off of CVS HEAD, not JBoss 4.0.x.  Future versions will be based off of 4.0.x code.</li>
+<li> Documentation is sparse.  Hopefully the tutorial examples are enough to get started.</li>
+<li> XA Connection pool is not available yet.</li>
+<li> When embedding into Tomcat, you still require a JBoss specific JNDI implementation.  Tomcat's JNDI is read-only.</li>
+<li> You still must use the JBoss transaction manager even when embedding in another app server vendor.  This will be remedied in the future when the JBoss AOP/Microcontainer integration is complete.</li>
+<li> Distributed remote communication is not supported yet.</li>
+<li> EJB Timer service not supported</li>
+<li> Even though @Remote interfaces are local, you can only communicate through local connections.</li>
+<li> You cannot access JMS remotely.  Only locally.  Thus, you have to lookup the "java:/ConnectionFactory".</li>
+<li> JNDI is not available remotely</li>
+</ul>
+</p><p>
+<h2>Javadoc</h2>
+
+Heres a link to the <a href="api/index.html">javadocs</a>
+</p><p>
+</p><p>
+<h2>Installing</h2>
+
+Embeddable EJB 3.0 requires that all classes and configuration files be in your classpath so that it can locate them.  Make sure the
+conf/ directory and all jars in the lib/ directory are in your classpath.  That's about it.  Also, you will need JDK 5.0.  EJB 3.0
+requires annotations and generics.
+</p><p>
+<h2>Using Embeddable EJB 3.0</h2>
+
+Embeddable EJB 3.0 is built on top of the new JBoss Microcontainer that will be the core of JBoss 5.0.  It is a dependency injection
+container and the configuration files will look very similar to other injection frameworks.  It should be very possible to
+port Embeddable EJB 3.0 to other IoC frameworks.   If you are interested in contributing such a port, please email us and we
+will be happy to include it within the distribution.
+</p><p>
+<h3>Defining a datasource</h3>
+
+Open <a href="../conf/embedded-jboss-beans.xml">conf/embedded-jboss-beans.xml</a> and search for DefaultDS.  This example configures
+a default datasource that is used by the JMS Persistence Manager and is the default datasource for EJB3 Entity beans.
+</p><p>
+<pre>
+   &lt;bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"&gt;
+      &lt;property name="driverClass"&gt;&lt;value&gt;org.hsqldb.jdbcDriver&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="connectionURL"&gt;&lt;value&gt;jdbc:hsqldb:.&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="userName"&gt;&lt;value&gt;sa&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="jndiName"&gt;&lt;value&gt;java:/DefaultDS&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="minSize"&gt;&lt;value&gt;0&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="maxSize"&gt;&lt;value&gt;10&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="blockingTimeout"&gt;&lt;value&gt;1000&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="idleTimeout"&gt;&lt;value&gt;50000&lt;/value&gt;&lt;/property&gt;
+      &lt;property name="transactionManager"&gt;&lt;inject bean="TransactionManager"/&gt;&lt;/property&gt;
+      &lt;property name="cachedConnectionManager"&gt;&lt;inject bean="CachedConnectionManager"/&gt;&lt;/property&gt;
+      &lt;property name="initialContextProperties"&gt;&lt;inject bean="InitialContextProperties"/&gt;&lt;/property&gt;
+   &lt;/bean&gt;
+
+   &lt;bean name="DefaultDS" class="java.lang.Object"&gt;
+      &lt;constructor factoryMethod="getDatasource"&gt;
+         &lt;factory bean="DefaultDSBootstrap"/&gt;
+      &lt;/constructor&gt;
+   &lt;/bean&gt;
+</pre>
+</p><p>
+If you need to define your own datasource, basically cut and paste this XML.  The properties are pretty self explanatory.
+<i>DefaultDSBootstrap</i> is the real configuration of the datasource.  The <i>DefaultDS</i> bean is only there to make the datasource
+available for injection into other Microcontainer defined beans.
+</p><p>
+The DefaultDS, uses an in-memory database and thus will not persist changes to a file on disk.  If you want changes persisted using the
+DefaultDS, then make the following change:
+</p><p>
+<pre>
+&lt;property name="connectionURL"&gt;&lt;value&gt;jdbc:hsqldb:/home/put/your/path/here/localDB&lt;/value&gt;&lt;/property&gt;
+</pre>
+</p><p>
+<h3> Security</h3>
+
+Security works just like JBoss application server security.  Only the user/role property file domain has been tested, but others should work too.  A login-config.xml file must be available in your classpath. There is one already built for you in the conf/ directory of the distribution.  Also, the JBoss Security manager is not loaded by default.  It is configured in the security-beans.xml file in the conf/ directory but the MC file is not loaded by default.  To enable it you must do:
+</p><p>
+<pre>
+      EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
+</pre>
+</p><p>
+There is a <a href="embedded-tutorial/security">security tutorial</a> in the embedded distribution.
+</p><p>
+<h3> Embedding in Standalone Applications and JUnit tests</h3>
+
+You can embedded EJB 3.0 in standalone applications and junit tests.  See the <a href="api/org/jboss/ejb3/embedded/package-summary.html">org.jboss.ejb3.embedded</a> package for more information on what classes you need.
+The tutorial has a bunch of examples for bootstrapping your applications.  Check out the Main.java file in each one to see how it works.
+</p><p>
+The simplest way of finding EJBs/Entities to deploy is by using the EJB3StandaloneBootstrap.scanClasspath() method.  It will search all paths returned
+by the <tt>java.class.path</tt> System property.  Here's an example of bootstrapping Embeddable EJB 3.0 in a standalone environment.  It is taken from the
+JMS <tt>mdb-standalone</tt> tutorial example.
+</p><p>
+<pre>
+      EJB3StandaloneBootstrap.boot(null);
+      // initialize JBoss MQ core services
+      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+      // initialize configured test queue and topic
+      EJB3StandaloneBootstrap.deployXmlResource("testjms.xml");
+      // scan classpath for ejbs and MDBs
+      EJB3StandaloneBootstrap.scanClasspath();
+</pre>
+</p><p>
+The boot() method creates the JBoss Microcontainer kernel and deploys the embedded-jboss-beans.xml file into it.  This file
+creates a bunch of JBoss services like  JNDI, Transaction Manager, and a default datasource.  The boot() method
+also loads the ejb3-interceptors-aop.xml file which initializes AOP aspects that are used by the EJB containers.
+</p><p>
+The deployXmlResource() method deploys a JBoss Microcontainer XML file that is available in your Classpath.  In the above example,
+it loads jboss-jms-beans.xml which are initialize the core services for JMS.  It also loads the testjms.xml file that contains
+user definitions of topics and queues that their app is using.
+</p><p>
+The scanClasspath() method looks scans all jars and directories listed in the <tt>java.class.path</tt> System property.  This
+environment variable is not guaranteed to be accurate, so you may have to result to some of the advanced deployment options
+discussed in the <tt>advanced-deployment</tt> tutorials.  The scanClasspath() method is also overloaded with a comma delimited string parameter
+where you can specify a list of jars/directories to scan only and not he entire classpath.
+</p><p>
+</p><p>
+<h3> Testing with JUnit</h3>
+
+Testing Embeddable EJBs with JUnit is really very much the same as running a standalone SE app.  One thing you might want to do
+is to bootstrap the container only at the beginning of testing and not with every method call.  Here is a code snippet for doing this:
+</p><p>
+<pre>
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(EmbeddedEjb3TestCase.class);
+
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+         EJB3StandaloneBootstrap.boot(null);
+         EJB3StandaloneBootstrap.scanClasspath();
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+</pre>
+</p><p>
+This code snippet is taken from the <tt>test-with-junit</tt> example tutorial.  Basically this will make sure that startupEmbeddedJBoss
+and shutdownEmbeddedJBoss only happen once for all test methods in that class.
+</p><p>
+<h3> Embedding EJB 3.0 into a WAR/Tomcat</h3>
+
+You can initialize WAR deployments in servlet code like you do in standalone code, but there is a better solution.  JBoss comes with a
+context listener class that you can use to configure your application.  You put the following in your web.xml file of your WAR.
+</p><p>
+<pre>
+   &lt;context-param&gt;
+      &lt;param-name&gt;jboss-kernel-deployments&lt;/param-name&gt;
+      &lt;param-value&gt;embedded-jboss-beans.xml, jboss-jms-beans.xml&lt;/param-value&gt;
+   &lt;/context-param&gt;
+
+   &lt;listener&gt;
+      &lt;listener-class&gt;org.jboss.ejb3.embedded.ServletBootstrapListener&lt;/listener-class&gt;
+   &lt;/listener&gt;
+</pre>
+</p><p>
+The <i>jboss-kernel-deployments</i> param specifies a list of JBoss Microcontainer resources to deploy when the WAR is created.  These XML
+files are comma delimited and must be in your classpath (in your WEB-INF/classes directory for example).  The tutorial has a full example.
+If you are not using JMS then you can remove the <i>jboss-kernel-deployments</i> context-param as embedded-jboss-beans.xml will be
+loaded automatically by the ServletBootstrapListener.  If you have defined your own datasources, or JMS queues or topics, you must additionally
+add these XML files to the <i>jboss-kernel-deployments</i> context-param list.  All of the XML files must be available in the WAR's classpath.
+</p><p>
+The <i>ServletBootstrapListener</i> will automatically scan all Jars within <i>/WEB-INF/lib</i> for EJBs and Entity beans that can be deployed.  If you
+have more complex deployments then you can turn off scanning by this context-param:
+<pre>
+   &lt;context-param&gt;
+      &lt;param-name&gt;automatic-scan&lt;/param-name&gt;
+      &lt;param-value&gt;false&lt;/param-value&gt;
+   &lt;/context-param&gt;
+</pre>
+</p><p>
+You can use the advanced deployment techniques instead to deploy your EJBs as described below.
+</p><p>
+<h3> JNDI Requirements</h3>
+
+EJB requires JNDI.  Embeddable EJB 3.0 comes with a local-only JBoss JNDI implementation.  The default configuration
+initializes and uses this JBoss JNDI implementation at runtime even in Tomcat or other app server environments.  To connect
+to it you must use the following JNDI properties
+<pre>
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+</pre>
+Just like any app that uses JNDI, you can set these properties as System properties, or have a jndi.properties file that is
+in your classpath.
+</p><p>
+It is theoritically possible (no tests done yet) to use other vendor's JNDI implementations as long as they allow you to bind into them (EJB
+creates a bunch of bindings).  For instance, Tomcat's JNDI implementation is read-only at runtime, so you are required
+to use JBoss's implementation.
+</p><p>
+</p><p>
+<h3>Tutorial</h3>
+
+The <a href="embedded-tutorial">tutorial</a> goes through a bunch of different ways to configure your embedded EJB 3.0.
+<ul>
+<li> <a href="embedded-tutorial/simple-deployment">simple-deployment</a> is a simple app that deploys one EJB and one Entity bean.  It discovers EJB deployments by scanning the <tt>java.class.path</tt> System property and is the simplest way to deploy EJB in a standalone environment</li>
+<li> <a href="embedded-tutorial/mdb-standalone">mdb-standalone</a> Shows how to configure a JMS Queue and Topic and EJB 3 MDB in a standalone/embedded environment.</li>
+<li> <a href="embedded-tutorial/security">security</a> Shows basic EJB security.</li>
+<li> <a href="embedded-tutorial/test-with-junit">test-with-junit</a> Shows how to run Embedded EJB3 within a JUnit test suite.</li>
+<li> <a href="embedded-tutorial/embedded-war">embedded-war</a> Creates a WAR that you can deploy To tomcat.  Go to <a href="http://localhost:8080/standalone/EmbeddedEJB3.jsp">http://localhost:8080/standalone/EmbeddedEJB3.jsp</a> to try it out once you've copied the built war into your Tomcat distribution.</li>
+</ul>
+</p><p>
+<h3>Advanced Deployment Tutorials</h3>
+
+If you have more complex deployment requirements, these tutorials walk you through different ways you can deploy your EJBs/Entities.
+</p><p>
+<ul>
+<li> <a href="embedded-tutorial/advanced-deployment/archive">archive</a> walks you through a standalone application that bootstraps EJB 3.0 and finds your EJB3 archives by you explicitly specifying the archive location via a URL.</li>
+<li> <a href="embedded-tutorial/advanced-deployment/archive-by-resource">archive-by-resource</a> Looks for deployments by doing ClassLoader.getResources. You specify resource string names that are contained within a archive, and EJB 3.0 will look for annotated EJB3s and deployment descriptors within the archive that the resource is within.</li>
+<li> <a href="embedded-tutorial/advanced-deployment/deploy-dir">deploy-dir</a>  Specify URLs that point to directories where your jar files and classes reside.  The EJB3 implementation will search all for annotated class files, deployment descriptors with jar files and directories within those urls.</li>
+<li> <a href="embedded-tutorial/advanced-deployment/deploy-dir-by-resource">deploy-dir-by-resource</a> Looks for deploy directories by doing ClassLoader.getResources.  You specify a resource string and EJB3 will look for deploy directories of the archive this resource is contained in and scan these deploy directories.</li>
+<li> <a href="embedded-tutorial/advanced-deployment/microcontainer-deployment">microcontainer-deployment</a> You can avoid coding most of EJB3 bootstraping by defining deployments within JBoss Microcontainer XML.</li>
+</ul>
+</p><p>
+</p>
+</body>
+</html>

Copied: branches/Branch_4_2/ejb3/docs/embedded.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/embedded.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/embedded.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/embedded.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,229 @@
+!!!Embeddable EJB 3.0
+JBoss EJB 3.0 supports an embeddable version that can be run outside of the application server in standalone applications,
+junit tests, Tomcat, or even other non-jboss application servers.  The full JBoss JEMS suite is not all embeddable yet, but here's what is available.
+
+* Local JNDI
+* Transaction Manager
+* JMS
+* Local TX datasource/connection pool
+* Stateful, Stateless, Service, Consumer, Producer, and MDBs
+* EJB 3 Persistence
+* Hibernate integration
+* EJB Security
+
+These are the limitations
+
+* We have only sparsely tested the embedded stack.  Consider it an alpha release
+* The Embedded stack is based off of CVS HEAD, not JBoss 4.0.x.  Future versions will be based off of 4.0.x code.
+* Documentation is sparse.  Hopefully the tutorial examples are enough to get started.
+* XA Connection pool is not available yet.
+* When embedding into Tomcat, you still require a JBoss specific JNDI implementation.  Tomcat's JNDI is read-only.
+* You still must use the JBoss transaction manager even when embedding in another app server vendor.  This will be remedied in the future when the JBoss AOP/Microcontainer integration is complete.
+* Distributed remote communication is not supported yet.
+* EJB Timer service not supported
+* Even though @Remote interfaces are local, you can only communicate through local connections.
+* You cannot access JMS remotely.  Only locally.  Thus, you have to lookup the "java:/ConnectionFactory".
+* JNDI is not available remotely
+
+!!!Javadoc
+Heres a link to the [javadocs|api/index.html]
+
+
+!!!Installing
+Embeddable EJB 3.0 requires that all classes and configuration files be in your classpath so that it can locate them.  Make sure the
+conf/ directory and all jars in the lib/ directory are in your classpath.  That's about it.  Also, you will need JDK 5.0.  EJB 3.0
+requires annotations and generics.
+
+!!!Using Embeddable EJB 3.0
+Embeddable EJB 3.0 is built on top of the new JBoss Microcontainer that will be the core of JBoss 5.0.  It is a dependency injection
+container and the configuration files will look very similar to other injection frameworks.  It should be very possible to
+port Embeddable EJB 3.0 to other IoC frameworks.   If you are interested in contributing such a port, please email us and we
+will be happy to include it within the distribution.
+
+!!Defining a datasource
+Open [conf/embedded-jboss-beans.xml|../conf/embedded-jboss-beans.xml] and search for DefaultDS.  This example configures
+a default datasource that is used by the JMS Persistence Manager and is the default datasource for EJB3 Entity beans.
+
+{{{
+   <bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
+      <property name="driverClass"><value>org.hsqldb.jdbcDriver</value></property>
+      <property name="connectionURL"><value>jdbc:hsqldb:.</value></property>
+      <property name="userName"><value>sa</value></property>
+      <property name="jndiName"><value>java:/DefaultDS</value></property>
+      <property name="minSize"><value>0</value></property>
+      <property name="maxSize"><value>10</value></property>
+      <property name="blockingTimeout"><value>1000</value></property>
+      <property name="idleTimeout"><value>50000</value></property>
+      <property name="transactionManager"><inject bean="TransactionManager"/></property>
+      <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
+      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+   </bean>
+
+   <bean name="DefaultDS" class="java.lang.Object">
+      <constructor factoryMethod="getDatasource">
+         <factory bean="DefaultDSBootstrap"/>
+      </constructor>
+   </bean>
+}}}
+
+If you need to define your own datasource, basically cut and paste this XML.  The properties are pretty self explanatory.
+''DefaultDSBootstrap'' is the real configuration of the datasource.  The ''DefaultDS'' bean is only there to make the datasource
+available for injection into other Microcontainer defined beans.
+
+The DefaultDS, uses an in-memory database and thus will not persist changes to a file on disk.  If you want changes persisted using the
+DefaultDS, then make the following change:
+
+{{{
+<property name="connectionURL"><value>jdbc:hsqldb:/home/put/your/path/here/localDB</value></property>
+}}}
+
+!! Security
+Security works just like JBoss application server security.  Only the user/role property file domain has been tested, but others should work too.  A login-config.xml file must be available in your classpath. There is one already built for you in the conf/ directory of the distribution.  Also, the JBoss Security manager is not loaded by default.  It is configured in the security-beans.xml file in the conf/ directory but the MC file is not loaded by default.  To enable it you must do:
+
+{{{
+      EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
+}}}
+
+There is a [security tutorial|embedded-tutorial/security] in the embedded distribution.
+
+!! Embedding in Standalone Applications and JUnit tests
+You can embedded EJB 3.0 in standalone applications and junit tests.  See the [org.jboss.ejb3.embedded|api/org/jboss/ejb3/embedded/package-summary.html] package for more information on what classes you need.
+The tutorial has a bunch of examples for bootstrapping your applications.  Check out the Main.java file in each one to see how it works.
+
+The simplest way of finding EJBs/Entities to deploy is by using the EJB3StandaloneBootstrap.scanClasspath() method.  It will search all paths returned
+by the {{java.class.path}} System property.  Here's an example of bootstrapping Embeddable EJB 3.0 in a standalone environment.  It is taken from the
+JMS {{mdb-standalone}} tutorial example.
+
+{{{
+      EJB3StandaloneBootstrap.boot(null);
+      // initialize JBoss MQ core services
+      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+      // initialize configured test queue and topic
+      EJB3StandaloneBootstrap.deployXmlResource("testjms.xml");
+      // scan classpath for ejbs and MDBs
+      EJB3StandaloneBootstrap.scanClasspath();
+}}}
+
+The boot() method creates the JBoss Microcontainer kernel and deploys the embedded-jboss-beans.xml file into it.  This file
+creates a bunch of JBoss services like  JNDI, Transaction Manager, and a default datasource.  The boot() method
+also loads the ejb3-interceptors-aop.xml file which initializes AOP aspects that are used by the EJB containers.
+
+The deployXmlResource() method deploys a JBoss Microcontainer XML file that is available in your Classpath.  In the above example,
+it loads jboss-jms-beans.xml which are initialize the core services for JMS.  It also loads the testjms.xml file that contains
+user definitions of topics and queues that their app is using.
+
+The scanClasspath() method looks scans all jars and directories listed in the {{java.class.path}} System property.  This
+environment variable is not guaranteed to be accurate, so you may have to result to some of the advanced deployment options
+discussed in the {{advanced-deployment}} tutorials.  The scanClasspath() method is also overloaded with a comma delimited string parameter
+where you can specify a list of jars/directories to scan only and not he entire classpath.
+
+
+!! Testing with JUnit
+Testing Embeddable EJBs with JUnit is really very much the same as running a standalone SE app.  One thing you might want to do
+is to bootstrap the container only at the beginning of testing and not with every method call.  Here is a code snippet for doing this:
+
+{{{
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(EmbeddedEjb3TestCase.class);
+
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+         EJB3StandaloneBootstrap.boot(null);
+         EJB3StandaloneBootstrap.scanClasspath();
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+}}}
+
+This code snippet is taken from the {{test-with-junit}} example tutorial.  Basically this will make sure that startupEmbeddedJBoss
+and shutdownEmbeddedJBoss only happen once for all test methods in that class.
+
+!! Embedding EJB 3.0 into a WAR/Tomcat
+You can initialize WAR deployments in servlet code like you do in standalone code, but there is a better solution.  JBoss comes with a
+context listener class that you can use to configure your application.  You put the following in your web.xml file of your WAR.
+
+{{{
+   <context-param>
+      <param-name>jboss-kernel-deployments</param-name>
+      <param-value>embedded-jboss-beans.xml, jboss-jms-beans.xml</param-value>
+   </context-param>
+
+   <listener>
+      <listener-class>org.jboss.ejb3.embedded.ServletBootstrapListener</listener-class>
+   </listener>
+}}}
+
+The ''jboss-kernel-deployments'' param specifies a list of JBoss Microcontainer resources to deploy when the WAR is created.  These XML
+files are comma delimited and must be in your classpath (in your WEB-INF/classes directory for example).  The tutorial has a full example.
+If you are not using JMS then you can remove the ''jboss-kernel-deployments'' context-param as embedded-jboss-beans.xml will be
+loaded automatically by the ServletBootstrapListener.  If you have defined your own datasources, or JMS queues or topics, you must additionally
+add these XML files to the ''jboss-kernel-deployments'' context-param list.  All of the XML files must be available in the WAR's classpath.
+
+The ''ServletBootstrapListener'' will automatically scan all Jars within ''/WEB-INF/lib'' for EJBs and Entity beans that can be deployed.  If you
+have more complex deployments then you can turn off scanning by this context-param:
+{{{
+   <context-param>
+      <param-name>automatic-scan</param-name>
+      <param-value>false</param-value>
+   </context-param>
+}}}
+
+You can use the advanced deployment techniques instead to deploy your EJBs as described below.
+
+!! JNDI Requirements
+EJB requires JNDI.  Embeddable EJB 3.0 comes with a local-only JBoss JNDI implementation.  The default configuration
+initializes and uses this JBoss JNDI implementation at runtime even in Tomcat or other app server environments.  To connect
+to it you must use the following JNDI properties
+{{{
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+}}}
+Just like any app that uses JNDI, you can set these properties as System properties, or have a jndi.properties file that is
+in your classpath.
+
+It is theoritically possible (no tests done yet) to use other vendor's JNDI implementations as long as they allow you to bind into them (EJB
+creates a bunch of bindings).  For instance, Tomcat's JNDI implementation is read-only at runtime, so you are required
+to use JBoss's implementation.
+
+
+!!Tutorial
+The [tutorial|embedded-tutorial] goes through a bunch of different ways to configure your embedded EJB 3.0.
+* [simple-deployment|embedded-tutorial/simple-deployment] is a simple app that deploys one EJB and one Entity bean.  It discovers EJB deployments by scanning the {{java.class.path}} System property and is the simplest way to deploy EJB in a standalone environment
+* [mdb-standalone|embedded-tutorial/mdb-standalone] Shows how to configure a JMS Queue and Topic and EJB 3 MDB in a standalone/embedded environment.
+* [security|embedded-tutorial/security] Shows basic EJB security.
+* [test-with-junit|embedded-tutorial/test-with-junit] Shows how to run Embedded EJB3 within a JUnit test suite.
+* [embedded-war|embedded-tutorial/embedded-war] Creates a WAR that you can deploy To tomcat.  Go to [http://localhost:8080/standalone/EmbeddedEJB3.jsp|http://localhost:8080/standalone/EmbeddedEJB3.jsp] to try it out once you've copied the built war into your Tomcat distribution.
+
+!!Advanced Deployment Tutorials
+If you have more complex deployment requirements, these tutorials walk you through different ways you can deploy your EJBs/Entities.
+
+* [archive|embedded-tutorial/advanced-deployment/archive] walks you through a standalone application that bootstraps EJB 3.0 and finds your EJB3 archives by you explicitly specifying the archive location via a URL.
+* [archive-by-resource|embedded-tutorial/advanced-deployment/archive-by-resource] Looks for deployments by doing ClassLoader.getResources. You specify resource string names that are contained within a archive, and EJB 3.0 will look for annotated EJB3s and deployment descriptors within the archive that the resource is within.
+* [deploy-dir|embedded-tutorial/advanced-deployment/deploy-dir]  Specify URLs that point to directories where your jar files and classes reside.  The EJB3 implementation will search all for annotated class files, deployment descriptors with jar files and directories within those urls.
+* [deploy-dir-by-resource|embedded-tutorial/advanced-deployment/deploy-dir-by-resource] Looks for deploy directories by doing ClassLoader.getResources.  You specify a resource string and EJB3 will look for deploy directories of the archive this resource is contained in and scan these deploy directories.
+* [microcontainer-deployment|embedded-tutorial/advanced-deployment/microcontainer-deployment] You can avoid coding most of EJB3 bootstraping by defining deployments within JBoss Microcontainer XML.
+

Copied: branches/Branch_4_2/ejb3/docs/examples (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/.classpath
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/.classpath	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="xpetstore-ejb3/java"/>
-	<classpathentry kind="src" path="xpetstore-ejb3/test"/>
-	<classpathentry kind="src" path="xpetstore-ejb3/web"/>
-	<classpathentry kind="src" path="xpetstore-servlet/java"/>
-	<classpathentry kind="src" path="xpetstore-servlet/web"/>
-	<classpathentry kind="lib" path="dist/xpetstore-ejb.jar"/>
-	<classpathentry kind="lib" path="lib/ant/junit/junit.jar"/>
-	<classpathentry kind="lib" path="lib/ant/org.apache.tools.ant/ant.jar"/>
-	<classpathentry kind="lib" path="lib/ant/org.apache.tools.ant/optional.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/c3p0.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/cglib.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/hibernate.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/jcs.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/odmg.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/xalan.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/xerces.jar"/>
-	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/xml-apis.jar"/>
-	<classpathentry kind="lib" path="lib/main/com.java2html/j2h.jar"/>
-	<classpathentry kind="lib" path="lib/main/com.mysql/mysql-connector-java-bin.jar"/>
-	<classpathentry kind="lib" path="lib/main/com.opensymphony.module.sitemesh/sitemesh.jar"/>
-	<classpathentry kind="lib" path="lib/main/com.opensymphony.module.webwork/webwork.jar"/>
-	<classpathentry kind="lib" path="lib/main/com.opensymphony.module.webwork/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="lib/main/com.pointbase/pbclient.jar"/>
-	<classpathentry kind="lib" path="lib/main/com.sap/sapdbc.jar"/>
-	<classpathentry kind="lib" path="lib/main/de.hunsicker.jalopy/aelfred.jar"/>
-	<classpathentry kind="lib" path="lib/main/de.hunsicker.jalopy/jalopy.jar"/>
-	<classpathentry kind="lib" path="lib/main/de.hunsicker.jalopy/jalopy-ant.jar"/>
-	<classpathentry kind="lib" path="lib/main/javancss/ccl.jar"/>
-	<classpathentry kind="lib" path="lib/main/javancss/javancss.jar"/>
-	<classpathentry kind="lib" path="lib/main/javancss/jhbasic.jar"/>
-	<classpathentry kind="lib" path="lib/main/javax.j2ee/activation.jar"/>
-	<classpathentry kind="lib" path="lib/main/javax.j2ee/j2ee.jar"/>
-	<classpathentry kind="lib" path="lib/main/javax.j2ee/mail.jar"/>
-	<classpathentry kind="lib" path="lib/main/javax.j2ee/servlet.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.cactus/aspectjrt.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.cactus/cactus.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.cactus/cactus-ant.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.cactus/commons-httpclient.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.cactus/httpunit.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-dbcp.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-digester.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-fileupload.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-lang.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-pool.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-resources.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-services.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-validator.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.log4j/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.oro/jakarta-oro.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.struts/struts.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.velocity/antlr-runtime.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.velocity/velocity.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.apache.velocity/werken.xpath.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.hsqldb/hsqldb.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.jdom/jdom.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.junitee/junitee.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.junitee/junitee-anttask.jar"/>
-	<classpathentry kind="lib" path="lib/main/org.postgresql/postgresql.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-apache-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-bea-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-ejb-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-hibernate-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-jboss-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-jmx-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-orion-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-web-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-webwork-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-xdoclet-module.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-xjavadoc.jar"/>
-	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-xjavadoc-uc.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jboss-ejb3x.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/antlr-2.7.5H3.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/asm.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/asm-attrs.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/cglib-2.1.1.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-codec-1.2.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-collections.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-digester-1.6.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-discovery.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-fileupload.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-httpclient.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-lang-2.0.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-logging.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-logging-api.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-pool.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-validator-1.1.3.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-vfs.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/dom4j.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/ejb3-persistence.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/hibernate3.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/hibernate-annotations.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/hibernate-entitymanager.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/.classpath (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/.classpath)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/.classpath	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="xpetstore-ejb3/java"/>
+	<classpathentry kind="src" path="xpetstore-ejb3/test"/>
+	<classpathentry kind="src" path="xpetstore-ejb3/web"/>
+	<classpathentry kind="src" path="xpetstore-servlet/java"/>
+	<classpathentry kind="src" path="xpetstore-servlet/web"/>
+	<classpathentry kind="lib" path="dist/xpetstore-ejb.jar"/>
+	<classpathentry kind="lib" path="lib/ant/junit/junit.jar"/>
+	<classpathentry kind="lib" path="lib/ant/org.apache.tools.ant/ant.jar"/>
+	<classpathentry kind="lib" path="lib/ant/org.apache.tools.ant/optional.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/c3p0.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/cglib.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/hibernate.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/jcs.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/odmg.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/xalan.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/xerces.jar"/>
+	<classpathentry kind="lib" path="lib/main/cirrus.hibernate/xml-apis.jar"/>
+	<classpathentry kind="lib" path="lib/main/com.java2html/j2h.jar"/>
+	<classpathentry kind="lib" path="lib/main/com.mysql/mysql-connector-java-bin.jar"/>
+	<classpathentry kind="lib" path="lib/main/com.opensymphony.module.sitemesh/sitemesh.jar"/>
+	<classpathentry kind="lib" path="lib/main/com.opensymphony.module.webwork/webwork.jar"/>
+	<classpathentry kind="lib" path="lib/main/com.opensymphony.module.webwork/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="lib/main/com.pointbase/pbclient.jar"/>
+	<classpathentry kind="lib" path="lib/main/com.sap/sapdbc.jar"/>
+	<classpathentry kind="lib" path="lib/main/de.hunsicker.jalopy/aelfred.jar"/>
+	<classpathentry kind="lib" path="lib/main/de.hunsicker.jalopy/jalopy.jar"/>
+	<classpathentry kind="lib" path="lib/main/de.hunsicker.jalopy/jalopy-ant.jar"/>
+	<classpathentry kind="lib" path="lib/main/javancss/ccl.jar"/>
+	<classpathentry kind="lib" path="lib/main/javancss/javancss.jar"/>
+	<classpathentry kind="lib" path="lib/main/javancss/jhbasic.jar"/>
+	<classpathentry kind="lib" path="lib/main/javax.j2ee/activation.jar"/>
+	<classpathentry kind="lib" path="lib/main/javax.j2ee/j2ee.jar"/>
+	<classpathentry kind="lib" path="lib/main/javax.j2ee/mail.jar"/>
+	<classpathentry kind="lib" path="lib/main/javax.j2ee/servlet.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.cactus/aspectjrt.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.cactus/cactus.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.cactus/cactus-ant.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.cactus/commons-httpclient.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.cactus/httpunit.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-beanutils.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-collections.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-dbcp.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-digester.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-fileupload.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-lang.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-pool.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-resources.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-services.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.commons/commons-validator.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.log4j/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.oro/jakarta-oro.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.struts/struts.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.velocity/antlr-runtime.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.velocity/velocity.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.apache.velocity/werken.xpath.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.hsqldb/hsqldb.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.jdom/jdom.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.junitee/junitee.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.junitee/junitee-anttask.jar"/>
+	<classpathentry kind="lib" path="lib/main/org.postgresql/postgresql.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-apache-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-bea-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-ejb-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-hibernate-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-jboss-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-jmx-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-orion-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-web-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-webwork-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-xdoclet-module.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-xjavadoc.jar"/>
+	<classpathentry kind="lib" path="lib/main/xdoclet/xdoclet-xjavadoc-uc.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jboss-ejb3x.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/antlr-2.7.5H3.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/asm.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/asm-attrs.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/cglib-2.1.1.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-beanutils.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-codec-1.2.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-collections.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-digester-1.6.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-discovery.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-fileupload.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-httpclient.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-lang-2.0.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-logging.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-logging-api.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-pool.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-validator-1.1.3.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/commons-vfs.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/dom4j.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/ejb3-persistence.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/hibernate3.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/hibernate-annotations.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/hibernate-entitymanager.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+	<classpathentry kind="lib" path="C:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/.project
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/.project	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>xpetstore</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/.project (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/.project)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/.project	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>xpetstore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/.project
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/.project	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>conf</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/.project (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/.project)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/.project	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>conf</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/appserver.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/appserver.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/appserver.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,25 +0,0 @@
-#================================================================
-# Application server configuration file
-#================================================================
-
-# Select the application server:
-#	- jboss
-#	- weblogic
-#	- orion
-#   - tomcat (For xpetstore-servlet only)
-app.server=jboss
-
-# logical JNDI of the javax.jms.QueueConnectionFactory
-jndi.queue.ConnectionFactory=jms/xpetstore/QueueConnectionFactory
-
-# logical JNDI of the queue used by xpetstore.services.order.OrderProcessorMDB
-jndi.queue.order=jms/queue/xpetstore/order
-
-# logical JNDI of the queue used by xpetstore.services.mail.MailerMDB
-jndi.queue.mail=jms/queue/xpetstore/mail
-
-# logical JNDI of javax.mail.MailSession
-jndi.mail.session=mail/xpetstore/MailSession
-
-# logical JNDI of javax.sql.DataSource
-jndi.datasource=jdbc/xpetstore

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/appserver.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/appserver.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/appserver.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/appserver.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,25 @@
+#================================================================
+# Application server configuration file
+#================================================================
+
+# Select the application server:
+#	- jboss
+#	- weblogic
+#	- orion
+#   - tomcat (For xpetstore-servlet only)
+app.server=jboss
+
+# logical JNDI of the javax.jms.QueueConnectionFactory
+jndi.queue.ConnectionFactory=jms/xpetstore/QueueConnectionFactory
+
+# logical JNDI of the queue used by xpetstore.services.order.OrderProcessorMDB
+jndi.queue.order=jms/queue/xpetstore/order
+
+# logical JNDI of the queue used by xpetstore.services.mail.MailerMDB
+jndi.queue.mail=jms/queue/xpetstore/mail
+
+# logical JNDI of javax.mail.MailSession
+jndi.mail.session=mail/xpetstore/MailSession
+
+# logical JNDI of javax.sql.DataSource
+jndi.datasource=jdbc/xpetstore

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/jboss.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/jboss.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/jboss.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-#=====================================================
-# JBoss configuration file
-#=====================================================
-
-# JBoss version
-jboss.version=3.0
-
-# JBoss home directory
-jboss.home.dir=${env.JBOSS_HOME}
-
-# Deploment directory.
-jboss.deploy.dir=${jboss.home.dir}/server/xpetstore/deploy
-
-# HTTP port used by web applications
-jboss.http.port=8080
-
-# physical JNDI of the datasource
-jboss.datasource=java:/xpetstoreDS
-
-# physical JNDI name of the javax.jms.QueueConnectionFactory
-jboss.queue.ConnectionFactory=java:/ConnectionFactory
-
-# physical JNDI name of the queue used by xpetstore.services.order.OrderProcessorMDB
-jboss.queue.order=queue/order
-
-# physical JNDI name of the queue used by xpetstore.services.mail.MailerMDB
-jboss.queue.mail=queue/mail
-
-# physical JNDI name of the javax.jms.MailSession
-jboss.mail.session=java:/Mail
-
-# Always create tables at each deployment
-jboss.create.table=true
-jboss.remove.table=true
-
-# JBoss type mappings. (Don't change the following lines)
-jboss.typemapping.hsqldb=Hypersonic SQL
-jboss.typemapping.pointbase=PointBase
-jboss.typemapping.postgres=PostgreSQL
-jboss.typemapping.postgres72=PostgreSQL 7.2
-jboss.typemapping.sapdb=SapDB
-jboss.typemapping.mssql=MS SQLSERVER
-jboss.typemapping.mssql2000=MS SQLSERVER2000
-jboss.typemapping.mysql=mySQL
-jboss.typemapping.oracle7=Oracle7
-jboss.typemapping.oracle8=Oracle8
-jboss.typemapping.oracle9i=Oracle9i
-jboss.tuned.updates=true
-
-# Datasource used by Hibernate
-# DO NOT CHANGE THIS
-hibernate.datasource=${jboss.datasource}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/jboss.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/jboss.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/jboss.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/jboss.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+#=====================================================
+# JBoss configuration file
+#=====================================================
+
+# JBoss version
+jboss.version=3.0
+
+# JBoss home directory
+jboss.home.dir=${env.JBOSS_HOME}
+
+# Deploment directory.
+jboss.deploy.dir=${jboss.home.dir}/server/xpetstore/deploy
+
+# HTTP port used by web applications
+jboss.http.port=8080
+
+# physical JNDI of the datasource
+jboss.datasource=java:/xpetstoreDS
+
+# physical JNDI name of the javax.jms.QueueConnectionFactory
+jboss.queue.ConnectionFactory=java:/ConnectionFactory
+
+# physical JNDI name of the queue used by xpetstore.services.order.OrderProcessorMDB
+jboss.queue.order=queue/order
+
+# physical JNDI name of the queue used by xpetstore.services.mail.MailerMDB
+jboss.queue.mail=queue/mail
+
+# physical JNDI name of the javax.jms.MailSession
+jboss.mail.session=java:/Mail
+
+# Always create tables at each deployment
+jboss.create.table=true
+jboss.remove.table=true
+
+# JBoss type mappings. (Don't change the following lines)
+jboss.typemapping.hsqldb=Hypersonic SQL
+jboss.typemapping.pointbase=PointBase
+jboss.typemapping.postgres=PostgreSQL
+jboss.typemapping.postgres72=PostgreSQL 7.2
+jboss.typemapping.sapdb=SapDB
+jboss.typemapping.mssql=MS SQLSERVER
+jboss.typemapping.mssql2000=MS SQLSERVER2000
+jboss.typemapping.mysql=mySQL
+jboss.typemapping.oracle7=Oracle7
+jboss.typemapping.oracle8=Oracle8
+jboss.typemapping.oracle9i=Oracle9i
+jboss.tuned.updates=true
+
+# Datasource used by Hibernate
+# DO NOT CHANGE THIS
+hibernate.datasource=${jboss.datasource}
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/orion.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/orion.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/orion.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-#=====================================================
-# Orion configuration file
-#=====================================================
-
-# orion version
-orion.version=1.6.0
-
-# orion home directory
-orion.home.dir=${env.ORION_HOME}
-
-# orion Deploment directory
-orion.deploy.dir=${orion.home.dir}/applications
-
-# HTTP port used by web applications
-orion.http.port=8080
-
-# physical JNDI of the datasource
-orion.datasource=jdbc/xpetstoreDS
-
-# physical JNDI of the javax.jms.QueueConnectionFactory
-orion.queue.ConnectionFactory=jms/QueueConnectionFactory
-
-# physical JNDI of the queue used by xpetstore.services.order.OrderProcessorMDB
-orion.queue.order=jms/queue/order
-
-# physical JNDI of the queue used by xpetstore.services.mail.MailerMDB
-orion.queue.mail=jms/queue/mail
-
-# physical JNDI of the javax.jms.MailSession
-orion.mail.session=mail/MailSession
-
-# Orion user. This is the user who deploy the application
-orion.user.name=admin
-orion.user.password=123
-
-# ORMI URL
-orion.deploy.ormi=ormi://localhost
-
-# Datasource used by Hibernate
-# DO NOT CHANGE THIS
-hibernate.datasource=${orion.datasource}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/orion.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/orion.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/orion.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/orion.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+#=====================================================
+# Orion configuration file
+#=====================================================
+
+# orion version
+orion.version=1.6.0
+
+# orion home directory
+orion.home.dir=${env.ORION_HOME}
+
+# orion Deploment directory
+orion.deploy.dir=${orion.home.dir}/applications
+
+# HTTP port used by web applications
+orion.http.port=8080
+
+# physical JNDI of the datasource
+orion.datasource=jdbc/xpetstoreDS
+
+# physical JNDI of the javax.jms.QueueConnectionFactory
+orion.queue.ConnectionFactory=jms/QueueConnectionFactory
+
+# physical JNDI of the queue used by xpetstore.services.order.OrderProcessorMDB
+orion.queue.order=jms/queue/order
+
+# physical JNDI of the queue used by xpetstore.services.mail.MailerMDB
+orion.queue.mail=jms/queue/mail
+
+# physical JNDI of the javax.jms.MailSession
+orion.mail.session=mail/MailSession
+
+# Orion user. This is the user who deploy the application
+orion.user.name=admin
+orion.user.password=123
+
+# ORMI URL
+orion.deploy.ormi=ormi://localhost
+
+# Datasource used by Hibernate
+# DO NOT CHANGE THIS
+hibernate.datasource=${orion.datasource}
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,25 +0,0 @@
-#=====================================================
-# JBoss configuration file
-#=====================================================
-
-# JBoss version
-tomcat.version=4.1
-
-# JBoss home directory
-tomcat.home.dir=${env.TOMCAT_HOME}
-
-# Deploment directory.
-tomcat.deploy.dir=${tomcat.home.dir}/webapps
-
-# HTTP port used by web applications
-tomcat.http.port=8080
-
-# physical JNDI of the datasource
-tomcat.datasource=java:/comp/env/jdbc/xpetstoreDS
-
-# physical JNDI name of the javax.jms.MailSession
-tomcat.mail.session=java:/comp/env/mail/xpetstore/MailSession
-
-# Datasource used by Hibernate
-# DO NOT CHANGE THIS
-hibernate.datasource=${tomcat.datasource}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/tomcat.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,25 @@
+#=====================================================
+# JBoss configuration file
+#=====================================================
+
+# JBoss version
+tomcat.version=4.1
+
+# JBoss home directory
+tomcat.home.dir=${env.TOMCAT_HOME}
+
+# Deploment directory.
+tomcat.deploy.dir=${tomcat.home.dir}/webapps
+
+# HTTP port used by web applications
+tomcat.http.port=8080
+
+# physical JNDI of the datasource
+tomcat.datasource=java:/comp/env/jdbc/xpetstoreDS
+
+# physical JNDI name of the javax.jms.MailSession
+tomcat.mail.session=java:/comp/env/mail/xpetstore/MailSession
+
+# Datasource used by Hibernate
+# DO NOT CHANGE THIS
+hibernate.datasource=${tomcat.datasource}
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-#==========================================================================================
-# WebLogic Section
-#
-# Instructions
-# 	- Make sure that the environemment variable WL_HOME is set
-#   - Create a new domain named xpetstore
-#     Make sure that the property weblogic.domain.dir point to the domain's directory
-#   - You must create the following resources:
-#      	1. JDBC datasource: jndi-name=jdbc/xpetstore
-#		2. JMS queues: jndi-names=jms/queue/order, jms/queue/mail
-#		3. JMS connection factory: jndi-name=jms/ConnectionFactory
-#		4. Mail session: jndi-name=mail/MailSession
-#  Goto XPETSTORE_HOME/src/petstore/etc/jboss to see config.xml
-#==========================================================================================
-
-weblogic=
-
-# WebLogic version
-weblogic.version=6.0
-
-# WebLogic home directory
-weblogic.home.dir=${env.WL_HOME}
-
-# Home directory of the domain
-weblogic.domain.dir=${weblogic.home.dir}/../user_projects/xpetstore
-
-# WebLogic Deploment directory
-weblogic.deploy.dir=${weblogic.domain.dir}/applications
-
-# HTTP port used by web applications
-weblogic.http.port=7001
-
-# physical JNDI of the datasource
-weblogic.datasource=jdbc/xpetstore
-
-# physical JNDI of the javax.jms.QueueConnectionFactory
-weblogic.queue.ConnectionFactory=jms/ConnectionFactory
-
-# physical JNDI of the queue used by xpetstore.services.order.OrderProcessorMDB
-weblogic.queue.order=jms/queue/mail
-
-# physical JNDI of the queue used by xpetstore.services.mail.MailerMDB
-weblogic.queue.mail=jms/queue/order
-
-# physical JNDI of the javax.jms.MailSession
-weblogic.mail.session=mail/MailSession
-
-# Always create the tables on deployment
-weblogic.create.table=true
-
-# Datasource used by Hibernate
-# DO NOT CHANGE THIS
-hibernate.datasource=${weblogic.datasource}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/as/weblogic.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+#==========================================================================================
+# WebLogic Section
+#
+# Instructions
+# 	- Make sure that the environemment variable WL_HOME is set
+#   - Create a new domain named xpetstore
+#     Make sure that the property weblogic.domain.dir point to the domain's directory
+#   - You must create the following resources:
+#      	1. JDBC datasource: jndi-name=jdbc/xpetstore
+#		2. JMS queues: jndi-names=jms/queue/order, jms/queue/mail
+#		3. JMS connection factory: jndi-name=jms/ConnectionFactory
+#		4. Mail session: jndi-name=mail/MailSession
+#  Goto XPETSTORE_HOME/src/petstore/etc/jboss to see config.xml
+#==========================================================================================
+
+weblogic=
+
+# WebLogic version
+weblogic.version=6.0
+
+# WebLogic home directory
+weblogic.home.dir=${env.WL_HOME}
+
+# Home directory of the domain
+weblogic.domain.dir=${weblogic.home.dir}/../user_projects/xpetstore
+
+# WebLogic Deploment directory
+weblogic.deploy.dir=${weblogic.domain.dir}/applications
+
+# HTTP port used by web applications
+weblogic.http.port=7001
+
+# physical JNDI of the datasource
+weblogic.datasource=jdbc/xpetstore
+
+# physical JNDI of the javax.jms.QueueConnectionFactory
+weblogic.queue.ConnectionFactory=jms/ConnectionFactory
+
+# physical JNDI of the queue used by xpetstore.services.order.OrderProcessorMDB
+weblogic.queue.order=jms/queue/mail
+
+# physical JNDI of the queue used by xpetstore.services.mail.MailerMDB
+weblogic.queue.mail=jms/queue/order
+
+# physical JNDI of the javax.jms.MailSession
+weblogic.mail.session=mail/MailSession
+
+# Always create the tables on deployment
+weblogic.create.table=true
+
+# Datasource used by Hibernate
+# DO NOT CHANGE THIS
+hibernate.datasource=${weblogic.datasource}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/database.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/database.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/database.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-#================================================================
-# Database configuration file
-#================================================================
-
-# Name of the database.
-# The supported databases are:
-#		- hsqldb
-#		- pointbase
-#		- postgres
-#		- postgres72
-#		- mssql
-#		- mssql2000
-#		- sapdb
-#		- mysql
-#		- oracle7
-#		- oracle8
-#		- oracle9i
-database=hsqldb
-
-
-# Output Hibernate SQL ?
-hibernate.show.sql=true
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/database.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/database.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/database.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/database.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+#================================================================
+# Database configuration file
+#================================================================
+
+# Name of the database.
+# The supported databases are:
+#		- hsqldb
+#		- pointbase
+#		- postgres
+#		- postgres72
+#		- mssql
+#		- mssql2000
+#		- sapdb
+#		- mysql
+#		- oracle7
+#		- oracle8
+#		- oracle9i
+database=hsqldb
+
+
+# Output Hibernate SQL ?
+hibernate.show.sql=true
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-#=================================================
-# Hypersonic SQL configuration
-#=================================================
-db.driver=org.hsqldb.jdbcDriver
-#db.url=jdbc:hsqldb:hsql://localhost:1701
-db.url=jdbc:hsqldb:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/xpetstore/data/hypersonic/localDB
-db.user=sa
-db.password=
-db.classpath=/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/xpetstore/lib/hsqldb.jar
-db.foreign.key=false
-
-hibernate.dialect=cirrus.hibernate.sql.HSQLDialect
-hibernate.generator.class=native
-hibernate.outer.join=false
-hibernate.scrollable.recordset=false
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/hsqldb.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+#=================================================
+# Hypersonic SQL configuration
+#=================================================
+db.driver=org.hsqldb.jdbcDriver
+#db.url=jdbc:hsqldb:hsql://localhost:1701
+db.url=jdbc:hsqldb:/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/xpetstore/data/hypersonic/localDB
+db.user=sa
+db.password=
+db.classpath=/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha/server/xpetstore/lib/hsqldb.jar
+db.foreign.key=false
+
+hibernate.dialect=cirrus.hibernate.sql.HSQLDialect
+hibernate.generator.class=native
+hibernate.outer.join=false
+hibernate.scrollable.recordset=false
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/mssql.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-#=================================================
-# Microsoft SQL Server Configuration
-#
-# IMPORTANT
-# Please, download the SQL Server jar driver from:
-#	 http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml
-#=================================================
-db.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
-db.url=jdbc:microsoft:sqlserver://localhost:1433
-db.user=sa
-db.password=
-db.classpath=${lib.dir}/main/com.microsoft.jdbc.sqlserver/msbase.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/mssqlserver.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/msutil.jar
-
-db.foreign.key=true
-
-hibernate.dialect=cirrus.hibernate.sql.SybaseDialect
-hibernate.generator.class=native
-hibernate.outer.join=true
-hibernate.scrollable.recordset=true
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/mssql.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+#=================================================
+# Microsoft SQL Server Configuration
+#
+# IMPORTANT
+# Please, download the SQL Server jar driver from:
+#	 http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml
+#=================================================
+db.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
+db.url=jdbc:microsoft:sqlserver://localhost:1433
+db.user=sa
+db.password=
+db.classpath=${lib.dir}/main/com.microsoft.jdbc.sqlserver/msbase.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/mssqlserver.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/msutil.jar
+
+db.foreign.key=true
+
+hibernate.dialect=cirrus.hibernate.sql.SybaseDialect
+hibernate.generator.class=native
+hibernate.outer.join=true
+hibernate.scrollable.recordset=true
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-#=================================================
-# Microsoft SQL Server Configuration
-#
-# Please, download the SQL Server jar driver from:
-#	 http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml
-#=================================================
-db.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
-db.url=jdbc:microsoft:sqlserver://localhost:1433
-db.user=sa
-db.password=
-db.classpath=${lib.dir}/main/com.microsoft.jdbc.sqlserver/msbase.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/mssqlserver.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/msutil.jar
-db.foreign.key=true
-
-hibernate.dialect=cirrus.hibernate.sql.SybaseDialect
-hibernate.generator.class=native
-hibernate.outer.join=true
-hibernate.scrollable.recordset=true

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mssql2000.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+#=================================================
+# Microsoft SQL Server Configuration
+#
+# Please, download the SQL Server jar driver from:
+#	 http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml
+#=================================================
+db.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
+db.url=jdbc:microsoft:sqlserver://localhost:1433
+db.user=sa
+db.password=
+db.classpath=${lib.dir}/main/com.microsoft.jdbc.sqlserver/msbase.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/mssqlserver.jar:${lib.dir}/ext/com.microsoft.jdbc.sqlserver/msutil.jar
+db.foreign.key=true
+
+hibernate.dialect=cirrus.hibernate.sql.SybaseDialect
+hibernate.generator.class=native
+hibernate.outer.join=true
+hibernate.scrollable.recordset=true

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mysql.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/mysql.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mysql.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-#=================================================
-# MySQL SQL configuration
-#=================================================
-db.driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://localhost:3306/xpetstore
-db.user=herve
-db.password=herve
-db.classpath=${lib.dir}/main/com.mysql/mysql-connector-java-bin.jar
-db.foreign.key=true
-
-
-hibernate.dialect=cirrus.hibernate.sql.MySQLDialect
-hibernate.generator.class=sequence
-hibernate.outer.join=true
-hibernate.scrollable.recordset=false

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mysql.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/mysql.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mysql.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/mysql.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+#=================================================
+# MySQL SQL configuration
+#=================================================
+db.driver=com.mysql.jdbc.Driver
+db.url=jdbc:mysql://localhost:3306/xpetstore
+db.user=herve
+db.password=herve
+db.classpath=${lib.dir}/main/com.mysql/mysql-connector-java-bin.jar
+db.foreign.key=true
+
+
+hibernate.dialect=cirrus.hibernate.sql.MySQLDialect
+hibernate.generator.class=sequence
+hibernate.outer.join=true
+hibernate.scrollable.recordset=false

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +0,0 @@
-#=================================================
-# Oracle SQL configuration
-#=================================================
-db.driver=oracle.jdbc.driver.OracleDriver
-# put your servername (replace jupiter) and SID (replace DEV) here
-db.url=>jdbc:oracle:thin:@jupiter:1521:DEV
-# user scott with password tiger is created as part of the default install. Change as appropriate.
-db.user=scott
-db.password=tiger
-# you will need to copy ojdbc14.jar to this dir. It cannot be shipped by xpetstore.
-db.classpath=${lib.dir}/main/com.oracle-9i/ojdbc14.jar
-db.foreign.key=false
-
-#---------------------------------------
-#Hibernate configuration
-# Do not edit
-#---------------------------------------
-hibernate.generator.class=sequence
-hibernate.outer.join=true
-hibernate.dialect=cirrus.hibernate.sql.OracleDialect
-hibernate.scrollable.recordset=true
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle7.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,21 @@
+#=================================================
+# Oracle SQL configuration
+#=================================================
+db.driver=oracle.jdbc.driver.OracleDriver
+# put your servername (replace jupiter) and SID (replace DEV) here
+db.url=>jdbc:oracle:thin:@jupiter:1521:DEV
+# user scott with password tiger is created as part of the default install. Change as appropriate.
+db.user=scott
+db.password=tiger
+# you will need to copy ojdbc14.jar to this dir. It cannot be shipped by xpetstore.
+db.classpath=${lib.dir}/main/com.oracle-9i/ojdbc14.jar
+db.foreign.key=false
+
+#---------------------------------------
+#Hibernate configuration
+# Do not edit
+#---------------------------------------
+hibernate.generator.class=sequence
+hibernate.outer.join=true
+hibernate.dialect=cirrus.hibernate.sql.OracleDialect
+hibernate.scrollable.recordset=true
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-#=================================================
-# Oracle SQL configuration
-#=================================================
-db.driver=oracle.jdbc.driver.OracleDriver
-# put your servername (replace jupiter) and SID (replace DEV) here
-db.url=>jdbc:oracle:thin:@jupiter:1521:DEV
-# user scott with password tiger is created as part of the default install. Change as appropriate.
-db.user=scott
-db.password=tiger
-# you will need to copy ojdbc14.jar to this dir. It cannot be shipped by xpetstore.
-db.classpath=${lib.dir}/main/com.oracle-9i/ojdbc14.jar
-db.foreign.key=false
-
-
-#---------------------------------------
-#Hibernate configuration
-# Do not edit
-#---------------------------------------
-hibernate.generator.class=sequence
-hibernate.outer.join=true
-hibernate.dialect=cirrus.hibernate.sql.OracleDialect
-hibernate.scrollable.recordset=true

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle8.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+#=================================================
+# Oracle SQL configuration
+#=================================================
+db.driver=oracle.jdbc.driver.OracleDriver
+# put your servername (replace jupiter) and SID (replace DEV) here
+db.url=>jdbc:oracle:thin:@jupiter:1521:DEV
+# user scott with password tiger is created as part of the default install. Change as appropriate.
+db.user=scott
+db.password=tiger
+# you will need to copy ojdbc14.jar to this dir. It cannot be shipped by xpetstore.
+db.classpath=${lib.dir}/main/com.oracle-9i/ojdbc14.jar
+db.foreign.key=false
+
+
+#---------------------------------------
+#Hibernate configuration
+# Do not edit
+#---------------------------------------
+hibernate.generator.class=sequence
+hibernate.outer.join=true
+hibernate.dialect=cirrus.hibernate.sql.OracleDialect
+hibernate.scrollable.recordset=true

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-#=================================================
-# Oracle-9i SQL configuration
-#=================================================
-db.driver=oracle.jdbc.driver.OracleDriver
-# put your servername (replace jupiter) and SID (replace DEV) here
-db.url=>jdbc:oracle:thin:@jupiter:1521:DEV
-# user scott with password tiger is created as part of the default install. Change as appropriate.
-db.user=scott
-db.password=tiger
-# you will need to copy ojdbc14.jar to this dir. It cannot be shipped by xpetstore.
-db.classpath=${lib.dir}/main/com.oracle9i/ojdbc14.jar
-db.foreign.key=true
-
-hibernate.dialect=cirrus.hibernate.sql.OracleDialect
-hibernate.generator.class=sequence
-hibernate.outer.join=true
-hibernate.scrollable.recordset=true
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/oracle9i.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+#=================================================
+# Oracle-9i SQL configuration
+#=================================================
+db.driver=oracle.jdbc.driver.OracleDriver
+# put your servername (replace jupiter) and SID (replace DEV) here
+db.url=>jdbc:oracle:thin:@jupiter:1521:DEV
+# user scott with password tiger is created as part of the default install. Change as appropriate.
+db.user=scott
+db.password=tiger
+# you will need to copy ojdbc14.jar to this dir. It cannot be shipped by xpetstore.
+db.classpath=${lib.dir}/main/com.oracle9i/ojdbc14.jar
+db.foreign.key=true
+
+hibernate.dialect=cirrus.hibernate.sql.OracleDialect
+hibernate.generator.class=sequence
+hibernate.outer.join=true
+hibernate.scrollable.recordset=true
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-#==================================================================
-# PointBase configuration
-#==================================================================
-db.driver=com.pointbase.jdbc.jdbcUniversalDriver
-db.url=jdbc:pointbase:server://localhost/demo
-db.user=petstore
-db.password=petstore
-db.classpath=${lib.dir}/main/com.pointbase/pbclient.jar
-db.foreign.key=false
-
-hibernate.dialect=cirrus.hibernate.sql.PointbaseDialect
-hibernate.generator.class=native
-hibernate.outer.join=false

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/pointbase.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+#==================================================================
+# PointBase configuration
+#==================================================================
+db.driver=com.pointbase.jdbc.jdbcUniversalDriver
+db.url=jdbc:pointbase:server://localhost/demo
+db.user=petstore
+db.password=petstore
+db.classpath=${lib.dir}/main/com.pointbase/pbclient.jar
+db.foreign.key=false
+
+hibernate.dialect=cirrus.hibernate.sql.PointbaseDialect
+hibernate.generator.class=native
+hibernate.outer.join=false

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/postgres.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/postgres.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/postgres.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-#=================================================
-# PostgreSQL configuration
-#=================================================
-db.driver=org.postgresql.Driver
-db.url=jdbc:postgresql://localhost/xpetstore
-db.user=herve
-db.password=herve
-db.classpath=${lib.dir}/main/org.postgresql/postgresql.jar
-db.foreign.key=true
-
-
-hibernate.dialect=cirrus.hibernate.sql.PostgreSQLDialect
-hibernate.generator.class=sequence
-hibernate.outer.join=true
-hibernate.scrollable.recordset=false
-

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/postgres.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/postgres.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/postgres.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/postgres.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+#=================================================
+# PostgreSQL configuration
+#=================================================
+db.driver=org.postgresql.Driver
+db.url=jdbc:postgresql://localhost/xpetstore
+db.user=herve
+db.password=herve
+db.classpath=${lib.dir}/main/org.postgresql/postgresql.jar
+db.foreign.key=true
+
+
+hibernate.dialect=cirrus.hibernate.sql.PostgreSQLDialect
+hibernate.generator.class=sequence
+hibernate.outer.join=true
+hibernate.scrollable.recordset=false
+

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-#================================================================================
-# SapDB v7.3
-#
-# -	Run the script XPETSTORE_HOME/src/petstore/sql/sapdb/create_db.sh 
-#   to create the xpetstore database
-#===================================================================================
-db.driver=com.sap.dbtech.jdbc.DriverSapDB
-db.url=jdbc:sapdb://localhost/XPSTORE
-db.user=test
-db.password=test
-db.classpath=${lib.dir}/main/com.sap/sapdbc.jar
-db.foreign.key=true
-
-hibernate.dialect=cirrus.hibernate.sql.SAPDBDialect
-hibernate.generator.class=sequence
-hibernate.outer.join=true
-hibernate.scrollable.recordset=true
-

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/db/sapdb.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+#================================================================================
+# SapDB v7.3
+#
+# -	Run the script XPETSTORE_HOME/src/petstore/sql/sapdb/create_db.sh 
+#   to create the xpetstore database
+#===================================================================================
+db.driver=com.sap.dbtech.jdbc.DriverSapDB
+db.url=jdbc:sapdb://localhost/XPSTORE
+db.user=test
+db.password=test
+db.classpath=${lib.dir}/main/com.sap/sapdbc.jar
+db.foreign.key=true
+
+hibernate.dialect=cirrus.hibernate.sql.SAPDBDialect
+hibernate.generator.class=sequence
+hibernate.outer.join=true
+hibernate.scrollable.recordset=true
+

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/jalopy.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/jalopy.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/jalopy.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jalopy>
-    <general>
-        <compliance>
-            <version>14</version>
-        </compliance>
-        <style>
-            <description>Sun Java Coding Convention</description>
-            <name>Sun</name>
-        </style>
-    </general>
-    <inspector>
-        <enable>false</enable>
-        <naming>
-            <classes>
-                <abstract>[A-Z][a-zA-Z0-9]+</abstract>
-                <general>[A-Z][a-zA-Z0-9]+</general>
-            </classes>
-            <fields>
-                <default>[a-z][\w]+</default>
-                <defaultStatic>[a-z][\w]+</defaultStatic>
-                <defaultStaticFinal>[a-zA-Z][\w]+</defaultStaticFinal>
-                <private>[a-z][\w]+</private>
-                <privateStatic>[a-z][\w]+</privateStatic>
-                <privateStaticFinal>[a-zA-Z][\w]+</privateStaticFinal>
-                <protected>[a-z][\w]+</protected>
-                <protectedStatic>[a-z][\w]+</protectedStatic>
-                <protectedStaticFinal>[a-zA-Z][\w]+</protectedStaticFinal>
-                <public>[a-z][\w]+</public>
-                <publicStatic>[a-z][\w]+</publicStatic>
-                <publicStaticFinal>[a-zA-Z][\w]+</publicStaticFinal>
-            </fields>
-            <interfaces>[A-Z][a-zA-Z0-9]+</interfaces>
-            <labels>\w+</labels>
-            <methods>
-                <default>[a-z][\w]+</default>
-                <defaultStatic>[a-z][\w]+</defaultStatic>
-                <defaultStaticFinal>[a-z][\w]+</defaultStaticFinal>
-                <private>[a-z][\w]+</private>
-                <privateStatic>[a-z][\w]+</privateStatic>
-                <privateStaticFinal>[a-z][\w]+</privateStaticFinal>
-                <protected>[a-z][\w]+</protected>
-                <protectedStatic>[a-z][\w]+</protectedStatic>
-                <protectedStaticFinal>[a-z][\w]+</protectedStaticFinal>
-                <public>[a-z][\w]+</public>
-                <publicStatic>[a-z][\w]+</publicStatic>
-                <publicStaticFinal>[a-z][\w]+</publicStaticFinal>
-            </methods>
-            <packages>[a-z]+(?:\.[a-z]+)*</packages>
-            <parameters>
-                <default>[a-z][\w]+</default>
-                <final>[a-z][\w]+</final>
-            </parameters>
-            <variables>[a-z][\w]*</variables>
-        </naming>
-        <tips>
-            <adhereToNamingConvention>false</adhereToNamingConvention>
-            <alwaysOverrideEquals>false</alwaysOverrideEquals>
-            <alwaysOverrideHashCode>false</alwaysOverrideHashCode>
-            <avoidThreadGroups>false</avoidThreadGroups>
-            <declareCollectionComment>false</declareCollectionComment>
-            <dontIgnoreExceptions>false</dontIgnoreExceptions>
-            <dontSubstituteObjectEquals>false</dontSubstituteObjectEquals>
-            <neverDeclareException>false</neverDeclareException>
-            <neverDeclareThrowable>false</neverDeclareThrowable>
-            <neverInvokeWaitOutsideLoop>false</neverInvokeWaitOutsideLoop>
-            <neverReturnZeroArrays>false</neverReturnZeroArrays>
-            <neverUseEmptyFinally>false</neverUseEmptyFinally>
-            <obeyContractEquals>false</obeyContractEquals>
-            <overrideToString>false</overrideToString>
-            <referToObjectsByInterface>false</referToObjectsByInterface>
-            <replaceStructureWithClass>false</replaceStructureWithClass>
-            <stringLiterallI18n>false</stringLiterallI18n>
-            <useInterfaceOnlyForTypes>false</useInterfaceOnlyForTypes>
-            <wrongCollectionComment>false</wrongCollectionComment>
-        </tips>
-    </inspector>
-    <internal>
-        <version>6</version>
-    </internal>
-    <messages>
-        <priority>
-            <general>30000</general>
-            <parser>30000</parser>
-            <parserJavadoc>30000</parserJavadoc>
-            <printer>30000</printer>
-            <printerJavadoc>30000</printerJavadoc>
-            <transform>30000</transform>
-        </priority>
-        <showErrorStackTrace>true</showErrorStackTrace>
-    </messages>
-    <misc>
-        <threadCount>1</threadCount>
-    </misc>
-    <printer>
-        <alignment>
-            <methodCallChain>true</methodCallChain>
-            <parameterMethodDeclaration>true</parameterMethodDeclaration>
-            <ternaryOperator>true</ternaryOperator>
-            <variableAssignment>true</variableAssignment>
-            <variableIdentifier>true</variableIdentifier>
-        </alignment>
-        <backup>
-            <directory>bak</directory>
-            <level>0</level>
-        </backup>
-        <blanklines>
-            <after>
-                <block>1</block>
-                <braceLeft>0</braceLeft>
-                <class>1</class>
-                <declaration>0</declaration>
-                <footer>1</footer>
-                <header>0</header>
-                <interface>1</interface>
-                <lastImport>2</lastImport>
-                <method>1</method>
-                <package>1</package>
-            </after>
-            <before>
-                <block>0</block>
-                <braceRight>0</braceRight>
-                <caseBlock>0</caseBlock>
-                <comment>
-                    <javadoc>1</javadoc>
-                    <multiline>1</multiline>
-                    <singleline>1</singleline>
-                </comment>
-                <controlStatement>0</controlStatement>
-                <declaration>0</declaration>
-                <footer>0</footer>
-                <header>0</header>
-            </before>
-            <keepUpTo>1</keepUpTo>
-        </blanklines>
-        <braces>
-            <empty>
-                <cuddle>true</cuddle>
-                <insertStatement>false</insertStatement>
-            </empty>
-            <insert>
-                <dowhile>true</dowhile>
-                <for>true</for>
-                <ifelse>true</ifelse>
-                <while>true</while>
-            </insert>
-            <remove>
-                <block>true</block>
-                <dowhile>false</dowhile>
-                <for>false</for>
-                <ifelse>false</ifelse>
-                <while>false</while>
-            </remove>
-            <treatDifferent>
-                <methodClass>false</methodClass>
-                <methodClassIfWrapped>false</methodClassIfWrapped>
-            </treatDifferent>
-        </braces>
-        <chunks>
-            <blanklines>true</blanklines>
-            <comments>true</comments>
-        </chunks>
-        <comments>
-            <format>
-                <multiline>false</multiline>
-            </format>
-            <javadoc>
-                <check>
-                    <innerclass>false</innerclass>
-                    <tags>false</tags>
-                    <throwsTags>false</throwsTags>
-                </check>
-                <fieldsShort>true</fieldsShort>
-                <generate>
-                    <class>0</class>
-                    <constructor>0</constructor>
-                    <field>0</field>
-                    <method>0</method>
-                </generate>
-                <parseComments>false</parseComments>
-                <tags>
-                    <in-line />
-                    <standard />
-                </tags>
-                <templates>
-                    <class>/**| * DOCUMENT ME!| *| * @author $author$| * @version $Revision$| */</class>
-                    <method>
-                        <bottom> */</bottom>
-                        <exception> * @throws $exceptionType$ DOCUMENT ME!</exception>
-                        <param> * @param $paramType$ DOCUMENT ME!</param>
-                        <return> * @return DOCUMENT ME!</return>
-                        <top>/**| * DOCUMENT ME!</top>
-                    </method>
-                </templates>
-            </javadoc>
-            <remove>
-                <javadoc>false</javadoc>
-                <multiline>false</multiline>
-                <singleline>false</singleline>
-            </remove>
-            <separator>
-                <fillCharacter>-</fillCharacter>
-                <insert>true</insert>
-                <insertRecursive>true</insertRecursive>
-                <text>
-                    <class>Inner Classes</class>
-                    <constructor>Constructors</constructor>
-                    <field>Instance fields</field>
-                    <initializer>Instance initializers</initializer>
-                    <interface>Inner Interfaces</interface>
-                    <method>Methods</method>
-                    <static>Static fields/initializers</static>
-                </text>
-            </separator>
-        </comments>
-        <environment />
-        <footer>
-            <keys />
-            <smartMode>0</smartMode>
-            <use>false</use>
-        </footer>
-        <header>
-            <keys />
-            <smartMode>5</smartMode>
-            <text>kkjk</text>
-            <use>false</use>
-        </header>
-        <history>
-            <policy>disabled</policy>
-        </history>
-        <imports>
-            <grouping>
-                <defaultDepth>2</defaultDepth>
-                <packages>java:2|javax:2|gnu:2|com:2|org:2|*:0</packages>
-            </grouping>
-            <policy>disabled</policy>
-            <sort>true</sort>
-        </imports>
-        <indentation>
-            <caseFromSwitch>true</caseFromSwitch>
-            <continuation>
-                <block>false</block>
-                <operator>false</operator>
-            </continuation>
-            <firstColumnComments>true</firstColumnComments>
-            <label>false</label>
-            <policy>
-                <deep>true</deep>
-            </policy>
-            <sizes>
-                <braceCuddled>1</braceCuddled>
-                <braceLeft>0</braceLeft>
-                <braceRight>0</braceRight>
-                <braceRightAfter>0</braceRightAfter>
-                <continuation>4</continuation>
-                <deep>55</deep>
-                <extends>4</extends>
-                <general>4</general>
-                <implements>4</implements>
-                <leading>0</leading>
-                <tabs>4</tabs>
-                <throws>4</throws>
-                <trailingComment>4</trailingComment>
-            </sizes>
-            <tabs>
-                <enable>false</enable>
-                <onlyLeading>false</onlyLeading>
-            </tabs>
-        </indentation>
-        <misc>
-            <arrayBracketsAfterIdent>true</arrayBracketsAfterIdent>
-            <forceFormatting>false</forceFormatting>
-            <insertExpressionParentheses>true</insertExpressionParentheses>
-            <insertLoggingConditional>false</insertLoggingConditional>
-            <insertTrailingNewline>true</insertTrailingNewline>
-            <insertUID>false</insertUID>
-        </misc>
-        <sorting>
-            <declaration>
-                <class>false</class>
-                <constructor>false</constructor>
-                <enable>true</enable>
-                <interface>false</interface>
-                <method>false</method>
-                <order>static|field|initializer|constructor|method|interface|class</order>
-                <variable>false</variable>
-            </declaration>
-            <modifier>
-                <enable>true</enable>
-                <order>public|abstract|protected|private|static|final|synchronized|transient|volatile|native|strictfp</order>
-            </modifier>
-        </sorting>
-        <whitespace>
-            <after>
-                <comma>true</comma>
-                <semicolon>true</semicolon>
-                <typeCast>true</typeCast>
-            </after>
-            <before>
-                <braces>true</braces>
-                <brackets>false</brackets>
-                <bracketsTypes>false</bracketsTypes>
-                <caseColon>false</caseColon>
-                <operator>
-                    <not>false</not>
-                </operator>
-                <parentheses>
-                    <methodCall>false</methodCall>
-                    <methodDeclaration>false</methodDeclaration>
-                    <statement>true</statement>
-                </parentheses>
-            </before>
-            <padding>
-                <braces>true</braces>
-                <brackets>true</brackets>
-                <operator>
-                    <assignment>true</assignment>
-                    <bitwise>true</bitwise>
-                    <logical>true</logical>
-                    <mathematical>true</mathematical>
-                    <relational>true</relational>
-                    <shift>true</shift>
-                </operator>
-                <parenthesis>true</parenthesis>
-                <typeCast>true</typeCast>
-            </padding>
-        </whitespace>
-        <wrapping>
-            <always>
-                <after>
-                    <arrayElement>2147483647</arrayElement>
-                    <braceRight>true</braceRight>
-                    <extendsTypes>true</extendsTypes>
-                    <implementsTypes>true</implementsTypes>
-                    <label>true</label>
-                    <methodCallChained>false</methodCallChained>
-                    <ternaryOperator>
-                        <first>true</first>
-                        <second>true</second>
-                    </ternaryOperator>
-                    <throwsTypes>true</throwsTypes>
-                </after>
-                <before>
-                    <braceLeft>true</braceLeft>
-                    <extends>true</extends>
-                    <implements>true</implements>
-                    <throws>true</throws>
-                </before>
-                <parameter>
-                    <methodCall>false</methodCall>
-                    <methodCallNested>false</methodCallNested>
-                    <methodDeclaration>true</methodDeclaration>
-                </parameter>
-            </always>
-            <general>
-                <beforeOperator>false</beforeOperator>
-                <enable>false</enable>
-                <lineLength>80</lineLength>
-            </general>
-            <ondemand>
-                <after>
-                    <assignment>false</assignment>
-                    <leftParenthesis>false</leftParenthesis>
-                    <parameter>false</parameter>
-                    <types>
-                        <extends>false</extends>
-                        <implements>false</implements>
-                        <throws>false</throws>
-                    </types>
-                </after>
-                <before>
-                    <rightParenthesis>false</rightParenthesis>
-                </before>
-                <groupingParentheses>false</groupingParentheses>
-            </ondemand>
-        </wrapping>
-    </printer>
-</jalopy>
-

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/jalopy.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/conf/jalopy.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/jalopy.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/conf/jalopy.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jalopy>
+    <general>
+        <compliance>
+            <version>14</version>
+        </compliance>
+        <style>
+            <description>Sun Java Coding Convention</description>
+            <name>Sun</name>
+        </style>
+    </general>
+    <inspector>
+        <enable>false</enable>
+        <naming>
+            <classes>
+                <abstract>[A-Z][a-zA-Z0-9]+</abstract>
+                <general>[A-Z][a-zA-Z0-9]+</general>
+            </classes>
+            <fields>
+                <default>[a-z][\w]+</default>
+                <defaultStatic>[a-z][\w]+</defaultStatic>
+                <defaultStaticFinal>[a-zA-Z][\w]+</defaultStaticFinal>
+                <private>[a-z][\w]+</private>
+                <privateStatic>[a-z][\w]+</privateStatic>
+                <privateStaticFinal>[a-zA-Z][\w]+</privateStaticFinal>
+                <protected>[a-z][\w]+</protected>
+                <protectedStatic>[a-z][\w]+</protectedStatic>
+                <protectedStaticFinal>[a-zA-Z][\w]+</protectedStaticFinal>
+                <public>[a-z][\w]+</public>
+                <publicStatic>[a-z][\w]+</publicStatic>
+                <publicStaticFinal>[a-zA-Z][\w]+</publicStaticFinal>
+            </fields>
+            <interfaces>[A-Z][a-zA-Z0-9]+</interfaces>
+            <labels>\w+</labels>
+            <methods>
+                <default>[a-z][\w]+</default>
+                <defaultStatic>[a-z][\w]+</defaultStatic>
+                <defaultStaticFinal>[a-z][\w]+</defaultStaticFinal>
+                <private>[a-z][\w]+</private>
+                <privateStatic>[a-z][\w]+</privateStatic>
+                <privateStaticFinal>[a-z][\w]+</privateStaticFinal>
+                <protected>[a-z][\w]+</protected>
+                <protectedStatic>[a-z][\w]+</protectedStatic>
+                <protectedStaticFinal>[a-z][\w]+</protectedStaticFinal>
+                <public>[a-z][\w]+</public>
+                <publicStatic>[a-z][\w]+</publicStatic>
+                <publicStaticFinal>[a-z][\w]+</publicStaticFinal>
+            </methods>
+            <packages>[a-z]+(?:\.[a-z]+)*</packages>
+            <parameters>
+                <default>[a-z][\w]+</default>
+                <final>[a-z][\w]+</final>
+            </parameters>
+            <variables>[a-z][\w]*</variables>
+        </naming>
+        <tips>
+            <adhereToNamingConvention>false</adhereToNamingConvention>
+            <alwaysOverrideEquals>false</alwaysOverrideEquals>
+            <alwaysOverrideHashCode>false</alwaysOverrideHashCode>
+            <avoidThreadGroups>false</avoidThreadGroups>
+            <declareCollectionComment>false</declareCollectionComment>
+            <dontIgnoreExceptions>false</dontIgnoreExceptions>
+            <dontSubstituteObjectEquals>false</dontSubstituteObjectEquals>
+            <neverDeclareException>false</neverDeclareException>
+            <neverDeclareThrowable>false</neverDeclareThrowable>
+            <neverInvokeWaitOutsideLoop>false</neverInvokeWaitOutsideLoop>
+            <neverReturnZeroArrays>false</neverReturnZeroArrays>
+            <neverUseEmptyFinally>false</neverUseEmptyFinally>
+            <obeyContractEquals>false</obeyContractEquals>
+            <overrideToString>false</overrideToString>
+            <referToObjectsByInterface>false</referToObjectsByInterface>
+            <replaceStructureWithClass>false</replaceStructureWithClass>
+            <stringLiterallI18n>false</stringLiterallI18n>
+            <useInterfaceOnlyForTypes>false</useInterfaceOnlyForTypes>
+            <wrongCollectionComment>false</wrongCollectionComment>
+        </tips>
+    </inspector>
+    <internal>
+        <version>6</version>
+    </internal>
+    <messages>
+        <priority>
+            <general>30000</general>
+            <parser>30000</parser>
+            <parserJavadoc>30000</parserJavadoc>
+            <printer>30000</printer>
+            <printerJavadoc>30000</printerJavadoc>
+            <transform>30000</transform>
+        </priority>
+        <showErrorStackTrace>true</showErrorStackTrace>
+    </messages>
+    <misc>
+        <threadCount>1</threadCount>
+    </misc>
+    <printer>
+        <alignment>
+            <methodCallChain>true</methodCallChain>
+            <parameterMethodDeclaration>true</parameterMethodDeclaration>
+            <ternaryOperator>true</ternaryOperator>
+            <variableAssignment>true</variableAssignment>
+            <variableIdentifier>true</variableIdentifier>
+        </alignment>
+        <backup>
+            <directory>bak</directory>
+            <level>0</level>
+        </backup>
+        <blanklines>
+            <after>
+                <block>1</block>
+                <braceLeft>0</braceLeft>
+                <class>1</class>
+                <declaration>0</declaration>
+                <footer>1</footer>
+                <header>0</header>
+                <interface>1</interface>
+                <lastImport>2</lastImport>
+                <method>1</method>
+                <package>1</package>
+            </after>
+            <before>
+                <block>0</block>
+                <braceRight>0</braceRight>
+                <caseBlock>0</caseBlock>
+                <comment>
+                    <javadoc>1</javadoc>
+                    <multiline>1</multiline>
+                    <singleline>1</singleline>
+                </comment>
+                <controlStatement>0</controlStatement>
+                <declaration>0</declaration>
+                <footer>0</footer>
+                <header>0</header>
+            </before>
+            <keepUpTo>1</keepUpTo>
+        </blanklines>
+        <braces>
+            <empty>
+                <cuddle>true</cuddle>
+                <insertStatement>false</insertStatement>
+            </empty>
+            <insert>
+                <dowhile>true</dowhile>
+                <for>true</for>
+                <ifelse>true</ifelse>
+                <while>true</while>
+            </insert>
+            <remove>
+                <block>true</block>
+                <dowhile>false</dowhile>
+                <for>false</for>
+                <ifelse>false</ifelse>
+                <while>false</while>
+            </remove>
+            <treatDifferent>
+                <methodClass>false</methodClass>
+                <methodClassIfWrapped>false</methodClassIfWrapped>
+            </treatDifferent>
+        </braces>
+        <chunks>
+            <blanklines>true</blanklines>
+            <comments>true</comments>
+        </chunks>
+        <comments>
+            <format>
+                <multiline>false</multiline>
+            </format>
+            <javadoc>
+                <check>
+                    <innerclass>false</innerclass>
+                    <tags>false</tags>
+                    <throwsTags>false</throwsTags>
+                </check>
+                <fieldsShort>true</fieldsShort>
+                <generate>
+                    <class>0</class>
+                    <constructor>0</constructor>
+                    <field>0</field>
+                    <method>0</method>
+                </generate>
+                <parseComments>false</parseComments>
+                <tags>
+                    <in-line />
+                    <standard />
+                </tags>
+                <templates>
+                    <class>/**| * DOCUMENT ME!| *| * @author $author$| * @version $Revision$| */</class>
+                    <method>
+                        <bottom> */</bottom>
+                        <exception> * @throws $exceptionType$ DOCUMENT ME!</exception>
+                        <param> * @param $paramType$ DOCUMENT ME!</param>
+                        <return> * @return DOCUMENT ME!</return>
+                        <top>/**| * DOCUMENT ME!</top>
+                    </method>
+                </templates>
+            </javadoc>
+            <remove>
+                <javadoc>false</javadoc>
+                <multiline>false</multiline>
+                <singleline>false</singleline>
+            </remove>
+            <separator>
+                <fillCharacter>-</fillCharacter>
+                <insert>true</insert>
+                <insertRecursive>true</insertRecursive>
+                <text>
+                    <class>Inner Classes</class>
+                    <constructor>Constructors</constructor>
+                    <field>Instance fields</field>
+                    <initializer>Instance initializers</initializer>
+                    <interface>Inner Interfaces</interface>
+                    <method>Methods</method>
+                    <static>Static fields/initializers</static>
+                </text>
+            </separator>
+        </comments>
+        <environment />
+        <footer>
+            <keys />
+            <smartMode>0</smartMode>
+            <use>false</use>
+        </footer>
+        <header>
+            <keys />
+            <smartMode>5</smartMode>
+            <text>kkjk</text>
+            <use>false</use>
+        </header>
+        <history>
+            <policy>disabled</policy>
+        </history>
+        <imports>
+            <grouping>
+                <defaultDepth>2</defaultDepth>
+                <packages>java:2|javax:2|gnu:2|com:2|org:2|*:0</packages>
+            </grouping>
+            <policy>disabled</policy>
+            <sort>true</sort>
+        </imports>
+        <indentation>
+            <caseFromSwitch>true</caseFromSwitch>
+            <continuation>
+                <block>false</block>
+                <operator>false</operator>
+            </continuation>
+            <firstColumnComments>true</firstColumnComments>
+            <label>false</label>
+            <policy>
+                <deep>true</deep>
+            </policy>
+            <sizes>
+                <braceCuddled>1</braceCuddled>
+                <braceLeft>0</braceLeft>
+                <braceRight>0</braceRight>
+                <braceRightAfter>0</braceRightAfter>
+                <continuation>4</continuation>
+                <deep>55</deep>
+                <extends>4</extends>
+                <general>4</general>
+                <implements>4</implements>
+                <leading>0</leading>
+                <tabs>4</tabs>
+                <throws>4</throws>
+                <trailingComment>4</trailingComment>
+            </sizes>
+            <tabs>
+                <enable>false</enable>
+                <onlyLeading>false</onlyLeading>
+            </tabs>
+        </indentation>
+        <misc>
+            <arrayBracketsAfterIdent>true</arrayBracketsAfterIdent>
+            <forceFormatting>false</forceFormatting>
+            <insertExpressionParentheses>true</insertExpressionParentheses>
+            <insertLoggingConditional>false</insertLoggingConditional>
+            <insertTrailingNewline>true</insertTrailingNewline>
+            <insertUID>false</insertUID>
+        </misc>
+        <sorting>
+            <declaration>
+                <class>false</class>
+                <constructor>false</constructor>
+                <enable>true</enable>
+                <interface>false</interface>
+                <method>false</method>
+                <order>static|field|initializer|constructor|method|interface|class</order>
+                <variable>false</variable>
+            </declaration>
+            <modifier>
+                <enable>true</enable>
+                <order>public|abstract|protected|private|static|final|synchronized|transient|volatile|native|strictfp</order>
+            </modifier>
+        </sorting>
+        <whitespace>
+            <after>
+                <comma>true</comma>
+                <semicolon>true</semicolon>
+                <typeCast>true</typeCast>
+            </after>
+            <before>
+                <braces>true</braces>
+                <brackets>false</brackets>
+                <bracketsTypes>false</bracketsTypes>
+                <caseColon>false</caseColon>
+                <operator>
+                    <not>false</not>
+                </operator>
+                <parentheses>
+                    <methodCall>false</methodCall>
+                    <methodDeclaration>false</methodDeclaration>
+                    <statement>true</statement>
+                </parentheses>
+            </before>
+            <padding>
+                <braces>true</braces>
+                <brackets>true</brackets>
+                <operator>
+                    <assignment>true</assignment>
+                    <bitwise>true</bitwise>
+                    <logical>true</logical>
+                    <mathematical>true</mathematical>
+                    <relational>true</relational>
+                    <shift>true</shift>
+                </operator>
+                <parenthesis>true</parenthesis>
+                <typeCast>true</typeCast>
+            </padding>
+        </whitespace>
+        <wrapping>
+            <always>
+                <after>
+                    <arrayElement>2147483647</arrayElement>
+                    <braceRight>true</braceRight>
+                    <extendsTypes>true</extendsTypes>
+                    <implementsTypes>true</implementsTypes>
+                    <label>true</label>
+                    <methodCallChained>false</methodCallChained>
+                    <ternaryOperator>
+                        <first>true</first>
+                        <second>true</second>
+                    </ternaryOperator>
+                    <throwsTypes>true</throwsTypes>
+                </after>
+                <before>
+                    <braceLeft>true</braceLeft>
+                    <extends>true</extends>
+                    <implements>true</implements>
+                    <throws>true</throws>
+                </before>
+                <parameter>
+                    <methodCall>false</methodCall>
+                    <methodCallNested>false</methodCallNested>
+                    <methodDeclaration>true</methodDeclaration>
+                </parameter>
+            </always>
+            <general>
+                <beforeOperator>false</beforeOperator>
+                <enable>false</enable>
+                <lineLength>80</lineLength>
+            </general>
+            <ondemand>
+                <after>
+                    <assignment>false</assignment>
+                    <leftParenthesis>false</leftParenthesis>
+                    <parameter>false</parameter>
+                    <types>
+                        <extends>false</extends>
+                        <implements>false</implements>
+                        <throws>false</throws>
+                    </types>
+                </after>
+                <before>
+                    <rightParenthesis>false</rightParenthesis>
+                </before>
+                <groupingParentheses>false</groupingParentheses>
+            </ondemand>
+        </wrapping>
+    </printer>
+</jalopy>
+

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/.project
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/.project	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>etc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/.project (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/.project)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/.project	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>etc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss Server Configuration                                           -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-
-<server>
-
-  <!-- ==================================================================== -->
-  <!-- New ConnectionManager setup for default hsql dbs                     -->
-  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
-  <!-- ==================================================================== -->
-
-  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=hsqldbDS">
-
-    <!-- Include a login module configuration named HsqlDbRealm.
-         Update your login-conf.xml, here is an example for a 
-         ConfiguredIdentityLoginModule:
-
-    <application-policy name = "HsqlDbRealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
-             <module-option name = "principal">sa</module-option>
-             <module-option name = "userName">sa</module-option>
-             <module-option name = "password"></module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=hsqldbDS</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    NOTE: the application-policy name attribute must match  
-    SecurityDomainJndiName, and the 
-      module-option name = "managedConnectionFactoryName"
-    must match the object name of the ConnectionManager you are configuring here.
-    -->
-    <!--uncomment out this line if you are using the DB2DbRealm above
-    <attribute name="SecurityDomainJndiName">HsqlDbRealm</attribute>
-    -->
-
-    <depends optional-attribute-name="ManagedConnectionFactoryName">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=hsqldbDS">
-
-        <attribute name="JndiName">xpetstoreDS</attribute>
-        <attribute name="ManagedConnectionFactoryProperties">
-          <properties>
-            <config-property name="ConnectionURL" type="java.lang.String">jdbc:hsqldb:hsql://localhost:1476</config-property>
-            <config-property name="DriverClass" type="java.lang.String">org.hsqldb.jdbcDriver</config-property>
-            <config-property name="UserName" type="java.lang.String">sa</config-property>
-            <config-property name="Password" type="java.lang.String"></config-property>
-          </properties>
-        </attribute>
-
-<!--Below here are advanced properties -->
-        <!--hack-->
-        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
-        <depends>jboss:service=Hypersonic</depends>
-
-      </mbean>
-    </depends>
-    <depends optional-attribute-name="ManagedConnectionPool">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=hsqldbDS">
-
-        <attribute name="MinSize">0</attribute>
-        <attribute name="MaxSize">50</attribute>
-        <attribute name="BlockingTimeoutMillis">5000</attribute>
-        <attribute name="IdleTimeoutMinutes">15</attribute>
-        <!--criteria indicates if Subject (from security domain) or app supplied
-            parameters (such as from getConnection(user, pw)) are used to distinguish
-            connections in the pool. Choices are 
-            ByContainerAndApplication (use both), 
-            ByContainer (use Subject),
-            ByApplication (use app supplied params only),
-            ByNothing (all connections are equivalent, usually if adapter supports
-              reauthentication)-->
-        <attribute name="Criteria">ByContainer</attribute>
-      </mbean>
-    </depends>
-    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
-
-    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
-
-    <attribute name="TransactionManager">java:/TransactionManager</attribute>
-
-    <!--make the rar deploy! hack till better deployment-->
-    <depends>jboss.jca:service=RARDeployer</depends>
-
-  </mbean>
-
-
-  <!-- Moved to end to test anonymous depends -->
-
-  <mbean code="org.jboss.jdbc.HypersonicDatabase" 
-	 name="jboss:service=Hypersonic">
-    <attribute name="Port">1476</attribute>
-    <attribute name="Silent">true</attribute>
-    <attribute name="Database">default</attribute>
-    <attribute name="Trace">false</attribute>
-  </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/hsqldb-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- New ConnectionManager setup for default hsql dbs                     -->
+  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
+  <!-- ==================================================================== -->
+
+  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=hsqldbDS">
+
+    <!-- Include a login module configuration named HsqlDbRealm.
+         Update your login-conf.xml, here is an example for a 
+         ConfiguredIdentityLoginModule:
+
+    <application-policy name = "HsqlDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
+             <module-option name = "principal">sa</module-option>
+             <module-option name = "userName">sa</module-option>
+             <module-option name = "password"></module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=hsqldbDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    NOTE: the application-policy name attribute must match  
+    SecurityDomainJndiName, and the 
+      module-option name = "managedConnectionFactoryName"
+    must match the object name of the ConnectionManager you are configuring here.
+    -->
+    <!--uncomment out this line if you are using the DB2DbRealm above
+    <attribute name="SecurityDomainJndiName">HsqlDbRealm</attribute>
+    -->
+
+    <depends optional-attribute-name="ManagedConnectionFactoryName">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=hsqldbDS">
+
+        <attribute name="JndiName">xpetstoreDS</attribute>
+        <attribute name="ManagedConnectionFactoryProperties">
+          <properties>
+            <config-property name="ConnectionURL" type="java.lang.String">jdbc:hsqldb:hsql://localhost:1476</config-property>
+            <config-property name="DriverClass" type="java.lang.String">org.hsqldb.jdbcDriver</config-property>
+            <config-property name="UserName" type="java.lang.String">sa</config-property>
+            <config-property name="Password" type="java.lang.String"></config-property>
+          </properties>
+        </attribute>
+
+<!--Below here are advanced properties -->
+        <!--hack-->
+        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
+        <depends>jboss:service=Hypersonic</depends>
+
+      </mbean>
+    </depends>
+    <depends optional-attribute-name="ManagedConnectionPool">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=hsqldbDS">
+
+        <attribute name="MinSize">0</attribute>
+        <attribute name="MaxSize">50</attribute>
+        <attribute name="BlockingTimeoutMillis">5000</attribute>
+        <attribute name="IdleTimeoutMinutes">15</attribute>
+        <!--criteria indicates if Subject (from security domain) or app supplied
+            parameters (such as from getConnection(user, pw)) are used to distinguish
+            connections in the pool. Choices are 
+            ByContainerAndApplication (use both), 
+            ByContainer (use Subject),
+            ByApplication (use app supplied params only),
+            ByNothing (all connections are equivalent, usually if adapter supports
+              reauthentication)-->
+        <attribute name="Criteria">ByContainer</attribute>
+      </mbean>
+    </depends>
+    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
+
+    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+
+    <attribute name="TransactionManager">java:/TransactionManager</attribute>
+
+    <!--make the rar deploy! hack till better deployment-->
+    <depends>jboss.jca:service=RARDeployer</depends>
+
+  </mbean>
+
+
+  <!-- Moved to end to test anonymous depends -->
+
+  <mbean code="org.jboss.jdbc.HypersonicDatabase" 
+	 name="jboss:service=Hypersonic">
+    <attribute name="Port">1476</attribute>
+    <attribute name="Silent">true</attribute>
+    <attribute name="Database">default</attribute>
+    <attribute name="Trace">false</attribute>
+  </mbean>
+
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<!-- 
-   | This file defines the default Queues and Topics that JBossMQ
-   | ships with.  The default Queues and Topics are used by the 
-   | JBoss test suite and by the sample jms programs.
-   |
-   | You can add other destinations to this file, or you can create other
-   | *-service.xml files to contain your application's destinations.
- -->
-
-<server>
-  <!-- Destination without a configured SecurityManager or without a 
-       a SecurityConf will default to role guest with read=true, write=true,
-       create=false.
-  -->
-<!--
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=testTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="durpublisher" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=securedTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="publisher" read="true" write="true" create="false"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=testDurableTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-       <security>
-         <role name="guest" read="true" write="true"/>
-         <role name="publisher" read="true" write="true" create="false"/>
-         <role name="durpublisher" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=testQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="noacc" read="false" write="false" create="false"/>
-      </security>
-    </attribute>
-  </mbean>
--->
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=order">
-    <attribute name="JNDIName">queue/order</attribute>
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=mail">
-    <attribute name="JNDIName">queue/mail</attribute>
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-<!--
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=C">
-	 <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=D">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=ex">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
--->
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<!-- 
+   | This file defines the default Queues and Topics that JBossMQ
+   | ships with.  The default Queues and Topics are used by the 
+   | JBoss test suite and by the sample jms programs.
+   |
+   | You can add other destinations to this file, or you can create other
+   | *-service.xml files to contain your application's destinations.
+ -->
+
+<server>
+  <!-- Destination without a configured SecurityManager or without a 
+       a SecurityConf will default to role guest with read=true, write=true,
+       create=false.
+  -->
+<!--
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=testTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="guest" read="true" write="true"/>
+        <role name="publisher" read="true" write="true" create="false"/>
+        <role name="durpublisher" read="true" write="true" create="true"/>
+      </security>
+    </attribute>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=securedTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="publisher" read="true" write="true" create="false"/>
+      </security>
+    </attribute>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=testDurableTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+       <security>
+         <role name="guest" read="true" write="true"/>
+         <role name="publisher" read="true" write="true" create="false"/>
+         <role name="durpublisher" read="true" write="true" create="true"/>
+      </security>
+    </attribute>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=testQueue">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="guest" read="true" write="true"/>
+        <role name="publisher" read="true" write="true" create="false"/>
+        <role name="noacc" read="false" write="false" create="false"/>
+      </security>
+    </attribute>
+  </mbean>
+-->
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=order">
+    <attribute name="JNDIName">queue/order</attribute>
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=mail">
+    <attribute name="JNDIName">queue/mail</attribute>
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+<!--
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=C">
+	 <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=D">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=ex">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+-->
+
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss Server Configuration                                           -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<server>
-
-  <!-- ==================================================================== -->
-  <!-- New ConnectionManager setup for mysql using 2.0.11 driver            -->
-  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
-  <!-- ==================================================================== -->
-
-  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=MySqlDS">
-
-
-    <!-- Include a login module configuration named MySqlDbRealm. 
-         Update your login-conf.xml, here is an example for a 
-         ConfiguredIdentityLoginModule:
-
-    <application-policy name = "MySqlDbRealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
-             <module-option name = "principal">yourprincipal</module-option>
-             <module-option name = "userName">yourusername</module-option>
-             <module-option name = "password">yourpassword</module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=MySqlDS</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
-      module-option name = "managedConnectionFactoryName"
-    must match the object name of the ConnectionManager you are configuring here.
-    -->
-    <!--uncomment out this line if you are using the MySqlDbRealm above
-    <attribute name="SecurityDomainJndiName">MySqlDbRealm</attribute>
-    -->
-
-    <depends optional-attribute-name="ManagedConnectionFactoryName">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=MySqlDS">
-
-        <attribute name="JndiName">xpetstoreDS</attribute>
-
-        <attribute name="ManagedConnectionFactoryProperties">
-          <properties>
-            <config-property name="ConnectionURL" type="java.lang.String">jdbc:mysql://localhost:3306/xpetstore</config-property>
-            <config-property name="DriverClass" type="java.lang.String">com.mysql.jdbc.Driver</config-property>
-            <!--set these only if you want only default logins, not through JAAS -->
-            <config-property name="UserName" type="java.lang.String">herve</config-property>
-            <config-property name="Password" type="java.lang.String">herve</config-property>
-          </properties>
-
-        </attribute>
-
-<!--Below here are advanced properties -->
-        <!--hack-->
-        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
-
-      </mbean>
-    </depends>
-
-    <depends optional-attribute-name="ManagedConnectionPool">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=MySqlDS">
-
-        <attribute name="MinSize">0</attribute>
-        <attribute name="MaxSize">50</attribute>
-        <attribute name="BlockingTimeoutMillis">5000</attribute>
-        <attribute name="IdleTimeoutMinutes">15</attribute>
-        <!--criteria indicates if Subject (from security domain) or app supplied
-            parameters (such as from getConnection(user, pw)) are used to distinguish
-            connections in the pool. Choices are 
-            ByContainerAndApplication (use both), 
-            ByContainer (use Subject),
-            ByApplication (use app supplied params only),
-            ByNothing (all connections are equivalent, usually if adapter supports
-              reauthentication)-->
-        <attribute name="Criteria">ByContainer</attribute>
-      </mbean>
-
-    </depends>
-    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
-
-    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
-
-    <attribute name="TransactionManager">java:/TransactionManager</attribute>
-    <!--make the rar deploy! hack till better deployment-->
-    <depends>jboss.jca:service=RARDeployer</depends>
-
-  </mbean>
-
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/mysql-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- New ConnectionManager setup for mysql using 2.0.11 driver            -->
+  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
+  <!-- ==================================================================== -->
+
+  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=MySqlDS">
+
+
+    <!-- Include a login module configuration named MySqlDbRealm. 
+         Update your login-conf.xml, here is an example for a 
+         ConfiguredIdentityLoginModule:
+
+    <application-policy name = "MySqlDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
+             <module-option name = "principal">yourprincipal</module-option>
+             <module-option name = "userName">yourusername</module-option>
+             <module-option name = "password">yourpassword</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=MySqlDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
+      module-option name = "managedConnectionFactoryName"
+    must match the object name of the ConnectionManager you are configuring here.
+    -->
+    <!--uncomment out this line if you are using the MySqlDbRealm above
+    <attribute name="SecurityDomainJndiName">MySqlDbRealm</attribute>
+    -->
+
+    <depends optional-attribute-name="ManagedConnectionFactoryName">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=MySqlDS">
+
+        <attribute name="JndiName">xpetstoreDS</attribute>
+
+        <attribute name="ManagedConnectionFactoryProperties">
+          <properties>
+            <config-property name="ConnectionURL" type="java.lang.String">jdbc:mysql://localhost:3306/xpetstore</config-property>
+            <config-property name="DriverClass" type="java.lang.String">com.mysql.jdbc.Driver</config-property>
+            <!--set these only if you want only default logins, not through JAAS -->
+            <config-property name="UserName" type="java.lang.String">herve</config-property>
+            <config-property name="Password" type="java.lang.String">herve</config-property>
+          </properties>
+
+        </attribute>
+
+<!--Below here are advanced properties -->
+        <!--hack-->
+        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
+
+      </mbean>
+    </depends>
+
+    <depends optional-attribute-name="ManagedConnectionPool">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=MySqlDS">
+
+        <attribute name="MinSize">0</attribute>
+        <attribute name="MaxSize">50</attribute>
+        <attribute name="BlockingTimeoutMillis">5000</attribute>
+        <attribute name="IdleTimeoutMinutes">15</attribute>
+        <!--criteria indicates if Subject (from security domain) or app supplied
+            parameters (such as from getConnection(user, pw)) are used to distinguish
+            connections in the pool. Choices are 
+            ByContainerAndApplication (use both), 
+            ByContainer (use Subject),
+            ByApplication (use app supplied params only),
+            ByNothing (all connections are equivalent, usually if adapter supports
+              reauthentication)-->
+        <attribute name="Criteria">ByContainer</attribute>
+      </mbean>
+
+    </depends>
+    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
+
+    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+
+    <attribute name="TransactionManager">java:/TransactionManager</attribute>
+    <!--make the rar deploy! hack till better deployment-->
+    <depends>jboss.jca:service=RARDeployer</depends>
+
+  </mbean>
+
+
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss Server Configuration                                           -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<server>
-
-  <!-- ==================================================================== -->
-  <!-- ConnectionManager setup for Oracle dbs                               -->
-  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
-  <!-- Thanks to Steven Coy                                                 -->
-  <!-- ==================================================================== -->
-
-  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=xpetstoreDS">
-
-
-    <!-- Include a login module configuration named OracleDbRealm. 
-         Update your login-conf.xml, here is an example for a 
-         ConfiguredIdentityLoginModule:
-
-    <application-policy name = "OracleDbRealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
-             <module-option name = "principal">scott</module-option>
-             <module-option name = "userName">scott</module-option>
-             <module-option name = "password">tiger</module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=xpetstoreDS</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
-      module-option name = "managedConnectionFactoryName"
-    must match the object name of the ConnectionManager you are configuring here.
-    -->
-
-    <!--uncomment out this line if you are using the OracleDbRealm above
-    <attribute name="SecurityDomainJndiName">OracleDbRealm</attribute>
-    -->
-
-    <depends optional-attribute-name="ManagedConnectionFactoryName">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=xpetstoreDS">
-
-        <attribute name="JndiName">xpetstoreDS</attribute>
-
-        <attribute name="ManagedConnectionFactoryProperties">
-          <properties>
-            <config-property name="ConnectionURL" type="java.lang.String">jdbc:oracle:thin:@jupiter:1521:DEV</config-property>
-            <config-property name="DriverClass" type="java.lang.String">oracle.jdbc.driver.OracleDriver</config-property>
-            <!--set these only if you want only default logins, not through JAAS -->
-            <config-property name="UserName" type="java.lang.String">scott</config-property>
-            <config-property name="Password" type="java.lang.String">tiger</config-property>
-
-          </properties>
-
-        </attribute>
-
-<!--Below here are advanced properties -->
-        <!--hack-->
-        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
-      </mbean>
-    </depends>
-
-    <depends optional-attribute-name="ManagedConnectionPool">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=xpetstoreDS">
-
-        <attribute name="MinSize">1</attribute>
-        <attribute name="MaxSize">50</attribute>
-        <attribute name="BlockingTimeoutMillis">5000</attribute>
-        <attribute name="IdleTimeoutMinutes">15</attribute>
-        <!--criteria indicates if Subject (from security domain) or app supplied
-            parameters (such as from getConnection(user, pw)) are used to distinguish
-            connections in the pool. Choices are 
-            ByContainerAndApplication (use both), 
-            ByContainer (use Subject),
-            ByApplication (use app supplied params only),
-            ByNothing (all connections are equivalent, usually if adapter supports
-              reauthentication)-->
-        <attribute name="Criteria">ByContainer</attribute>
-      </mbean>
-
-    </depends>
-    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
-   
-    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
-
-    <attribute name="TransactionManager">java:/TransactionManager</attribute>
- 
-    <!--make the rar deploy! hack till better deployment-->
-    <depends>jboss.jca:service=RARDeployer</depends>
-
-  </mbean>
-
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/oracle-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- ConnectionManager setup for Oracle dbs                               -->
+  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
+  <!-- Thanks to Steven Coy                                                 -->
+  <!-- ==================================================================== -->
+
+  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=xpetstoreDS">
+
+
+    <!-- Include a login module configuration named OracleDbRealm. 
+         Update your login-conf.xml, here is an example for a 
+         ConfiguredIdentityLoginModule:
+
+    <application-policy name = "OracleDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
+             <module-option name = "principal">scott</module-option>
+             <module-option name = "userName">scott</module-option>
+             <module-option name = "password">tiger</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=xpetstoreDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
+      module-option name = "managedConnectionFactoryName"
+    must match the object name of the ConnectionManager you are configuring here.
+    -->
+
+    <!--uncomment out this line if you are using the OracleDbRealm above
+    <attribute name="SecurityDomainJndiName">OracleDbRealm</attribute>
+    -->
+
+    <depends optional-attribute-name="ManagedConnectionFactoryName">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=xpetstoreDS">
+
+        <attribute name="JndiName">xpetstoreDS</attribute>
+
+        <attribute name="ManagedConnectionFactoryProperties">
+          <properties>
+            <config-property name="ConnectionURL" type="java.lang.String">jdbc:oracle:thin:@jupiter:1521:DEV</config-property>
+            <config-property name="DriverClass" type="java.lang.String">oracle.jdbc.driver.OracleDriver</config-property>
+            <!--set these only if you want only default logins, not through JAAS -->
+            <config-property name="UserName" type="java.lang.String">scott</config-property>
+            <config-property name="Password" type="java.lang.String">tiger</config-property>
+
+          </properties>
+
+        </attribute>
+
+<!--Below here are advanced properties -->
+        <!--hack-->
+        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
+      </mbean>
+    </depends>
+
+    <depends optional-attribute-name="ManagedConnectionPool">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=xpetstoreDS">
+
+        <attribute name="MinSize">1</attribute>
+        <attribute name="MaxSize">50</attribute>
+        <attribute name="BlockingTimeoutMillis">5000</attribute>
+        <attribute name="IdleTimeoutMinutes">15</attribute>
+        <!--criteria indicates if Subject (from security domain) or app supplied
+            parameters (such as from getConnection(user, pw)) are used to distinguish
+            connections in the pool. Choices are 
+            ByContainerAndApplication (use both), 
+            ByContainer (use Subject),
+            ByApplication (use app supplied params only),
+            ByNothing (all connections are equivalent, usually if adapter supports
+              reauthentication)-->
+        <attribute name="Criteria">ByContainer</attribute>
+      </mbean>
+
+    </depends>
+    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
+   
+    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+
+    <attribute name="TransactionManager">java:/TransactionManager</attribute>
+ 
+    <!--make the rar deploy! hack till better deployment-->
+    <depends>jboss.jca:service=RARDeployer</depends>
+
+  </mbean>
+
+
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-  <!-- ======================================================================================== -->
-  <!-- New ConnectionManager setup for default PostgreSQL dbs                                   -->
-  <!-- Build jmx-api (build/build.sh all) and view for config documentation                     -->
-  <!-- To avoid class not found headaches, copy your postgres driver to the jboss lib directory -->
-  <!-- ======================================================================================== -->
-
-<server>
-
-  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=PostgresDS">
-    <!-- ======================================================= -->
-    <!-- You must include a login module configuration named PostgresDbRealm
-         in your login-conf.xml, here is an example for a 
-         ConfiguredIdentityLoginModule:
-
-    <application-policy name = "PostgresDbRealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
-             <module-option name = "principal">yourprincipal</module-option>
-             <module-option name = "userName">yourusername</module-option>
-             <module-option name = "password">yourpassword</module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=PostgresDS</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
-      module-option name = "managedConnectionFactoryName"
-    must match the object name of the ConnectionManager you are configuring here.
-    -->
-    <!-- ===================================================================== -->
-    <!--uncomment out this line if you are using the PostgresDbRealm above
-    <attribute name="SecurityDomainJndiName">PostgresDbRealm</attribute>
-    -->
-
-    <depends optional-attribute-name="ManagedConnectionFactoryName">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=PostgresDS">
-<!-- ========== Set the JndiName ======================= -->
-        <attribute name="JndiName">xpetstoreDS</attribute>
-        <attribute name="ManagedConnectionFactoryProperties">
-          <properties>
-            <config-property name="ConnectionURL" type="java.lang.String">jdbc:postgresql://[servername]:[port]/[database name]</config-property>
-            <config-property name="DriverClass" type="java.lang.String">org.postgresql.Driver</config-property>
-            <!--set these only if you want only default logins, not through JAAS -->
-            <config-property name="UserName" type="java.lang.String"></config-property>
-            <config-property name="Password" type="java.lang.String"></config-property>
-          </properties>
-
-        </attribute>
-
-<!--Below here are advanced properties -->
-        <!--hack-->
-        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
-
-        <!--real attributes-->
-      </mbean>
-    </depends>
-
-    <depends optional-attribute-name="ManagedConnectionPool">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=PostgresDS">
-
-        <attribute name="MinSize">0</attribute>
-        <attribute name="MaxSize">50</attribute>
-        <attribute name="BlockingTimeoutMillis">5000</attribute>
-        <attribute name="IdleTimeoutMinutes">15</attribute>
-        <!--criteria indicates if Subject (from security domain) or app supplied
-            parameters (such as from getConnection(user, pw)) are used to distinguish
-            connections in the pool. Choices are 
-            ByContainerAndApplication (use both), 
-            ByContainer (use Subject),
-            ByApplication (use app supplied params only),
-            ByNothing (all connections are equivalent, usually if adapter supports
-              reauthentication)-->
-        <attribute name="Criteria">ByContainer</attribute>
-      </mbean>
-
-    </depends>
-    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
-
-    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
-
-    <attribute name="TransactionManager">java:/TransactionManager</attribute>
-    <!--make the rar deploy! hack till better deployment-->
-    <depends>jboss.jca:service=RARDeployer</depends>
-
-
-  </mbean>
-
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/postgres-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+  <!-- ======================================================================================== -->
+  <!-- New ConnectionManager setup for default PostgreSQL dbs                                   -->
+  <!-- Build jmx-api (build/build.sh all) and view for config documentation                     -->
+  <!-- To avoid class not found headaches, copy your postgres driver to the jboss lib directory -->
+  <!-- ======================================================================================== -->
+
+<server>
+
+  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=PostgresDS">
+    <!-- ======================================================= -->
+    <!-- You must include a login module configuration named PostgresDbRealm
+         in your login-conf.xml, here is an example for a 
+         ConfiguredIdentityLoginModule:
+
+    <application-policy name = "PostgresDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
+             <module-option name = "principal">yourprincipal</module-option>
+             <module-option name = "userName">yourusername</module-option>
+             <module-option name = "password">yourpassword</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=PostgresDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
+      module-option name = "managedConnectionFactoryName"
+    must match the object name of the ConnectionManager you are configuring here.
+    -->
+    <!-- ===================================================================== -->
+    <!--uncomment out this line if you are using the PostgresDbRealm above
+    <attribute name="SecurityDomainJndiName">PostgresDbRealm</attribute>
+    -->
+
+    <depends optional-attribute-name="ManagedConnectionFactoryName">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=PostgresDS">
+<!-- ========== Set the JndiName ======================= -->
+        <attribute name="JndiName">xpetstoreDS</attribute>
+        <attribute name="ManagedConnectionFactoryProperties">
+          <properties>
+            <config-property name="ConnectionURL" type="java.lang.String">jdbc:postgresql://[servername]:[port]/[database name]</config-property>
+            <config-property name="DriverClass" type="java.lang.String">org.postgresql.Driver</config-property>
+            <!--set these only if you want only default logins, not through JAAS -->
+            <config-property name="UserName" type="java.lang.String"></config-property>
+            <config-property name="Password" type="java.lang.String"></config-property>
+          </properties>
+
+        </attribute>
+
+<!--Below here are advanced properties -->
+        <!--hack-->
+        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
+
+        <!--real attributes-->
+      </mbean>
+    </depends>
+
+    <depends optional-attribute-name="ManagedConnectionPool">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=PostgresDS">
+
+        <attribute name="MinSize">0</attribute>
+        <attribute name="MaxSize">50</attribute>
+        <attribute name="BlockingTimeoutMillis">5000</attribute>
+        <attribute name="IdleTimeoutMinutes">15</attribute>
+        <!--criteria indicates if Subject (from security domain) or app supplied
+            parameters (such as from getConnection(user, pw)) are used to distinguish
+            connections in the pool. Choices are 
+            ByContainerAndApplication (use both), 
+            ByContainer (use Subject),
+            ByApplication (use app supplied params only),
+            ByNothing (all connections are equivalent, usually if adapter supports
+              reauthentication)-->
+        <attribute name="Criteria">ByContainer</attribute>
+      </mbean>
+
+    </depends>
+    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
+
+    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+
+    <attribute name="TransactionManager">java:/TransactionManager</attribute>
+    <!--make the rar deploy! hack till better deployment-->
+    <depends>jboss.jca:service=RARDeployer</depends>
+
+
+  </mbean>
+
+
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss Server Configuration                                           -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<server>
-
-  <!-- ==================================================================== -->
-  <!-- New ConnectionManager setup for Sapdb using the sapdbc driver        -->
-  <!-- Thanks to Kasper Nielsen <news at kav.dk>                               -->
-  <!-- See http://www.sapdb.org/sap_db_jdbc.htm for details                 -->
-  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
-  <!-- ==================================================================== -->
-
-  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=SapdbDS">
-
-
-    <!-- Include a login module configuration named SapdbRealm. 
-         Update your login-conf.xml, here is an example for a 
-         ConfiguredIdentityLoginModule:
-
-    <application-policy name = "SapdbRealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
-             <module-option name = "principal">yourprincipal</module-option>
-             <module-option name = "userName">yourusername</module-option>
-             <module-option name = "password">yourpassword</module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=SapdbDS</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
-      module-option name = "managedConnectionFactoryName"
-    must match the object name of the ConnectionManager you are configuring here.
-    -->
-    <!--uncomment out this line if you are using the SapdbRealm above
-    <attribute name="SecurityDomainJndiName">SapdbRealm</attribute>
-    -->
-
-    <depends optional-attribute-name="ManagedConnectionFactoryName">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=SapdbDS">
-
-        <attribute name="JndiName">xpetstoreDS</attribute>
-
-        <attribute name="ManagedConnectionFactoryProperties">
-          <properties>
-            <config-property name="ConnectionURL" type="java.lang.String">jdbc:sapdb://localhost/XPSTORE</config-property>
-            <config-property name="DriverClass" type="java.lang.String">com.sap.dbtech.jdbc.DriverSapDB</config-property>
-            <!--set these only if you want only default logins, not through JAAS -->
-            <config-property name="UserName" type="java.lang.String">username</config-property>
-            <config-property name="Password" type="java.lang.String">password</config-property>
-          </properties>
-
-        </attribute>
-
-<!--Below here are advanced properties -->
-        <!--hack-->
-        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
-
-      </mbean>
-    </depends>
-
-    <depends optional-attribute-name="ManagedConnectionPool">
-      <!--embedded mbean-->
-      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=SapdbDS">
-
-        <attribute name="MinSize">0</attribute>
-        <attribute name="MaxSize">50</attribute>
-        <attribute name="BlockingTimeoutMillis">5000</attribute>
-        <attribute name="IdleTimeoutMinutes">15</attribute>
-        <!--criteria indicates if Subject (from security domain) or app supplied
-            parameters (such as from getConnection(user, pw)) are used to distinguish
-            connections in the pool. Choices are 
-            ByContainerAndApplication (use both), 
-            ByContainer (use Subject),
-            ByApplication (use app supplied params only),
-            ByNothing (all connections are equivalent, usually if adapter supports
-              reauthentication)-->
-        <attribute name="Criteria">ByContainer</attribute>
-      </mbean>
-
-    </depends>
-    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
-
-    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
-
-    <attribute name="TransactionManager">java:/TransactionManager</attribute>
-    <!--make the rar deploy! hack till better deployment-->
-    <depends>jboss.jca:service=RARDeployer</depends>
-
-  </mbean>
-
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/etc/jboss-3.0.x/sapdb-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- New ConnectionManager setup for Sapdb using the sapdbc driver        -->
+  <!-- Thanks to Kasper Nielsen <news at kav.dk>                               -->
+  <!-- See http://www.sapdb.org/sap_db_jdbc.htm for details                 -->
+  <!-- Build jmx-api (build/build.sh all) and view for config documentation -->
+  <!-- ==================================================================== -->
+
+  <mbean code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" name="jboss.jca:service=LocalTxCM,name=SapdbDS">
+
+
+    <!-- Include a login module configuration named SapdbRealm. 
+         Update your login-conf.xml, here is an example for a 
+         ConfiguredIdentityLoginModule:
+
+    <application-policy name = "SapdbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
+             <module-option name = "principal">yourprincipal</module-option>
+             <module-option name = "userName">yourusername</module-option>
+             <module-option name = "password">yourpassword</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=SapdbDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    NOTE: the application-policy name attribute must match SecurityDomainJndiName, and the 
+      module-option name = "managedConnectionFactoryName"
+    must match the object name of the ConnectionManager you are configuring here.
+    -->
+    <!--uncomment out this line if you are using the SapdbRealm above
+    <attribute name="SecurityDomainJndiName">SapdbRealm</attribute>
+    -->
+
+    <depends optional-attribute-name="ManagedConnectionFactoryName">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=LocalTxDS,name=SapdbDS">
+
+        <attribute name="JndiName">xpetstoreDS</attribute>
+
+        <attribute name="ManagedConnectionFactoryProperties">
+          <properties>
+            <config-property name="ConnectionURL" type="java.lang.String">jdbc:sapdb://localhost/XPSTORE</config-property>
+            <config-property name="DriverClass" type="java.lang.String">com.sap.dbtech.jdbc.DriverSapDB</config-property>
+            <!--set these only if you want only default logins, not through JAAS -->
+            <config-property name="UserName" type="java.lang.String">username</config-property>
+            <config-property name="Password" type="java.lang.String">password</config-property>
+          </properties>
+
+        </attribute>
+
+<!--Below here are advanced properties -->
+        <!--hack-->
+        <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss LocalTransaction JDBC Wrapper</depends>
+
+      </mbean>
+    </depends>
+
+    <depends optional-attribute-name="ManagedConnectionPool">
+      <!--embedded mbean-->
+      <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name=SapdbDS">
+
+        <attribute name="MinSize">0</attribute>
+        <attribute name="MaxSize">50</attribute>
+        <attribute name="BlockingTimeoutMillis">5000</attribute>
+        <attribute name="IdleTimeoutMinutes">15</attribute>
+        <!--criteria indicates if Subject (from security domain) or app supplied
+            parameters (such as from getConnection(user, pw)) are used to distinguish
+            connections in the pool. Choices are 
+            ByContainerAndApplication (use both), 
+            ByContainer (use Subject),
+            ByApplication (use app supplied params only),
+            ByNothing (all connections are equivalent, usually if adapter supports
+              reauthentication)-->
+        <attribute name="Criteria">ByContainer</attribute>
+      </mbean>
+
+    </depends>
+    <depends optional-attribute-name="CachedConnectionManager">jboss.jca:service=CachedConnectionManager</depends>
+
+    <depends optional-attribute-name="JaasSecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+
+    <attribute name="TransactionManager">java:/TransactionManager</attribute>
+    <!--make the rar deploy! hack till better deployment-->
+    <depends>jboss.jca:service=RARDeployer</depends>
+
+  </mbean>
+
+
+</server>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.classpath
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/.classpath	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="output" path=""/>
-</classpath>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.classpath (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/.classpath)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.classpath	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="output" path=""/>
+</classpath>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.project
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/.project	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>lib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.project (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/.project)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.project	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>lib</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/ant)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/junit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/ant/junit)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/junit/junit.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/junit/junit.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/ant/junit/junit.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/ant.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/ant.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/ant.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/optional.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/optional.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/ant/org.apache.tools.ant/optional.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/c3p0.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/c3p0.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/c3p0.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/cglib.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/cglib.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/cglib.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/hibernate.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/hibernate.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/hibernate.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/jcs.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/jcs.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/jcs.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/odmg.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/odmg.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/odmg.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xalan.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xalan.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xalan.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xerces.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xerces.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xerces.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xml-apis.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xml-apis.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/cirrus.hibernate/xml-apis.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.java2html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.java2html)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.java2html/j2h.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.java2html/j2h.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.java2html/j2h.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.mysql (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.mysql)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.mysql/mysql-connector-java-bin.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.mysql/mysql-connector-java-bin.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.mysql/mysql-connector-java-bin.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh/sitemesh.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh/sitemesh.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.sitemesh/sitemesh.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/webwork.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/webwork.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/webwork.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/xercesImpl.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/xercesImpl.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.opensymphony.module.webwork/xercesImpl.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.pointbase (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.pointbase)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.pointbase/pbclient.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.pointbase/pbclient.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.pointbase/pbclient.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.sap (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.sap)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.sap/sapdbc.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/com.sap/sapdbc.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/com.sap/sapdbc.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/aelfred.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/aelfred.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/aelfred.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy-ant.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy-ant.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy-ant.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/de.hunsicker.jalopy/jalopy.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/ccl.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/ccl.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/ccl.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/javancss.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/javancss.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/javancss.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/jhbasic.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/jhbasic.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/jhbasic.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) 2002 Ross Gardler <ross at saafe.org>.
-
-This file is part of JavaNCSS2Ant
-(http://www.kclee.com/clemens/java/javancss/).
-
-JavaNCSS is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-JavaNCSS is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with JavaNCSS; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
--->
-<!--
-This stylesheet converts JavaNCSS XML output to a document format
-which is very close to HTML and which can be used to generate
-custom HTML pages for your project.
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:template match="javancss">
-    <document>
-      <header>
-        <title>Java Non Commenting Source Statements - Analysis</title>
-      </header>
-      <body>
-        <xsl:call-template name="packages"/>
-        <xsl:call-template name="classes"/>
-        <xsl:call-template name="methods"/>
-        <section title="Explanation">
-          <p>The metrics on this page are calculated by counting the comment lines and Non Commenting Source Statements (NCSS). Statements are not statements as specified in the Java Language Specification but include all kinds of declarations too. Roughly spoken, NCSS is approximately equivalent to counting ';' and '{' characters in Java source files.</p>
-          <p>SLCs and MLCs correspond to Sinle Line and Multi Line comments, whilst CCN is the Cyclomatic Complexity Number.</p>
-          <p>For more information about these metrics see the <link href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</link> home page.</p>
-        </section>
-        <section title="credits">
-          <p>Generated by <link href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</link>,<link href="http://sourceforge.net/projects/javancss2ant/">javaNCSS2Ant</link> and <link href="http://jakarta.apache.org/ant">Ant</link></p>
-        </section>
-      </body>
-    </document>
-  </xsl:template>
-
-  <xsl:template name="packages">
-    <section title="Packages">
-      <table width="100%">
-        <tr>
-          <th width="25%">Name</th>
-          <th width="15%">Classes</th>
-          <th width="15%">Methods</th>
-          <th width="15%">Methods/Class</th>
-          <th width="15%">NCSS</th>
-          <th width="15%">Comm/NCSS</th>
-        </tr>
-        <xsl:for-each select="packages/package">
-          <xsl:sort select="functions" data-type="number"/>
-          <xsl:variable name="classes">
-            <xsl:value-of select="classes"/>
-          </xsl:variable>
-          <xsl:variable name="methods">
-            <xsl:value-of select="functions"/>
-          </xsl:variable>
-          <xsl:variable name="ncss">
-            <xsl:value-of select="ncss"/>
-          </xsl:variable>
-          <xsl:variable name="slc">
-            <xsl:value-of select="single_comment_lines"/>
-          </xsl:variable>
-          <xsl:variable name="mlc">
-            <xsl:value-of select="multi_comment_lines"/>
-          </xsl:variable>
-          <xsl:variable name="comments">
-            <xsl:value-of select="$slc + $mlc"/>
-          </xsl:variable>
-          <tr>
-            <td><xsl:value-of select="name"/></td>
-            <td><xsl:value-of select="$classes"/></td>
-            <td><xsl:value-of select="$methods"/></td>
-            <td><xsl:value-of select="format-number($methods div $classes, '#.#')"/></td>
-            <td><xsl:value-of select="$ncss"/></td>
-            <td><xsl:value-of select="format-number($ncss div $comments, '#.#')"/></td>
-          </tr>
-        </xsl:for-each>
-      </table>
-    </section>
-  </xsl:template>
-  
-  <xsl:template name="classes">
-    <section title="Classes">
-      <table width="100%">
-        <tr>
-          <th width="40%">Name</th>
-          <th width="20%">Methods</th>
-          <th width="20%">NCSS</th>
-          <th width="20%">NCSS/Method</th>
-        </tr>
-        <xsl:for-each select="objects/object">
-          <tr>
-            <xsl:variable name="ncss">
-              <xsl:value-of select="ncss"/>
-            </xsl:variable>
-            <xsl:variable name="methods">
-              <xsl:value-of select="functions"/>
-            </xsl:variable>
-            <td><xsl:value-of select="name"/></td>
-            <td><xsl:value-of select="$methods"/></td>
-            <td><xsl:value-of select="$ncss"/></td>
-            <td><xsl:value-of select="format-number($ncss div $methods, '#.#')"/></td>
-          </tr>
-        </xsl:for-each>
-      </table>
-    </section>    
-  </xsl:template>
-
-  <xsl:template name="methods">
-    <section title="Methods">
-      <table width="100%">
-        <tr>
-          <th width="40%">Name</th>
-          <th width="20%">NCSS</th>
-          <th width="20%">CCN</th>
-          <th width="20%">NCSS/CCN</th>
-        </tr>
-        <xsl:for-each select="functions/function">
-          <tr>
-            <xsl:variable name="ncss">
-              <xsl:value-of select="ncss"/>
-            </xsl:variable>
-            <xsl:variable name="ccn">
-              <xsl:value-of select="ccn"/>
-            </xsl:variable>
-            <td><xsl:value-of select="name"/></td>
-            <td><xsl:value-of select="$ncss"/></td>
-            <td><xsl:value-of select="$ccn"/></td>
-            <td><xsl:value-of select="format-number($ncss div $ccn, '#.#')"/></td>
-          </tr>
-        </xsl:for-each>
-      </table>
-    </section>
-  </xsl:template>
-
-</xsl:stylesheet>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2document11.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) 2002 Ross Gardler <ross at saafe.org>.
+
+This file is part of JavaNCSS2Ant
+(http://www.kclee.com/clemens/java/javancss/).
+
+JavaNCSS is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+JavaNCSS is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with JavaNCSS; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+-->
+<!--
+This stylesheet converts JavaNCSS XML output to a document format
+which is very close to HTML and which can be used to generate
+custom HTML pages for your project.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="xml" indent="yes"/>
+
+  <xsl:template match="javancss">
+    <document>
+      <header>
+        <title>Java Non Commenting Source Statements - Analysis</title>
+      </header>
+      <body>
+        <xsl:call-template name="packages"/>
+        <xsl:call-template name="classes"/>
+        <xsl:call-template name="methods"/>
+        <section title="Explanation">
+          <p>The metrics on this page are calculated by counting the comment lines and Non Commenting Source Statements (NCSS). Statements are not statements as specified in the Java Language Specification but include all kinds of declarations too. Roughly spoken, NCSS is approximately equivalent to counting ';' and '{' characters in Java source files.</p>
+          <p>SLCs and MLCs correspond to Sinle Line and Multi Line comments, whilst CCN is the Cyclomatic Complexity Number.</p>
+          <p>For more information about these metrics see the <link href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</link> home page.</p>
+        </section>
+        <section title="credits">
+          <p>Generated by <link href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</link>,<link href="http://sourceforge.net/projects/javancss2ant/">javaNCSS2Ant</link> and <link href="http://jakarta.apache.org/ant">Ant</link></p>
+        </section>
+      </body>
+    </document>
+  </xsl:template>
+
+  <xsl:template name="packages">
+    <section title="Packages">
+      <table width="100%">
+        <tr>
+          <th width="25%">Name</th>
+          <th width="15%">Classes</th>
+          <th width="15%">Methods</th>
+          <th width="15%">Methods/Class</th>
+          <th width="15%">NCSS</th>
+          <th width="15%">Comm/NCSS</th>
+        </tr>
+        <xsl:for-each select="packages/package">
+          <xsl:sort select="functions" data-type="number"/>
+          <xsl:variable name="classes">
+            <xsl:value-of select="classes"/>
+          </xsl:variable>
+          <xsl:variable name="methods">
+            <xsl:value-of select="functions"/>
+          </xsl:variable>
+          <xsl:variable name="ncss">
+            <xsl:value-of select="ncss"/>
+          </xsl:variable>
+          <xsl:variable name="slc">
+            <xsl:value-of select="single_comment_lines"/>
+          </xsl:variable>
+          <xsl:variable name="mlc">
+            <xsl:value-of select="multi_comment_lines"/>
+          </xsl:variable>
+          <xsl:variable name="comments">
+            <xsl:value-of select="$slc + $mlc"/>
+          </xsl:variable>
+          <tr>
+            <td><xsl:value-of select="name"/></td>
+            <td><xsl:value-of select="$classes"/></td>
+            <td><xsl:value-of select="$methods"/></td>
+            <td><xsl:value-of select="format-number($methods div $classes, '#.#')"/></td>
+            <td><xsl:value-of select="$ncss"/></td>
+            <td><xsl:value-of select="format-number($ncss div $comments, '#.#')"/></td>
+          </tr>
+        </xsl:for-each>
+      </table>
+    </section>
+  </xsl:template>
+  
+  <xsl:template name="classes">
+    <section title="Classes">
+      <table width="100%">
+        <tr>
+          <th width="40%">Name</th>
+          <th width="20%">Methods</th>
+          <th width="20%">NCSS</th>
+          <th width="20%">NCSS/Method</th>
+        </tr>
+        <xsl:for-each select="objects/object">
+          <tr>
+            <xsl:variable name="ncss">
+              <xsl:value-of select="ncss"/>
+            </xsl:variable>
+            <xsl:variable name="methods">
+              <xsl:value-of select="functions"/>
+            </xsl:variable>
+            <td><xsl:value-of select="name"/></td>
+            <td><xsl:value-of select="$methods"/></td>
+            <td><xsl:value-of select="$ncss"/></td>
+            <td><xsl:value-of select="format-number($ncss div $methods, '#.#')"/></td>
+          </tr>
+        </xsl:for-each>
+      </table>
+    </section>    
+  </xsl:template>
+
+  <xsl:template name="methods">
+    <section title="Methods">
+      <table width="100%">
+        <tr>
+          <th width="40%">Name</th>
+          <th width="20%">NCSS</th>
+          <th width="20%">CCN</th>
+          <th width="20%">NCSS/CCN</th>
+        </tr>
+        <xsl:for-each select="functions/function">
+          <tr>
+            <xsl:variable name="ncss">
+              <xsl:value-of select="ncss"/>
+            </xsl:variable>
+            <xsl:variable name="ccn">
+              <xsl:value-of select="ccn"/>
+            </xsl:variable>
+            <td><xsl:value-of select="name"/></td>
+            <td><xsl:value-of select="$ncss"/></td>
+            <td><xsl:value-of select="$ccn"/></td>
+            <td><xsl:value-of select="format-number($ncss div $ccn, '#.#')"/></td>
+          </tr>
+        </xsl:for-each>
+      </table>
+    </section>
+  </xsl:template>
+
+</xsl:stylesheet>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,254 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="html"/>
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>JavaNCSS Analysis</title>
-        <style type="text/css">
-          body {
-          font:normal 68% verdana,arial,helvetica;
-          color:#000000;
-          }
-          table tr td, tr th {
-            font-size: 68%;
-          }
-          table.details tr th{
-          font-weight: bold;
-          text-align:left;
-          background:#a6caf0;
-          }
-          table.details tr td{
-          background:#eeeee0;
-          }
-          
-          p {
-          line-height:1.5em;
-          margin-top:0.5em; margin-bottom:1.0em;
-          margin-left:2em;
-          margin-right:2em;
-          }
-          h1 {
-          margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-          }
-          h2 {
-          margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-          }
-          h3 {
-          margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-          }
-          h4 {
-          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-          }
-          h5 {
-          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-          }
-          h6 {
-          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-          }
-          .Error {
-          font-weight:bold; color:red;
-          }
-          .Failure {
-          font-weight:bold; color:purple;
-          }
-          .Properties {
-          text-align:right;
-          }
-        </style>
-      </head>  
-      <body>
-        <h1>
-        <a name="top">JavaNCSS Analysis</a>
-        </h1>
-        <p align="right">Designed for use with <a href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</a> and <a href="http://jakarta.apache.org">Ant</a>.</p>
-        <hr size="2"/>
-        <xsl:apply-templates/>
-      </body>
-    </html>
-  </xsl:template>
-  <xsl:template match="packages">
-    <h2>Packages</h2>
-    <table class="details" border="0" width="100%">
-      <tr>
-        <th>Nr.</th>
-        <th>Classes</th>
-        <th>Functions</th>
-        <th>NCSS</th>
-        <th>Javadocs</th>
-        <th>Package</th>
-      </tr>
-      <xsl:apply-templates select="package"/>
-      <tr>
-        <td>&#160;</td>
-        <td>&#160;</td>
-        <td>&#160;</td>
-        <td>&#160;</td>
-        <td>&#160;</td>
-        <td>&#160;</td>
-      </tr>
-      <tr>
-        <td>&#160;</td>
-        <td><xsl:value-of select="total/classes"/></td>  
-        <td><xsl:value-of select="total/functions"/></td>  
-        <td><xsl:value-of select="total/ncss"/></td>  
-        <td><xsl:value-of select="total/javadocs"/></td>
-        <td>Total</td>  
-      </tr>
-    </table>
-    <p/>
-    <xsl:apply-templates select="table"/>
-  </xsl:template>
-
-  <xsl:template match="package">
-    <tr>
-      <td><xsl:value-of select="position()"/></td>
-      <td><xsl:value-of select="classes"/></td>
-      <td><xsl:value-of select="functions"/></td>
-      <td><xsl:value-of select="ncss"/></td>
-      <td><xsl:value-of select="javadocs"/></td>
-      <td><xsl:value-of select="name"/></td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="table">
-    <table class="details" border="0" width="100%">
-      <xsl:apply-templates select="tr"/>
-    </table>
-    <p/>  
-  </xsl:template>
-
-  <xsl:template match="tr">
-    <xsl:variable name="row"><xsl:value-of select="position()"/></xsl:variable>
-    <tr>
-      <xsl:apply-templates select="td">
-        <xsl:with-param name="row"><xsl:value-of select="$row"/></xsl:with-param>
-      </xsl:apply-templates>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="td">
-    <xsl:param name="row" select="3"/>
-    <xsl:choose>
-      <xsl:when test="$row='1'">
-        <th>
-          <xsl:if test="position()=6">
-            <xsl:text>|</xsl:text>
-          </xsl:if>
-          <xsl:value-of select="."/>&#160;
-        </th>
-      </xsl:when>
-      <xsl:otherwise>
-        <td>
-          <xsl:if test="position()=6">
-            <xsl:text>| </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="."/>&#160;
-        </td>      
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="objects">
-    <h2>Objects</h2>
-    <table class="details" border="0" width="100%">
-      <tr>
-        <th>Nr.</th>
-        <th>NCSS</th>
-        <th>Functions</th>
-        <th>Classes</th>
-        <th>Javadocs</th>
-        <th>Class</th>
-      </tr>
-      <xsl:apply-templates select="object"/>
-      <tr>
-        <td colspan="5">Average Object NCSS:</td>
-        <td><xsl:value-of select="averages/ncss"/></td>
-      </tr>
-      <tr>
-        <td colspan="5">Average Object Functions:</td>
-        <td><xsl:value-of select="averages/functions"/></td>
-      </tr>
-      <tr>
-        <td colspan="5">Average Object Inner Classes:</td>
-        <td><xsl:value-of select="averages/classes"/></td>
-      </tr>
-      <tr>
-        <td colspan="5">Average Object Javadoc Comments:</td>
-        <td><xsl:value-of select="averages/javadocs"/></td>
-      </tr>
-      <tr>
-        <td colspan="5">Program NCSS:</td>
-        <td><xsl:value-of select="ncss"/></td>
-      </tr>
-    </table>
-    <p/>  
-  </xsl:template>
-
-  <xsl:template match="object">
-    <tr>
-      <td><xsl:value-of select="position()"/></td>
-      <td><xsl:value-of select="ncss"/></td>
-      <td><xsl:value-of select="functions"/></td>
-      <td><xsl:value-of select="classes"/></td>
-      <td><xsl:value-of select="javadocs"/></td>
-      <td><xsl:value-of select="name"/></td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="functions">
-    <h2>Functions</h2>
-    <table class="details" border="0" width="100%">
-      <tr>
-        <th>Nr.</th>
-        <th>NCSS</th>
-        <th>CCN</th>
-        <th>Javadoc</th>
-        <th>Function</th>
-      </tr>
-      <xsl:apply-templates select="function"/>
-      <tr>
-        <td colspan="4">Average Function NCSS:</td>
-        <td><xsl:value-of select="function_averages/ncss"/></td>
-      </tr>
-      <tr>
-        <td colspan="4">Average Function CCN:</td>
-        <td><xsl:value-of select="function_averages/ccn"/></td>
-      </tr>
-      <tr>
-        <td colspan="4">Average Function Javadocs:</td>
-        <td><xsl:value-of select="function_averages/javadocs"/></td>
-      </tr>
-      <tr>
-        <td colspan="4">Program NCSS:</td>
-        <td><xsl:value-of select="ncss"/></td>
-      </tr>
-    </table>
-    <p/>
-  </xsl:template>
-
-  <xsl:template match="function">
-    <xsl:variable name="ccn-color">
-      <xsl:choose>
-        <xsl:when test="ccn &gt; '9'">#ff0000</xsl:when>
-        <xsl:otherwise>#000000</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="jdocs-color">
-      <xsl:choose>
-        <xsl:when test="javadocs &lt; '1'">#ff0000</xsl:when>
-        <xsl:otherwise>#000000</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <tr>
-      <td><xsl:value-of select="position()"/></td>
-      <td><xsl:value-of select="ncss"/></td>
-      <td><font color="{$ccn-color}"><xsl:value-of select="ccn"/></font></td>
-      <td><font color="{$jdocs-color}"><xsl:value-of select="javadocs"/></font></td>
-      <td><xsl:value-of select="name"/></td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="text()"/>
-
-</xsl:stylesheet>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2html.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,254 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="html"/>
+  <xsl:template match="/">
+    <html>
+      <head>
+        <title>JavaNCSS Analysis</title>
+        <style type="text/css">
+          body {
+          font:normal 68% verdana,arial,helvetica;
+          color:#000000;
+          }
+          table tr td, tr th {
+            font-size: 68%;
+          }
+          table.details tr th{
+          font-weight: bold;
+          text-align:left;
+          background:#a6caf0;
+          }
+          table.details tr td{
+          background:#eeeee0;
+          }
+          
+          p {
+          line-height:1.5em;
+          margin-top:0.5em; margin-bottom:1.0em;
+          margin-left:2em;
+          margin-right:2em;
+          }
+          h1 {
+          margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+          }
+          h2 {
+          margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+          }
+          h3 {
+          margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+          }
+          h4 {
+          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          h5 {
+          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          h6 {
+          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          .Error {
+          font-weight:bold; color:red;
+          }
+          .Failure {
+          font-weight:bold; color:purple;
+          }
+          .Properties {
+          text-align:right;
+          }
+        </style>
+      </head>  
+      <body>
+        <h1>
+        <a name="top">JavaNCSS Analysis</a>
+        </h1>
+        <p align="right">Designed for use with <a href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</a> and <a href="http://jakarta.apache.org">Ant</a>.</p>
+        <hr size="2"/>
+        <xsl:apply-templates/>
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="packages">
+    <h2>Packages</h2>
+    <table class="details" border="0" width="100%">
+      <tr>
+        <th>Nr.</th>
+        <th>Classes</th>
+        <th>Functions</th>
+        <th>NCSS</th>
+        <th>Javadocs</th>
+        <th>Package</th>
+      </tr>
+      <xsl:apply-templates select="package"/>
+      <tr>
+        <td>&#160;</td>
+        <td>&#160;</td>
+        <td>&#160;</td>
+        <td>&#160;</td>
+        <td>&#160;</td>
+        <td>&#160;</td>
+      </tr>
+      <tr>
+        <td>&#160;</td>
+        <td><xsl:value-of select="total/classes"/></td>  
+        <td><xsl:value-of select="total/functions"/></td>  
+        <td><xsl:value-of select="total/ncss"/></td>  
+        <td><xsl:value-of select="total/javadocs"/></td>
+        <td>Total</td>  
+      </tr>
+    </table>
+    <p/>
+    <xsl:apply-templates select="table"/>
+  </xsl:template>
+
+  <xsl:template match="package">
+    <tr>
+      <td><xsl:value-of select="position()"/></td>
+      <td><xsl:value-of select="classes"/></td>
+      <td><xsl:value-of select="functions"/></td>
+      <td><xsl:value-of select="ncss"/></td>
+      <td><xsl:value-of select="javadocs"/></td>
+      <td><xsl:value-of select="name"/></td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="table">
+    <table class="details" border="0" width="100%">
+      <xsl:apply-templates select="tr"/>
+    </table>
+    <p/>  
+  </xsl:template>
+
+  <xsl:template match="tr">
+    <xsl:variable name="row"><xsl:value-of select="position()"/></xsl:variable>
+    <tr>
+      <xsl:apply-templates select="td">
+        <xsl:with-param name="row"><xsl:value-of select="$row"/></xsl:with-param>
+      </xsl:apply-templates>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="td">
+    <xsl:param name="row" select="3"/>
+    <xsl:choose>
+      <xsl:when test="$row='1'">
+        <th>
+          <xsl:if test="position()=6">
+            <xsl:text>|</xsl:text>
+          </xsl:if>
+          <xsl:value-of select="."/>&#160;
+        </th>
+      </xsl:when>
+      <xsl:otherwise>
+        <td>
+          <xsl:if test="position()=6">
+            <xsl:text>| </xsl:text>
+          </xsl:if>
+          <xsl:value-of select="."/>&#160;
+        </td>      
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="objects">
+    <h2>Objects</h2>
+    <table class="details" border="0" width="100%">
+      <tr>
+        <th>Nr.</th>
+        <th>NCSS</th>
+        <th>Functions</th>
+        <th>Classes</th>
+        <th>Javadocs</th>
+        <th>Class</th>
+      </tr>
+      <xsl:apply-templates select="object"/>
+      <tr>
+        <td colspan="5">Average Object NCSS:</td>
+        <td><xsl:value-of select="averages/ncss"/></td>
+      </tr>
+      <tr>
+        <td colspan="5">Average Object Functions:</td>
+        <td><xsl:value-of select="averages/functions"/></td>
+      </tr>
+      <tr>
+        <td colspan="5">Average Object Inner Classes:</td>
+        <td><xsl:value-of select="averages/classes"/></td>
+      </tr>
+      <tr>
+        <td colspan="5">Average Object Javadoc Comments:</td>
+        <td><xsl:value-of select="averages/javadocs"/></td>
+      </tr>
+      <tr>
+        <td colspan="5">Program NCSS:</td>
+        <td><xsl:value-of select="ncss"/></td>
+      </tr>
+    </table>
+    <p/>  
+  </xsl:template>
+
+  <xsl:template match="object">
+    <tr>
+      <td><xsl:value-of select="position()"/></td>
+      <td><xsl:value-of select="ncss"/></td>
+      <td><xsl:value-of select="functions"/></td>
+      <td><xsl:value-of select="classes"/></td>
+      <td><xsl:value-of select="javadocs"/></td>
+      <td><xsl:value-of select="name"/></td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="functions">
+    <h2>Functions</h2>
+    <table class="details" border="0" width="100%">
+      <tr>
+        <th>Nr.</th>
+        <th>NCSS</th>
+        <th>CCN</th>
+        <th>Javadoc</th>
+        <th>Function</th>
+      </tr>
+      <xsl:apply-templates select="function"/>
+      <tr>
+        <td colspan="4">Average Function NCSS:</td>
+        <td><xsl:value-of select="function_averages/ncss"/></td>
+      </tr>
+      <tr>
+        <td colspan="4">Average Function CCN:</td>
+        <td><xsl:value-of select="function_averages/ccn"/></td>
+      </tr>
+      <tr>
+        <td colspan="4">Average Function Javadocs:</td>
+        <td><xsl:value-of select="function_averages/javadocs"/></td>
+      </tr>
+      <tr>
+        <td colspan="4">Program NCSS:</td>
+        <td><xsl:value-of select="ncss"/></td>
+      </tr>
+    </table>
+    <p/>
+  </xsl:template>
+
+  <xsl:template match="function">
+    <xsl:variable name="ccn-color">
+      <xsl:choose>
+        <xsl:when test="ccn &gt; '9'">#ff0000</xsl:when>
+        <xsl:otherwise>#000000</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="jdocs-color">
+      <xsl:choose>
+        <xsl:when test="javadocs &lt; '1'">#ff0000</xsl:when>
+        <xsl:otherwise>#000000</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <tr>
+      <td><xsl:value-of select="position()"/></td>
+      <td><xsl:value-of select="ncss"/></td>
+      <td><font color="{$ccn-color}"><xsl:value-of select="ccn"/></font></td>
+      <td><font color="{$jdocs-color}"><xsl:value-of select="javadocs"/></font></td>
+      <td><xsl:value-of select="name"/></td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="text()"/>
+
+</xsl:stylesheet>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,149 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="text"/>
-
-  <xsl:template match="packages">
-    <xsl:value-of select="Util:paddWithSpace(String:new('Nr.'),Math:max(string-length(count(package)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-    <xsl:text>   Classes Functions      NCSS  Javadocs Package
-</xsl:text>
-
-    <xsl:apply-templates select="package"/>
-
-    <xsl:value-of select="Util:paddWithSpace(String:new('   '),Math:max(string-length(count(package)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-    <xsl:text> --------- --------- --------- ---------
-</xsl:text>
-
-    <xsl:value-of select="Util:paddWithSpace(String:new('   '),Math:max(string-length(count(package)),4))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-
-    <xsl:value-of select="Util:paddWithSpace(total/classes,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(total/functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(total/ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(total/javadocs,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> Total
-
-</xsl:text>
-
-    <xsl:apply-templates select="table"/>
-
-    <xsl:text>
-</xsl:text>
-
-
-  </xsl:template>
-
-  <xsl:template match="package">
-    <xsl:value-of select="Util:paddWithSpace(String:new(position()),Math:max(string-length(count(../package)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(classes,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(javadocs,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name"/>
-    <xsl:text>
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="table">
-    <xsl:apply-templates select="tr[position()=1]"/>
-    <xsl:text>-------------------------------------------------------------
-</xsl:text>
-    <xsl:apply-templates select="tr[position()!=1]"/>
-  </xsl:template>
-
-  <xsl:template match="tr">
-    <xsl:apply-templates select="td[position()!=6]"/>
-    <xsl:text>| </xsl:text>
-    <xsl:value-of select="td[position()=6]"/>
-    <xsl:text>
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="td">
-    <xsl:value-of select="Util:paddWithSpace(.,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-  </xsl:template>
-
-  <xsl:template match="objects">
-    <xsl:value-of select="Util:paddWithSpace(String:new('Nr.'),Math:max(string-length(count(object)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-    <xsl:text> NCSS Functions Classes Javadocs Class
-</xsl:text>
-    <xsl:apply-templates select="object"/>
-    <xsl:text>Average Object NCSS:             </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(averages/ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-Average Object Functions:        </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(averages/functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-Average Object Inner Classes:    </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(averages/classes,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-Average Object Javadoc Comments: </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(averages/javadocs,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-Program NCSS:                    </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="object">
-    <xsl:value-of select="Util:paddWithSpace(String:new(position()),Math:max(string-length(count(../object)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(ncss,4)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(classes,7)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(javadocs,8)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name"/>
-    <xsl:text>
-</xsl:text>    
-  </xsl:template>
-
-  <xsl:template match="functions">
-    <xsl:value-of select="Util:paddWithSpace(String:new('Nr.'),Math:max(string-length(count(function)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-    <xsl:text> NCSS CCN JVDC Function
-</xsl:text>
-    <xsl:apply-templates select="function"/>
-    <xsl:text>Average Function NCSS: </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(function_averages/ncss,10)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-Average Function CCN:  </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(function_averages/ccn,10)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-Average Function JVDC: </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(function_averages/javadocs,10)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-Program NCSS:          </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(ncss,10)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text>
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="function">
-    <xsl:value-of select="Util:paddWithSpace(String:new(position()),Math:max(string-length(count(../function)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(ncss,4)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(ccn,3)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="Util:paddWithSpace(javadocs,4)" xmlns:Util="xalan://ccl.util.Util"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name"/>
-    <xsl:text>
-</xsl:text>    
-  </xsl:template>
-
-  <xsl:template match="text()"/>
-
-</xsl:stylesheet>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss2text.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="text"/>
+
+  <xsl:template match="packages">
+    <xsl:value-of select="Util:paddWithSpace(String:new('Nr.'),Math:max(string-length(count(package)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+    <xsl:text>   Classes Functions      NCSS  Javadocs Package
+</xsl:text>
+
+    <xsl:apply-templates select="package"/>
+
+    <xsl:value-of select="Util:paddWithSpace(String:new('   '),Math:max(string-length(count(package)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+    <xsl:text> --------- --------- --------- ---------
+</xsl:text>
+
+    <xsl:value-of select="Util:paddWithSpace(String:new('   '),Math:max(string-length(count(package)),4))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+
+    <xsl:value-of select="Util:paddWithSpace(total/classes,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(total/functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(total/ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(total/javadocs,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> Total
+
+</xsl:text>
+
+    <xsl:apply-templates select="table"/>
+
+    <xsl:text>
+</xsl:text>
+
+
+  </xsl:template>
+
+  <xsl:template match="package">
+    <xsl:value-of select="Util:paddWithSpace(String:new(position()),Math:max(string-length(count(../package)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(classes,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(javadocs,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="name"/>
+    <xsl:text>
+</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="table">
+    <xsl:apply-templates select="tr[position()=1]"/>
+    <xsl:text>-------------------------------------------------------------
+</xsl:text>
+    <xsl:apply-templates select="tr[position()!=1]"/>
+  </xsl:template>
+
+  <xsl:template match="tr">
+    <xsl:apply-templates select="td[position()!=6]"/>
+    <xsl:text>| </xsl:text>
+    <xsl:value-of select="td[position()=6]"/>
+    <xsl:text>
+</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="td">
+    <xsl:value-of select="Util:paddWithSpace(.,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="objects">
+    <xsl:value-of select="Util:paddWithSpace(String:new('Nr.'),Math:max(string-length(count(object)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+    <xsl:text> NCSS Functions Classes Javadocs Class
+</xsl:text>
+    <xsl:apply-templates select="object"/>
+    <xsl:text>Average Object NCSS:             </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(averages/ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+Average Object Functions:        </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(averages/functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+Average Object Inner Classes:    </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(averages/classes,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+Average Object Javadoc Comments: </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(averages/javadocs,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+Program NCSS:                    </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(ncss,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+
+</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="object">
+    <xsl:value-of select="Util:paddWithSpace(String:new(position()),Math:max(string-length(count(../object)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(ncss,4)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(functions,9)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(classes,7)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(javadocs,8)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="name"/>
+    <xsl:text>
+</xsl:text>    
+  </xsl:template>
+
+  <xsl:template match="functions">
+    <xsl:value-of select="Util:paddWithSpace(String:new('Nr.'),Math:max(string-length(count(function)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+    <xsl:text> NCSS CCN JVDC Function
+</xsl:text>
+    <xsl:apply-templates select="function"/>
+    <xsl:text>Average Function NCSS: </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(function_averages/ncss,10)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+Average Function CCN:  </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(function_averages/ccn,10)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+Average Function JVDC: </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(function_averages/javadocs,10)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+Program NCSS:          </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(ncss,10)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text>
+</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="function">
+    <xsl:value-of select="Util:paddWithSpace(String:new(position()),Math:max(string-length(count(../function)),3))" xmlns:Util="xalan://ccl.util.Util" xmlns:String="xalan://java.lang.String" xmlns:Math="xalan://java.lang.Math"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(ncss,4)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(ccn,3)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="Util:paddWithSpace(javadocs,4)" xmlns:Util="xalan://ccl.util.Util"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="name"/>
+    <xsl:text>
+</xsl:text>    
+  </xsl:template>
+
+  <xsl:template match="text()"/>
+
+</xsl:stylesheet>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) 2002 Chr. Clemens Lee <clemens at kclee.com>.
-
-This file is part of JavaNCSS
-(http://www.kclee.com/clemens/java/javancss/).
-
-JavaNCSS is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-JavaNCSS is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with JavaNCSS; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
--->
-<!--
-This stylesheet converts JavaNCSS XML output to a document format
-which is very similar to its input but has different names
-for the functions tag so no overloading of that name takes place.
-
-Chr. Clemens Lee
-2002-08-04
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:template match="/javancss/packages/package/functions">
-    <pck_functions><xsl:value-of select="."/></pck_functions>
-  </xsl:template>
-
-  <xsl:template match="/javancss/packages/total/functions">
-    <pck_total_functions><xsl:value-of select="."/></pck_total_functions>
-  </xsl:template>
-
-  <xsl:template match="/javancss/objects/object/functions">
-    <obj_functions><xsl:value-of select="."/></obj_functions>
-  </xsl:template>
-
-  <xsl:template match="/javancss/objects/averages/functions">
-    <obj_avg_functions><xsl:value-of select="."/></obj_avg_functions>
-  </xsl:template>
-
-  <xsl:template match="*">
-    <xsl:copy>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/javancss_no_functions_overloading.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) 2002 Chr. Clemens Lee <clemens at kclee.com>.
+
+This file is part of JavaNCSS
+(http://www.kclee.com/clemens/java/javancss/).
+
+JavaNCSS is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+JavaNCSS is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with JavaNCSS; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+-->
+<!--
+This stylesheet converts JavaNCSS XML output to a document format
+which is very similar to its input but has different names
+for the functions tag so no overloading of that name takes place.
+
+Chr. Clemens Lee
+2002-08-04
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="xml" indent="yes"/>
+
+  <xsl:template match="/javancss/packages/package/functions">
+    <pck_functions><xsl:value-of select="."/></pck_functions>
+  </xsl:template>
+
+  <xsl:template match="/javancss/packages/total/functions">
+    <pck_total_functions><xsl:value-of select="."/></pck_total_functions>
+  </xsl:template>
+
+  <xsl:template match="/javancss/objects/object/functions">
+    <obj_functions><xsl:value-of select="."/></obj_functions>
+  </xsl:template>
+
+  <xsl:template match="/javancss/objects/averages/functions">
+    <obj_avg_functions><xsl:value-of select="."/></obj_avg_functions>
+  </xsl:template>
+
+  <xsl:template match="*">
+    <xsl:copy>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-Thanks to Yves Coene <Yves.Coene at spacebel.be>
-for these xslt stylesheets to produce svg diagrams out of javancss xml output.
-I like them very much.
-The svg files in this directory are example files.
-
-Use e.g. batik as an svg viewer to see the content.
-
-Generate your own with your favorite xslt transformer like:
-javancss -xml -all -recursively java_source_dir > temp.xml
-xslt -in temp.xml -xsl chart_XY.xsl > temp.svg
-batik temp.svg
-
-Chr. Clemens Lee, 2002-09-03.

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/README.TXT	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+Thanks to Yves Coene <Yves.Coene at spacebel.be>
+for these xslt stylesheets to produce svg diagrams out of javancss xml output.
+I like them very much.
+The svg files in this directory are example files.
+
+Use e.g. batik as an svg viewer to see the content.
+
+Generate your own with your favorite xslt transformer like:
+javancss -xml -all -recursively java_source_dir > temp.xml
+xslt -in temp.xml -xsl chart_XY.xsl > temp.svg
+batik temp.svg
+
+Chr. Clemens Lee, 2002-09-03.

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.svg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.svg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.svg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>  
-<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
-<!--            frequency table in a bar chart in SVG format.                 -->
-<!--            Range of metric on y-axis is 0 to 4*average.                  -->
-<!-- File     : chart_ccn.xsl                                                 -->
-<!-- Usage    : xt javancss_out.xml chart_ccn.xsl chart_ccn.svg               -->
-<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
-<!-- Input    : XML output of JavaNCSS tool.                                  -->
-<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
-<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
-<!--                   Original.  Shows table in SVG format.                  -->
-
-<!DOCTYPE BARCHART [
-  <!ENTITY UNIT        "javancss/functions/function">
-  <!ENTITY METRIC      "javancss/functions/function/ccn">
-  <!ENTITY SHORTMETRIC "ccn">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-
-<!-- global variables -->
-
-     <xsl:variable name="title1">Distribution Cyclomatic</xsl:variable>
-     <xsl:variable name="title2">Complexity per Function (CCN)</xsl:variable>
-     <xsl:variable name="labelx">Functions</xsl:variable>
-     <xsl:variable name="labely">Cyclomatic Complexity</xsl:variable>
-
-     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
-        35
-     </xsl:variable>
-     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
-        220
-     </xsl:variable>
-     <xsl:variable name="x0">   <!-- x offset of origin -->
-        464
-     </xsl:variable>
-
-     <xsl:variable name="last_value">
-        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
-     </xsl:variable>
-
-     <xsl:variable name="step_value">
-        <xsl:value-of select="floor($last_value div 10)+1"/>
-     </xsl:variable>
-
-
-<xsl:template match="/">
-
- <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
- <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
- <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
- <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
-     <rect x="40" y="40" width="4240" height="3160"/>
- </g>
-
- <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
-     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
-     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
- </g>
-
- <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
-     <text><xsl:value-of select="$labely"/></text>
- </g>
- <g style="fill:#008000; font-family:Arial;font-size:100;">
- <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
-       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
- </text>
- <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
-      <xsl:value-of select="count(&UNIT;)"/>
- </text>
- <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
-      <xsl:value-of select="sum(&METRIC;)"/>
- </text>
-
- </g>
- <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
-
- <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
-  <text x="{($x0)+0}" y="2970"> 0%</text>
-  <text x="{$x0+10*$dx}" y="2970">10%</text>
-  <text x="{$x0+20*$dx}" y="2970">20%</text>
-  <text x="{$x0+30*$dx}" y="2970">30%</text>
-  <text x="{$x0+40*$dx}" y="2970">40%</text>
-  <text x="{$x0+50*$dx}" y="2970">50%</text>
-  <text x="{$x0+60*$dx}" y="2970">60%</text>
-  <text x="{$x0+70*$dx}" y="2970">70%</text>
-  <text x="{$x0+80*$dx}" y="2970">80%</text>
-  <text x="{$x0+90*$dx}" y="2970">90%</text>
-  <text x="{$x0+100*$dx}" y="2970">100%</text>
- </g>
-
- <!-- x-axis with ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
-
- <!-- y-axis without ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
-
-       <xsl:call-template name="LOOP">
-          <xsl:with-param name="n">0</xsl:with-param>
-          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
-       </xsl:call-template>
-
-  </svg>
-</xsl:template>
-
-
-<!-- named templates to simplify ...  Use recursion to implement loop  -->
-
-<xsl:template name="ITEM">
-   <xsl:param name="i">0</xsl:param>
-   <xsl:param name="x">0</xsl:param>
-   <xsl:param name="y">0</xsl:param>
-   <xsl:param name="p">0</xsl:param>
-
-   <!-- tick on vertical axis -->
-   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
-
-   <!-- label on vertical axis -->
-   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
-       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
-           <xsl:value-of select="$x"/>
-       </text>
-   </g>
-
-   <!-- rectangle representing frequency (0 to 100)-->
-   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
-       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
-   </g>
-</xsl:template>
-
-
-<xsl:template name="LOOP">
-    <xsl:param name="n">0</xsl:param>
-    <xsl:param name="last">0</xsl:param>
-
-    <xsl:variable name="cnt">
-        <xsl:choose>
-        <xsl:when test="$n &lt; $last">
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
-        </xsl:otherwise>
-        </xsl:choose>
-     </xsl:variable>
-
-     <xsl:call-template name="ITEM">
-          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
-          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
-          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
-          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
-     </xsl:call-template>
-
-     <xsl:if test="$n &lt; $last">
-        <xsl:call-template name="LOOP">
-            <xsl:with-param name="n">
-              <xsl:value-of select="$n+1"/>
-            </xsl:with-param>
-            <xsl:with-param name="last">
-              <xsl:value-of select="$last"/>
-            </xsl:with-param>
-        </xsl:call-template>
-     </xsl:if>  
-
-</xsl:template>
-
-</xsl:stylesheet> 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ccn.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>  
+<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
+<!--            frequency table in a bar chart in SVG format.                 -->
+<!--            Range of metric on y-axis is 0 to 4*average.                  -->
+<!-- File     : chart_ccn.xsl                                                 -->
+<!-- Usage    : xt javancss_out.xml chart_ccn.xsl chart_ccn.svg               -->
+<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
+<!-- Input    : XML output of JavaNCSS tool.                                  -->
+<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
+<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
+<!--                   Original.  Shows table in SVG format.                  -->
+
+<!DOCTYPE BARCHART [
+  <!ENTITY UNIT        "javancss/functions/function">
+  <!ENTITY METRIC      "javancss/functions/function/ccn">
+  <!ENTITY SHORTMETRIC "ccn">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+
+<!-- global variables -->
+
+     <xsl:variable name="title1">Distribution Cyclomatic</xsl:variable>
+     <xsl:variable name="title2">Complexity per Function (CCN)</xsl:variable>
+     <xsl:variable name="labelx">Functions</xsl:variable>
+     <xsl:variable name="labely">Cyclomatic Complexity</xsl:variable>
+
+     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
+        35
+     </xsl:variable>
+     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
+        220
+     </xsl:variable>
+     <xsl:variable name="x0">   <!-- x offset of origin -->
+        464
+     </xsl:variable>
+
+     <xsl:variable name="last_value">
+        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
+     </xsl:variable>
+
+     <xsl:variable name="step_value">
+        <xsl:value-of select="floor($last_value div 10)+1"/>
+     </xsl:variable>
+
+
+<xsl:template match="/">
+
+ <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
+ <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
+ <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
+ <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
+     <rect x="40" y="40" width="4240" height="3160"/>
+ </g>
+
+ <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
+     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
+     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
+ </g>
+
+ <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
+     <text><xsl:value-of select="$labely"/></text>
+ </g>
+ <g style="fill:#008000; font-family:Arial;font-size:100;">
+ <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
+       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
+ </text>
+ <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
+      <xsl:value-of select="count(&UNIT;)"/>
+ </text>
+ <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
+      <xsl:value-of select="sum(&METRIC;)"/>
+ </text>
+
+ </g>
+ <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
+
+ <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
+  <text x="{($x0)+0}" y="2970"> 0%</text>
+  <text x="{$x0+10*$dx}" y="2970">10%</text>
+  <text x="{$x0+20*$dx}" y="2970">20%</text>
+  <text x="{$x0+30*$dx}" y="2970">30%</text>
+  <text x="{$x0+40*$dx}" y="2970">40%</text>
+  <text x="{$x0+50*$dx}" y="2970">50%</text>
+  <text x="{$x0+60*$dx}" y="2970">60%</text>
+  <text x="{$x0+70*$dx}" y="2970">70%</text>
+  <text x="{$x0+80*$dx}" y="2970">80%</text>
+  <text x="{$x0+90*$dx}" y="2970">90%</text>
+  <text x="{$x0+100*$dx}" y="2970">100%</text>
+ </g>
+
+ <!-- x-axis with ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
+
+ <!-- y-axis without ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
+
+       <xsl:call-template name="LOOP">
+          <xsl:with-param name="n">0</xsl:with-param>
+          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
+       </xsl:call-template>
+
+  </svg>
+</xsl:template>
+
+
+<!-- named templates to simplify ...  Use recursion to implement loop  -->
+
+<xsl:template name="ITEM">
+   <xsl:param name="i">0</xsl:param>
+   <xsl:param name="x">0</xsl:param>
+   <xsl:param name="y">0</xsl:param>
+   <xsl:param name="p">0</xsl:param>
+
+   <!-- tick on vertical axis -->
+   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
+
+   <!-- label on vertical axis -->
+   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
+       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
+           <xsl:value-of select="$x"/>
+       </text>
+   </g>
+
+   <!-- rectangle representing frequency (0 to 100)-->
+   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
+       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
+   </g>
+</xsl:template>
+
+
+<xsl:template name="LOOP">
+    <xsl:param name="n">0</xsl:param>
+    <xsl:param name="last">0</xsl:param>
+
+    <xsl:variable name="cnt">
+        <xsl:choose>
+        <xsl:when test="$n &lt; $last">
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
+        </xsl:otherwise>
+        </xsl:choose>
+     </xsl:variable>
+
+     <xsl:call-template name="ITEM">
+          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
+          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
+          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
+          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
+     </xsl:call-template>
+
+     <xsl:if test="$n &lt; $last">
+        <xsl:call-template name="LOOP">
+            <xsl:with-param name="n">
+              <xsl:value-of select="$n+1"/>
+            </xsl:with-param>
+            <xsl:with-param name="last">
+              <xsl:value-of select="$last"/>
+            </xsl:with-param>
+        </xsl:call-template>
+     </xsl:if>  
+
+</xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.svg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.svg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.svg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>  
-<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
-<!--            frequency table in a bar chart in SVG format.                 -->
-<!--            Range of metric on y-axis is 0 to 4*average.                  -->
-<!-- File     : chart_function_package.xsl                                    -->
-<!-- Usage    : xt javancss_out.xml chart_function_package.xsl                -->
-<!--            chart_function_package.svg                                    -->
-<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
-<!-- Input    : XML output of JavaNCSS tool.                                  -->
-<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
-<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
-<!--                   Original.  Shows table in SVG format.                  -->
-
-<!DOCTYPE BARCHART [
-  <!ENTITY UNIT        "javancss/packages/package">
-  <!ENTITY METRIC      "javancss/packages/package/functions">
-  <!ENTITY SHORTMETRIC "functions">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-
-<!-- global variables -->
-
-     <xsl:variable name="title1">Distribution Functions</xsl:variable>
-     <xsl:variable name="title2">per Package</xsl:variable>
-     <xsl:variable name="labelx">Packages</xsl:variable>
-     <xsl:variable name="labely">Functions</xsl:variable>
-
-     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
-        35
-     </xsl:variable>
-     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
-        220
-     </xsl:variable>
-     <xsl:variable name="x0">   <!-- x offset of origin -->
-        464
-     </xsl:variable>
-
-     <xsl:variable name="last_value">
-        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
-     </xsl:variable>
-
-     <xsl:variable name="step_value">
-        <xsl:value-of select="floor($last_value div 10)+1"/>
-     </xsl:variable>
-
-
-<xsl:template match="/">
-
- <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
- <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
- <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
- <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
-     <rect x="40" y="40" width="4240" height="3160"/>
- </g>
-
- <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
-     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
-     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
- </g>
-
- <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
-     <text><xsl:value-of select="$labely"/></text>
- </g>
- <g style="fill:#008000; font-family:Arial;font-size:100;">
- <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
-       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
- </text>
- <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
-      <xsl:value-of select="count(&UNIT;)"/>
- </text>
- <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
-      <xsl:value-of select="sum(&METRIC;)"/>
- </text>
-
- </g>
- <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
-
- <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
-  <text x="{($x0)+0}" y="2970"> 0%</text>
-  <text x="{$x0+10*$dx}" y="2970">10%</text>
-  <text x="{$x0+20*$dx}" y="2970">20%</text>
-  <text x="{$x0+30*$dx}" y="2970">30%</text>
-  <text x="{$x0+40*$dx}" y="2970">40%</text>
-  <text x="{$x0+50*$dx}" y="2970">50%</text>
-  <text x="{$x0+60*$dx}" y="2970">60%</text>
-  <text x="{$x0+70*$dx}" y="2970">70%</text>
-  <text x="{$x0+80*$dx}" y="2970">80%</text>
-  <text x="{$x0+90*$dx}" y="2970">90%</text>
-  <text x="{$x0+100*$dx}" y="2970">100%</text>
- </g>
-
- <!-- x-axis with ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
-
- <!-- y-axis without ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
-
-       <xsl:call-template name="LOOP">
-          <xsl:with-param name="n">0</xsl:with-param>
-          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
-       </xsl:call-template>
-
-  </svg>
-</xsl:template>
-
-
-<!-- named templates to simplify ...  Use recursion to implement loop  -->
-
-<xsl:template name="ITEM">
-   <xsl:param name="i">0</xsl:param>
-   <xsl:param name="x">0</xsl:param>
-   <xsl:param name="y">0</xsl:param>
-   <xsl:param name="p">0</xsl:param>
-
-   <!-- tick on vertical axis -->
-   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
-
-   <!-- label on vertical axis -->
-   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
-       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
-           <xsl:value-of select="$x"/>
-       </text>
-   </g>
-
-   <!-- rectangle representing frequency (0 to 100)-->
-   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
-       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
-   </g>
-</xsl:template>
-
-
-<xsl:template name="LOOP">
-    <xsl:param name="n">0</xsl:param>
-    <xsl:param name="last">0</xsl:param>
-
-    <xsl:variable name="cnt">
-        <xsl:choose>
-        <xsl:when test="$n &lt; $last">
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
-        </xsl:otherwise>
-        </xsl:choose>
-     </xsl:variable>
-
-     <xsl:call-template name="ITEM">
-          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
-          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
-          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
-          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
-     </xsl:call-template>
-
-     <xsl:if test="$n &lt; $last">
-        <xsl:call-template name="LOOP">
-            <xsl:with-param name="n">
-              <xsl:value-of select="$n+1"/>
-            </xsl:with-param>
-            <xsl:with-param name="last">
-              <xsl:value-of select="$last"/>
-            </xsl:with-param>
-        </xsl:call-template>
-     </xsl:if>  
-
-</xsl:template>
-
-</xsl:stylesheet> 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_function_package.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>  
+<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
+<!--            frequency table in a bar chart in SVG format.                 -->
+<!--            Range of metric on y-axis is 0 to 4*average.                  -->
+<!-- File     : chart_function_package.xsl                                    -->
+<!-- Usage    : xt javancss_out.xml chart_function_package.xsl                -->
+<!--            chart_function_package.svg                                    -->
+<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
+<!-- Input    : XML output of JavaNCSS tool.                                  -->
+<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
+<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
+<!--                   Original.  Shows table in SVG format.                  -->
+
+<!DOCTYPE BARCHART [
+  <!ENTITY UNIT        "javancss/packages/package">
+  <!ENTITY METRIC      "javancss/packages/package/functions">
+  <!ENTITY SHORTMETRIC "functions">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+
+<!-- global variables -->
+
+     <xsl:variable name="title1">Distribution Functions</xsl:variable>
+     <xsl:variable name="title2">per Package</xsl:variable>
+     <xsl:variable name="labelx">Packages</xsl:variable>
+     <xsl:variable name="labely">Functions</xsl:variable>
+
+     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
+        35
+     </xsl:variable>
+     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
+        220
+     </xsl:variable>
+     <xsl:variable name="x0">   <!-- x offset of origin -->
+        464
+     </xsl:variable>
+
+     <xsl:variable name="last_value">
+        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
+     </xsl:variable>
+
+     <xsl:variable name="step_value">
+        <xsl:value-of select="floor($last_value div 10)+1"/>
+     </xsl:variable>
+
+
+<xsl:template match="/">
+
+ <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
+ <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
+ <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
+ <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
+     <rect x="40" y="40" width="4240" height="3160"/>
+ </g>
+
+ <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
+     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
+     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
+ </g>
+
+ <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
+     <text><xsl:value-of select="$labely"/></text>
+ </g>
+ <g style="fill:#008000; font-family:Arial;font-size:100;">
+ <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
+       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
+ </text>
+ <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
+      <xsl:value-of select="count(&UNIT;)"/>
+ </text>
+ <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
+      <xsl:value-of select="sum(&METRIC;)"/>
+ </text>
+
+ </g>
+ <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
+
+ <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
+  <text x="{($x0)+0}" y="2970"> 0%</text>
+  <text x="{$x0+10*$dx}" y="2970">10%</text>
+  <text x="{$x0+20*$dx}" y="2970">20%</text>
+  <text x="{$x0+30*$dx}" y="2970">30%</text>
+  <text x="{$x0+40*$dx}" y="2970">40%</text>
+  <text x="{$x0+50*$dx}" y="2970">50%</text>
+  <text x="{$x0+60*$dx}" y="2970">60%</text>
+  <text x="{$x0+70*$dx}" y="2970">70%</text>
+  <text x="{$x0+80*$dx}" y="2970">80%</text>
+  <text x="{$x0+90*$dx}" y="2970">90%</text>
+  <text x="{$x0+100*$dx}" y="2970">100%</text>
+ </g>
+
+ <!-- x-axis with ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
+
+ <!-- y-axis without ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
+
+       <xsl:call-template name="LOOP">
+          <xsl:with-param name="n">0</xsl:with-param>
+          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
+       </xsl:call-template>
+
+  </svg>
+</xsl:template>
+
+
+<!-- named templates to simplify ...  Use recursion to implement loop  -->
+
+<xsl:template name="ITEM">
+   <xsl:param name="i">0</xsl:param>
+   <xsl:param name="x">0</xsl:param>
+   <xsl:param name="y">0</xsl:param>
+   <xsl:param name="p">0</xsl:param>
+
+   <!-- tick on vertical axis -->
+   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
+
+   <!-- label on vertical axis -->
+   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
+       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
+           <xsl:value-of select="$x"/>
+       </text>
+   </g>
+
+   <!-- rectangle representing frequency (0 to 100)-->
+   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
+       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
+   </g>
+</xsl:template>
+
+
+<xsl:template name="LOOP">
+    <xsl:param name="n">0</xsl:param>
+    <xsl:param name="last">0</xsl:param>
+
+    <xsl:variable name="cnt">
+        <xsl:choose>
+        <xsl:when test="$n &lt; $last">
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
+        </xsl:otherwise>
+        </xsl:choose>
+     </xsl:variable>
+
+     <xsl:call-template name="ITEM">
+          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
+          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
+          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
+          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
+     </xsl:call-template>
+
+     <xsl:if test="$n &lt; $last">
+        <xsl:call-template name="LOOP">
+            <xsl:with-param name="n">
+              <xsl:value-of select="$n+1"/>
+            </xsl:with-param>
+            <xsl:with-param name="last">
+              <xsl:value-of select="$last"/>
+            </xsl:with-param>
+        </xsl:call-template>
+     </xsl:if>  
+
+</xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.svg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.svg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.svg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>  
-<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
-<!--            frequency table in a bar chart in SVG format.                 -->
-<!--            Range of metric on y-axis is 0 to 4*average.                  -->
-<!-- File     : chart_ncss.xsl                                                -->
-<!-- Usage    : xt javancss_out.xml chart_ncss.xsl chart_ncss.svg             -->
-<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
-<!-- Input    : XML output of JavaNCSS tool.                                  -->
-<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
-<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
-<!--                   Original.  Shows table in SVG format.                  -->
-
-<!DOCTYPE BARCHART [
-  <!ENTITY UNIT        "javancss/functions/function">
-  <!ENTITY METRIC      "javancss/functions/function/ncss">
-  <!ENTITY SHORTMETRIC "ncss">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-
-<!-- global variables -->
-
-     <xsl:variable name="title1">Distribution Java Source Statements</xsl:variable>
-     <xsl:variable name="title2">per Function (NCSS)</xsl:variable>
-     <xsl:variable name="labelx">Functions</xsl:variable>
-     <xsl:variable name="labely">Java NCSS</xsl:variable>
-
-     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
-        35
-     </xsl:variable>
-     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
-        220
-     </xsl:variable>
-     <xsl:variable name="x0">   <!-- x offset of origin -->
-        464
-     </xsl:variable>
-
-     <xsl:variable name="last_value">
-        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
-     </xsl:variable>
-
-     <xsl:variable name="step_value">
-        <xsl:value-of select="floor($last_value div 10)+1"/>
-     </xsl:variable>
-
-
-<xsl:template match="/">
-
- <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
- <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
- <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
- <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
-     <rect x="40" y="40" width="4240" height="3160"/>
- </g>
-
- <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
-     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
-     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
- </g>
-
- <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
-     <text><xsl:value-of select="$labely"/></text>
- </g>
- <g style="fill:#008000; font-family:Arial;font-size:100;">
- <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
-       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
- </text>
- <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
-      <xsl:value-of select="count(&UNIT;)"/>
- </text>
- <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
-      <xsl:value-of select="sum(&METRIC;)"/>
- </text>
-
- </g>
- <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
-
- <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
-  <text x="{($x0)+0}" y="2970"> 0%</text>
-  <text x="{$x0+10*$dx}" y="2970">10%</text>
-  <text x="{$x0+20*$dx}" y="2970">20%</text>
-  <text x="{$x0+30*$dx}" y="2970">30%</text>
-  <text x="{$x0+40*$dx}" y="2970">40%</text>
-  <text x="{$x0+50*$dx}" y="2970">50%</text>
-  <text x="{$x0+60*$dx}" y="2970">60%</text>
-  <text x="{$x0+70*$dx}" y="2970">70%</text>
-  <text x="{$x0+80*$dx}" y="2970">80%</text>
-  <text x="{$x0+90*$dx}" y="2970">90%</text>
-  <text x="{$x0+100*$dx}" y="2970">100%</text>
- </g>
-
- <!-- x-axis with ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
-
- <!-- y-axis without ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
-
-       <xsl:call-template name="LOOP">
-          <xsl:with-param name="n">0</xsl:with-param>
-          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
-       </xsl:call-template>
-
-  </svg>
-</xsl:template>
-
-
-<!-- named templates to simplify ...  Use recursion to implement loop  -->
-
-<xsl:template name="ITEM">
-   <xsl:param name="i">0</xsl:param>
-   <xsl:param name="x">0</xsl:param>
-   <xsl:param name="y">0</xsl:param>
-   <xsl:param name="p">0</xsl:param>
-
-   <!-- tick on vertical axis -->
-   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
-
-   <!-- label on vertical axis -->
-   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
-       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
-           <xsl:value-of select="$x"/>
-       </text>
-   </g>
-
-   <!-- rectangle representing frequency (0 to 100)-->
-   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
-       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
-   </g>
-</xsl:template>
-
-
-<xsl:template name="LOOP">
-    <xsl:param name="n">0</xsl:param>
-    <xsl:param name="last">0</xsl:param>
-
-    <xsl:variable name="cnt">
-        <xsl:choose>
-        <xsl:when test="$n &lt; $last">
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
-        </xsl:otherwise>
-        </xsl:choose>
-     </xsl:variable>
-
-     <xsl:call-template name="ITEM">
-          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
-          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
-          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
-          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
-     </xsl:call-template>
-
-     <xsl:if test="$n &lt; $last">
-        <xsl:call-template name="LOOP">
-            <xsl:with-param name="n">
-              <xsl:value-of select="$n+1"/>
-            </xsl:with-param>
-            <xsl:with-param name="last">
-              <xsl:value-of select="$last"/>
-            </xsl:with-param>
-        </xsl:call-template>
-     </xsl:if>  
-
-</xsl:template>
-
-</xsl:stylesheet> 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>  
+<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
+<!--            frequency table in a bar chart in SVG format.                 -->
+<!--            Range of metric on y-axis is 0 to 4*average.                  -->
+<!-- File     : chart_ncss.xsl                                                -->
+<!-- Usage    : xt javancss_out.xml chart_ncss.xsl chart_ncss.svg             -->
+<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
+<!-- Input    : XML output of JavaNCSS tool.                                  -->
+<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
+<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
+<!--                   Original.  Shows table in SVG format.                  -->
+
+<!DOCTYPE BARCHART [
+  <!ENTITY UNIT        "javancss/functions/function">
+  <!ENTITY METRIC      "javancss/functions/function/ncss">
+  <!ENTITY SHORTMETRIC "ncss">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+
+<!-- global variables -->
+
+     <xsl:variable name="title1">Distribution Java Source Statements</xsl:variable>
+     <xsl:variable name="title2">per Function (NCSS)</xsl:variable>
+     <xsl:variable name="labelx">Functions</xsl:variable>
+     <xsl:variable name="labely">Java NCSS</xsl:variable>
+
+     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
+        35
+     </xsl:variable>
+     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
+        220
+     </xsl:variable>
+     <xsl:variable name="x0">   <!-- x offset of origin -->
+        464
+     </xsl:variable>
+
+     <xsl:variable name="last_value">
+        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
+     </xsl:variable>
+
+     <xsl:variable name="step_value">
+        <xsl:value-of select="floor($last_value div 10)+1"/>
+     </xsl:variable>
+
+
+<xsl:template match="/">
+
+ <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
+ <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
+ <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
+ <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
+     <rect x="40" y="40" width="4240" height="3160"/>
+ </g>
+
+ <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
+     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
+     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
+ </g>
+
+ <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
+     <text><xsl:value-of select="$labely"/></text>
+ </g>
+ <g style="fill:#008000; font-family:Arial;font-size:100;">
+ <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
+       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
+ </text>
+ <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
+      <xsl:value-of select="count(&UNIT;)"/>
+ </text>
+ <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
+      <xsl:value-of select="sum(&METRIC;)"/>
+ </text>
+
+ </g>
+ <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
+
+ <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
+  <text x="{($x0)+0}" y="2970"> 0%</text>
+  <text x="{$x0+10*$dx}" y="2970">10%</text>
+  <text x="{$x0+20*$dx}" y="2970">20%</text>
+  <text x="{$x0+30*$dx}" y="2970">30%</text>
+  <text x="{$x0+40*$dx}" y="2970">40%</text>
+  <text x="{$x0+50*$dx}" y="2970">50%</text>
+  <text x="{$x0+60*$dx}" y="2970">60%</text>
+  <text x="{$x0+70*$dx}" y="2970">70%</text>
+  <text x="{$x0+80*$dx}" y="2970">80%</text>
+  <text x="{$x0+90*$dx}" y="2970">90%</text>
+  <text x="{$x0+100*$dx}" y="2970">100%</text>
+ </g>
+
+ <!-- x-axis with ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
+
+ <!-- y-axis without ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
+
+       <xsl:call-template name="LOOP">
+          <xsl:with-param name="n">0</xsl:with-param>
+          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
+       </xsl:call-template>
+
+  </svg>
+</xsl:template>
+
+
+<!-- named templates to simplify ...  Use recursion to implement loop  -->
+
+<xsl:template name="ITEM">
+   <xsl:param name="i">0</xsl:param>
+   <xsl:param name="x">0</xsl:param>
+   <xsl:param name="y">0</xsl:param>
+   <xsl:param name="p">0</xsl:param>
+
+   <!-- tick on vertical axis -->
+   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
+
+   <!-- label on vertical axis -->
+   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
+       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
+           <xsl:value-of select="$x"/>
+       </text>
+   </g>
+
+   <!-- rectangle representing frequency (0 to 100)-->
+   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
+       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
+   </g>
+</xsl:template>
+
+
+<xsl:template name="LOOP">
+    <xsl:param name="n">0</xsl:param>
+    <xsl:param name="last">0</xsl:param>
+
+    <xsl:variable name="cnt">
+        <xsl:choose>
+        <xsl:when test="$n &lt; $last">
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
+        </xsl:otherwise>
+        </xsl:choose>
+     </xsl:variable>
+
+     <xsl:call-template name="ITEM">
+          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
+          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
+          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
+          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
+     </xsl:call-template>
+
+     <xsl:if test="$n &lt; $last">
+        <xsl:call-template name="LOOP">
+            <xsl:with-param name="n">
+              <xsl:value-of select="$n+1"/>
+            </xsl:with-param>
+            <xsl:with-param name="last">
+              <xsl:value-of select="$last"/>
+            </xsl:with-param>
+        </xsl:call-template>
+     </xsl:if>  
+
+</xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.svg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.svg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.svg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>  
-<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
-<!--            frequency table in a bar chart in SVG format.                 -->
-<!--            Range of metric on y-axis is 0 to 4*average.                  -->
-<!-- File     : chart_ncss_package.xsl                                        -->
-<!-- Usage    : xt javancss_out.xml chart_ncss_package.xsl                    -->
-<!--            chart_ncss_package.svg                                        -->
-<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
-<!-- Input    : XML output of JavaNCSS tool.                                  -->
-<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
-<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
-<!--                   Original.  Shows table in SVG format.                  -->
-
-<!DOCTYPE BARCHART [
-  <!ENTITY UNIT        "javancss/packages/package">
-  <!ENTITY METRIC      "javancss/packages/package/ncss">
-  <!ENTITY SHORTMETRIC "ncss">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-
-<!-- global variables -->
-
-     <xsl:variable name="title1">Distribution Java Source Statements</xsl:variable>
-     <xsl:variable name="title2">per Package (NCSS)</xsl:variable>
-     <xsl:variable name="labelx">Packages</xsl:variable>
-     <xsl:variable name="labely">Java NCSS</xsl:variable>
-
-     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
-        35
-     </xsl:variable>
-     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
-        220
-     </xsl:variable>
-     <xsl:variable name="x0">   <!-- x offset of origin -->
-        464
-     </xsl:variable>
-
-     <xsl:variable name="last_value">
-        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
-     </xsl:variable>
-
-     <xsl:variable name="step_value">
-        <xsl:value-of select="floor($last_value div 10)+1"/>
-     </xsl:variable>
-
-
-<xsl:template match="/">
-
- <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
- <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
- <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
- <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
-     <rect x="40" y="40" width="4240" height="3160"/>
- </g>
-
- <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
-     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
-     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
- </g>
-
- <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
-     <text><xsl:value-of select="$labely"/></text>
- </g>
- <g style="fill:#008000; font-family:Arial;font-size:100;">
- <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
-       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
- </text>
- <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
-      <xsl:value-of select="count(&UNIT;)"/>
- </text>
- <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
-      <xsl:value-of select="sum(&METRIC;)"/>
- </text>
-
- </g>
- <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
-
- <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
-  <text x="{($x0)+0}" y="2970"> 0%</text>
-  <text x="{$x0+10*$dx}" y="2970">10%</text>
-  <text x="{$x0+20*$dx}" y="2970">20%</text>
-  <text x="{$x0+30*$dx}" y="2970">30%</text>
-  <text x="{$x0+40*$dx}" y="2970">40%</text>
-  <text x="{$x0+50*$dx}" y="2970">50%</text>
-  <text x="{$x0+60*$dx}" y="2970">60%</text>
-  <text x="{$x0+70*$dx}" y="2970">70%</text>
-  <text x="{$x0+80*$dx}" y="2970">80%</text>
-  <text x="{$x0+90*$dx}" y="2970">90%</text>
-  <text x="{$x0+100*$dx}" y="2970">100%</text>
- </g>
-
- <!-- x-axis with ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
-
- <!-- y-axis without ticks -->
- <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
-
-       <xsl:call-template name="LOOP">
-          <xsl:with-param name="n">0</xsl:with-param>
-          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
-       </xsl:call-template>
-
-  </svg>
-</xsl:template>
-
-
-<!-- named templates to simplify ...  Use recursion to implement loop  -->
-
-<xsl:template name="ITEM">
-   <xsl:param name="i">0</xsl:param>
-   <xsl:param name="x">0</xsl:param>
-   <xsl:param name="y">0</xsl:param>
-   <xsl:param name="p">0</xsl:param>
-
-   <!-- tick on vertical axis -->
-   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
-
-   <!-- label on vertical axis -->
-   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
-       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
-           <xsl:value-of select="$x"/>
-       </text>
-   </g>
-
-   <!-- rectangle representing frequency (0 to 100)-->
-   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
-       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
-   </g>
-</xsl:template>
-
-
-<xsl:template name="LOOP">
-    <xsl:param name="n">0</xsl:param>
-    <xsl:param name="last">0</xsl:param>
-
-    <xsl:variable name="cnt">
-        <xsl:choose>
-        <xsl:when test="$n &lt; $last">
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
-        </xsl:otherwise>
-        </xsl:choose>
-     </xsl:variable>
-
-     <xsl:call-template name="ITEM">
-          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
-          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
-          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
-          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
-     </xsl:call-template>
-
-     <xsl:if test="$n &lt; $last">
-        <xsl:call-template name="LOOP">
-            <xsl:with-param name="n">
-              <xsl:value-of select="$n+1"/>
-            </xsl:with-param>
-            <xsl:with-param name="last">
-              <xsl:value-of select="$last"/>
-            </xsl:with-param>
-        </xsl:call-template>
-     </xsl:if>  
-
-</xsl:template>
-
-</xsl:stylesheet> 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/chart_ncss_package.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>  
+<!-- Abstract : Style sheet to present data generated by JavaNCSS as a        -->
+<!--            frequency table in a bar chart in SVG format.                 -->
+<!--            Range of metric on y-axis is 0 to 4*average.                  -->
+<!-- File     : chart_ncss_package.xsl                                        -->
+<!-- Usage    : xt javancss_out.xml chart_ncss_package.xsl                    -->
+<!--            chart_ncss_package.svg                                        -->
+<!-- Requires : XT and SVG plugin from www.adobe.com/svg                      -->
+<!-- Input    : XML output of JavaNCSS tool.                                  -->
+<!-- Output   : Frequency chart METRIC v UNIT in SVG format.                  --> 
+<!-- History  : 16/08/02 Y. Coene (yves.coene13 at yucom.be)                     -->
+<!--                   Original.  Shows table in SVG format.                  -->
+
+<!DOCTYPE BARCHART [
+  <!ENTITY UNIT        "javancss/packages/package">
+  <!ENTITY METRIC      "javancss/packages/package/ncss">
+  <!ENTITY SHORTMETRIC "ncss">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+
+<!-- global variables -->
+
+     <xsl:variable name="title1">Distribution Java Source Statements</xsl:variable>
+     <xsl:variable name="title2">per Package (NCSS)</xsl:variable>
+     <xsl:variable name="labelx">Packages</xsl:variable>
+     <xsl:variable name="labely">Java NCSS</xsl:variable>
+
+     <xsl:variable name="dx">   <!-- pixels between ticks on x axis = 10*dx -->
+        35
+     </xsl:variable>
+     <xsl:variable name="dy">   <!-- pixels between ticks on y axis = dy    -->
+        220
+     </xsl:variable>
+     <xsl:variable name="x0">   <!-- x offset of origin -->
+        464
+     </xsl:variable>
+
+     <xsl:variable name="last_value">
+        <xsl:value-of select="4 * sum(&METRIC;) div count(&UNIT;)"/>
+     </xsl:variable>
+
+     <xsl:variable name="step_value">
+        <xsl:value-of select="floor($last_value div 10)+1"/>
+     </xsl:variable>
+
+
+<xsl:template match="/">
+
+ <svg width="436pt" height="327pt" viewBox="0 0 4360 3270">
+ <rect x="40" y="30" width="4320" height="3240" style="fill:silver;"/>
+ <rect x="3" y="3" width="4314" height="3234" style="fill:white; stroke-width:6; stroke:black"/>
+ <g style="fill:#FFFFFF; stroke-width:15; stroke:black">
+     <rect x="40" y="40" width="4240" height="3160"/>
+ </g>
+
+ <g style="fill:#000080; font-family:Times New Roman;font-style:italic; font-size:180; text-anchor:end;">
+     <text id="Heading" x="4100" y="256"><xsl:value-of select="$title1"/></text>
+     <text x="4100" y="456"><xsl:value-of select="$title2"/></text>
+ </g>
+
+ <g transform="translate(190 640) rotate(-90)" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end; ">
+     <text><xsl:value-of select="$labely"/></text>
+ </g>
+ <g style="fill:#008000; font-family:Arial;font-size:100;">
+ <text id="Notes" x="2535" y="1080">Average <xsl:value-of select="$labely"/> = 
+       <xsl:value-of select="format-number(sum(&METRIC;) div count(&UNIT;),'0.00')"/>
+ </text>
+ <text x="2535" y="1200">Total <xsl:value-of select="$labelx"/> = 
+      <xsl:value-of select="count(&UNIT;)"/>
+ </text>
+ <text x="2535" y="1320">Total <xsl:value-of select="$labely"/> = 
+      <xsl:value-of select="sum(&METRIC;)"/>
+ </text>
+
+ </g>
+ <text x="4100" y="3110" style="fill:#008080; font-family:Times New Roman;font-size:100; text-anchor:end;"><xsl:value-of select="$labelx"/></text>
+
+ <g style="font-family:Times New Roman;font-size:80; text-anchor:middle;">
+  <text x="{($x0)+0}" y="2970"> 0%</text>
+  <text x="{$x0+10*$dx}" y="2970">10%</text>
+  <text x="{$x0+20*$dx}" y="2970">20%</text>
+  <text x="{$x0+30*$dx}" y="2970">30%</text>
+  <text x="{$x0+40*$dx}" y="2970">40%</text>
+  <text x="{$x0+50*$dx}" y="2970">50%</text>
+  <text x="{$x0+60*$dx}" y="2970">60%</text>
+  <text x="{$x0+70*$dx}" y="2970">70%</text>
+  <text x="{$x0+80*$dx}" y="2970">80%</text>
+  <text x="{$x0+90*$dx}" y="2970">90%</text>
+  <text x="{$x0+100*$dx}" y="2970">100%</text>
+ </g>
+
+ <!-- x-axis with ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},2881 z M {($x0)+10*$dx},2842 L {($x0)+10*$dx},2881 z M {($x0)+20*$dx},2842 L {$x0+20*$dx},2881 z M {$x0+30*$dx},2842 L {$x0+30*$dx},2881 z M {$x0+40*$dx},2842 L {$x0+40*$dx},2881 z M {$x0+50*$dx},2842 L {$x0+50*$dx},2881 z M {$x0+60*$dx},2842 L {$x0+60*$dx},2881 z M {$x0+70*$dx},2842 L {$x0+70*$dx},2881 z M {$x0+80*$dx},2842 L {$x0+80*$dx},2881 z M {$x0+90*$dx},2842 L {$x0+90*$dx},2881 z M {$x0+100*$dx},2842 L {$x0+100*$dx},2881 z  M {$x0+100*$dx},2842 L {$x0+0*$dx},2842 z"/>
+
+ <!-- y-axis without ticks -->
+ <path style="stroke:#000000; stroke-width:6" d="M {($x0)+0},2842 L {($x0)+0},300 z"/>
+
+       <xsl:call-template name="LOOP">
+          <xsl:with-param name="n">0</xsl:with-param>
+          <xsl:with-param name="last">10</xsl:with-param>  <!-- defines number of horizontal bars -->
+       </xsl:call-template>
+
+  </svg>
+</xsl:template>
+
+
+<!-- named templates to simplify ...  Use recursion to implement loop  -->
+
+<xsl:template name="ITEM">
+   <xsl:param name="i">0</xsl:param>
+   <xsl:param name="x">0</xsl:param>
+   <xsl:param name="y">0</xsl:param>
+   <xsl:param name="p">0</xsl:param>
+
+   <!-- tick on vertical axis -->
+   <path style="stroke:#000000; stroke-width:6" d="M {($x0)-30},{2842-$i*$dy} L {($x0)-1},{2842-$i*$dy} z"/>
+
+   <!-- label on vertical axis -->
+   <g style="font-family:Times New Roman;font-size:80; text-anchor:end;">
+       <text x='{($x0)-40}' y='{2842-$i*$dy}'>
+           <xsl:value-of select="$x"/>
+       </text>
+   </g>
+
+   <!-- rectangle representing frequency (0 to 100)-->
+   <g style="fill:#DBDBED;stroke-width:4; stroke:black">
+       <rect x="{($x0)+0}" y='{2842-$i*($dy)-176-24}' width="{format-number($p*$dx*100,'0')}" height="{($dy)-44}"/>
+   </g>
+</xsl:template>
+
+
+<xsl:template name="LOOP">
+    <xsl:param name="n">0</xsl:param>
+    <xsl:param name="last">0</xsl:param>
+
+    <xsl:variable name="cnt">
+        <xsl:choose>
+        <xsl:when test="$n &lt; $last">
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n and &SHORTMETRIC; &lt; $step_value*($n+1) ])"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="count(&UNIT;[&SHORTMETRIC; >= $step_value*$n])"/>
+        </xsl:otherwise>
+        </xsl:choose>
+     </xsl:variable>
+
+     <xsl:call-template name="ITEM">
+          <xsl:with-param name="i"><xsl:value-of select="$n"/></xsl:with-param>
+          <xsl:with-param name="x"><xsl:value-of select="$step_value*$n"/></xsl:with-param>
+          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
+          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(&UNIT;)"/></xsl:with-param>
+     </xsl:call-template>
+
+     <xsl:if test="$n &lt; $last">
+        <xsl:call-template name="LOOP">
+            <xsl:with-param name="n">
+              <xsl:value-of select="$n+1"/>
+            </xsl:with-param>
+            <xsl:with-param name="last">
+              <xsl:value-of select="$last"/>
+            </xsl:with-param>
+        </xsl:call-template>
+     </xsl:if>  
+
+</xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,184 +0,0 @@
-<?xml version="1.0"?>  
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!-- Abstract : Style sheet to format JavaNCSS XML output as frequency tables -->
-<!-- Requires : XT or IE5 + MSXML 3.0                                         -->
-<!-- History  : 10/08/02 Y. Coene                                             -->
-<!--                   Original.  Shows tables in IE5 and NS4, and VML bar    -->
-<!--                   chart with IE5 only.                                   -->
-
-<!-- to do: add for-each and sort to know max value .... -->
-
-
-<!-- global variables -->
-
-     <xsl:variable name="metric">
-        ncss
-     </xsl:variable>
-
-     <xsl:variable name="last_value_ncss">
-        <xsl:value-of select="4 * sum(javancss/functions/function/ncss) div count(javancss/functions/function)"/>
-     </xsl:variable>
-
-     <xsl:variable name="step_value_ncss">
-        <xsl:value-of select="floor($last_value_ncss div 10)+1"/>
-     </xsl:variable>
-
-     <xsl:variable name="last_value_ccn">
-        <xsl:value-of select="4 * sum(javancss/functions/function/ccn) div count(javancss/functions/function)"/>
-     </xsl:variable>
-
-     <xsl:variable name="step_value_ccn">
-        <xsl:value-of select="floor($last_value_ccn div 10)+1"/>
-     </xsl:variable>
-
-
-<xsl:template match="/">
-  <html xmlns:v="urn:schemas-microsoft-com:vml"
-        xmlns:o="urn:schemas-microsoft-com:office:office"
-        xmlns="http://www.w3.org/TR/REC-html40">
-
-  <head>
-  <xsl:text disable-output-escaping="yes">
-    &lt;!--[if !mso]&gt; 
-  &lt;style&gt;
-  v\:* {behavior:url(#default#VML);}
-  o\:* {behavior:url(#default#VML);}
-  .shape {behavior:url(#default#VML);}
-  &lt;/style&gt;
-  &lt;![endif]--&gt;
-  
-  </xsl:text>
-
-
-    <title>JavaNCSS Analysis</title>
-    </head>
-    <body>
-    <table width="100%">
-        <tr>
-        <td><h3>JavaNCSS Analysis</h3></td>
-        <td>
-        <p align="right">Designed for use with <a href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</a>.</p>
-        </td>
-        </tr>        
-    </table>
-    <hr size="2"/><p>
-
-    <!-- table with distribution of ncss metric -->
-    <table>
-       <tr><td><b>NCSS</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr>
-       <xsl:call-template name="LOOP_NCSS">
-          <xsl:with-param name="n">0</xsl:with-param>
-          <xsl:with-param name="last">10</xsl:with-param>
-       </xsl:call-template>
-
-    </table>
-
-    <!-- table with distribution of ccn metric -->
-    <table>
-       <tr><td><b>CCN</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr>
-       <xsl:call-template name="LOOP_CCN">
-          <xsl:with-param name="n">0</xsl:with-param>
-          <xsl:with-param name="last">10</xsl:with-param>
-       </xsl:call-template>
-    </table>
-
-    </p>
-    </body>
-    </html>
-</xsl:template>
-
-
-<!-- named templates to simplify ...  Use recursion to implement loop  -->
-
-<xsl:template name="ITEM">
-   <xsl:param name="x">0</xsl:param>
-   <xsl:param name="y">0</xsl:param>
-   <xsl:param name="p">0</xsl:param>
-
-   <tr><td><xsl:value-of select="$x"/></td>
-   <td><p align="right"><xsl:value-of select="$y"/></p></td>
-   <td><p align="right"><xsl:value-of select="format-number($p,'0.00%')"/></p></td>
-   <td>
-   <xsl:text disable-output-escaping="yes">
-        &lt;v:rect style='width:
-   </xsl:text>
-
-    <xsl:value-of select="format-number($p*400,'0')"/>
-    <xsl:text disable-output-escaping="yes">
-        pt;height:8pt'fillcolor="red" &gt;&lt;/v:rect&gt;
-    </xsl:text>
-   </td>
-   </tr>
-</xsl:template>
-
-
-<xsl:template name="LOOP_NCSS">
-    <xsl:param name="n">0</xsl:param>
-    <xsl:param name="last">0</xsl:param>
-
-    <xsl:variable name="cnt">
-        <xsl:choose>
-        <xsl:when test="$n &lt; $last">
-            <xsl:value-of select="count(javancss/functions/function[ncss >= $step_value_ncss*$n and ncss &lt; $step_value_ncss*($n+1) ])"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="count(javancss/functions/function[ncss >= $step_value_ncss*$n])"/>
-        </xsl:otherwise>
-        </xsl:choose>
-     </xsl:variable>
-
-     <xsl:call-template name="ITEM">
-          <xsl:with-param name="x"><xsl:value-of select="$step_value_ncss*$n"/></xsl:with-param>
-          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
-          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(javancss/functions/function)"/></xsl:with-param>
-     </xsl:call-template>
-
-     <xsl:if test="$n &lt; $last">
-        <xsl:call-template name="LOOP_NCSS">
-            <xsl:with-param name="n">
-              <xsl:value-of select="$n+1"/>
-            </xsl:with-param>
-            <xsl:with-param name="last">
-              <xsl:value-of select="$last"/>
-            </xsl:with-param>
-        </xsl:call-template>
-     </xsl:if>  
-
-</xsl:template>
-
-
-<xsl:template name="LOOP_CCN">
-    <xsl:param name="n">0</xsl:param>
-    <xsl:param name="last">0</xsl:param>
-
-    <xsl:variable name="cnt">
-        <xsl:choose>
-        <xsl:when test="$n &lt; $last">
-            <xsl:value-of select="count(javancss/functions/function[ccn >= $step_value_ccn*$n and ccn &lt; $step_value_ccn*($n+1) ])"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="count(javancss/functions/function[ccn >= $step_value_ccn*$n])"/>
-        </xsl:otherwise>
-        </xsl:choose>
-     </xsl:variable>
-
-     <xsl:call-template name="ITEM">
-          <xsl:with-param name="x"><xsl:value-of select="$step_value_ccn*$n"/></xsl:with-param>
-          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
-          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(javancss/functions/function)"/></xsl:with-param>
-     </xsl:call-template>
-
-     <xsl:if test="$n &lt; $last">
-        <xsl:call-template name="LOOP_CCN">
-            <xsl:with-param name="n">
-              <xsl:value-of select="$n+1"/>
-            </xsl:with-param>
-            <xsl:with-param name="last">
-              <xsl:value-of select="$last"/>
-            </xsl:with-param>
-        </xsl:call-template>
-     </xsl:if>  
-</xsl:template>
-
-</xsl:stylesheet> 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_graph.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,184 @@
+<?xml version="1.0"?>  
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Abstract : Style sheet to format JavaNCSS XML output as frequency tables -->
+<!-- Requires : XT or IE5 + MSXML 3.0                                         -->
+<!-- History  : 10/08/02 Y. Coene                                             -->
+<!--                   Original.  Shows tables in IE5 and NS4, and VML bar    -->
+<!--                   chart with IE5 only.                                   -->
+
+<!-- to do: add for-each and sort to know max value .... -->
+
+
+<!-- global variables -->
+
+     <xsl:variable name="metric">
+        ncss
+     </xsl:variable>
+
+     <xsl:variable name="last_value_ncss">
+        <xsl:value-of select="4 * sum(javancss/functions/function/ncss) div count(javancss/functions/function)"/>
+     </xsl:variable>
+
+     <xsl:variable name="step_value_ncss">
+        <xsl:value-of select="floor($last_value_ncss div 10)+1"/>
+     </xsl:variable>
+
+     <xsl:variable name="last_value_ccn">
+        <xsl:value-of select="4 * sum(javancss/functions/function/ccn) div count(javancss/functions/function)"/>
+     </xsl:variable>
+
+     <xsl:variable name="step_value_ccn">
+        <xsl:value-of select="floor($last_value_ccn div 10)+1"/>
+     </xsl:variable>
+
+
+<xsl:template match="/">
+  <html xmlns:v="urn:schemas-microsoft-com:vml"
+        xmlns:o="urn:schemas-microsoft-com:office:office"
+        xmlns="http://www.w3.org/TR/REC-html40">
+
+  <head>
+  <xsl:text disable-output-escaping="yes">
+    &lt;!--[if !mso]&gt; 
+  &lt;style&gt;
+  v\:* {behavior:url(#default#VML);}
+  o\:* {behavior:url(#default#VML);}
+  .shape {behavior:url(#default#VML);}
+  &lt;/style&gt;
+  &lt;![endif]--&gt;
+  
+  </xsl:text>
+
+
+    <title>JavaNCSS Analysis</title>
+    </head>
+    <body>
+    <table width="100%">
+        <tr>
+        <td><h3>JavaNCSS Analysis</h3></td>
+        <td>
+        <p align="right">Designed for use with <a href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</a>.</p>
+        </td>
+        </tr>        
+    </table>
+    <hr size="2"/><p>
+
+    <!-- table with distribution of ncss metric -->
+    <table>
+       <tr><td><b>NCSS</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr>
+       <xsl:call-template name="LOOP_NCSS">
+          <xsl:with-param name="n">0</xsl:with-param>
+          <xsl:with-param name="last">10</xsl:with-param>
+       </xsl:call-template>
+
+    </table>
+
+    <!-- table with distribution of ccn metric -->
+    <table>
+       <tr><td><b>CCN</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr>
+       <xsl:call-template name="LOOP_CCN">
+          <xsl:with-param name="n">0</xsl:with-param>
+          <xsl:with-param name="last">10</xsl:with-param>
+       </xsl:call-template>
+    </table>
+
+    </p>
+    </body>
+    </html>
+</xsl:template>
+
+
+<!-- named templates to simplify ...  Use recursion to implement loop  -->
+
+<xsl:template name="ITEM">
+   <xsl:param name="x">0</xsl:param>
+   <xsl:param name="y">0</xsl:param>
+   <xsl:param name="p">0</xsl:param>
+
+   <tr><td><xsl:value-of select="$x"/></td>
+   <td><p align="right"><xsl:value-of select="$y"/></p></td>
+   <td><p align="right"><xsl:value-of select="format-number($p,'0.00%')"/></p></td>
+   <td>
+   <xsl:text disable-output-escaping="yes">
+        &lt;v:rect style='width:
+   </xsl:text>
+
+    <xsl:value-of select="format-number($p*400,'0')"/>
+    <xsl:text disable-output-escaping="yes">
+        pt;height:8pt'fillcolor="red" &gt;&lt;/v:rect&gt;
+    </xsl:text>
+   </td>
+   </tr>
+</xsl:template>
+
+
+<xsl:template name="LOOP_NCSS">
+    <xsl:param name="n">0</xsl:param>
+    <xsl:param name="last">0</xsl:param>
+
+    <xsl:variable name="cnt">
+        <xsl:choose>
+        <xsl:when test="$n &lt; $last">
+            <xsl:value-of select="count(javancss/functions/function[ncss >= $step_value_ncss*$n and ncss &lt; $step_value_ncss*($n+1) ])"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="count(javancss/functions/function[ncss >= $step_value_ncss*$n])"/>
+        </xsl:otherwise>
+        </xsl:choose>
+     </xsl:variable>
+
+     <xsl:call-template name="ITEM">
+          <xsl:with-param name="x"><xsl:value-of select="$step_value_ncss*$n"/></xsl:with-param>
+          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
+          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(javancss/functions/function)"/></xsl:with-param>
+     </xsl:call-template>
+
+     <xsl:if test="$n &lt; $last">
+        <xsl:call-template name="LOOP_NCSS">
+            <xsl:with-param name="n">
+              <xsl:value-of select="$n+1"/>
+            </xsl:with-param>
+            <xsl:with-param name="last">
+              <xsl:value-of select="$last"/>
+            </xsl:with-param>
+        </xsl:call-template>
+     </xsl:if>  
+
+</xsl:template>
+
+
+<xsl:template name="LOOP_CCN">
+    <xsl:param name="n">0</xsl:param>
+    <xsl:param name="last">0</xsl:param>
+
+    <xsl:variable name="cnt">
+        <xsl:choose>
+        <xsl:when test="$n &lt; $last">
+            <xsl:value-of select="count(javancss/functions/function[ccn >= $step_value_ccn*$n and ccn &lt; $step_value_ccn*($n+1) ])"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="count(javancss/functions/function[ccn >= $step_value_ccn*$n])"/>
+        </xsl:otherwise>
+        </xsl:choose>
+     </xsl:variable>
+
+     <xsl:call-template name="ITEM">
+          <xsl:with-param name="x"><xsl:value-of select="$step_value_ccn*$n"/></xsl:with-param>
+          <xsl:with-param name="y"><xsl:value-of select="$cnt"/></xsl:with-param>
+          <xsl:with-param name="p"><xsl:value-of select="$cnt div count(javancss/functions/function)"/></xsl:with-param>
+     </xsl:call-template>
+
+     <xsl:if test="$n &lt; $last">
+        <xsl:call-template name="LOOP_CCN">
+            <xsl:with-param name="n">
+              <xsl:value-of select="$n+1"/>
+            </xsl:with-param>
+            <xsl:with-param name="last">
+              <xsl:value-of select="$last"/>
+            </xsl:with-param>
+        </xsl:call-template>
+     </xsl:if>  
+</xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://www.w3.org/TR/REC-html40"><head>
-    <!--[if !mso]> 
-  <style>
-  v\:* {behavior:url(#default#VML);}
-  o\:* {behavior:url(#default#VML);}
-  .shape {behavior:url(#default#VML);}
-  </style>
-  <![endif]-->
-  
-  <title>JavaNCSS Analysis</title></head><body><table width="100%"><tr><td><h3>JavaNCSS Analysis</h3></td><td><p align="right">Designed for use with <a href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</a>.</p></td></tr></table><hr size="2"/><p><table><tr><td><b>NCSS</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr><tr xmlns=""><td>0</td><td><p align="right">1522</p></td><td><p align="right">67.73%</p></td><td>
-        <v:rect style='width:
-   271
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>3</td><td><p align="right">212</p></td><td><p align="right">9.43%</p></td><td>
-        <v:rect style='width:
-   38
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>6</td><td><p align="right">104</p></td><td><p align="right">4.63%</p></td><td>
-        <v:rect style='width:
-   19
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>9</td><td><p align="right">99</p></td><td><p align="right">4.41%</p></td><td>
-        <v:rect style='width:
-   18
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>12</td><td><p align="right">89</p></td><td><p align="right">3.96%</p></td><td>
-        <v:rect style='width:
-   16
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>15</td><td><p align="right">83</p></td><td><p align="right">3.69%</p></td><td>
-        <v:rect style='width:
-   15
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>18</td><td><p align="right">29</p></td><td><p align="right">1.29%</p></td><td>
-        <v:rect style='width:
-   5
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>21</td><td><p align="right">16</p></td><td><p align="right">0.71%</p></td><td>
-        <v:rect style='width:
-   3
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>24</td><td><p align="right">22</p></td><td><p align="right">0.98%</p></td><td>
-        <v:rect style='width:
-   4
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>27</td><td><p align="right">15</p></td><td><p align="right">0.67%</p></td><td>
-        <v:rect style='width:
-   3
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>30</td><td><p align="right">56</p></td><td><p align="right">2.49%</p></td><td>
-        <v:rect style='width:
-   10
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr></table><table><tr><td><b>CCN</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr><tr xmlns=""><td>0</td><td><p align="right">0</p></td><td><p align="right">0.00%</p></td><td>
-        <v:rect style='width:
-   0
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>1</td><td><p align="right">1753</p></td><td><p align="right">78.02%</p></td><td>
-        <v:rect style='width:
-   312
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>2</td><td><p align="right">58</p></td><td><p align="right">2.58%</p></td><td>
-        <v:rect style='width:
-   10
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>3</td><td><p align="right">102</p></td><td><p align="right">4.54%</p></td><td>
-        <v:rect style='width:
-   18
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>4</td><td><p align="right">57</p></td><td><p align="right">2.54%</p></td><td>
-        <v:rect style='width:
-   10
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>5</td><td><p align="right">69</p></td><td><p align="right">3.07%</p></td><td>
-        <v:rect style='width:
-   12
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>6</td><td><p align="right">50</p></td><td><p align="right">2.23%</p></td><td>
-        <v:rect style='width:
-   9
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>7</td><td><p align="right">56</p></td><td><p align="right">2.49%</p></td><td>
-        <v:rect style='width:
-   10
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>8</td><td><p align="right">34</p></td><td><p align="right">1.51%</p></td><td>
-        <v:rect style='width:
-   6
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>9</td><td><p align="right">20</p></td><td><p align="right">0.89%</p></td><td>
-        <v:rect style='width:
-   4
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr><tr xmlns=""><td>10</td><td><p align="right">48</p></td><td><p align="right">2.14%</p></td><td>
-        <v:rect style='width:
-   9
-        pt;height:8pt'fillcolor="red" ></v:rect>
-    </td></tr></table></p></body></html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/svg/javancss_out.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://www.w3.org/TR/REC-html40"><head>
+    <!--[if !mso]> 
+  <style>
+  v\:* {behavior:url(#default#VML);}
+  o\:* {behavior:url(#default#VML);}
+  .shape {behavior:url(#default#VML);}
+  </style>
+  <![endif]-->
+  
+  <title>JavaNCSS Analysis</title></head><body><table width="100%"><tr><td><h3>JavaNCSS Analysis</h3></td><td><p align="right">Designed for use with <a href="http://www.kclee.com/clemens/java/javancss/">JavaNCSS</a>.</p></td></tr></table><hr size="2"/><p><table><tr><td><b>NCSS</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr><tr xmlns=""><td>0</td><td><p align="right">1522</p></td><td><p align="right">67.73%</p></td><td>
+        <v:rect style='width:
+   271
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>3</td><td><p align="right">212</p></td><td><p align="right">9.43%</p></td><td>
+        <v:rect style='width:
+   38
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>6</td><td><p align="right">104</p></td><td><p align="right">4.63%</p></td><td>
+        <v:rect style='width:
+   19
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>9</td><td><p align="right">99</p></td><td><p align="right">4.41%</p></td><td>
+        <v:rect style='width:
+   18
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>12</td><td><p align="right">89</p></td><td><p align="right">3.96%</p></td><td>
+        <v:rect style='width:
+   16
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>15</td><td><p align="right">83</p></td><td><p align="right">3.69%</p></td><td>
+        <v:rect style='width:
+   15
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>18</td><td><p align="right">29</p></td><td><p align="right">1.29%</p></td><td>
+        <v:rect style='width:
+   5
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>21</td><td><p align="right">16</p></td><td><p align="right">0.71%</p></td><td>
+        <v:rect style='width:
+   3
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>24</td><td><p align="right">22</p></td><td><p align="right">0.98%</p></td><td>
+        <v:rect style='width:
+   4
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>27</td><td><p align="right">15</p></td><td><p align="right">0.67%</p></td><td>
+        <v:rect style='width:
+   3
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>30</td><td><p align="right">56</p></td><td><p align="right">2.49%</p></td><td>
+        <v:rect style='width:
+   10
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr></table><table><tr><td><b>CCN</b></td><td><b>Functions</b></td><td><b>Percent</b></td></tr><tr xmlns=""><td>0</td><td><p align="right">0</p></td><td><p align="right">0.00%</p></td><td>
+        <v:rect style='width:
+   0
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>1</td><td><p align="right">1753</p></td><td><p align="right">78.02%</p></td><td>
+        <v:rect style='width:
+   312
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>2</td><td><p align="right">58</p></td><td><p align="right">2.58%</p></td><td>
+        <v:rect style='width:
+   10
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>3</td><td><p align="right">102</p></td><td><p align="right">4.54%</p></td><td>
+        <v:rect style='width:
+   18
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>4</td><td><p align="right">57</p></td><td><p align="right">2.54%</p></td><td>
+        <v:rect style='width:
+   10
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>5</td><td><p align="right">69</p></td><td><p align="right">3.07%</p></td><td>
+        <v:rect style='width:
+   12
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>6</td><td><p align="right">50</p></td><td><p align="right">2.23%</p></td><td>
+        <v:rect style='width:
+   9
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>7</td><td><p align="right">56</p></td><td><p align="right">2.49%</p></td><td>
+        <v:rect style='width:
+   10
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>8</td><td><p align="right">34</p></td><td><p align="right">1.51%</p></td><td>
+        <v:rect style='width:
+   6
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>9</td><td><p align="right">20</p></td><td><p align="right">0.89%</p></td><td>
+        <v:rect style='width:
+   4
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr><tr xmlns=""><td>10</td><td><p align="right">48</p></td><td><p align="right">2.14%</p></td><td>
+        <v:rect style='width:
+   9
+        pt;height:8pt'fillcolor="red" ></v:rect>
+    </td></tr></table></p></body></html>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="text"/>
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="javancss"/>
-  </xsl:template>
-
-  <xsl:template match="javancss">
-	 <xsl:value-of select="ncss"/>
-  </xsl:template>
-
-  <xsl:template match="text()"/>
-
-</xsl:stylesheet>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javancss/xslt/xmltest.xsl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="text"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates select="javancss"/>
+  </xsl:template>
+
+  <xsl:template match="javancss">
+	 <xsl:value-of select="ncss"/>
+  </xsl:template>
+
+  <xsl:template match="text()"/>
+
+</xsl:stylesheet>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/activation.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/activation.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/activation.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/ejb3-persistence.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/ejb3-persistence.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/ejb3-persistence.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/j2ee.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/j2ee.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/j2ee.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-annotations-ejb3.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-annotations-ejb3.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-annotations-ejb3.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3x.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3x.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/jboss-ejb3x.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/mail.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/mail.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/mail.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/servlet.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/servlet.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/javax.j2ee/servlet.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/aspectjrt.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/aspectjrt.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/aspectjrt.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus-ant.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus-ant.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus-ant.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/cactus.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/commons-httpclient.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/commons-httpclient.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/commons-httpclient.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/httpunit.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/httpunit.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.cactus/httpunit.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-beanutils.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-beanutils.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-beanutils.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-collections.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-collections.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-collections.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-dbcp.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-dbcp.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-dbcp.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-digester.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-digester.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-digester.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-fileupload.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-fileupload.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-fileupload.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-lang.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-lang.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-lang.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-logging.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-logging.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-logging.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-pool.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-pool.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-pool.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-resources.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-resources.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-resources.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-services.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-services.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-services.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-validator.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-validator.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.commons/commons-validator.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j/log4j.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j/log4j.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.log4j/log4j.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro/jakarta-oro.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro/jakarta-oro.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.oro/jakarta-oro.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-bean.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-bean.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-bean.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_0.dtd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_0.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_0.dtd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_1.dtd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_1.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-config_1_1.dtd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-html.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-html.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-html.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-logic.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-logic.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-logic.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-nested.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-nested.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-nested.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-template.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-template.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-template.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-tiles.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-tiles.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts-tiles.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/struts.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/tiles-config.dtd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/tiles-config.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/tiles-config.dtd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validation_1_1.dtd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validation_1_1.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validation_1_1.dtd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,808 +0,0 @@
-<!--
-
-   This file contains the default Struts Validator pluggable validator
-   definitions.  It should be placed somewhere under /WEB-INF and
-   referenced in the struts-config.xml under the plug-in element
-   for the ValidatorPlugIn.
-
-      <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
-        <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
-                                                  /WEB-INF/validation.xml"/>
-      </plug-in>
-
-   These are the default error messages associated with
-   each validator defined in this file.  They should be
-   added to your projects ApplicationResources.properties
-   file or you can associate new ones by modifying the
-   pluggable validators msg attributes in this file.
-
-   # Struts Validator Error Messages
-   errors.required={0} is required.
-   errors.minlength={0} can not be less than {1} characters.
-   errors.maxlength={0} can not be greater than {1} characters.
-   errors.invalid={0} is invalid.
-
-   errors.byte={0} must be an byte.
-   errors.short={0} must be an short.
-   errors.integer={0} must be an integer.
-   errors.long={0} must be an long.
-   errors.float={0} must be an float.
-   errors.double={0} must be an double.
-
-   errors.date={0} is not a date.
-   errors.range={0} is not in the range {1} through {2}.
-   errors.creditcard={0} is not a valid credit card number.
-   errors.email={0} is an invalid e-mail address.
-
--->
-
-<form-validation>
-
-   <global>
-
-      <validator name="required"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateRequired"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-                  msg="errors.required">
-
-         <javascript><![CDATA[
-            function validateRequired(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oRequired = new required();
-                for (x in oRequired) {
-                    if ((form[oRequired[x][0]].type == 'text' ||
-                         form[oRequired[x][0]].type == 'textarea' ||
-                         form[oRequired[x][0]].type == 'select-one' ||
-                         form[oRequired[x][0]].type == 'radio' ||
-                         form[oRequired[x][0]].type == 'password') &&
-                        (form[oRequired[x][0]].value == '')) {
-                        if (i == 0) {
-                            focusField = form[oRequired[x][0]];
-                        }
-                        fields[i++] = oRequired[x][1];
-                        bValid = false;
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="minlength"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateMinLength"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.minlength">
-
-         <javascript><![CDATA[
-            function validateMinLength(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oMinLength = new minlength();
-                for (x in oMinLength) {
-                    if (form[oMinLength[x][0]].type == 'text' ||
-                        form[oMinLength[x][0]].type == 'textarea') {
-                        var iMin = parseInt(oMinLength[x][2]("minlength"));
-                        if (!(form[oMinLength[x][0]].value.length >= iMin)) {
-                            if (i == 0) {
-                                focusField = form[oMinLength[x][0]];
-                            }
-                            fields[i++] = oMinLength[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="maxlength"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateMaxLength"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.maxlength">
-
-         <javascript><![CDATA[
-            function validateMaxLength(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oMaxLength = new maxlength();
-                for (x in oMaxLength) {
-                    if (form[oMaxLength[x][0]].type == 'text' ||
-                        form[oMaxLength[x][0]].type == 'textarea') {
-                        var iMax = parseInt(oMaxLength[x][2]("maxlength"));
-                        if (!(form[oMaxLength[x][0]].value.length <= iMax)) {
-                            if (i == 0) {
-                                focusField = form[oMaxLength[x][0]];
-                            }
-                            fields[i++] = oMaxLength[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="mask"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateMask"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.invalid">
-
-         <javascript><![CDATA[
-            function validateMask(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oMasked = new mask();
-                for (x in oMasked) {
-                    if ((form[oMasked[x][0]].type == 'text' ||
-                         form[oMasked[x][0]].type == 'textarea' ||
-                         form[oMasked[x][0]].type == 'password') &&
-                        (form[oMasked[x][0]].value.length > 0)) {
-                        if (!matchPattern(form[oMasked[x][0]].value, oMasked[x][2]("mask"))) {
-                            if (i == 0) {
-                                focusField = form[oMasked[x][0]];
-                            }
-                            fields[i++] = oMasked[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }
-
-            function matchPattern(value, mask) {
-               var bMatched = mask.exec(value);
-               if (!bMatched) {
-                   return false;
-               }
-               return true;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="byte"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateByte"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.byte"
-       jsFunctionName="ByteValidations">
-
-         <javascript><![CDATA[
-            function validateByte(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oByte = new ByteValidations();
-                for (x in oByte) {
-                    if ((form[oByte[x][0]].type == 'text' ||
-                         form[oByte[x][0]].type == 'textarea' ||
-                         form[oByte[x][0]].type == 'select-one' ||
-                         form[oByte[x][0]].type == 'radio') &&
-                        (form[oByte[x][0]].value.length > 0)) {
-                        var iValue = parseInt(form[oByte[x][0]].value);
-                        if (isNaN(iValue) || !(iValue >= -128 && iValue <= 127)) {
-                            if (i == 0)
-                                focusField = form[oByte[x][0]];
-                            fields[i++] = oByte[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="short"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateShort"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.short"
-       jsFunctionName="ShortValidations">
-
-         <javascript><![CDATA[
-            function validateShort(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oShort = new ShortValidations();
-                for (x in oShort) {
-                    if ((form[oShort[x][0]].type == 'text' ||
-                         form[oShort[x][0]].type == 'textarea' ||
-                         form[oShort[x][0]].type == 'select-one' ||
-                         form[oShort[x][0]].type == 'radio') &&
-                        (form[oShort[x][0]].value.length > 0)) {
-                        var iValue = parseInt(form[oShort[x][0]].value);
-                        if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) {
-                            if (i == 0) {
-                                focusField = form[oShort[x][0]];
-                            }
-                            fields[i++] = oShort[x][1];
-                            bValid = false;
-                       }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="integer"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateInteger"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.integer"
-       jsFunctionName="IntegerValidations">
-
-         <javascript><![CDATA[
-            function validateInteger(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oInteger = new IntegerValidations();
-                for (x in oInteger) {
-                    if ((form[oInteger[x][0]].type == 'text' ||
-                         form[oInteger[x][0]].type == 'textarea' ||
-                         form[oInteger[x][0]].type == 'select-one' ||
-                         form[oInteger[x][0]].type == 'radio') &&
-                        (form[oInteger[x][0]].value.length > 0)) {
-                        var iValue = parseInt(form[oInteger[x][0]].value);
-                        if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) {
-                            if (i == 0) {
-                                focusField = form[oInteger[x][0]];
-                            }
-                            fields[i++] = oInteger[x][1];
-                            bValid = false;
-                       }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="long"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateLong"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.long"/>
-
-
-      <validator name="float"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateFloat"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.float"
-       jsFunctionName="FloatValidations">
-
-         <javascript><![CDATA[
-            function validateFloat(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oFloat = new FloatValidations();
-                for (x in oFloat) {
-                    if ((form[oFloat[x][0]].type == 'text' ||
-                         form[oFloat[x][0]].type == 'textarea' ||
-                         form[oFloat[x][0]].type == 'select-one' ||
-                         form[oFloat[x][0]].type == 'radio') &&
-                        (form[oFloat[x][0]].value.length > 0)) {
-                        var iValue = parseFloat(form[oFloat[x][0]].value);
-                        if (isNaN(iValue)) {
-                            if (i == 0) {
-                                focusField = form[oFloat[x][0]];
-                            }
-                            fields[i++] = oFloat[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="double"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateDouble"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.double"/>
-
-
-      <validator name="date"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateDate"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.date"
-       jsFunctionName="DateValidations">
-
-         <javascript><![CDATA[
-            function validateDate(form) {
-               var bValid = true;
-               var focusField = null;
-               var i = 0;
-               var fields = new Array();
-               oDate = new DateValidations();
-               for (x in oDate) {
-                   var value = form[oDate[x][0]].value;
-                   var datePattern = oDate[x][2]("datePatternStrict");
-                   if ((form[oDate[x][0]].type == 'text' ||
-                        form[oDate[x][0]].type == 'textarea') &&
-                       (value.length > 0) &&
-                       (datePattern.length > 0)) {
-                     var MONTH = "MM";
-                     var DAY = "dd";
-                     var YEAR = "yyyy";
-                     var orderMonth = datePattern.indexOf(MONTH);
-                     var orderDay = datePattern.indexOf(DAY);
-                     var orderYear = datePattern.indexOf(YEAR);
-                     if ((orderDay < orderYear && orderDay > orderMonth)) {
-                         var iDelim1 = orderMonth + MONTH.length;
-                         var iDelim2 = orderDay + DAY.length;
-                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
-                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
-                         if (iDelim1 == orderDay && iDelim2 == orderYear) {
-                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
-                         } else if (iDelim1 == orderDay) {
-                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
-                         } else if (iDelim2 == orderYear) {
-                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
-                         } else {
-                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
-                         }
-                         var matched = dateRegexp.exec(value);
-                         if(matched != null) {
-                            if (!isValidDate(matched[2], matched[1], matched[3])) {
-                               if (i == 0) {
-                                   focusField = form[oDate[x][0]];
-                               }
-                               fields[i++] = oDate[x][1];
-                               bValid =  false;
-                            }
-                         } else {
-                            if (i == 0) {
-                                focusField = form[oDate[x][0]];
-                            }
-                            fields[i++] = oDate[x][1];
-                            bValid =  false;
-                         }
-                     } else if ((orderMonth < orderYear && orderMonth > orderDay)) {
-                         var iDelim1 = orderDay + DAY.length;
-                         var iDelim2 = orderMonth + MONTH.length;
-                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
-                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
-                         if (iDelim1 == orderMonth && iDelim2 == orderYear) {
-                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
-                         } else if (iDelim1 == orderMonth) {
-                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
-                         } else if (iDelim2 == orderYear) {
-                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
-                         } else {
-                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
-                         }
-                         var matched = dateRegexp.exec(value);
-                         if(matched != null) {
-                             if (!isValidDate(matched[1], matched[2], matched[3])) {
-                                 if (i == 0) {
-                                     focusField = form[oDate[x][0]];
-                                 }
-                                 fields[i++] = oDate[x][1];
-                                 bValid =  false;
-                              }
-                         } else {
-                             if (i == 0) {
-                                 focusField = form[oDate[x][0]];
-                             }
-                             fields[i++] = oDate[x][1];
-                             bValid =  false;
-                         }
-                     } else if ((orderMonth > orderYear && orderMonth < orderDay)) {
-                         var iDelim1 = orderYear + YEAR.length;
-                         var iDelim2 = orderMonth + MONTH.length;
-                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
-                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
-                         if (iDelim1 == orderMonth && iDelim2 == orderDay) {
-                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})(\\d{2})$");
-                         } else if (iDelim1 == orderMonth) {
-                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})[" + delim2 + "](\\d{2})$");
-                         } else if (iDelim2 == orderDay) {
-                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})(\\d{2})$");
-                         } else {
-                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{2})$");
-                         }
-                         var matched = dateRegexp.exec(value);
-                         if(matched != null) {
-                             if (!isValidDate(matched[3], matched[2], matched[1])) {
-                                 if (i == 0) {
-                                     focusField = form[oDate[x][0]];
-                                  }
-                                  fields[i++] = oDate[x][1];
-                                  bValid =  false;
-                              }
-                          } else {
-                              if (i == 0) {
-                                  focusField = form[oDate[x][0]];
-                              }
-                              fields[i++] = oDate[x][1];
-                              bValid =  false;
-                          }
-                     } else {
-                         if (i == 0) {
-                             focusField = form[oDate[x][0]];
-                         }
-                         fields[i++] = oDate[x][1];
-                         bValid =  false;
-                     }
-                  }
-               }
-               if (fields.length > 0) {
-                  focusField.focus();
-                  alert(fields.join('\n'));
-               }
-               return bValid;
-            }
-
-	    function isValidDate(day, month, year) {
-	        if (month < 1 || month > 12) {
-                    return false;
-                }
-                if (day < 1 || day > 31) {
-                    return false;
-                }
-                if ((month == 4 || month == 6 || month == 9 || month == 11) &&
-                    (day == 31)) {
-                    return false;
-                }
-                if (month == 2) {
-                    var leap = (year % 4 == 0 &&
-                               (year % 100 != 0 || year % 400 == 0));
-                    if (day>29 || (day == 29 && !leap)) {
-                        return false;
-                    }
-                }
-                return true;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="range"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateRange"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required,integer"
-                  msg="errors.range">
-
-         <javascript><![CDATA[
-            function validateRange(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oRange = new range();
-                for (x in oRange) {
-                    if ((form[oRange[x][0]].type == 'text' ||
-                         form[oRange[x][0]].type == 'textarea') &&
-                        (form[oRange[x][0]].value.length > 0)) {
-                        var iMin = parseInt(oRange[x][2]("min"));
-                        var iMax = parseInt(oRange[x][2]("max"));
-                        var iValue = parseInt(form[oRange[x][0]].value);
-                        if (!(iValue >= iMin && iValue <= iMax)) {
-                            if (i == 0) {
-                                focusField = form[oRange[x][0]];
-                            }
-                            fields[i++] = oRange[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                    focusField.focus();
-                    alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="creditCard"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateCreditCard"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.creditcard">
-
-         <javascript><![CDATA[
-            function validateCreditCard(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oCreditCard = new creditCard();
-                for (x in oCreditCard) {
-                    if ((form[oCreditCard[x][0]].type == 'text' ||
-                         form[oCreditCard[x][0]].type == 'textarea') &&
-                        (form[oCreditCard[x][0]].value.length > 0)) {
-                        if (!luhnCheck(form[oCreditCard[x][0]].value)) {
-                            if (i == 0) {
-                                focusField = form[oCreditCard[x][0]];
-                            }
-                            fields[i++] = oCreditCard[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                    focusField.focus();
-                    alert(fields.join('\n'));
-                }
-                return bValid;
-            }
-
-            /**
-             * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl
-             */
-            function luhnCheck(cardNumber) {
-                if (isLuhnNum(cardNumber)) {
-                    var no_digit = cardNumber.length;
-                    var oddoeven = no_digit & 1;
-                    var sum = 0;
-                    for (var count = 0; count < no_digit; count++) {
-                        var digit = parseInt(cardNumber.charAt(count));
-                        if (!((count & 1) ^ oddoeven)) {
-                            digit *= 2;
-                            if (digit > 9) digit -= 9;
-                        };
-                        sum += digit;
-                    };
-                    if (sum == 0) return false;
-                    if (sum % 10 == 0) return true;
-                };
-                return false;
-            }
-
-            function isLuhnNum(argvalue) {
-                argvalue = argvalue.toString();
-                if (argvalue.length == 0) {
-                    return false;
-                }
-                for (var n = 0; n < argvalue.length; n++) {
-                    if ((argvalue.substring(n, n+1) < "0") ||
-                        (argvalue.substring(n,n+1) > "9")) {
-                        return false;
-                    }
-                }
-                return true;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
-      <validator name="email"
-            classname="org.apache.struts.util.StrutsValidator"
-               method="validateEmail"
-         methodParams="java.lang.Object,
-                       org.apache.commons.validator.ValidatorAction,
-                       org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
-                       javax.servlet.http.HttpServletRequest"
-              depends="required"
-                  msg="errors.email">
-
-         <javascript><![CDATA[
-            function validateEmail(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oEmail = new email();
-                for (x in oEmail) {
-                    if ((form[oEmail[x][0]].type == 'text' ||
-                         form[oEmail[x][0]].type == 'textarea') &&
-                        (form[oEmail[x][0]].value.length > 0)) {
-                        if (!checkEmail(form[oEmail[x][0]].value)) {
-                            if (i == 0) {
-                                focusField = form[oEmail[x][0]];
-                            }
-                            fields[i++] = oEmail[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                    focusField.focus();
-                    alert(fields.join('\n'));
-                }
-                return bValid;
-            }
-
-            /**
-             * Reference: Sandeep V. Tamhankar (stamhankar at hotmail.com),
-             * http://javascript.internet.com
-             */
-            function checkEmail(emailStr) {
-               if (emailStr.length == 0) {
-                   return true;
-               }
-               var emailPat=/^(.+)@(.+)$/;
-               var specialChars="\\(\\)<>@,;:\\\\\\\"\\.\\[\\]";
-               var validChars="\[^\\s" + specialChars + "\]";
-               var quotedUser="(\"[^\"]*\")";
-               var ipDomainPat=/^(\d{1,3})[.](\d{1,3})[.](\d{1,3})[.](\d{1,3})$/;
-               var atom=validChars + '+';
-               var word="(" + atom + "|" + quotedUser + ")";
-               var userPat=new RegExp("^" + word + "(\\." + word + ")*$");
-               var domainPat=new RegExp("^" + atom + "(\\." + atom + ")*$");
-               var matchArray=emailStr.match(emailPat);
-               if (matchArray == null) {
-                   return false;
-               }
-               var user=matchArray[1];
-               var domain=matchArray[2];
-               if (user.match(userPat) == null) {
-                   return false;
-               }
-               var IPArray = domain.match(ipDomainPat);
-               if (IPArray != null) {
-                   for (var i = 1; i <= 4; i++) {
-                      if (IPArray[i] > 255) {
-                         return false;
-                      }
-                   }
-                   return true;
-               }
-               var domainArray=domain.match(domainPat);
-               if (domainArray == null) {
-                   return false;
-               }
-               var atomPat=new RegExp(atom,"g");
-               var domArr=domain.match(atomPat);
-               var len=domArr.length;
-               if ((domArr[domArr.length-1].length < 2) ||
-                   (domArr[domArr.length-1].length > 3)) {
-                   return false;
-               }
-               if (len < 2) {
-                   return false;
-               }
-               return true;
-            }]]>
-         </javascript>
-
-      </validator>
-
-   </global>
-
-</form-validation>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,808 @@
+<!--
+
+   This file contains the default Struts Validator pluggable validator
+   definitions.  It should be placed somewhere under /WEB-INF and
+   referenced in the struts-config.xml under the plug-in element
+   for the ValidatorPlugIn.
+
+      <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
+                                                  /WEB-INF/validation.xml"/>
+      </plug-in>
+
+   These are the default error messages associated with
+   each validator defined in this file.  They should be
+   added to your projects ApplicationResources.properties
+   file or you can associate new ones by modifying the
+   pluggable validators msg attributes in this file.
+
+   # Struts Validator Error Messages
+   errors.required={0} is required.
+   errors.minlength={0} can not be less than {1} characters.
+   errors.maxlength={0} can not be greater than {1} characters.
+   errors.invalid={0} is invalid.
+
+   errors.byte={0} must be an byte.
+   errors.short={0} must be an short.
+   errors.integer={0} must be an integer.
+   errors.long={0} must be an long.
+   errors.float={0} must be an float.
+   errors.double={0} must be an double.
+
+   errors.date={0} is not a date.
+   errors.range={0} is not in the range {1} through {2}.
+   errors.creditcard={0} is not a valid credit card number.
+   errors.email={0} is an invalid e-mail address.
+
+-->
+
+<form-validation>
+
+   <global>
+
+      <validator name="required"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateRequired"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+                  msg="errors.required">
+
+         <javascript><![CDATA[
+            function validateRequired(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oRequired = new required();
+                for (x in oRequired) {
+                    if ((form[oRequired[x][0]].type == 'text' ||
+                         form[oRequired[x][0]].type == 'textarea' ||
+                         form[oRequired[x][0]].type == 'select-one' ||
+                         form[oRequired[x][0]].type == 'radio' ||
+                         form[oRequired[x][0]].type == 'password') &&
+                        (form[oRequired[x][0]].value == '')) {
+                        if (i == 0) {
+                            focusField = form[oRequired[x][0]];
+                        }
+                        fields[i++] = oRequired[x][1];
+                        bValid = false;
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="minlength"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateMinLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.minlength">
+
+         <javascript><![CDATA[
+            function validateMinLength(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oMinLength = new minlength();
+                for (x in oMinLength) {
+                    if (form[oMinLength[x][0]].type == 'text' ||
+                        form[oMinLength[x][0]].type == 'textarea') {
+                        var iMin = parseInt(oMinLength[x][2]("minlength"));
+                        if (!(form[oMinLength[x][0]].value.length >= iMin)) {
+                            if (i == 0) {
+                                focusField = form[oMinLength[x][0]];
+                            }
+                            fields[i++] = oMinLength[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="maxlength"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateMaxLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.maxlength">
+
+         <javascript><![CDATA[
+            function validateMaxLength(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oMaxLength = new maxlength();
+                for (x in oMaxLength) {
+                    if (form[oMaxLength[x][0]].type == 'text' ||
+                        form[oMaxLength[x][0]].type == 'textarea') {
+                        var iMax = parseInt(oMaxLength[x][2]("maxlength"));
+                        if (!(form[oMaxLength[x][0]].value.length <= iMax)) {
+                            if (i == 0) {
+                                focusField = form[oMaxLength[x][0]];
+                            }
+                            fields[i++] = oMaxLength[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="mask"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateMask"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.invalid">
+
+         <javascript><![CDATA[
+            function validateMask(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oMasked = new mask();
+                for (x in oMasked) {
+                    if ((form[oMasked[x][0]].type == 'text' ||
+                         form[oMasked[x][0]].type == 'textarea' ||
+                         form[oMasked[x][0]].type == 'password') &&
+                        (form[oMasked[x][0]].value.length > 0)) {
+                        if (!matchPattern(form[oMasked[x][0]].value, oMasked[x][2]("mask"))) {
+                            if (i == 0) {
+                                focusField = form[oMasked[x][0]];
+                            }
+                            fields[i++] = oMasked[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }
+
+            function matchPattern(value, mask) {
+               var bMatched = mask.exec(value);
+               if (!bMatched) {
+                   return false;
+               }
+               return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="byte"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateByte"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.byte"
+       jsFunctionName="ByteValidations">
+
+         <javascript><![CDATA[
+            function validateByte(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oByte = new ByteValidations();
+                for (x in oByte) {
+                    if ((form[oByte[x][0]].type == 'text' ||
+                         form[oByte[x][0]].type == 'textarea' ||
+                         form[oByte[x][0]].type == 'select-one' ||
+                         form[oByte[x][0]].type == 'radio') &&
+                        (form[oByte[x][0]].value.length > 0)) {
+                        var iValue = parseInt(form[oByte[x][0]].value);
+                        if (isNaN(iValue) || !(iValue >= -128 && iValue <= 127)) {
+                            if (i == 0)
+                                focusField = form[oByte[x][0]];
+                            fields[i++] = oByte[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="short"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateShort"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.short"
+       jsFunctionName="ShortValidations">
+
+         <javascript><![CDATA[
+            function validateShort(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oShort = new ShortValidations();
+                for (x in oShort) {
+                    if ((form[oShort[x][0]].type == 'text' ||
+                         form[oShort[x][0]].type == 'textarea' ||
+                         form[oShort[x][0]].type == 'select-one' ||
+                         form[oShort[x][0]].type == 'radio') &&
+                        (form[oShort[x][0]].value.length > 0)) {
+                        var iValue = parseInt(form[oShort[x][0]].value);
+                        if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) {
+                            if (i == 0) {
+                                focusField = form[oShort[x][0]];
+                            }
+                            fields[i++] = oShort[x][1];
+                            bValid = false;
+                       }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="integer"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateInteger"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.integer"
+       jsFunctionName="IntegerValidations">
+
+         <javascript><![CDATA[
+            function validateInteger(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oInteger = new IntegerValidations();
+                for (x in oInteger) {
+                    if ((form[oInteger[x][0]].type == 'text' ||
+                         form[oInteger[x][0]].type == 'textarea' ||
+                         form[oInteger[x][0]].type == 'select-one' ||
+                         form[oInteger[x][0]].type == 'radio') &&
+                        (form[oInteger[x][0]].value.length > 0)) {
+                        var iValue = parseInt(form[oInteger[x][0]].value);
+                        if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) {
+                            if (i == 0) {
+                                focusField = form[oInteger[x][0]];
+                            }
+                            fields[i++] = oInteger[x][1];
+                            bValid = false;
+                       }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="long"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateLong"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.long"/>
+
+
+      <validator name="float"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateFloat"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.float"
+       jsFunctionName="FloatValidations">
+
+         <javascript><![CDATA[
+            function validateFloat(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oFloat = new FloatValidations();
+                for (x in oFloat) {
+                    if ((form[oFloat[x][0]].type == 'text' ||
+                         form[oFloat[x][0]].type == 'textarea' ||
+                         form[oFloat[x][0]].type == 'select-one' ||
+                         form[oFloat[x][0]].type == 'radio') &&
+                        (form[oFloat[x][0]].value.length > 0)) {
+                        var iValue = parseFloat(form[oFloat[x][0]].value);
+                        if (isNaN(iValue)) {
+                            if (i == 0) {
+                                focusField = form[oFloat[x][0]];
+                            }
+                            fields[i++] = oFloat[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="double"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateDouble"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.double"/>
+
+
+      <validator name="date"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateDate"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.date"
+       jsFunctionName="DateValidations">
+
+         <javascript><![CDATA[
+            function validateDate(form) {
+               var bValid = true;
+               var focusField = null;
+               var i = 0;
+               var fields = new Array();
+               oDate = new DateValidations();
+               for (x in oDate) {
+                   var value = form[oDate[x][0]].value;
+                   var datePattern = oDate[x][2]("datePatternStrict");
+                   if ((form[oDate[x][0]].type == 'text' ||
+                        form[oDate[x][0]].type == 'textarea') &&
+                       (value.length > 0) &&
+                       (datePattern.length > 0)) {
+                     var MONTH = "MM";
+                     var DAY = "dd";
+                     var YEAR = "yyyy";
+                     var orderMonth = datePattern.indexOf(MONTH);
+                     var orderDay = datePattern.indexOf(DAY);
+                     var orderYear = datePattern.indexOf(YEAR);
+                     if ((orderDay < orderYear && orderDay > orderMonth)) {
+                         var iDelim1 = orderMonth + MONTH.length;
+                         var iDelim2 = orderDay + DAY.length;
+                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
+                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
+                         if (iDelim1 == orderDay && iDelim2 == orderYear) {
+                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
+                         } else if (iDelim1 == orderDay) {
+                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
+                         } else if (iDelim2 == orderYear) {
+                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
+                         } else {
+                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
+                         }
+                         var matched = dateRegexp.exec(value);
+                         if(matched != null) {
+                            if (!isValidDate(matched[2], matched[1], matched[3])) {
+                               if (i == 0) {
+                                   focusField = form[oDate[x][0]];
+                               }
+                               fields[i++] = oDate[x][1];
+                               bValid =  false;
+                            }
+                         } else {
+                            if (i == 0) {
+                                focusField = form[oDate[x][0]];
+                            }
+                            fields[i++] = oDate[x][1];
+                            bValid =  false;
+                         }
+                     } else if ((orderMonth < orderYear && orderMonth > orderDay)) {
+                         var iDelim1 = orderDay + DAY.length;
+                         var iDelim2 = orderMonth + MONTH.length;
+                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
+                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
+                         if (iDelim1 == orderMonth && iDelim2 == orderYear) {
+                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
+                         } else if (iDelim1 == orderMonth) {
+                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
+                         } else if (iDelim2 == orderYear) {
+                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
+                         } else {
+                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
+                         }
+                         var matched = dateRegexp.exec(value);
+                         if(matched != null) {
+                             if (!isValidDate(matched[1], matched[2], matched[3])) {
+                                 if (i == 0) {
+                                     focusField = form[oDate[x][0]];
+                                 }
+                                 fields[i++] = oDate[x][1];
+                                 bValid =  false;
+                              }
+                         } else {
+                             if (i == 0) {
+                                 focusField = form[oDate[x][0]];
+                             }
+                             fields[i++] = oDate[x][1];
+                             bValid =  false;
+                         }
+                     } else if ((orderMonth > orderYear && orderMonth < orderDay)) {
+                         var iDelim1 = orderYear + YEAR.length;
+                         var iDelim2 = orderMonth + MONTH.length;
+                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
+                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
+                         if (iDelim1 == orderMonth && iDelim2 == orderDay) {
+                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})(\\d{2})$");
+                         } else if (iDelim1 == orderMonth) {
+                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})[" + delim2 + "](\\d{2})$");
+                         } else if (iDelim2 == orderDay) {
+                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})(\\d{2})$");
+                         } else {
+                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{2})$");
+                         }
+                         var matched = dateRegexp.exec(value);
+                         if(matched != null) {
+                             if (!isValidDate(matched[3], matched[2], matched[1])) {
+                                 if (i == 0) {
+                                     focusField = form[oDate[x][0]];
+                                  }
+                                  fields[i++] = oDate[x][1];
+                                  bValid =  false;
+                              }
+                          } else {
+                              if (i == 0) {
+                                  focusField = form[oDate[x][0]];
+                              }
+                              fields[i++] = oDate[x][1];
+                              bValid =  false;
+                          }
+                     } else {
+                         if (i == 0) {
+                             focusField = form[oDate[x][0]];
+                         }
+                         fields[i++] = oDate[x][1];
+                         bValid =  false;
+                     }
+                  }
+               }
+               if (fields.length > 0) {
+                  focusField.focus();
+                  alert(fields.join('\n'));
+               }
+               return bValid;
+            }
+
+	    function isValidDate(day, month, year) {
+	        if (month < 1 || month > 12) {
+                    return false;
+                }
+                if (day < 1 || day > 31) {
+                    return false;
+                }
+                if ((month == 4 || month == 6 || month == 9 || month == 11) &&
+                    (day == 31)) {
+                    return false;
+                }
+                if (month == 2) {
+                    var leap = (year % 4 == 0 &&
+                               (year % 100 != 0 || year % 400 == 0));
+                    if (day>29 || (day == 29 && !leap)) {
+                        return false;
+                    }
+                }
+                return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="range"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required,integer"
+                  msg="errors.range">
+
+         <javascript><![CDATA[
+            function validateRange(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oRange = new range();
+                for (x in oRange) {
+                    if ((form[oRange[x][0]].type == 'text' ||
+                         form[oRange[x][0]].type == 'textarea') &&
+                        (form[oRange[x][0]].value.length > 0)) {
+                        var iMin = parseInt(oRange[x][2]("min"));
+                        var iMax = parseInt(oRange[x][2]("max"));
+                        var iValue = parseInt(form[oRange[x][0]].value);
+                        if (!(iValue >= iMin && iValue <= iMax)) {
+                            if (i == 0) {
+                                focusField = form[oRange[x][0]];
+                            }
+                            fields[i++] = oRange[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                    focusField.focus();
+                    alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="creditCard"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateCreditCard"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.creditcard">
+
+         <javascript><![CDATA[
+            function validateCreditCard(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oCreditCard = new creditCard();
+                for (x in oCreditCard) {
+                    if ((form[oCreditCard[x][0]].type == 'text' ||
+                         form[oCreditCard[x][0]].type == 'textarea') &&
+                        (form[oCreditCard[x][0]].value.length > 0)) {
+                        if (!luhnCheck(form[oCreditCard[x][0]].value)) {
+                            if (i == 0) {
+                                focusField = form[oCreditCard[x][0]];
+                            }
+                            fields[i++] = oCreditCard[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                    focusField.focus();
+                    alert(fields.join('\n'));
+                }
+                return bValid;
+            }
+
+            /**
+             * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl
+             */
+            function luhnCheck(cardNumber) {
+                if (isLuhnNum(cardNumber)) {
+                    var no_digit = cardNumber.length;
+                    var oddoeven = no_digit & 1;
+                    var sum = 0;
+                    for (var count = 0; count < no_digit; count++) {
+                        var digit = parseInt(cardNumber.charAt(count));
+                        if (!((count & 1) ^ oddoeven)) {
+                            digit *= 2;
+                            if (digit > 9) digit -= 9;
+                        };
+                        sum += digit;
+                    };
+                    if (sum == 0) return false;
+                    if (sum % 10 == 0) return true;
+                };
+                return false;
+            }
+
+            function isLuhnNum(argvalue) {
+                argvalue = argvalue.toString();
+                if (argvalue.length == 0) {
+                    return false;
+                }
+                for (var n = 0; n < argvalue.length; n++) {
+                    if ((argvalue.substring(n, n+1) < "0") ||
+                        (argvalue.substring(n,n+1) > "9")) {
+                        return false;
+                    }
+                }
+                return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="email"
+            classname="org.apache.struts.util.StrutsValidator"
+               method="validateEmail"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="required"
+                  msg="errors.email">
+
+         <javascript><![CDATA[
+            function validateEmail(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oEmail = new email();
+                for (x in oEmail) {
+                    if ((form[oEmail[x][0]].type == 'text' ||
+                         form[oEmail[x][0]].type == 'textarea') &&
+                        (form[oEmail[x][0]].value.length > 0)) {
+                        if (!checkEmail(form[oEmail[x][0]].value)) {
+                            if (i == 0) {
+                                focusField = form[oEmail[x][0]];
+                            }
+                            fields[i++] = oEmail[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                    focusField.focus();
+                    alert(fields.join('\n'));
+                }
+                return bValid;
+            }
+
+            /**
+             * Reference: Sandeep V. Tamhankar (stamhankar at hotmail.com),
+             * http://javascript.internet.com
+             */
+            function checkEmail(emailStr) {
+               if (emailStr.length == 0) {
+                   return true;
+               }
+               var emailPat=/^(.+)@(.+)$/;
+               var specialChars="\\(\\)<>@,;:\\\\\\\"\\.\\[\\]";
+               var validChars="\[^\\s" + specialChars + "\]";
+               var quotedUser="(\"[^\"]*\")";
+               var ipDomainPat=/^(\d{1,3})[.](\d{1,3})[.](\d{1,3})[.](\d{1,3})$/;
+               var atom=validChars + '+';
+               var word="(" + atom + "|" + quotedUser + ")";
+               var userPat=new RegExp("^" + word + "(\\." + word + ")*$");
+               var domainPat=new RegExp("^" + atom + "(\\." + atom + ")*$");
+               var matchArray=emailStr.match(emailPat);
+               if (matchArray == null) {
+                   return false;
+               }
+               var user=matchArray[1];
+               var domain=matchArray[2];
+               if (user.match(userPat) == null) {
+                   return false;
+               }
+               var IPArray = domain.match(ipDomainPat);
+               if (IPArray != null) {
+                   for (var i = 1; i <= 4; i++) {
+                      if (IPArray[i] > 255) {
+                         return false;
+                      }
+                   }
+                   return true;
+               }
+               var domainArray=domain.match(domainPat);
+               if (domainArray == null) {
+                   return false;
+               }
+               var atomPat=new RegExp(atom,"g");
+               var domArr=domain.match(atomPat);
+               var len=domArr.length;
+               if ((domArr[domArr.length-1].length < 2) ||
+                   (domArr[domArr.length-1].length > 3)) {
+                   return false;
+               }
+               if (len < 2) {
+                   return false;
+               }
+               return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+   </global>
+
+</form-validation>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules_1_1.dtd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules_1_1.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/validator-rules_1_1.dtd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_2.dtd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_2.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_2.dtd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_3.dtd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_3.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.struts/web-app_2_3.dtd)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/antlr-runtime.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/antlr-runtime.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/antlr-runtime.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/velocity.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/velocity.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/velocity.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/werken.xpath.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/werken.xpath.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.apache.velocity/werken.xpath.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb/hsqldb.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb/hsqldb.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.hsqldb/hsqldb.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.jdom (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.jdom)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.jdom/jdom.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.jdom/jdom.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.jdom/jdom.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.junitee)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee-anttask.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee-anttask.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee-anttask.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.junitee/junitee.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.postgresql (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.postgresql)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.postgresql/postgresql.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/org.postgresql/postgresql.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/org.postgresql/postgresql.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-apache-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-apache-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-apache-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-bea-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-bea-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-bea-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-ejb-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-ejb-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-ejb-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-hibernate-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-hibernate-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-hibernate-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jboss-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jboss-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jboss-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jmx-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jmx-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-jmx-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-orion-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-orion-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-orion-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-web-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-web-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-web-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-webwork-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-webwork-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-webwork-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xdoclet-module.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xdoclet-module.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xdoclet-module.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc-uc.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc-uc.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc-uc.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet-xjavadoc.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/lib/main/xdoclet/xdoclet.jar)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/uml)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-ejb.zargo
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-ejb.zargo (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/uml/xpetstore-ejb.zargo)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-servlet.zargo
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/uml/xpetstore-servlet.zargo (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/uml/xpetstore-servlet.zargo)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.classpath
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/.classpath	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path=""/>
-    <classpathentry kind="output" path="build"/>
-</classpath>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.classpath (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/.classpath)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.classpath	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" path=""/>
+    <classpathentry kind="output" path="build"/>
+</classpath>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.project
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/.project	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>xdocs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.project (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/.project)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.project	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>xdocs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.bat
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.bat (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/build.bat)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/build.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-#==========================================================
-# Ant properties
-#
-# Author: Herve Tchepannou
-#==========================================================
-
-#------------------------------------------------------------
-# Application informations
-#------------------------------------------------------------
-app.version=3.1.3
-
-#------------------------------------------------------------
-# Directories
-#------------------------------------------------------------
-
-lib.dir=${basedir}/../lib
-lib.commons.dir=${lib.dir}/main/org.apache.commons
-lib.jdom.dir=${lib.dir}/main/org.jdom
-lib.java2html.dir=${lib.dir}/main/com.java2html
-lib.junit.dir=${lib.dir}/ant/junit
-lib.junitee.dir=${lib.dir}/main/org.junitee
-lib.log4j.dir=${lib.dir}/main/org.apache.log4j
-lib.velocity.dir=${lib.dir}/main/org.apache.velocity
-
-build.dir=${basedir}/build
-build.doc.dir=${build.dir}/doc
-build.java2html.dir=${build.doc.dir}/java2html
-
-css.dir=${basedir}/css
-dist.dir=${basedir}/../dist
-images.dir=${basedir}/images
-xml.dir=${basedir}/xml
-
-xpetstore.dir=${basedir}/..
-xpetstore_ejb.dir=${basedir}/../xpetstore-ejb
-xpetstore_servlet.dir=${basedir}/../xpetstore-servlet

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/build.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+#==========================================================
+# Ant properties
+#
+# Author: Herve Tchepannou
+#==========================================================
+
+#------------------------------------------------------------
+# Application informations
+#------------------------------------------------------------
+app.version=3.1.3
+
+#------------------------------------------------------------
+# Directories
+#------------------------------------------------------------
+
+lib.dir=${basedir}/../lib
+lib.commons.dir=${lib.dir}/main/org.apache.commons
+lib.jdom.dir=${lib.dir}/main/org.jdom
+lib.java2html.dir=${lib.dir}/main/com.java2html
+lib.junit.dir=${lib.dir}/ant/junit
+lib.junitee.dir=${lib.dir}/main/org.junitee
+lib.log4j.dir=${lib.dir}/main/org.apache.log4j
+lib.velocity.dir=${lib.dir}/main/org.apache.velocity
+
+build.dir=${basedir}/build
+build.doc.dir=${build.dir}/doc
+build.java2html.dir=${build.doc.dir}/java2html
+
+css.dir=${basedir}/css
+dist.dir=${basedir}/../dist
+images.dir=${basedir}/images
+xml.dir=${basedir}/xml
+
+xpetstore.dir=${basedir}/..
+xpetstore_ejb.dir=${basedir}/../xpetstore-ejb
+xpetstore_servlet.dir=${basedir}/../xpetstore-servlet

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.sh
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.sh (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/build.sh)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,224 +0,0 @@
-<project name="xdocs" default="all" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />            	
-        
-        
-        <!-- Directories -->
-       	<mkdir dir="${build.dir}" />
-       	<mkdir dir="${build.doc.dir}" />
-       	<mkdir dir="${build.doc.dir}/images" />
-       	<mkdir dir="${build.java2html.dir}/xpetstore-ejb" />
-       	<mkdir dir="${build.java2html.dir}/xpetstore-servlet" />
-		<mkdir dir="${dist.dir}" />
-		       	   	                          
-	</target>
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Main                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="all" depends="init">
-		<antcall target="clean" />
-		<antcall target="doc" />
-		<antcall target="java2html" />
-		<antcall target="zip" />
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Clean                                          -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="clean" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Cleaning                                             +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<delete>
-			<fileset dir="${build.dir}" />
-		</delete>
-	</target>
-	
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Document                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="doc" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Generating the documentation                         +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-
-        <taskdef 
-        	name="anakia" 
-        	classname="org.apache.velocity.anakia.AnakiaTask"
-        >
-	        <classpath>
-	    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-	    		<fileset dir="${lib.junit.dir}" 	includes="**/*.jar" />
-	    		<fileset dir="${lib.log4j.dir}"		includes="**/*.jar" />	    		
-	    		<fileset dir="${lib.velocity.dir}"	includes="**/*.jar" />
-	    		<fileset dir="${lib.jdom.dir}"		includes="**/*.jar" />
-	        </classpath>
-        </taskdef>
-        
-        <!-- Generate HTML -->
-        <anakia 
-        	basedir="${xml.dir}"
-        	destdir="${build.doc.dir}"
-            extension=".html" 
-            style="./website.vsl"
-            projectFile="../website.xml"
-            includes="**/*.xml"
-        />
-
-		<!-- Images -->
-        <copy todir="${build.doc.dir}/images" filtering="no">
-            <fileset dir="${images.dir}">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-        
-        <!-- CSS -->
-        <copy todir="${build.doc.dir}" filtering="no">
-            <fileset dir="${css.dir}">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-	</target>
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Java2Html                                      -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="java2html" depends="init">
-	
-		<!-- EJB -->
-		<java classname="j2h" fork="yes">
-			<classpath>
-				<fileset dir="${lib.java2html.dir}" includes="*.jar" />
-			</classpath>
-			
-        	<arg line="-d  ${build.java2html.dir}/xpetstore-ejb" />
-        	<arg line="-js ${xpetstore_ejb.dir}/java" />
-        	<arg line="-js ${xpetstore_ejb.dir}/build/java" />
-        	<arg line="-js ${xpetstore_ejb.dir}/web" /> 
-        </java>
-        
-		<!-- Servlet -->
-		<java classname="j2h" fork="yes">
-			<classpath>
-				<fileset dir="${lib.java2html.dir}" includes="*.jar" />
-			</classpath>
-			
-			
-        	<arg line="-d  ${build.java2html.dir}/xpetstore-servlet" />
-        	<arg line="-js ${xpetstore_servlet.dir}/java" />
-        	<arg line="-js ${xpetstore_servlet.dir}/build/java" />
-        	<arg line="-js ${xpetstore_servlet.dir}/web" /> 
-        </java>
-        
-	</target>	
-	
-	
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Build the packages                             -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="zip" depends="init">
-	
-		<delete>
-			<fileset dir="${dist.dir}" includes="**/*.zip" />
-		</delete>
-		
-		<!-- Website -->
-		<zip
-			basedir="${build.doc.dir}"
-			destfile="${dist.dir}/website-${app.version}.zip"
-			includes="**/*"
-		/>
-        
-		<!-- Source code -->
-		<zip
-			basedir="${xpetstore.dir}/.."
-			destfile="${dist.dir}/xpetstore-src-${app.version}.zip"
-			excludes="**/*"
-		>		
-			<fileset dir="${xpetstore.dir}/..">
-				<include name="xpetstore/**/*" />
-				<include name="xpetstore/**/.classpath" />
-				<include name="xpetstore/**/.project" />
-				
-				<exclude name="**/build/**" />
-				<exclude name="**/dist/**" />
-				<exclude name="**/lib/**" />
-				<exclude name="**/.metadata/**" />
-			</fileset>
-		</zip>
-        
-		<!-- All -->
-		<zip
-			basedir="${xpetstore.dir}/.."
-			destfile="${dist.dir}/xpetstore-${app.version}.zip"
-			excludes="**/*"
-		>		
-			<!-- Documentation -->
-			<fileset dir="${build.dir}">
-				<include name="doc/**/*" />
-				
-				<exclude name="**/*" />
-			</fileset>
-			
-			<!-- All -->
-			<fileset dir="${xpetstore.dir}/..">
-				<include name="xpetstore/**/*" />
-				<include name="xpetstore/**/.classpath" />
-				<include name="xpetstore/**/.project" />
-								
-				<exclude name="**/build/**" />
-				<exclude name="**/dist/**" />
-				<exclude name="**/.metadata/**" />
-			</fileset>
-		</zip>
-        
-        
-	</target>	
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,224 @@
+<project name="xdocs" default="all" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />            	
+        
+        
+        <!-- Directories -->
+       	<mkdir dir="${build.dir}" />
+       	<mkdir dir="${build.doc.dir}" />
+       	<mkdir dir="${build.doc.dir}/images" />
+       	<mkdir dir="${build.java2html.dir}/xpetstore-ejb" />
+       	<mkdir dir="${build.java2html.dir}/xpetstore-servlet" />
+		<mkdir dir="${dist.dir}" />
+		       	   	                          
+	</target>
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Main                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="all" depends="init">
+		<antcall target="clean" />
+		<antcall target="doc" />
+		<antcall target="java2html" />
+		<antcall target="zip" />
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Clean                                          -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="clean" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Cleaning                                             +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<delete>
+			<fileset dir="${build.dir}" />
+		</delete>
+	</target>
+	
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Document                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="doc" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Generating the documentation                         +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+
+        <taskdef 
+        	name="anakia" 
+        	classname="org.apache.velocity.anakia.AnakiaTask"
+        >
+	        <classpath>
+	    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+	    		<fileset dir="${lib.junit.dir}" 	includes="**/*.jar" />
+	    		<fileset dir="${lib.log4j.dir}"		includes="**/*.jar" />	    		
+	    		<fileset dir="${lib.velocity.dir}"	includes="**/*.jar" />
+	    		<fileset dir="${lib.jdom.dir}"		includes="**/*.jar" />
+	        </classpath>
+        </taskdef>
+        
+        <!-- Generate HTML -->
+        <anakia 
+        	basedir="${xml.dir}"
+        	destdir="${build.doc.dir}"
+            extension=".html" 
+            style="./website.vsl"
+            projectFile="../website.xml"
+            includes="**/*.xml"
+        />
+
+		<!-- Images -->
+        <copy todir="${build.doc.dir}/images" filtering="no">
+            <fileset dir="${images.dir}">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+        
+        <!-- CSS -->
+        <copy todir="${build.doc.dir}" filtering="no">
+            <fileset dir="${css.dir}">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+	</target>
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Java2Html                                      -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="java2html" depends="init">
+	
+		<!-- EJB -->
+		<java classname="j2h" fork="yes">
+			<classpath>
+				<fileset dir="${lib.java2html.dir}" includes="*.jar" />
+			</classpath>
+			
+        	<arg line="-d  ${build.java2html.dir}/xpetstore-ejb" />
+        	<arg line="-js ${xpetstore_ejb.dir}/java" />
+        	<arg line="-js ${xpetstore_ejb.dir}/build/java" />
+        	<arg line="-js ${xpetstore_ejb.dir}/web" /> 
+        </java>
+        
+		<!-- Servlet -->
+		<java classname="j2h" fork="yes">
+			<classpath>
+				<fileset dir="${lib.java2html.dir}" includes="*.jar" />
+			</classpath>
+			
+			
+        	<arg line="-d  ${build.java2html.dir}/xpetstore-servlet" />
+        	<arg line="-js ${xpetstore_servlet.dir}/java" />
+        	<arg line="-js ${xpetstore_servlet.dir}/build/java" />
+        	<arg line="-js ${xpetstore_servlet.dir}/web" /> 
+        </java>
+        
+	</target>	
+	
+	
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Build the packages                             -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="zip" depends="init">
+	
+		<delete>
+			<fileset dir="${dist.dir}" includes="**/*.zip" />
+		</delete>
+		
+		<!-- Website -->
+		<zip
+			basedir="${build.doc.dir}"
+			destfile="${dist.dir}/website-${app.version}.zip"
+			includes="**/*"
+		/>
+        
+		<!-- Source code -->
+		<zip
+			basedir="${xpetstore.dir}/.."
+			destfile="${dist.dir}/xpetstore-src-${app.version}.zip"
+			excludes="**/*"
+		>		
+			<fileset dir="${xpetstore.dir}/..">
+				<include name="xpetstore/**/*" />
+				<include name="xpetstore/**/.classpath" />
+				<include name="xpetstore/**/.project" />
+				
+				<exclude name="**/build/**" />
+				<exclude name="**/dist/**" />
+				<exclude name="**/lib/**" />
+				<exclude name="**/.metadata/**" />
+			</fileset>
+		</zip>
+        
+		<!-- All -->
+		<zip
+			basedir="${xpetstore.dir}/.."
+			destfile="${dist.dir}/xpetstore-${app.version}.zip"
+			excludes="**/*"
+		>		
+			<!-- Documentation -->
+			<fileset dir="${build.dir}">
+				<include name="doc/**/*" />
+				
+				<exclude name="**/*" />
+			</fileset>
+			
+			<!-- All -->
+			<fileset dir="${xpetstore.dir}/..">
+				<include name="xpetstore/**/*" />
+				<include name="xpetstore/**/.classpath" />
+				<include name="xpetstore/**/.project" />
+								
+				<exclude name="**/build/**" />
+				<exclude name="**/dist/**" />
+				<exclude name="**/.metadata/**" />
+			</fileset>
+		</zip>
+        
+        
+	</target>	
+	
+</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/css (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/css)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/css/style.css
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/css/style.css (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/css/style.css)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-domain.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-domain.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/ejb-domain.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-services.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-services.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/ejb-services.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-web.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/ejb-web.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/ejb-web.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files_total.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files_total.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/metrics_files_total.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss_total.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss_total.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/metrics_ncss_total.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/pageflow.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/pageflow.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/pageflow.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-domain.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-domain.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/servlet-domain.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-web.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/servlet-web.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/servlet-web.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/sflogo.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/sflogo.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/sflogo.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/usecases.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/images/usecases.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/images/usecases.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/lcp.bat
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/lcp.bat (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/lcp.bat)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/ooffice (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/ooffice)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/ooffice/metrics.sxc
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/ooffice/metrics.sxc (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/ooffice/metrics.sxc)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
-<TITLE>All Classes (Java2HTML)</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-<FONT ID="FrameHeadingFont" size="+1">
-All Classes</FONT>
-</BODY>
-</HTML>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/AllClasses.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+<HEAD>
+<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
+<TITLE>All Classes (Java2HTML)</TITLE>
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+</HEAD>
+<BODY BGCOLOR="white">
+<FONT ID="FrameHeadingFont" size="+1">
+All Classes</FONT>
+</BODY>
+</HTML>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/front.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/front.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/front.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
-<HTML>
-<HEAD>
-<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
-<TITLE>Java2HTML</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY>
-<p><strong>Instructions:-</strong></p>
-<ul>
-<li>Top-Left Panel Selects a Package</li>
-<li>Bottom-Left Panel Selects a Java File</li>
-<li>Text displayed like <FONT ID="Classes"><A href="#">this</A></FONT> represents a link to another Java source, clicking on it selects it in this panel.</li>
-</ul>
-<p><strong>Credits:-</strong></p>
-<ul><li>Produced by <a href="http://www.java2html.com" TARGET="_top"><em>Java2HTML Version 1.2</em></a> on the Mar 2, 2003 1:48 AM</li></ul>
-<em>(If you like this tool, please <a href="mailto:?subject=http://www.java2html.com">email</a> the reference <A href="http://www.java2html.com" TARGET="_top">http://www.java2html.com</A> to a colleague)</em>
-</BODY>
-</HTML>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/front.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/front.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/front.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/front.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
+<HTML>
+<HEAD>
+<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
+<TITLE>Java2HTML</TITLE>
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+</HEAD>
+<BODY>
+<p><strong>Instructions:-</strong></p>
+<ul>
+<li>Top-Left Panel Selects a Package</li>
+<li>Bottom-Left Panel Selects a Java File</li>
+<li>Text displayed like <FONT ID="Classes"><A href="#">this</A></FONT> represents a link to another Java source, clicking on it selects it in this panel.</li>
+</ul>
+<p><strong>Credits:-</strong></p>
+<ul><li>Produced by <a href="http://www.java2html.com" TARGET="_top"><em>Java2HTML Version 1.2</em></a> on the Mar 2, 2003 1:48 AM</li></ul>
+<em>(If you like this tool, please <a href="mailto:?subject=http://www.java2html.com">email</a> the reference <A href="http://www.java2html.com" TARGET="_top">http://www.java2html.com</A> to a colleague)</em>
+</BODY>
+</HTML>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/index.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/index.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/index.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
-<TITLE>Java Source (Java2HTML)</TITLE>
-
-</HEAD>
-<FRAMESET cols="30%, 70%">
-<FRAMESET rows="30%, 70%">
-<FRAME src="packages.html" name="packageListFrame">
-<FRAME src="AllClasses.html" name="packageFrame">
-</FRAMESET>
-<FRAME src="front.html" name="SourceFrame">
-</FRAMESET>
-<NOFRAMES>
-<H2>Frame Alert</H2>
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-</NOFRAMES>
-</HTML>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/index.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/index.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/index.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/index.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+<HEAD>
+<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
+<TITLE>Java Source (Java2HTML)</TITLE>
+
+</HEAD>
+<FRAMESET cols="30%, 70%">
+<FRAMESET rows="30%, 70%">
+<FRAME src="packages.html" name="packageListFrame">
+<FRAME src="AllClasses.html" name="packageFrame">
+</FRAMESET>
+<FRAME src="front.html" name="SourceFrame">
+</FRAMESET>
+<NOFRAMES>
+<H2>Frame Alert</H2>
+<P>
+This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+</NOFRAMES>
+</HTML>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/packages.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/packages.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/packages.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
-<TITLE>Java Source (Java2HTML)
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY>
-<FONT size="+1" ID="FrameHeadingFont"><A HREF="front.html" TARGET="SourceFrame">Java Source</A></FONT>
-<BR> <FONT ID="FrameItemFont"><A HREF="AllClasses.html" TARGET="packageFrame">All Classes</A></FONT>
-<BR> <FONT size="+1" ID="FrameHeadingFont">Packages</FONT>
-</BODY>
-</HTML>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/packages.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/packages.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/packages.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/packages.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+<HEAD>
+<META NAME="GENERATOR" CONTENT="Java2HTML Version 1.2">
+<TITLE>Java Source (Java2HTML)
+</TITLE>
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+</HEAD>
+<BODY>
+<FONT size="+1" ID="FrameHeadingFont"><A HREF="front.html" TARGET="SourceFrame">Java Source</A></FONT>
+<BR> <FONT ID="FrameItemFont"><A HREF="AllClasses.html" TARGET="packageFrame">All Classes</A></FONT>
+<BR> <FONT size="+1" ID="FrameHeadingFont">Packages</FONT>
+</BODY>
+</HTML>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/stylesheet.css
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/output/stylesheet.css (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/output/stylesheet.css)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/velocity.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/velocity.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/velocity.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-#
-# This is a simple example of a velocity properties file.
-#
-# Any property that is not listed here will have it's default
-# value used.  The default values are located in :
-#  *  src/java/org/apache/velocity/runtime/default/velocity.defaults
-#  *  http://jakarta.apache.org/velocity/developer-guide.html
-#
-# as an example, we are changing the name of the velocity log 
-#
-runtime.log = velocity.log
-

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/velocity.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/velocity.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/velocity.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/velocity.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+#
+# This is a simple example of a velocity properties file.
+#
+# Any property that is not listed here will have it's default
+# value used.  The default values are located in :
+#  *  src/java/org/apache/velocity/runtime/default/velocity.defaults
+#  *  http://jakarta.apache.org/velocity/developer-guide.html
+#
+# as an example, we are changing the name of the velocity log 
+#
+runtime.log = velocity.log
+

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.vsl
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.vsl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/website.vsl)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/website.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="xPetstore"
-        href="http://xpetstore.sourceforge.net/">
-
-    <title>xPetstore</title>
-
-    <body>
-        <menu name="Overview">
-            <item name="Home"          		href="/index.html"/>
-            <item name="Specifications"		href="/specifications.html"/>
-            <item name="xPetstore-EJB"		href="/xpetstore_ejb.html"/>
-            <item name="xPetstore-Servlet"	href="/xpetstore_servlet.html"/>
-            <item name="Source Code"		href="/source_code.html"/>
-            <item name="Metrics"			href="/metrics.html"/>
-            <item name="ToDo"				href="/todo.html"/>
-        </menu>
-    
-        <menu name="Project">
-            <item name="Mailing Lists"     	href="/lists.html"/>
-            <item name="Source Repository" 	href="/repository.html"/>
-            <item name="Issue Tracking" 	href="/issues.html"/>
-            <item name="Project Team"       href="/team.html"/>
-            <item name="References"       	href="/references.html"/>
-        </menu>
-    
-        <menu name="Installation">
-            <item name="Download"          			href="/download.html"/>
-            <item name="Configuring JBoss 3.0.x" 	href="/setup_jboss-3.0.x.html"/>
-            <item name="Configuring WebLogic 7.x" 	href="/setup_weblogic-7.x.html"/>
-            <item name="Configuring Orion 2.x" 		href="/setup_orion-2.x.html"/>
-            <item name="Configuring Tomcat 4.x"		href="/setup_tomcat-4.x.html"/>
-            <item name="Running xPetstore" 			href="/run.html"/>
-        </menu>
-    </body>
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/website.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/website.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="xPetstore"
+        href="http://xpetstore.sourceforge.net/">
+
+    <title>xPetstore</title>
+
+    <body>
+        <menu name="Overview">
+            <item name="Home"          		href="/index.html"/>
+            <item name="Specifications"		href="/specifications.html"/>
+            <item name="xPetstore-EJB"		href="/xpetstore_ejb.html"/>
+            <item name="xPetstore-Servlet"	href="/xpetstore_servlet.html"/>
+            <item name="Source Code"		href="/source_code.html"/>
+            <item name="Metrics"			href="/metrics.html"/>
+            <item name="ToDo"				href="/todo.html"/>
+        </menu>
+    
+        <menu name="Project">
+            <item name="Mailing Lists"     	href="/lists.html"/>
+            <item name="Source Repository" 	href="/repository.html"/>
+            <item name="Issue Tracking" 	href="/issues.html"/>
+            <item name="Project Team"       href="/team.html"/>
+            <item name="References"       	href="/references.html"/>
+        </menu>
+    
+        <menu name="Installation">
+            <item name="Download"          			href="/download.html"/>
+            <item name="Configuring JBoss 3.0.x" 	href="/setup_jboss-3.0.x.html"/>
+            <item name="Configuring WebLogic 7.x" 	href="/setup_weblogic-7.x.html"/>
+            <item name="Configuring Orion 2.x" 		href="/setup_orion-2.x.html"/>
+            <item name="Configuring Tomcat 4.x"		href="/setup_tomcat-4.x.html"/>
+            <item name="Running xPetstore" 			href="/run.html"/>
+        </menu>
+    </body>
+</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Download</title>
-  </properties>
-
-<body>
-
-<section name="Downlaod">
-	<p>
-    	You can download the lattest version of xPetstore 
-    	<a href="http://sourceforge.net/project/showfiles.php?group_id=67431">here</a>
-    </p>
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/download.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Download</title>
+  </properties>
+
+<body>
+
+<section name="Downlaod">
+	<p>
+    	You can download the lattest version of xPetstore 
+    	<a href="http://sourceforge.net/project/showfiles.php?group_id=67431">here</a>
+    </p>
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore</title>
-  </properties>
-
-<body>
-
-<section name="Overview">
-	<p>
-    	xPetstore is a re-implementation of Sun Microsystem
-    	<a href="http://java.sun.com/blueprints/code/index.html#java_pet_store_demo">PetStore</a> based on
-    	<a href="http://xdoclet.sourceforge.net">xDoclet</a>
-    	<br/>
-    	This demo application demonstrate how to use open source frameworks to build
-    	<i>WODRA</i> (Write Once, Deploy and Run Anywhere) J2EE applications.
-	</p>
-	
-	<p>	
-    	xPetstore has been implemented using 2 differents approaches:
-    	<ul>
-    		<li> A pure EJB solution based on JSP, <a href="http://jakarta.apache.org/struts">Struts</a>,
-    			 <a href="http://www.opensymphony.com/sitemesh">Sitemesh</a>, EJB 2.0 and CMP 2.0 
-    		</li>
-    			 
-    		<li> A Servlet solution based on <a href="http://jakarta.apache.org/velocity">Velocity</a>,
-    	  	 	 <a href="http://www.opensymphony.com/webwork">WebWork</a>,
-    			 <a href="http://www.opensymphony.com/sitemesh">Sitemesh</a>,
-    			 POJO and <a href="http://hibernate.sourceforge.net">Hibernate</a>.
-    		</li>
-    	</ul>
-    	
-    	Both solutions have been deployed and tested on the following platforms:
-    	<ul>
-    		<li> Operating System: 
-    			<ul>
-    				<li> Linux </li>
-    				<li> Windows </li>
-    			</ul>
-    		</li>
-    		
-    		<li> Application Servers: 
-    			<ul>
-    				<li> <a href="www.jboss.org">JBoss 3.x</a> </li>
-    				<li> <a href="http://www.bea.com/products/weblogic">WebLogic 7.x</a> </li>
-    				<li> <a href="http://www.orionserver.com">Orion 2.x</a> </li>
-    				<li> <a href="http://jakarta.apache.org/tomcat">Tomcat 4.x</a> </li>
-    			</ul>
-    		</li>
-    			
-    		<li> Databases: 
-    			<ul>
-    				<li> <a href="http://www.hsqldb.org">Hypersonic SQL</a> </li>
-    				<li> <a href="http://www.postgresql.org">PostgreSQL</a> </li>
-    				<li> <a href="http://www.sapdb.org">SapDB</a> </li>
-    				<li> <a href="http://www.mysql.org">MySQL</a> </li>
-    				<li> <a href="http://www.oracle.com">Oracle</a> </li>
-    				<li> <a href="http://www.microsoft.com/sql/default.asp">MS SQL Server</a> </li>
-    			</ul>
-    		</li>
-    	</ul>
-    </p>
-</section>
-
-<section name="Features">
-	<p>
-		With xPetstore, you will learn how to use <a href="http://xdoclet.sourceforge.net">xDoclet</a> to:
-		<ul>
-			<li> Generate EJB 2.0 files:
-				<ul>
-					<li> Home and Business interfaces (local and remotes) </li>
-					<li> ejb-jar.xml </li>
-					<li> Application server specific deployment descriptors </li>
-					<li> Value Objects classes </li>
-				</ul>
-			</li>			
-			<li> Use J2EE 1.3 features like CMP 2.0 and CMR </li>			
-			<li> Generate web deployment descriptors for:
-				<ul>
-					<li> Servlets </li>
-					<li> Web Filters </li>
-					<li> JSP Taglibs </li>
-				</ul>
-			</li>
-			<li> Generate <a href="http://jakarta.apache.org/struts">Struts</a> deployement descriptors </li>
-			<li> Generate <a href="http://www.opensymphony.com/webwork">Webwork</a> deployment descriptor </li>
-			<li> Use other  web template technology like <a href="http://jakarta.apache.org/velocity">Velocity</a> </li>
-			<li> Use <a href="http://hibernate.sourceforge.net">Hibernate</a> as persistence layer </li>
-			<li> Use <a href="http://xdoclet.sourceforge.net">xDoclet</a> merge points to add extra stuff </li>
-			<li> Test J2EE application using <a href="http://junitee.sourceforge.net">JUnitEE</a> framework </li>
-		</ul>
-	</p>
-</section>
-
-</body>
-
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/index.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore</title>
+  </properties>
+
+<body>
+
+<section name="Overview">
+	<p>
+    	xPetstore is a re-implementation of Sun Microsystem
+    	<a href="http://java.sun.com/blueprints/code/index.html#java_pet_store_demo">PetStore</a> based on
+    	<a href="http://xdoclet.sourceforge.net">xDoclet</a>
+    	<br/>
+    	This demo application demonstrate how to use open source frameworks to build
+    	<i>WODRA</i> (Write Once, Deploy and Run Anywhere) J2EE applications.
+	</p>
+	
+	<p>	
+    	xPetstore has been implemented using 2 differents approaches:
+    	<ul>
+    		<li> A pure EJB solution based on JSP, <a href="http://jakarta.apache.org/struts">Struts</a>,
+    			 <a href="http://www.opensymphony.com/sitemesh">Sitemesh</a>, EJB 2.0 and CMP 2.0 
+    		</li>
+    			 
+    		<li> A Servlet solution based on <a href="http://jakarta.apache.org/velocity">Velocity</a>,
+    	  	 	 <a href="http://www.opensymphony.com/webwork">WebWork</a>,
+    			 <a href="http://www.opensymphony.com/sitemesh">Sitemesh</a>,
+    			 POJO and <a href="http://hibernate.sourceforge.net">Hibernate</a>.
+    		</li>
+    	</ul>
+    	
+    	Both solutions have been deployed and tested on the following platforms:
+    	<ul>
+    		<li> Operating System: 
+    			<ul>
+    				<li> Linux </li>
+    				<li> Windows </li>
+    			</ul>
+    		</li>
+    		
+    		<li> Application Servers: 
+    			<ul>
+    				<li> <a href="www.jboss.org">JBoss 3.x</a> </li>
+    				<li> <a href="http://www.bea.com/products/weblogic">WebLogic 7.x</a> </li>
+    				<li> <a href="http://www.orionserver.com">Orion 2.x</a> </li>
+    				<li> <a href="http://jakarta.apache.org/tomcat">Tomcat 4.x</a> </li>
+    			</ul>
+    		</li>
+    			
+    		<li> Databases: 
+    			<ul>
+    				<li> <a href="http://www.hsqldb.org">Hypersonic SQL</a> </li>
+    				<li> <a href="http://www.postgresql.org">PostgreSQL</a> </li>
+    				<li> <a href="http://www.sapdb.org">SapDB</a> </li>
+    				<li> <a href="http://www.mysql.org">MySQL</a> </li>
+    				<li> <a href="http://www.oracle.com">Oracle</a> </li>
+    				<li> <a href="http://www.microsoft.com/sql/default.asp">MS SQL Server</a> </li>
+    			</ul>
+    		</li>
+    	</ul>
+    </p>
+</section>
+
+<section name="Features">
+	<p>
+		With xPetstore, you will learn how to use <a href="http://xdoclet.sourceforge.net">xDoclet</a> to:
+		<ul>
+			<li> Generate EJB 2.0 files:
+				<ul>
+					<li> Home and Business interfaces (local and remotes) </li>
+					<li> ejb-jar.xml </li>
+					<li> Application server specific deployment descriptors </li>
+					<li> Value Objects classes </li>
+				</ul>
+			</li>			
+			<li> Use J2EE 1.3 features like CMP 2.0 and CMR </li>			
+			<li> Generate web deployment descriptors for:
+				<ul>
+					<li> Servlets </li>
+					<li> Web Filters </li>
+					<li> JSP Taglibs </li>
+				</ul>
+			</li>
+			<li> Generate <a href="http://jakarta.apache.org/struts">Struts</a> deployement descriptors </li>
+			<li> Generate <a href="http://www.opensymphony.com/webwork">Webwork</a> deployment descriptor </li>
+			<li> Use other  web template technology like <a href="http://jakarta.apache.org/velocity">Velocity</a> </li>
+			<li> Use <a href="http://hibernate.sourceforge.net">Hibernate</a> as persistence layer </li>
+			<li> Use <a href="http://xdoclet.sourceforge.net">xDoclet</a> merge points to add extra stuff </li>
+			<li> Test J2EE application using <a href="http://junitee.sourceforge.net">JUnitEE</a> framework </li>
+		</ul>
+	</p>
+</section>
+
+</body>
+
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Issue Tracking</title>
-  </properties>
-
-<body>
-
-<section name="Issue Tracking">
-	<p>
-    	<a href="http://sourceforge.net/tracker/?group_id=67431">
-    		http://sourceforge.net/tracker/?group_id=67431</a>
-    </p>
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/issues.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Issue Tracking</title>
+  </properties>
+
+<body>
+
+<section name="Issue Tracking">
+	<p>
+    	<a href="http://sourceforge.net/tracker/?group_id=67431">
+    		http://sourceforge.net/tracker/?group_id=67431</a>
+    </p>
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Mailing Lists</title>
-  </properties>
-
-<body>
-
-<section name="Downlaod">
-	<p>
-    	These are the mailing lists that have been established for this project.
-    </p>
-    <p>
-    	<table border="0" cellspacing="1" width="100%">
-    		<tr>
-    			<th><b>List Name</b></th>
-    			<th></th>
-    		</tr>
-    		<tr>
-    			<td>
-    				Develloper List
-    			</td>
-    			<td>
-    				<a href="http://lists.sourceforge.net/lists/listinfo/xpetstore-devel">Subscribe</a>
-    				<a href="http://lists.sourceforge.net/lists/listinfo/xpetstore-devel">Unsubscribe</a>
-    				<a href="http://sourceforge.net/mail/?group_id=67431">Archive</a>
-    			</td>
-    		</tr>
-    	</table>
-    </p>
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/lists.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Mailing Lists</title>
+  </properties>
+
+<body>
+
+<section name="Downlaod">
+	<p>
+    	These are the mailing lists that have been established for this project.
+    </p>
+    <p>
+    	<table border="0" cellspacing="1" width="100%">
+    		<tr>
+    			<th><b>List Name</b></th>
+    			<th></th>
+    		</tr>
+    		<tr>
+    			<td>
+    				Develloper List
+    			</td>
+    			<td>
+    				<a href="http://lists.sourceforge.net/lists/listinfo/xpetstore-devel">Subscribe</a>
+    				<a href="http://lists.sourceforge.net/lists/listinfo/xpetstore-devel">Unsubscribe</a>
+    				<a href="http://sourceforge.net/mail/?group_id=67431">Archive</a>
+    			</td>
+    		</tr>
+    	</table>
+    </p>
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Metrics</title>
-  </properties>
-
-<body>
-
-<section>
-	<p>
-    	This page shows a couple of statistics for comparing both implementations.
-    	
-    	<p/>
-    	Those statistics have been captures only for <code>.java</code> files, which IMHO 
-    	are the best indicators of the application complexity.
-    	
-    	<p/>
-    	The different statistics are:
-    	<ul>
-    		<li> <a href="files">Number of Files </a> </li>
-    		<li> <a href="ncss">Number of Line of Code </a> </li>
-    	</ul>
-    </p>
-</section>
-
-<section name="Number of Files">
-	<p>
-		<a name="files"/>
-		
-    	The following diagrams shows the number of files for both implementations.
-    	<ul>
-    		<li> <i>Business</i> represents the number of files for the business tiers (domain and service classes)</li>
-    		<li> <i>Web</i> represents the number of files at the web tiers. </li>
-    		<li> <i>xDoclet</i> reprensent the number of files generated by xDoclet on both <i>Business</i> and <i>Web</i> tiers </li>
-    	</ul>
-    	
-    	<p/>
-    	<table border="0" cellspacing="1" width="100%">
-    		<tr>
-    			<td width="50%">
-    				<img border="1" src="images/metrics_files.jpg" />
-    			</td>
-    			<td width="50%">
-    				<img border="1" src="images/metrics_files_total.jpg" />
-    			</td>
-    		</tr>
-    	</table>
-    </p>
-</section>
-
-<section name="Number of Line of Code">
-    <p>
-    	<a name="ncss"/>
-    	
-    	The following diagrams shows the number of line of code (LOC) for both implementations (excluding comments).
-    	<ul>
-    		<li> <i>Business</i> represents the number of LOC for the business tiers (domain and service classes)</li>
-    		<li> <i>Web</i> represents the number of LOC at the web tiers. </li>
-    		<li> <i>xDoclet</i> reprensent the number of LOC generated by xDoclet on both <i>Business</i> and <i>Web</i> tiers </li>
-    	</ul>
-    	
-    	To make the comparison fair, both implementation have been formatted with
-    	<a href="http://jalopy.sourceforge.net">Jalopy</a> code formatter using the same formatting rules.
-    	
-    	<p/>
-    	<table border="0" cellspacing="1" width="100%">
-    		<tr>
-    			<td width="50%">
-    				<img border="1" src="images/metrics_ncss.jpg" />
-    			</td>
-    			<td width="50%">
-    				<img border="1" src="images/metrics_ncss_total.jpg" />
-    			</td>
-    		</tr>
-    	</table>
-    </p>
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/metrics.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Metrics</title>
+  </properties>
+
+<body>
+
+<section>
+	<p>
+    	This page shows a couple of statistics for comparing both implementations.
+    	
+    	<p/>
+    	Those statistics have been captures only for <code>.java</code> files, which IMHO 
+    	are the best indicators of the application complexity.
+    	
+    	<p/>
+    	The different statistics are:
+    	<ul>
+    		<li> <a href="files">Number of Files </a> </li>
+    		<li> <a href="ncss">Number of Line of Code </a> </li>
+    	</ul>
+    </p>
+</section>
+
+<section name="Number of Files">
+	<p>
+		<a name="files"/>
+		
+    	The following diagrams shows the number of files for both implementations.
+    	<ul>
+    		<li> <i>Business</i> represents the number of files for the business tiers (domain and service classes)</li>
+    		<li> <i>Web</i> represents the number of files at the web tiers. </li>
+    		<li> <i>xDoclet</i> reprensent the number of files generated by xDoclet on both <i>Business</i> and <i>Web</i> tiers </li>
+    	</ul>
+    	
+    	<p/>
+    	<table border="0" cellspacing="1" width="100%">
+    		<tr>
+    			<td width="50%">
+    				<img border="1" src="images/metrics_files.jpg" />
+    			</td>
+    			<td width="50%">
+    				<img border="1" src="images/metrics_files_total.jpg" />
+    			</td>
+    		</tr>
+    	</table>
+    </p>
+</section>
+
+<section name="Number of Line of Code">
+    <p>
+    	<a name="ncss"/>
+    	
+    	The following diagrams shows the number of line of code (LOC) for both implementations (excluding comments).
+    	<ul>
+    		<li> <i>Business</i> represents the number of LOC for the business tiers (domain and service classes)</li>
+    		<li> <i>Web</i> represents the number of LOC at the web tiers. </li>
+    		<li> <i>xDoclet</i> reprensent the number of LOC generated by xDoclet on both <i>Business</i> and <i>Web</i> tiers </li>
+    	</ul>
+    	
+    	To make the comparison fair, both implementation have been formatted with
+    	<a href="http://jalopy.sourceforge.net">Jalopy</a> code formatter using the same formatting rules.
+    	
+    	<p/>
+    	<table border="0" cellspacing="1" width="100%">
+    		<tr>
+    			<td width="50%">
+    				<img border="1" src="images/metrics_ncss.jpg" />
+    			</td>
+    			<td width="50%">
+    				<img border="1" src="images/metrics_ncss_total.jpg" />
+    			</td>
+    		</tr>
+    	</table>
+    </p>
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore References</title>
-  </properties>
-
-<body>
-
-<section>
-	<p>
-		<table width="100%">
-			<tr>
-				<th>Name</th>
-				<th>Version</th>
-				<th>URL</th>
-			</tr>
-			
-			<tr>
-				<td>Hibernate</td>
-				<td>1.2.x</td>
-				<td><a href="http://hibernate.sourceforge.net">http://hibernate.sourceforge.net</a></td>
-			</tr>
-			
-			<tr>
-				<td>HypersonicSQL</td>
-				<td>1.6</td>
-				<td><a href="http://hsqldb.sourceforge.net/">http://hsqldb.sourceforge.net/</a></td>
-			</tr>
-			
-			<tr>
-				<td>JBoss</td>
-				<td>3.0.x</td>
-				<td><a href="http://www.jboss.org">http://www.jboss.org</a></td>
-			</tr>
-			
-			<tr>
-				<td>JUnit</td>
-				<td>3.8.1</td>
-				<td><a href="http://junit.org">http://www.junit.org</a></td>
-			</tr>
-			
-			<tr>
-				<td>JUnitEE</td>
-				<td>1.6.x</td>
-				<td><a href="http://junitee.sourceforge.net">http://www.junitee.sourceforge.net</a></td>
-			</tr>
-			
-			<tr>
-				<td>MS SQL Server</td>
-				<td>2000</td>
-				<td>
-					<a href="http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml">
-						http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml
-					</a>
-				</td>
-			</tr>			
-			
-			<tr>
-				<td>mySQL</td>
-				<td></td>
-				<td><a href="http://www.mysql.org">http://www.mysql.org</a></td>
-			</tr>						
-			
-			<tr>
-				<td>Oracle</td>
-				<td>7, 8, 9i</td>
-				<td><a href="http://www.oracle.org">http://www.oracle.com</a></td>
-			</tr>						
-			
-			<tr>
-				<td>PostgreSQL</td>
-				<td>7.2</td>
-				<td><a href="http://www.postgresql.org">http://www.postgresql.org</a></td>
-			</tr>						
-			
-			<tr>
-				<td>SapDB</td>
-				<td>7.3</td>
-				<td><a href="http://www.sapdb.org">http://www.sapdb.org</a></td>
-			</tr>			
-			
-			<tr>
-				<td>Sitemesh</td>
-				<td>1.5</td>
-				<td><a href="http://www.opensymphony.com/sitemesh">http://www.opensymphony.com/sitemesh</a></td>
-			</tr>			
-			
-			<tr>
-				<td>Struts</td>
-				<td>1.1b2</td>
-				<td><a href="http://jakarta.apache.org/struts">http://jakarta.apache.org/struts</a></td>
-			</tr>			
-			
-			<tr>
-				<td>Velocity</td>
-				<td>1.3</td>
-				<td><a href="http://jakarta.apache.org/velocity">http://jakarta.apache.org/velocity</a></td>
-			</tr>			
-			
-			<tr>
-				<td>WebLogic</td>
-				<td>4.x</td>
-				<td><a href="http://www.bea.com/products/weblogic">http://www.bea.com/products/weblogic</a></td>
-			</tr>
-			
-			<tr>
-				<td>WebWork</td>
-				<td>1.2.1</td>
-				<td><a href="http://www.opensymphony.com/webwork">http://www.opensymphony.com/webwork</a></td>
-			</tr>			
-			
-			<tr>
-				<td>xDoclet</td>
-				<td>1.2b2</td>
-				<td><a href="http://xdoclet.sourceforge.net.net">http://www.sourceforge.net/projects/xdoclet</a></td>
-			</tr>
-			
-		</table>
-    </p>
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/references.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore References</title>
+  </properties>
+
+<body>
+
+<section>
+	<p>
+		<table width="100%">
+			<tr>
+				<th>Name</th>
+				<th>Version</th>
+				<th>URL</th>
+			</tr>
+			
+			<tr>
+				<td>Hibernate</td>
+				<td>1.2.x</td>
+				<td><a href="http://hibernate.sourceforge.net">http://hibernate.sourceforge.net</a></td>
+			</tr>
+			
+			<tr>
+				<td>HypersonicSQL</td>
+				<td>1.6</td>
+				<td><a href="http://hsqldb.sourceforge.net/">http://hsqldb.sourceforge.net/</a></td>
+			</tr>
+			
+			<tr>
+				<td>JBoss</td>
+				<td>3.0.x</td>
+				<td><a href="http://www.jboss.org">http://www.jboss.org</a></td>
+			</tr>
+			
+			<tr>
+				<td>JUnit</td>
+				<td>3.8.1</td>
+				<td><a href="http://junit.org">http://www.junit.org</a></td>
+			</tr>
+			
+			<tr>
+				<td>JUnitEE</td>
+				<td>1.6.x</td>
+				<td><a href="http://junitee.sourceforge.net">http://www.junitee.sourceforge.net</a></td>
+			</tr>
+			
+			<tr>
+				<td>MS SQL Server</td>
+				<td>2000</td>
+				<td>
+					<a href="http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml">
+						http://msdn.microsoft.com/downloads/default.asp?URL=/downloads/sample.asp?url=/msdn-files/027/001/779/msdncompositedoc.xml
+					</a>
+				</td>
+			</tr>			
+			
+			<tr>
+				<td>mySQL</td>
+				<td></td>
+				<td><a href="http://www.mysql.org">http://www.mysql.org</a></td>
+			</tr>						
+			
+			<tr>
+				<td>Oracle</td>
+				<td>7, 8, 9i</td>
+				<td><a href="http://www.oracle.org">http://www.oracle.com</a></td>
+			</tr>						
+			
+			<tr>
+				<td>PostgreSQL</td>
+				<td>7.2</td>
+				<td><a href="http://www.postgresql.org">http://www.postgresql.org</a></td>
+			</tr>						
+			
+			<tr>
+				<td>SapDB</td>
+				<td>7.3</td>
+				<td><a href="http://www.sapdb.org">http://www.sapdb.org</a></td>
+			</tr>			
+			
+			<tr>
+				<td>Sitemesh</td>
+				<td>1.5</td>
+				<td><a href="http://www.opensymphony.com/sitemesh">http://www.opensymphony.com/sitemesh</a></td>
+			</tr>			
+			
+			<tr>
+				<td>Struts</td>
+				<td>1.1b2</td>
+				<td><a href="http://jakarta.apache.org/struts">http://jakarta.apache.org/struts</a></td>
+			</tr>			
+			
+			<tr>
+				<td>Velocity</td>
+				<td>1.3</td>
+				<td><a href="http://jakarta.apache.org/velocity">http://jakarta.apache.org/velocity</a></td>
+			</tr>			
+			
+			<tr>
+				<td>WebLogic</td>
+				<td>4.x</td>
+				<td><a href="http://www.bea.com/products/weblogic">http://www.bea.com/products/weblogic</a></td>
+			</tr>
+			
+			<tr>
+				<td>WebWork</td>
+				<td>1.2.1</td>
+				<td><a href="http://www.opensymphony.com/webwork">http://www.opensymphony.com/webwork</a></td>
+			</tr>			
+			
+			<tr>
+				<td>xDoclet</td>
+				<td>1.2b2</td>
+				<td><a href="http://xdoclet.sourceforge.net.net">http://www.sourceforge.net/projects/xdoclet</a></td>
+			</tr>
+			
+		</table>
+    </p>
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Mailing Lists</title>
-  </properties>
-
-<body>
-
-<section name="Web Access">
-	<p>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/xpetstore/</p>
-</section>
-
-<section name="Anonymous Access">
-	<p>
-    	This project's CVS repository can be checked out through anonymous (pserver) CVS 
-    	with the following instruction set. When prompted for a password for anonymous, 
-    	simply press the <i>Enter</i> key. 
-        <br/><br/>
-		cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xpetstore login
-        <br/><br/>
-		cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xpetstore/ co xpetstore
-	</p>
-</section>
-
-<section name="Developer Access via SSH">
-	<p>
-        Only project developers can access the CVS tree via this method. 
-        SSH1 must be installed on your client machine. 
-        <br/><br/>
-        export CVS_RSH=ssh 
-        <br/><br/>   
-        cvs -z3 -d:ext:<i>developername</i>@cvs.sourceforge.net:/cvsroot/xpetstore co xpetstore
-	</p>
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/repository.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Mailing Lists</title>
+  </properties>
+
+<body>
+
+<section name="Web Access">
+	<p>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/xpetstore/</p>
+</section>
+
+<section name="Anonymous Access">
+	<p>
+    	This project's CVS repository can be checked out through anonymous (pserver) CVS 
+    	with the following instruction set. When prompted for a password for anonymous, 
+    	simply press the <i>Enter</i> key. 
+        <br/><br/>
+		cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xpetstore login
+        <br/><br/>
+		cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xpetstore/ co xpetstore
+	</p>
+</section>
+
+<section name="Developer Access via SSH">
+	<p>
+        Only project developers can access the CVS tree via this method. 
+        SSH1 must be installed on your client machine. 
+        <br/><br/>
+        export CVS_RSH=ssh 
+        <br/><br/>   
+        cvs -z3 -d:ext:<i>developername</i>@cvs.sourceforge.net:/cvsroot/xpetstore co xpetstore
+	</p>
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>Running xPetstore</title>
-  </properties>
-
-<body>
-
-<section name="Running xPetstore">
-
-	<p>
-		<ol>
-			<li>
-				<b><u> Start the application server</u></b>
-				<ul>
-					<li>
-						For JBoss, run the following commands:
-						<ul>
-							<li> cd JBOSS_HOME/bin </li>
-							<li> ./run.sh -c xpetstore </li>
-						</ul>
-					</li>
-					
-					<li>
-						For WebLogic, run the following commands:
-						<ul>
-							<li> cd WL_HOME/../user_projects/xpetstore </li>
-							<li> ./startWebLogic.sh </li>
-						</ul>
-					</li>
-					
-					<li>
-						For Orion, run the following commands:
-						<ul>
-							<li> cd ORION_HOME</li>
-							<li> 
-								java -jar orion.jar
-								<br/>
-								<u>Note:</u> The first time you run the Orion, you may have errorrs because the xpetstore 
-								application are not registered. No worry, as soon as you're going to deploy them, it will
-								resolve this issue.
-							</li>
-						</ul>
-					</li>
-					
-					<li>
-						For Tomcat, run the following commands:
-						<ul>
-							<li> cd TOMCAT_HOME/bin</li>
-							<li> ./startup.sh</li>
-						</ul>
-					</li>
-				</ul>					
-			</li>
-			
-		
-			<li>
-				<b><u> Select the Application Server </u></b>
-				<ul>
-					<li>
-						Edit the file <code>XPETSTORE_HOME/conf/as/appserver.properties</code> and set the 
-						property <code>app.server</code>.
-						You may want to review <code>XPETSTORE_HOME/conf/as/<i>&lt;app.server></i>.properties</code>
-						to make sure that all the properties are properly set.
-					</li>
-				</ul>					
-			</li>
-			
-			<li>
-				<b><u> Select the Database </u></b>
-				<ul>
-					<li>
-						Edit the file <code>XPETSTORE_HOME/conf/db/database.properties</code> and set the 
-						property <code>db.name</code> 
-					</li>
-					
-					<li>
-						Edit the file <code>XPETSTORE_HOME/conf/db/<i>&lt;db.name></i>.properties</code> to configure the
-						database.<br/>
-						You must set the following properties:
-						<ul>
-							<li> db.driver </li>
-							<li> db.url </li>
-							<li> db.user </li>
-							<li> db.password </li>
-							<li> db.classpath </li>
-						</ul>
-						<u>PS:</u> Don't change the <code>hibernate</code> properties.
-					</li>
-				</ul>
-			</li>
-			
-			<li>
-				<b><u> Build the source code </u></b>
-				<ul>
-					<li> 
-						cd <code>XPETSTORE_HOME/xpetstore-<i>implementation</i></code> 
-					</li>
-					
-					<li>
-						./build.sh <br/>
-						This command will :
-						<ul>
-							<li> 
-								Generate Java code in <code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/java</code> 
-							</li>
-							
-							<li> 
-								Generate the deployment descriptors at <code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/META-INF</code>
-								and <code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/WEB-INF</code>
-							</li>
-							
-							<li>
-								Compile the source code and build <code>.jar</code>, <code>.war</code> and <code>.ear</code> files
-								at <code>XPETSTORE_HOME/dist</code>
-							</li>
-						</ul>
-					</li>
-				</ul>
-			</li>
-			
-			<li>
-				<b><u> Test the application (for xpetstore-ejb only)</u></b>
-				<ul>
-					<li> 
-						./build.sh test <br/>
-						This run all the test cases and generate a report at 
-						<code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/junit/index.html</code>
-					</li>
-				</ul>				
-			</li>
-			
-			<li>
-				<b><u> Deploy the application </u></b>
-				<ul>
-					<li> 
-						./build.sh deploy
-					</li>
-				</ul>				
-			</li>
-			
-			<li>
-				<b><u> Initialize the database </u></b>
-				<ul>
-					<li> 
-						./build.sh db
-					</li>
-				</ul>				
-			</li>
-			
-			
-			<li>
-				<b><u> Run the application </u></b>
-				<ul>
-					<li> 
-						For xpetstore-ejb: <a href="http://localhost:8080/xpetstore-ejb/">http://localhost:8080/xpetstore-ejb/</a>
-					</li>
-					<li> 
-						For xpetstore-servlet: <a href="http://localhost:8080/xpetstore-servlet/">http://localhost:8080/xpetstore-servlet/</a>
-					</li>
-				</ul>				
-			</li>
-			
-		</ol>
-		
-	</p>
-	
-</section>
-
-</body>
-
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/run.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>Running xPetstore</title>
+  </properties>
+
+<body>
+
+<section name="Running xPetstore">
+
+	<p>
+		<ol>
+			<li>
+				<b><u> Start the application server</u></b>
+				<ul>
+					<li>
+						For JBoss, run the following commands:
+						<ul>
+							<li> cd JBOSS_HOME/bin </li>
+							<li> ./run.sh -c xpetstore </li>
+						</ul>
+					</li>
+					
+					<li>
+						For WebLogic, run the following commands:
+						<ul>
+							<li> cd WL_HOME/../user_projects/xpetstore </li>
+							<li> ./startWebLogic.sh </li>
+						</ul>
+					</li>
+					
+					<li>
+						For Orion, run the following commands:
+						<ul>
+							<li> cd ORION_HOME</li>
+							<li> 
+								java -jar orion.jar
+								<br/>
+								<u>Note:</u> The first time you run the Orion, you may have errorrs because the xpetstore 
+								application are not registered. No worry, as soon as you're going to deploy them, it will
+								resolve this issue.
+							</li>
+						</ul>
+					</li>
+					
+					<li>
+						For Tomcat, run the following commands:
+						<ul>
+							<li> cd TOMCAT_HOME/bin</li>
+							<li> ./startup.sh</li>
+						</ul>
+					</li>
+				</ul>					
+			</li>
+			
+		
+			<li>
+				<b><u> Select the Application Server </u></b>
+				<ul>
+					<li>
+						Edit the file <code>XPETSTORE_HOME/conf/as/appserver.properties</code> and set the 
+						property <code>app.server</code>.
+						You may want to review <code>XPETSTORE_HOME/conf/as/<i>&lt;app.server></i>.properties</code>
+						to make sure that all the properties are properly set.
+					</li>
+				</ul>					
+			</li>
+			
+			<li>
+				<b><u> Select the Database </u></b>
+				<ul>
+					<li>
+						Edit the file <code>XPETSTORE_HOME/conf/db/database.properties</code> and set the 
+						property <code>db.name</code> 
+					</li>
+					
+					<li>
+						Edit the file <code>XPETSTORE_HOME/conf/db/<i>&lt;db.name></i>.properties</code> to configure the
+						database.<br/>
+						You must set the following properties:
+						<ul>
+							<li> db.driver </li>
+							<li> db.url </li>
+							<li> db.user </li>
+							<li> db.password </li>
+							<li> db.classpath </li>
+						</ul>
+						<u>PS:</u> Don't change the <code>hibernate</code> properties.
+					</li>
+				</ul>
+			</li>
+			
+			<li>
+				<b><u> Build the source code </u></b>
+				<ul>
+					<li> 
+						cd <code>XPETSTORE_HOME/xpetstore-<i>implementation</i></code> 
+					</li>
+					
+					<li>
+						./build.sh <br/>
+						This command will :
+						<ul>
+							<li> 
+								Generate Java code in <code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/java</code> 
+							</li>
+							
+							<li> 
+								Generate the deployment descriptors at <code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/META-INF</code>
+								and <code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/WEB-INF</code>
+							</li>
+							
+							<li>
+								Compile the source code and build <code>.jar</code>, <code>.war</code> and <code>.ear</code> files
+								at <code>XPETSTORE_HOME/dist</code>
+							</li>
+						</ul>
+					</li>
+				</ul>
+			</li>
+			
+			<li>
+				<b><u> Test the application (for xpetstore-ejb only)</u></b>
+				<ul>
+					<li> 
+						./build.sh test <br/>
+						This run all the test cases and generate a report at 
+						<code>XPETSTORE_HOME/xpetstore-<i>implementation</i>/build/junit/index.html</code>
+					</li>
+				</ul>				
+			</li>
+			
+			<li>
+				<b><u> Deploy the application </u></b>
+				<ul>
+					<li> 
+						./build.sh deploy
+					</li>
+				</ul>				
+			</li>
+			
+			<li>
+				<b><u> Initialize the database </u></b>
+				<ul>
+					<li> 
+						./build.sh db
+					</li>
+				</ul>				
+			</li>
+			
+			
+			<li>
+				<b><u> Run the application </u></b>
+				<ul>
+					<li> 
+						For xpetstore-ejb: <a href="http://localhost:8080/xpetstore-ejb/">http://localhost:8080/xpetstore-ejb/</a>
+					</li>
+					<li> 
+						For xpetstore-servlet: <a href="http://localhost:8080/xpetstore-servlet/">http://localhost:8080/xpetstore-servlet/</a>
+					</li>
+				</ul>				
+			</li>
+			
+		</ol>
+		
+	</p>
+	
+</section>
+
+</body>
+
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>Configuring JBoss-3.x</title>
-  </properties>
-
-<body>
-
-<section name="Configuring JBoss-3.x">
-
-	<p>
-		<ol>
-			<li>
-				<b><u> Set <code>JBOSS_HOME</code> </u></b>
-				<br/>
-				Make sure that the variable <code>JBOSS_HOME</code> is set to the JBoss home directory
-			</li>
-			
-			<li>  
-				<b><u>Create the JBoss xpetstore server</u></b>
-				<br/>
-	 			Copy recursively <code>JBOSS_HOME/server/default</code> to <code>JBOSS_HOME/server/xpetstore</code>
-			</li>
-			
-			<li>  
-				<b><u> Configure JMS </u></b>
-				<br/>
-  				Edit <code>JBOSS_HOME/server/xpetstore/deploy/destinations-service.xml</code>
-  				to create JMS queues <code>queue/order</code> and <code>queue/mail</code>.
-  				<br/>
-				<code>JBOSS_HOME/server/xpetstore/deploy/destinations-service.xml</code> should look like this:
-<pre class="example">
-&lt;server>
-...
-  &lt;mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=order">
-    &lt;attribute name="JNDIName"><b>queue/order</b>&lt;/attribute>
-    &lt;depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager&lt;/depends>
-  &lt;/mbean>
-  
-  &lt;mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=mail">
-    &lt;attribute name="JNDIName"><b>queue/mail</b>&lt;/attribute>
-    &lt;depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager&lt;/depends>
-  &lt;/mbean>
-...
-&lt;/server>
-</pre>				
-			</li>
-			
-			<li>
-				<b><u> Configure JDBC </u></b>
-				<br/>
-				- Copy the JDBC driver to <code>JBOSS_HOME/server/xpetstore/lib</code>
-				<br/>
-				- Edit <code>JBOSS_HOME/server/xpetstore/deploy/<i>db.name</i>-service.xml</code> to
-				create the datasource <code>java:/xpetstoreDS</code>
-				<br/>
-				<code>JBOSS_HOME/server/xpetstore/deploy/<i>db.name</i>-service.xml</code> should look like this:
-<pre class="example">
-&lt;server>
-  &lt;mbean 
-    code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" 
-    name="jboss.jca:service=LocalTxCM,name=SapdbDS">
-
-    &lt;depends optional-attribute-name="ManagedConnectionFactoryName">
-      &lt;!--embedded mbean-->
-      &lt;mbean 
-        code="org.jboss.resource.connectionmanager.RARDeployment" 
-        name="jboss.jca:service=LocalTxDS,name=SapdbDS"
-      >
-        &lt;attribute name="JndiName"><b>xpetstoreDS</b>&lt;/attribute>
-
-        &lt;attribute name="ManagedConnectionFactoryProperties">
-          &lt;properties>
-            &lt;config-property name="ConnectionURL" type="java.lang.String"><i>your-database-url</i>&lt;/config-property>
-            &lt;config-property name="DriverClass" type="java.lang.String"><i>your-jdbc-driver</i>&lt;/config-property>
-            &lt;!--set these only if you want only default logins, not through JAAS -->
-            &lt;config-property name="UserName" type="java.lang.String"><i>your-username</i>&lt;/config-property>
-            &lt;config-property name="Password" type="java.lang.String"><i>your-password</i>&lt;/config-property>
-          &lt;/properties>
-        &lt;/attribute>
-    ....
-  &lt;/mbean>
-&lt;/server>
-</pre>				
-			</li>
-
-			<li>
-				<b><u> Configure JavaMail</u></b>
-				<br/>
-				Create the MailSesion <code>java/:Mail</code>.
-				<br/>
-				Make sure that <code>JBOSS_HOME/server/xpetstore/deploy/mail-service.xml</code> look like this:
-<pre class="example">
-&lt;server>
-  &lt;classpath codebase="lib" 
-             archives="mail.jar, activation.jar, mail-plugin.jar"/>
-
-  &lt;mbean code="org.jboss.mail.MailService"
-         name="jboss:service=Mail">
-    &lt;attribute name="JNDIName"><b>Mail</b>&lt;/attribute>
-    &lt;attribute name="User"><i>your-user-name</i>&lt;/attribute>
-    &lt;attribute name="Password"><i>your-password</i>&lt;/attribute>
-    &lt;attribute name="Configuration">
-       &lt;configuration>
-          &lt;property name="mail.store.protocol" value="pop3"/>
-          &lt;property name="mail.transport.protocol" value="smtp"/>
-          &lt;property name="mail.user" value="<i>your-username</i>"/>
-          &lt;property name="mail.pop3.host" value="<i>your-pop3-host</i>"/>
-          &lt;property name="mail.smtp.host" value="<i>your-smtp-host</i>"/>
-          &lt;property name="mail.from" value="noreply at xpetstore.sourceforge.net"/>
-          &lt;property name="mail.debug" value="false"/>
-       &lt;/configuration>
-    &lt;/attribute>
-  &lt;/mbean>
-&lt;/server>
-</pre>
-			</li>
-		</ol>
-				
-	</p>
-	
-</section>
-
-</body>
-
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_jboss-3.0.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>Configuring JBoss-3.x</title>
+  </properties>
+
+<body>
+
+<section name="Configuring JBoss-3.x">
+
+	<p>
+		<ol>
+			<li>
+				<b><u> Set <code>JBOSS_HOME</code> </u></b>
+				<br/>
+				Make sure that the variable <code>JBOSS_HOME</code> is set to the JBoss home directory
+			</li>
+			
+			<li>  
+				<b><u>Create the JBoss xpetstore server</u></b>
+				<br/>
+	 			Copy recursively <code>JBOSS_HOME/server/default</code> to <code>JBOSS_HOME/server/xpetstore</code>
+			</li>
+			
+			<li>  
+				<b><u> Configure JMS </u></b>
+				<br/>
+  				Edit <code>JBOSS_HOME/server/xpetstore/deploy/destinations-service.xml</code>
+  				to create JMS queues <code>queue/order</code> and <code>queue/mail</code>.
+  				<br/>
+				<code>JBOSS_HOME/server/xpetstore/deploy/destinations-service.xml</code> should look like this:
+<pre class="example">
+&lt;server>
+...
+  &lt;mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=order">
+    &lt;attribute name="JNDIName"><b>queue/order</b>&lt;/attribute>
+    &lt;depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager&lt;/depends>
+  &lt;/mbean>
+  
+  &lt;mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=mail">
+    &lt;attribute name="JNDIName"><b>queue/mail</b>&lt;/attribute>
+    &lt;depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager&lt;/depends>
+  &lt;/mbean>
+...
+&lt;/server>
+</pre>				
+			</li>
+			
+			<li>
+				<b><u> Configure JDBC </u></b>
+				<br/>
+				- Copy the JDBC driver to <code>JBOSS_HOME/server/xpetstore/lib</code>
+				<br/>
+				- Edit <code>JBOSS_HOME/server/xpetstore/deploy/<i>db.name</i>-service.xml</code> to
+				create the datasource <code>java:/xpetstoreDS</code>
+				<br/>
+				<code>JBOSS_HOME/server/xpetstore/deploy/<i>db.name</i>-service.xml</code> should look like this:
+<pre class="example">
+&lt;server>
+  &lt;mbean 
+    code="org.jboss.resource.connectionmanager.LocalTxConnectionManager" 
+    name="jboss.jca:service=LocalTxCM,name=SapdbDS">
+
+    &lt;depends optional-attribute-name="ManagedConnectionFactoryName">
+      &lt;!--embedded mbean-->
+      &lt;mbean 
+        code="org.jboss.resource.connectionmanager.RARDeployment" 
+        name="jboss.jca:service=LocalTxDS,name=SapdbDS"
+      >
+        &lt;attribute name="JndiName"><b>xpetstoreDS</b>&lt;/attribute>
+
+        &lt;attribute name="ManagedConnectionFactoryProperties">
+          &lt;properties>
+            &lt;config-property name="ConnectionURL" type="java.lang.String"><i>your-database-url</i>&lt;/config-property>
+            &lt;config-property name="DriverClass" type="java.lang.String"><i>your-jdbc-driver</i>&lt;/config-property>
+            &lt;!--set these only if you want only default logins, not through JAAS -->
+            &lt;config-property name="UserName" type="java.lang.String"><i>your-username</i>&lt;/config-property>
+            &lt;config-property name="Password" type="java.lang.String"><i>your-password</i>&lt;/config-property>
+          &lt;/properties>
+        &lt;/attribute>
+    ....
+  &lt;/mbean>
+&lt;/server>
+</pre>				
+			</li>
+
+			<li>
+				<b><u> Configure JavaMail</u></b>
+				<br/>
+				Create the MailSesion <code>java/:Mail</code>.
+				<br/>
+				Make sure that <code>JBOSS_HOME/server/xpetstore/deploy/mail-service.xml</code> look like this:
+<pre class="example">
+&lt;server>
+  &lt;classpath codebase="lib" 
+             archives="mail.jar, activation.jar, mail-plugin.jar"/>
+
+  &lt;mbean code="org.jboss.mail.MailService"
+         name="jboss:service=Mail">
+    &lt;attribute name="JNDIName"><b>Mail</b>&lt;/attribute>
+    &lt;attribute name="User"><i>your-user-name</i>&lt;/attribute>
+    &lt;attribute name="Password"><i>your-password</i>&lt;/attribute>
+    &lt;attribute name="Configuration">
+       &lt;configuration>
+          &lt;property name="mail.store.protocol" value="pop3"/>
+          &lt;property name="mail.transport.protocol" value="smtp"/>
+          &lt;property name="mail.user" value="<i>your-username</i>"/>
+          &lt;property name="mail.pop3.host" value="<i>your-pop3-host</i>"/>
+          &lt;property name="mail.smtp.host" value="<i>your-smtp-host</i>"/>
+          &lt;property name="mail.from" value="noreply at xpetstore.sourceforge.net"/>
+          &lt;property name="mail.debug" value="false"/>
+       &lt;/configuration>
+    &lt;/attribute>
+  &lt;/mbean>
+&lt;/server>
+</pre>
+			</li>
+		</ol>
+				
+	</p>
+	
+</section>
+
+</body>
+
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>Configuring Orion-2.x</title>
-  </properties>
-
-<body>
-
-<section name="Configuring Orion-2.x">
-
-	<p>
-		<ol>
-			<li>
-				<b><u> Set <code>ORION_HOME</code> </u></b>
-				<br/>
-				Make sure that the variable <code>ORION_HOME</code> is set to the Orion home directory
-			</li>
-			
-			<li>  
-				<b><u> Configure JMS </u></b>
-				<br/>
-				- Make sure in <code>ORION_HOME/config/server.xml</code> that JMS is enable. Uncomment the line
-				<code>&lt;jms-config path="./jms" /></code>. By default, JMS is not enable on Orion.
-				<br/>
- 				- Edit <code>ORION_HOME/config/jms.xml</code> to create:
-  				<ul>
-  					<li> A queue connection factory: <code>jms/QueueConnectionFactory</code></li>
-  					<li> The queues: <code>jms/queue/order</code> and <code>jms/queue/mail</code> </li>
-  				</ul>
-				<code>ORION_HOME/config/jms.xml</code> should look like:
-<pre class="example">
-&lt;jms-server ...>
-...
-	&lt;queue-connection-factory location="<b>jms/QueueConnectionFactory</b>"/>
-
-	&lt;queue name="Order Queue" location="<b>jms/queue/order</b>"/>
-	&lt;queue name="Mail Queue"  location="<b>jms/queue/mail</b>" />
-...
-&lt;/jms-server>
-</pre>				
-			</li>
-			
-
-			<li>
-				<b><u> Configure JDBC </u></b>
-				<br/>
-				- Copy the JDBC driver to <code>ORION_HOME/lib</code>
-				<br/>
-				- Edit <code>ORION_HOME/config/data-sources.xml</code> and create the datasource <code>jdbc/xpetstoreDS</code>.
-				<br/>
-				<code>ORION_HOME/config/data-sources.xml</code> should look like:
-<pre class="example">
-&lt;data-sources>
-...
-	&lt;data-source
-		class="com.evermind.sql.DriverManagerDataSource"
-		name="postgresql"
-		location="jdbc/MyPostgreSQLDS"
-		xa-location="jdbc/xa/MyMyPostgreSQLXADS"
-		ejb-location="<b>jdbc/xpetstoreDS</b>"
-		connection-driver="<i>your-jdbc-driver</i>"
-		username="<i>your-username</i>"
-		password="<i>your-password</i>"
-		url="<i>your-database-url</i>"
-		inactivity-timeout="30"
-	/>
-...
-&lt;/data-sources>
-</pre>				
-			</li>
-
-			<li>
-				<b><u> Configure JavaMail</u></b>
-				<br/>
-				Edit <code>ORION_HOME/config/server.xml</code> and create the Mail session <code>mail/MailSession</code>.
-				<br/>
-				<code>ORION_HOME/config/server.xml</code> should look like:
-<pre class="example">
-&lt;application-server ...>
-...
-	&lt;mail-session location="<b>mail/MailSession</b>" smtp-host="<i>your-smtp-host</i>">
-		&lt;property name="mail.from" value="noreply at xpetstore.sourceforge.net" />
-		&lt;property name="mail.transport.protocol" value="smtp" />
-		&lt;property name="mail.smtp.from" value="noreply at xpetstore.sourceforge.net" />
-	&lt;/mail-session>
-...
-&lt;/application-server>
-</pre>
-			</li>
-		
-			<li>
-				<b><u>Register the application</u></b>
-				<br/>
-				- Edit <code>ORION_HOME/config/server.xml</code> and register 
-				<code>xpetstore-ejb</code> and <code>xpetstore-servlet</code> applications
-				<br/>
-				<code>ORION_HOME/config/server.xml</code> should look like:
-<pre class="example">
-&lt;application-server ...>
-...
-	&lt;application name="xpetstore-ejb" 
-		path="<i>ORION_HOME</i>/applications/xpetstore-ejb.ear" 
-		auto-start="true" 
-	/>
-	
-	&lt;application name="xpetstore-servlet" 
-		path="<i>ORION_HOME</i>/applications/xpetstore-servlet.ear" 
-		auto-start="true" 
-	/>
-...
-&lt;/application-server>
-</pre>
-
-			- Edit <code>ORION_HOME/config/default-web-site.xml</code> to:
-			<ol>
-			 	<li> register <code>xpetstore-ejb</code> and <code>xpetstore-servlet</code> applications.</li>
-			 	<li> change the port from <code>80</code> to <code>8080</code> </li>
-			 </ol>
-				
-<pre class="example">
-&lt;web-site host="[ALL]" port="<b>8080</b>" display-name="Default Orion WebSite">
-   ...
-    &lt;web-app
-            application="xpetstore-ejb"
-            name="xpetstore-ejb"
-            root="/xpetstore-ejb"
-            load-on-startup="true"
-    />
-    &lt;web-app
-            application="xpetstore-ejb-test"
-            name="xpetstore-ejb-test"
-            root="/xpetstore-test"
-            load-on-startup="true"
-    />
-&lt;web-site>
-</pre>			
-			</li>
-			
-			<li>
-				<b><u>Enable the admin account</u></b>
-				<br/>
-				Enable the admin user used to deploy the application.
-				Edit <code>ORION_HOME/config/principals.xml</code> and turn the line
-				<br/>
-				<code>&lt;user name="admin" password="123" deactivated="true"></code>
-				<br/>
-				to
-				<br/>
-				<code>&lt;user name="admin" password="123" deactivated="<b>false</b>"></code>
-			</li>
-		</ol>	
-	</p>
-	
-</section>
-
-</body>
-
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_orion-2.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>Configuring Orion-2.x</title>
+  </properties>
+
+<body>
+
+<section name="Configuring Orion-2.x">
+
+	<p>
+		<ol>
+			<li>
+				<b><u> Set <code>ORION_HOME</code> </u></b>
+				<br/>
+				Make sure that the variable <code>ORION_HOME</code> is set to the Orion home directory
+			</li>
+			
+			<li>  
+				<b><u> Configure JMS </u></b>
+				<br/>
+				- Make sure in <code>ORION_HOME/config/server.xml</code> that JMS is enable. Uncomment the line
+				<code>&lt;jms-config path="./jms" /></code>. By default, JMS is not enable on Orion.
+				<br/>
+ 				- Edit <code>ORION_HOME/config/jms.xml</code> to create:
+  				<ul>
+  					<li> A queue connection factory: <code>jms/QueueConnectionFactory</code></li>
+  					<li> The queues: <code>jms/queue/order</code> and <code>jms/queue/mail</code> </li>
+  				</ul>
+				<code>ORION_HOME/config/jms.xml</code> should look like:
+<pre class="example">
+&lt;jms-server ...>
+...
+	&lt;queue-connection-factory location="<b>jms/QueueConnectionFactory</b>"/>
+
+	&lt;queue name="Order Queue" location="<b>jms/queue/order</b>"/>
+	&lt;queue name="Mail Queue"  location="<b>jms/queue/mail</b>" />
+...
+&lt;/jms-server>
+</pre>				
+			</li>
+			
+
+			<li>
+				<b><u> Configure JDBC </u></b>
+				<br/>
+				- Copy the JDBC driver to <code>ORION_HOME/lib</code>
+				<br/>
+				- Edit <code>ORION_HOME/config/data-sources.xml</code> and create the datasource <code>jdbc/xpetstoreDS</code>.
+				<br/>
+				<code>ORION_HOME/config/data-sources.xml</code> should look like:
+<pre class="example">
+&lt;data-sources>
+...
+	&lt;data-source
+		class="com.evermind.sql.DriverManagerDataSource"
+		name="postgresql"
+		location="jdbc/MyPostgreSQLDS"
+		xa-location="jdbc/xa/MyMyPostgreSQLXADS"
+		ejb-location="<b>jdbc/xpetstoreDS</b>"
+		connection-driver="<i>your-jdbc-driver</i>"
+		username="<i>your-username</i>"
+		password="<i>your-password</i>"
+		url="<i>your-database-url</i>"
+		inactivity-timeout="30"
+	/>
+...
+&lt;/data-sources>
+</pre>				
+			</li>
+
+			<li>
+				<b><u> Configure JavaMail</u></b>
+				<br/>
+				Edit <code>ORION_HOME/config/server.xml</code> and create the Mail session <code>mail/MailSession</code>.
+				<br/>
+				<code>ORION_HOME/config/server.xml</code> should look like:
+<pre class="example">
+&lt;application-server ...>
+...
+	&lt;mail-session location="<b>mail/MailSession</b>" smtp-host="<i>your-smtp-host</i>">
+		&lt;property name="mail.from" value="noreply at xpetstore.sourceforge.net" />
+		&lt;property name="mail.transport.protocol" value="smtp" />
+		&lt;property name="mail.smtp.from" value="noreply at xpetstore.sourceforge.net" />
+	&lt;/mail-session>
+...
+&lt;/application-server>
+</pre>
+			</li>
+		
+			<li>
+				<b><u>Register the application</u></b>
+				<br/>
+				- Edit <code>ORION_HOME/config/server.xml</code> and register 
+				<code>xpetstore-ejb</code> and <code>xpetstore-servlet</code> applications
+				<br/>
+				<code>ORION_HOME/config/server.xml</code> should look like:
+<pre class="example">
+&lt;application-server ...>
+...
+	&lt;application name="xpetstore-ejb" 
+		path="<i>ORION_HOME</i>/applications/xpetstore-ejb.ear" 
+		auto-start="true" 
+	/>
+	
+	&lt;application name="xpetstore-servlet" 
+		path="<i>ORION_HOME</i>/applications/xpetstore-servlet.ear" 
+		auto-start="true" 
+	/>
+...
+&lt;/application-server>
+</pre>
+
+			- Edit <code>ORION_HOME/config/default-web-site.xml</code> to:
+			<ol>
+			 	<li> register <code>xpetstore-ejb</code> and <code>xpetstore-servlet</code> applications.</li>
+			 	<li> change the port from <code>80</code> to <code>8080</code> </li>
+			 </ol>
+				
+<pre class="example">
+&lt;web-site host="[ALL]" port="<b>8080</b>" display-name="Default Orion WebSite">
+   ...
+    &lt;web-app
+            application="xpetstore-ejb"
+            name="xpetstore-ejb"
+            root="/xpetstore-ejb"
+            load-on-startup="true"
+    />
+    &lt;web-app
+            application="xpetstore-ejb-test"
+            name="xpetstore-ejb-test"
+            root="/xpetstore-test"
+            load-on-startup="true"
+    />
+&lt;web-site>
+</pre>			
+			</li>
+			
+			<li>
+				<b><u>Enable the admin account</u></b>
+				<br/>
+				Enable the admin user used to deploy the application.
+				Edit <code>ORION_HOME/config/principals.xml</code> and turn the line
+				<br/>
+				<code>&lt;user name="admin" password="123" deactivated="true"></code>
+				<br/>
+				to
+				<br/>
+				<code>&lt;user name="admin" password="123" deactivated="<b>false</b>"></code>
+			</li>
+		</ol>	
+	</p>
+	
+</section>
+
+</body>
+
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>Configuring Tomcat-4.x</title>
-  </properties>
-
-<body>
-
-<section name="Configuring Tomcat-4.x">
-
-	<p>
-		<b>IMPORTANT: This is for xpetstore-servlet ONLY</b>
-		<ol>
-			<li>
-				<b><u> Set <code>TOMCAT_HOME</code> </u></b>
-				<br/>
-				Make sure that the variable <code>TOMCAT_HOME</code> is set to the Tomcat home directory
-			</li>
-			
-			<li>  
-				<b><u> Configure Tomcat</u></b>
-				- Copy the JDBC driver to <code>TOMCAT_HOME/common/lib</code>
-				<br/>
-				- Edit <code>TOMCAT_HOME/conf/server.xml</code> and make sure that it looks like this:
-<pre class="example">
-
-&lt;Server port="8005" shutdown="SHUTDOWN" debug="0">
-  ...
-  &lt;Service name="Tomcat-Standalone">
-    ...
-    &lt;Engine name="Standalone" defaultHost="localhost" debug="0">
-
-      &lt;Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="catalina_log." suffix=".txt"
-              timestamp="true"/>
-
-      &lt;Realm className="org.apache.catalina.realm.UserDatabaseRealm" debug="0" resourceName="UserDatabase"/>
-
-      &lt;Host name="localhost" debug="0" appBase="webapps" unpackWARs="true" autoDeploy="true" liveDeploy="true">
-        ...
-        &lt;!-- xPetstore -->
-        &lt;Context path="/xpetstore-servlet" docBase="xpetstore-servlet" 
-              debug="0"   reloadable="true" crossContext="true">
-          &lt;!-- xPetsore Logger -->
-          &lt;Logger className="org.apache.catalina.logger.FileLogger" 
-             directory="logs"  
-             prefix="xpetstore-servlet_log." 
-             suffix=".txt" 
-             timestamp="true"
-          />
-
-          &lt;!-- xPetstore datasource -->
-          &lt;Resource name="jdbc/xpetstoreDS" auth="Container" type="javax.sql.DataSource"/>		 
-          &lt;ResourceParams name="jdbc/xpetstoreDS">
-            &lt;parameter> 
-              &lt;name>factory&lt;/name>
-              &lt;value>org.apache.commons.dbcp.BasicDataSourceFactory&lt;/value>
-            &lt;/parameter>            
-            &lt;parameter>
-              &lt;name>username&lt;/name>
-              &lt;value><i>your-db-user</i>&lt;/value>
-            &lt;/parameter>
-            &lt;parameter>
-              &lt;name>password&lt;/name>
-              &lt;value><i>your-db-password</i>&lt;/value>
-            &lt;/parameter>
-            &lt;parameter>
-              &lt;name>driverClassName&lt;/name>
-              &lt;value><i>your-db-driver</i>&lt;/value>
-            &lt;/parameter>
-            &lt;parameter>
-              &lt;name>url&lt;/name>
-              &lt;value><i>your-db-url</i>&lt;/value>
-            &lt;/parameter>
-          &lt;/ResourceParams>
-
-          &lt;!-- xPetstore mail session -->
-          &lt;Resource name="mail/xpetstore/MailSession" 
-              auth="Container" type="javax.mail.Session"/>
-          &lt;ResourceParams name="mail/xpetstore/MailSession">
-            &lt;parameter>
-              &lt;name>mail.smtp.host&lt;/name>
-              &lt;value><i>your-mail-host</i>&lt;/value>
-            &lt;/parameter>
-          &lt;/ResourceParams>
-        &lt;/Context>
-        ...
-      &lt;/Host>
-  &lt;/Engine>
-  &lt;/Service>
-&lt;/Server>
-</pre>
-			</li>
-		</ol>	
-	</p>
-	
-</section>
-
-</body>
-
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_tomcat-4.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>Configuring Tomcat-4.x</title>
+  </properties>
+
+<body>
+
+<section name="Configuring Tomcat-4.x">
+
+	<p>
+		<b>IMPORTANT: This is for xpetstore-servlet ONLY</b>
+		<ol>
+			<li>
+				<b><u> Set <code>TOMCAT_HOME</code> </u></b>
+				<br/>
+				Make sure that the variable <code>TOMCAT_HOME</code> is set to the Tomcat home directory
+			</li>
+			
+			<li>  
+				<b><u> Configure Tomcat</u></b>
+				- Copy the JDBC driver to <code>TOMCAT_HOME/common/lib</code>
+				<br/>
+				- Edit <code>TOMCAT_HOME/conf/server.xml</code> and make sure that it looks like this:
+<pre class="example">
+
+&lt;Server port="8005" shutdown="SHUTDOWN" debug="0">
+  ...
+  &lt;Service name="Tomcat-Standalone">
+    ...
+    &lt;Engine name="Standalone" defaultHost="localhost" debug="0">
+
+      &lt;Logger className="org.apache.catalina.logger.FileLogger"
+              prefix="catalina_log." suffix=".txt"
+              timestamp="true"/>
+
+      &lt;Realm className="org.apache.catalina.realm.UserDatabaseRealm" debug="0" resourceName="UserDatabase"/>
+
+      &lt;Host name="localhost" debug="0" appBase="webapps" unpackWARs="true" autoDeploy="true" liveDeploy="true">
+        ...
+        &lt;!-- xPetstore -->
+        &lt;Context path="/xpetstore-servlet" docBase="xpetstore-servlet" 
+              debug="0"   reloadable="true" crossContext="true">
+          &lt;!-- xPetsore Logger -->
+          &lt;Logger className="org.apache.catalina.logger.FileLogger" 
+             directory="logs"  
+             prefix="xpetstore-servlet_log." 
+             suffix=".txt" 
+             timestamp="true"
+          />
+
+          &lt;!-- xPetstore datasource -->
+          &lt;Resource name="jdbc/xpetstoreDS" auth="Container" type="javax.sql.DataSource"/>		 
+          &lt;ResourceParams name="jdbc/xpetstoreDS">
+            &lt;parameter> 
+              &lt;name>factory&lt;/name>
+              &lt;value>org.apache.commons.dbcp.BasicDataSourceFactory&lt;/value>
+            &lt;/parameter>            
+            &lt;parameter>
+              &lt;name>username&lt;/name>
+              &lt;value><i>your-db-user</i>&lt;/value>
+            &lt;/parameter>
+            &lt;parameter>
+              &lt;name>password&lt;/name>
+              &lt;value><i>your-db-password</i>&lt;/value>
+            &lt;/parameter>
+            &lt;parameter>
+              &lt;name>driverClassName&lt;/name>
+              &lt;value><i>your-db-driver</i>&lt;/value>
+            &lt;/parameter>
+            &lt;parameter>
+              &lt;name>url&lt;/name>
+              &lt;value><i>your-db-url</i>&lt;/value>
+            &lt;/parameter>
+          &lt;/ResourceParams>
+
+          &lt;!-- xPetstore mail session -->
+          &lt;Resource name="mail/xpetstore/MailSession" 
+              auth="Container" type="javax.mail.Session"/>
+          &lt;ResourceParams name="mail/xpetstore/MailSession">
+            &lt;parameter>
+              &lt;name>mail.smtp.host&lt;/name>
+              &lt;value><i>your-mail-host</i>&lt;/value>
+            &lt;/parameter>
+          &lt;/ResourceParams>
+        &lt;/Context>
+        ...
+      &lt;/Host>
+  &lt;/Engine>
+  &lt;/Service>
+&lt;/Server>
+</pre>
+			</li>
+		</ol>	
+	</p>
+	
+</section>
+
+</body>
+
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>Configuring WebLogic-7.x</title>
-  </properties>
-
-<body>
-
-<section name="Configuring WebLogic-7.x">
-
-	<p>
-		<ol>
-			<li>
-				<b><u> Set <code>WL_HOME</code> </u></b>
-				<ul>
-					<li> Make sure that the variable <code>WL_HOME</code> is set to the WenLogic home directory </li>
-				</ul>
-			</li>
-			
-			<li>  
-				<b><u>Create the WebLogic xpetstore domain</u></b>
-				<ul>
-					<li>
-			 			Create the xpetstore domain at <code>WL_HOME/../user_projects/xpetstore</code>
-			 		</li>
-			 	</ul>
-			</li>
-			
-			<li>  
-				<b><u> Configure JMS </u></b>
-				<ul>
-					<li> Create the following JMS ConnectionFactory: JNDI name = <code>jms/ConnectionFactory</code> </li>
-      				<li>
-      					Create the following JMS queues: 
-      					<ul>
-      						<li> JNDI name = <code>jms/queue/order</code> </li> 
-      						<li> JNDI name = <code>jms/queue/mail</code> </li>
-      					</ul>
-      				</li>
-				</ul>
-				The <code>config.xml</code> should contain the following lines:
-<pre class="example">
-&lt;JMSConnectionFactory 
-	JNDIName="<b>jms/ConnectionFactory</b>" 
-	Name="xpetstoreConnectionFactory" 
-	Targets="myserver"
-/>
-&lt;JMSFileStore 
-	Directory="/opt/bea/user_projects/xpetstore/persistence/jms/" 
-	Name="JMSFileStore"
-/>
-&lt;JMSServer Name="JMSServer" Store="JMSFileStore" Targets="myserver">
-    &lt;JMSQueue 
-        JNDIName="<b>jms/queue/mail</b>" 
-        Name="xpetstoreMail" 
-        RedeliveryLimit="10" 
-        StoreEnabled="true"
-    />
-    &lt;JMSQueue 
-        JNDIName="<b>jms/queue/order</b>" 
-        Name="xpetstoreOrder" 
-        RedeliveryLimit="10" 
-        StoreEnabled="false"
-    />
-&lt;/JMSServer>
-</pre>
-			</li>
-			
-			<li>
-				<b><u> Configure JDBC </u></b>
-				<ul>
-					<li>
-						 Create the datasource: JNDI name = <code>jdbc/xpetstore</code>
-					</li>
-				</ul>
-				The <code>config.xml</code> should contain the following lines:
-<pre class="example">
-&lt;JDBCConnectionPool 
-    DriverName="<i>com.sap.dbtech.jdbc.DriverSapDB</i>" 
-    Name="xpetstoreConnectionPool" 
-    Password="<i>{3DES}ZuRhxjydkEw=</i>" 
-    Properties="<i>user=test</i>" 
-    Targets="myserver" 
-    URL="<i>jdbc:sapdb://localhost/XPSTORE</i>"
-/>
-&lt;JDBCTxDataSource 
-    JNDIName="<b>jdbc/xpetstore</b>" 
-    Name="xpetstoreTXDataSource" 
-    PoolName="xpetstoreConnectionPool" 
-    Targets="myserver"
-/>
-</pre>
-			</li>
-			
-			<li>
-				<b><u> Configure JavaMail</u></b>
-				<ul>
-					<li>
-						 Create the MailSesion: JNDI name = <code>mail/MailSession</code>
-					</li>
-				</ul>
-				The <code>config.xml</code> should contain the following lines:
-<pre class="example">
-&lt;MailSession 
-    JNDIName="<b>mail/MailSession</b>" 
-    Name="xpetstoreMailSession" 
-    Properties="mail.from=noreply at xpetstore.sourceforge.net;\
-        mail.transport.protocol=smtp;mail.smtp.host=<i>your.smtp.host</i>;\
-        mail.store.protocol=pop3;mail.pop3.host=<i>your.pop.host</i>;mail.user=<i>your_user_name</i>" 
-    Targets="myserver"
-/>
-</pre>
-			</li>
-		</ol>
-				
-	</p>
-	
-</section>
-
-</body>
-
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/setup_weblogic-7.x.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>Configuring WebLogic-7.x</title>
+  </properties>
+
+<body>
+
+<section name="Configuring WebLogic-7.x">
+
+	<p>
+		<ol>
+			<li>
+				<b><u> Set <code>WL_HOME</code> </u></b>
+				<ul>
+					<li> Make sure that the variable <code>WL_HOME</code> is set to the WenLogic home directory </li>
+				</ul>
+			</li>
+			
+			<li>  
+				<b><u>Create the WebLogic xpetstore domain</u></b>
+				<ul>
+					<li>
+			 			Create the xpetstore domain at <code>WL_HOME/../user_projects/xpetstore</code>
+			 		</li>
+			 	</ul>
+			</li>
+			
+			<li>  
+				<b><u> Configure JMS </u></b>
+				<ul>
+					<li> Create the following JMS ConnectionFactory: JNDI name = <code>jms/ConnectionFactory</code> </li>
+      				<li>
+      					Create the following JMS queues: 
+      					<ul>
+      						<li> JNDI name = <code>jms/queue/order</code> </li> 
+      						<li> JNDI name = <code>jms/queue/mail</code> </li>
+      					</ul>
+      				</li>
+				</ul>
+				The <code>config.xml</code> should contain the following lines:
+<pre class="example">
+&lt;JMSConnectionFactory 
+	JNDIName="<b>jms/ConnectionFactory</b>" 
+	Name="xpetstoreConnectionFactory" 
+	Targets="myserver"
+/>
+&lt;JMSFileStore 
+	Directory="/opt/bea/user_projects/xpetstore/persistence/jms/" 
+	Name="JMSFileStore"
+/>
+&lt;JMSServer Name="JMSServer" Store="JMSFileStore" Targets="myserver">
+    &lt;JMSQueue 
+        JNDIName="<b>jms/queue/mail</b>" 
+        Name="xpetstoreMail" 
+        RedeliveryLimit="10" 
+        StoreEnabled="true"
+    />
+    &lt;JMSQueue 
+        JNDIName="<b>jms/queue/order</b>" 
+        Name="xpetstoreOrder" 
+        RedeliveryLimit="10" 
+        StoreEnabled="false"
+    />
+&lt;/JMSServer>
+</pre>
+			</li>
+			
+			<li>
+				<b><u> Configure JDBC </u></b>
+				<ul>
+					<li>
+						 Create the datasource: JNDI name = <code>jdbc/xpetstore</code>
+					</li>
+				</ul>
+				The <code>config.xml</code> should contain the following lines:
+<pre class="example">
+&lt;JDBCConnectionPool 
+    DriverName="<i>com.sap.dbtech.jdbc.DriverSapDB</i>" 
+    Name="xpetstoreConnectionPool" 
+    Password="<i>{3DES}ZuRhxjydkEw=</i>" 
+    Properties="<i>user=test</i>" 
+    Targets="myserver" 
+    URL="<i>jdbc:sapdb://localhost/XPSTORE</i>"
+/>
+&lt;JDBCTxDataSource 
+    JNDIName="<b>jdbc/xpetstore</b>" 
+    Name="xpetstoreTXDataSource" 
+    PoolName="xpetstoreConnectionPool" 
+    Targets="myserver"
+/>
+</pre>
+			</li>
+			
+			<li>
+				<b><u> Configure JavaMail</u></b>
+				<ul>
+					<li>
+						 Create the MailSesion: JNDI name = <code>mail/MailSession</code>
+					</li>
+				</ul>
+				The <code>config.xml</code> should contain the following lines:
+<pre class="example">
+&lt;MailSession 
+    JNDIName="<b>mail/MailSession</b>" 
+    Name="xpetstoreMailSession" 
+    Properties="mail.from=noreply at xpetstore.sourceforge.net;\
+        mail.transport.protocol=smtp;mail.smtp.host=<i>your.smtp.host</i>;\
+        mail.store.protocol=pop3;mail.pop3.host=<i>your.pop.host</i>;mail.user=<i>your_user_name</i>" 
+    Targets="myserver"
+/>
+</pre>
+			</li>
+		</ol>
+				
+	</p>
+	
+</section>
+
+</body>
+
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Source Code</title>
-  </properties>
-
-<body>
-
-<section name="xPetstore-EJB Source Code">
-	<p>
-    	You can browse the source code
-    	<a href="java2html/xpetstore-ejb/index.html">here</a>
-    </p>
-</section>
-
-<section name="xPetstore-Servlet Source Code">
-	<p>
-    	You can browse the source code
-    	<a href="java2html/xpetstore-servlet/index.html">here</a>
-    </p>
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/source_code.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Source Code</title>
+  </properties>
+
+<body>
+
+<section name="xPetstore-EJB Source Code">
+	<p>
+    	You can browse the source code
+    	<a href="java2html/xpetstore-ejb/index.html">here</a>
+    </p>
+</section>
+
+<section name="xPetstore-Servlet Source Code">
+	<p>
+    	You can browse the source code
+    	<a href="java2html/xpetstore-servlet/index.html">here</a>
+    </p>
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Specifications</title>
-  </properties>
-
-<body>
-
-<section name="Use Cases">
-	<p>
-		<img border="1" src="images/usecases.png" />
-	</p>
-	<p>
- 		When the customer enters into the xPetStore web site, he can:
- 		<ul>
- 			<li>Sign into the site</li>
- 			
- 			<li>Sign off from the site</li>
- 			
- 			<li>Browses the catalog</li>
- 			
- 			<li>Updates its shopping cart</li>
- 			
- 			<li>Places its order. Then he will receive an email notification</li>
- 			
- 			<li>Manages its account</li>
- 		</ul>
- 	</p>
-</section>
-
-<section name="Page Flow Navigation">
-	<p>
-		<img border="1" src="images/pageflow.png" />
-	</p>
-</section>
-
-<section name="Implementations">
-	<p>
-		xPetstore will provide 2 implementations:
-		
-		<p/>
-		<b><u>The EJB implementation</u></b>:
-		<br/>
-		The business layer is implemented with:
-		<ul>
-			<li> EntityBean and CMP 2.0 for business objects</li>
-			<li> a SessionBean to manages the application logic </li>
-			<li> MessageDriverBean for asynchronous processing (sending email, processing customer orders) </li>
-		</ul>
-		
-		The web layer is implemented using the Model-View-Controller design pattern:
-		<ul>
-			<li> 
-				The View implemeented with JSP and <a href="http://www.opensymphony.com/sitemesh">Sitemesh</a> 
-			</li>
-			<li>
-				The Model and Controller implemented with <a href="http://jakarta.apache.org/struts">Struts</a>.
-			</li>
-		</ul>
-		
-		<p/>
-		<b><u>The Servlet implementation</u></b>:
-		<br/>
-		The business layer is implemented with Plain JavaBean Object 
-		using <a href="http://hibernate.sourceforge.net">Hibernate</a> as persistence framework.
-		
-		<p/>
-		The web layers is implemented using the Model-View-Controller design pattern:
-		<ul>
-			<li>
-				The View implemeented with <a href="http://jakarta.apache.org/velocity">Velocity</a> and
-				<a href="http://www.opensymphony.com/sitemesh">Sitemesh</a>
-			</li>
-			<li>
-				The Model and Controller implemented with <a href="http://www.opensymphony.com/webwork">Webwork</a>.
-				All the business logic is implemented at this level.
-			</li>
-		</ul>		
-	</p>
-</section>
-
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/specifications.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Specifications</title>
+  </properties>
+
+<body>
+
+<section name="Use Cases">
+	<p>
+		<img border="1" src="images/usecases.png" />
+	</p>
+	<p>
+ 		When the customer enters into the xPetStore web site, he can:
+ 		<ul>
+ 			<li>Sign into the site</li>
+ 			
+ 			<li>Sign off from the site</li>
+ 			
+ 			<li>Browses the catalog</li>
+ 			
+ 			<li>Updates its shopping cart</li>
+ 			
+ 			<li>Places its order. Then he will receive an email notification</li>
+ 			
+ 			<li>Manages its account</li>
+ 		</ul>
+ 	</p>
+</section>
+
+<section name="Page Flow Navigation">
+	<p>
+		<img border="1" src="images/pageflow.png" />
+	</p>
+</section>
+
+<section name="Implementations">
+	<p>
+		xPetstore will provide 2 implementations:
+		
+		<p/>
+		<b><u>The EJB implementation</u></b>:
+		<br/>
+		The business layer is implemented with:
+		<ul>
+			<li> EntityBean and CMP 2.0 for business objects</li>
+			<li> a SessionBean to manages the application logic </li>
+			<li> MessageDriverBean for asynchronous processing (sending email, processing customer orders) </li>
+		</ul>
+		
+		The web layer is implemented using the Model-View-Controller design pattern:
+		<ul>
+			<li> 
+				The View implemeented with JSP and <a href="http://www.opensymphony.com/sitemesh">Sitemesh</a> 
+			</li>
+			<li>
+				The Model and Controller implemented with <a href="http://jakarta.apache.org/struts">Struts</a>.
+			</li>
+		</ul>
+		
+		<p/>
+		<b><u>The Servlet implementation</u></b>:
+		<br/>
+		The business layer is implemented with Plain JavaBean Object 
+		using <a href="http://hibernate.sourceforge.net">Hibernate</a> as persistence framework.
+		
+		<p/>
+		The web layers is implemented using the Model-View-Controller design pattern:
+		<ul>
+			<li>
+				The View implemeented with <a href="http://jakarta.apache.org/velocity">Velocity</a> and
+				<a href="http://www.opensymphony.com/sitemesh">Sitemesh</a>
+			</li>
+			<li>
+				The Model and Controller implemented with <a href="http://www.opensymphony.com/webwork">Webwork</a>.
+				All the business logic is implemented at this level.
+			</li>
+		</ul>		
+	</p>
+</section>
+
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Team</title>
-  </properties>
-
-<body>
-
-<section name="The Team">
-
-	<table border="0" cellspacing="1" width="100%">
-		<tr>
-			<th>Name</th>
-			<th>Role</th>
-		</tr>
-		<tr>
-			<td><a href="mailto:tchbansi at users.sourceforge.net">Herve Tchepannou</a></td>
-			<td>Project Leader</td>
-		</tr>
-		<tr>
-			<td><a href="mailto:mcsweenb at users.sourceforge.net">Brian McSweeney</a></td>
-			<td>Developer</td>
-		</tr>
-		<tr>
-			<td><a href="mailto:jcooley at users.sourceforge.net">James Cooley</a></td>
-			<td>Developer</td>
-		</tr>
-	</table>
-
-</section>
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/team.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Team</title>
+  </properties>
+
+<body>
+
+<section name="The Team">
+
+	<table border="0" cellspacing="1" width="100%">
+		<tr>
+			<th>Name</th>
+			<th>Role</th>
+		</tr>
+		<tr>
+			<td><a href="mailto:tchbansi at users.sourceforge.net">Herve Tchepannou</a></td>
+			<td>Project Leader</td>
+		</tr>
+		<tr>
+			<td><a href="mailto:mcsweenb at users.sourceforge.net">Brian McSweeney</a></td>
+			<td>Developer</td>
+		</tr>
+		<tr>
+			<td><a href="mailto:jcooley at users.sourceforge.net">James Cooley</a></td>
+			<td>Developer</td>
+		</tr>
+	</table>
+
+</section>
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore ToDo List</title>
-  </properties>
-
-<body>
-
-<section name="ToDo List">
-
-	<p>
-		<ol>
-			<li>
-				Support more J2EE 1.3 application servers like (Need help):
-				<ul>
-					<li> Sun Application Server </li>
-					<li> IBM WebSphere </li>
-					<li> JRun </li>
-					<li> JOnAs</li>
-				</ul>
-			</li>
-			
-			<li>
-				Run a performance test between all the xPetstore implementations on the different 
-				application servers
-			</li>
-			
-			<li> 
-				Integrate J2EE security at the Web and EJB layers.
-			</li>
-			
-			<li> 
-				Java Web Start UI for the administration module
-			</li>
-			
-			<li> 
-				Add web-services.<br/>
-				Everybody talks about it, it would be nice to have it.
-			</li>
-		</ol>
-	</p>
-	
-</section>
-
-</body>
-
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/todo.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore ToDo List</title>
+  </properties>
+
+<body>
+
+<section name="ToDo List">
+
+	<p>
+		<ol>
+			<li>
+				Support more J2EE 1.3 application servers like (Need help):
+				<ul>
+					<li> Sun Application Server </li>
+					<li> IBM WebSphere </li>
+					<li> JRun </li>
+					<li> JOnAs</li>
+				</ul>
+			</li>
+			
+			<li>
+				Run a performance test between all the xPetstore implementations on the different 
+				application servers
+			</li>
+			
+			<li> 
+				Integrate J2EE security at the Web and EJB layers.
+			</li>
+			
+			<li> 
+				Java Web Start UI for the administration module
+			</li>
+			
+			<li> 
+				Add web-services.<br/>
+				Everybody talks about it, it would be nice to have it.
+			</li>
+		</ol>
+	</p>
+	
+</section>
+
+</body>
+
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore EJB implementation</title>
-  </properties>
-
-<body>
-
-<section name="The Database">
-	<p>
-   	  	The database is composed of the following tables:
-   	  	<p/>
-		<table width="100%">
-			<tr>
-				<th>Name</th>
-				<th>Description</th>
-			</tr>
-			<tr>
-				<td>T_ACCOUNT</td>
-				<td>Login table for the customers</td>
-			</tr>
-			<tr>
-				<td>T_CUSTOMER</td>
-				<td>Customer' information</td>
-			</tr>
-			<tr>
-				<td>T_CATEGORY</td>
-				<td>The catalog categories (i.e. Fish, Dogs, Cats, etc.)</td>
-			</tr>
-			<tr>
-				<td>T_PRODUCT</td>
-				<td>
-					Catalog products. 
-					Each product may have one or more variants (Items). 
-					A typical variant is usually male or female
-				</td>
-			</tr>
-			<tr>
-				<td>T_ITEM</td>
-				<td>Individual product details</td>
-			</tr>
-			<tr>
-				<td>T_ORDER</td>
-				<td>Customers' orders</td>
-			</tr>
-			<tr>
-				<td>T_ORDER_ITEM</td>
-				<td>Items ordered by the Customers</td>
-			</tr>
-		</table>
-	</p>
-</section>
-
-
-<section name="The Domain">
-	<p>
-		The domain contains all the business objects of the application.
-		The business objects maintains and persists the state of the application into the database.
-		<p/>
-		<img border="1" src="images/ejb-domain.png" />
-	</p>
-</section> 
-
-
-<section name="The Services">
-	<p>
-		 The services manages the logic of the application.
-		 <p/>
-		<img border="1" src="images/ejb-services.png" />
-	</p>
-</section> 
-
-<section name="The Web">
-	<p>
-		<img border="1" src="images/ejb-web.png" />
-	</p>
-</section> 
-
-<section name="The Code Generation Patterns">
-	<p>
-		<b><u>EntityBean</u></b><br/>
-		Each EntityBean named <code>xpetstore.*.ejb.<i>name</i>EJB</code> 
-		will have the following classed generated:
-		
-		<p/>
-		<table border="0" cellspacing="2">
-			<tr>
-				<td>- <code>xpetstore.*.interfaces.<i>name</i>Local</code></td>
-				<td>The local business interface</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.interfaces.<i>name</i>LocalHome</code></td>
-				<td>The local home interface</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.util.<i>name</i>Value</code></td>
-				<td>The Value Object</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.util.<i>name</i>Util</code></td>
-				<td>Utility class for creating home objects</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.ejb.<i>name</i>CMP</code></td>
-				<td>The business implementation class</td>
-			</tr>
-		</table>
-		
-		<p/>
-		Each EntityBean will be also described in <code>META-INF/ejb-jar.xml</code>.
-	</p>
-	
-	<p>
-		<b><u>SessionBean</u></b><br/>
-		Each SessionBean named <code>xpetstore.*.ejb.<i>name</i>EJB</code> 
-		will have the following classed generated:
-		
-		<p/>
-		<table border="0" cellspacing="2">
-			<tr>
-				<td>- <code>xpetstore.*.interfaces.<i>name</i>Local</code></td>
-				<td>The local business interface</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.interfaces.<i>name</i>LocalHome</code></td>
-				<td>The local home interface</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.interfaces.<i>name</i>Remote</code></td>
-				<td>The remote business interface</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.interfaces.<i>name</i>RemoteHome</code></td>
-				<td>The remote home interface</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.util.<i>name</i>Util</code></td>
-				<td>Utility class for creating home objects</td>
-			</tr>
-			<tr>
-				<td>- <code>xpetstore.*.ejb.<i>name</i>Session</code></td>
-				<td>The business implementation class</td>
-			</tr>
-		</table>
-		
-		<p/>
-		Each SessionBean will be also described in <code>META-INF/ejb-jar.xml</code>.
-	</p>
-
-	<p>
-		<b><u>MessageDrivenBean</u></b><br/>
-		Each SessionBean will be described in <code>META-INF/ejb-jar.xml</code>.
-	</p>
-	
-	<p>
-		<b><u>Struts</u></b><br/>
-		All Struts classes named <code>xpetstore.web.struts.action.*</code>
-		will be described in <code>WEB-INF/struts-config.xml</code>.
-	</p>
-	
-	<p>
-		<b><u>JSP Taglibs</u></b><br/>
-		All classes named <code>xpetstore.web.taglib.*</code> 
-		will be described in <code>WEB-INF/xpetstore.tld</code>.
-	</p>
-	
-	<p>
-		<b><u>Web Filters</u></b><br/>
-		All classes named <code>xpetstore.web.filter.*</code> 
-		will be described in <code>WEB-INF/web.xml</code>.
-	</p>
-	
-	<p>
-		<b><u>Application Server Deployment Desciptors</u></b><br/>
-		Application server specific deployment descriptors will also be generated:
-		<ul>
-			<li> JBoss: jboss.xml, jbosscmp-jdbc.xml, jboss-web.xml </li>
-			<li> WebLogic: weblogic-ejb-jar.xml, weblogic-cmp-rdbms-jar.xml, weblogic.xml </li>
-		</ul>
-	</p>	
-	
-</section> 
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_ejb.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore EJB implementation</title>
+  </properties>
+
+<body>
+
+<section name="The Database">
+	<p>
+   	  	The database is composed of the following tables:
+   	  	<p/>
+		<table width="100%">
+			<tr>
+				<th>Name</th>
+				<th>Description</th>
+			</tr>
+			<tr>
+				<td>T_ACCOUNT</td>
+				<td>Login table for the customers</td>
+			</tr>
+			<tr>
+				<td>T_CUSTOMER</td>
+				<td>Customer' information</td>
+			</tr>
+			<tr>
+				<td>T_CATEGORY</td>
+				<td>The catalog categories (i.e. Fish, Dogs, Cats, etc.)</td>
+			</tr>
+			<tr>
+				<td>T_PRODUCT</td>
+				<td>
+					Catalog products. 
+					Each product may have one or more variants (Items). 
+					A typical variant is usually male or female
+				</td>
+			</tr>
+			<tr>
+				<td>T_ITEM</td>
+				<td>Individual product details</td>
+			</tr>
+			<tr>
+				<td>T_ORDER</td>
+				<td>Customers' orders</td>
+			</tr>
+			<tr>
+				<td>T_ORDER_ITEM</td>
+				<td>Items ordered by the Customers</td>
+			</tr>
+		</table>
+	</p>
+</section>
+
+
+<section name="The Domain">
+	<p>
+		The domain contains all the business objects of the application.
+		The business objects maintains and persists the state of the application into the database.
+		<p/>
+		<img border="1" src="images/ejb-domain.png" />
+	</p>
+</section> 
+
+
+<section name="The Services">
+	<p>
+		 The services manages the logic of the application.
+		 <p/>
+		<img border="1" src="images/ejb-services.png" />
+	</p>
+</section> 
+
+<section name="The Web">
+	<p>
+		<img border="1" src="images/ejb-web.png" />
+	</p>
+</section> 
+
+<section name="The Code Generation Patterns">
+	<p>
+		<b><u>EntityBean</u></b><br/>
+		Each EntityBean named <code>xpetstore.*.ejb.<i>name</i>EJB</code> 
+		will have the following classed generated:
+		
+		<p/>
+		<table border="0" cellspacing="2">
+			<tr>
+				<td>- <code>xpetstore.*.interfaces.<i>name</i>Local</code></td>
+				<td>The local business interface</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.interfaces.<i>name</i>LocalHome</code></td>
+				<td>The local home interface</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.util.<i>name</i>Value</code></td>
+				<td>The Value Object</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.util.<i>name</i>Util</code></td>
+				<td>Utility class for creating home objects</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.ejb.<i>name</i>CMP</code></td>
+				<td>The business implementation class</td>
+			</tr>
+		</table>
+		
+		<p/>
+		Each EntityBean will be also described in <code>META-INF/ejb-jar.xml</code>.
+	</p>
+	
+	<p>
+		<b><u>SessionBean</u></b><br/>
+		Each SessionBean named <code>xpetstore.*.ejb.<i>name</i>EJB</code> 
+		will have the following classed generated:
+		
+		<p/>
+		<table border="0" cellspacing="2">
+			<tr>
+				<td>- <code>xpetstore.*.interfaces.<i>name</i>Local</code></td>
+				<td>The local business interface</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.interfaces.<i>name</i>LocalHome</code></td>
+				<td>The local home interface</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.interfaces.<i>name</i>Remote</code></td>
+				<td>The remote business interface</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.interfaces.<i>name</i>RemoteHome</code></td>
+				<td>The remote home interface</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.util.<i>name</i>Util</code></td>
+				<td>Utility class for creating home objects</td>
+			</tr>
+			<tr>
+				<td>- <code>xpetstore.*.ejb.<i>name</i>Session</code></td>
+				<td>The business implementation class</td>
+			</tr>
+		</table>
+		
+		<p/>
+		Each SessionBean will be also described in <code>META-INF/ejb-jar.xml</code>.
+	</p>
+
+	<p>
+		<b><u>MessageDrivenBean</u></b><br/>
+		Each SessionBean will be described in <code>META-INF/ejb-jar.xml</code>.
+	</p>
+	
+	<p>
+		<b><u>Struts</u></b><br/>
+		All Struts classes named <code>xpetstore.web.struts.action.*</code>
+		will be described in <code>WEB-INF/struts-config.xml</code>.
+	</p>
+	
+	<p>
+		<b><u>JSP Taglibs</u></b><br/>
+		All classes named <code>xpetstore.web.taglib.*</code> 
+		will be described in <code>WEB-INF/xpetstore.tld</code>.
+	</p>
+	
+	<p>
+		<b><u>Web Filters</u></b><br/>
+		All classes named <code>xpetstore.web.filter.*</code> 
+		will be described in <code>WEB-INF/web.xml</code>.
+	</p>
+	
+	<p>
+		<b><u>Application Server Deployment Desciptors</u></b><br/>
+		Application server specific deployment descriptors will also be generated:
+		<ul>
+			<li> JBoss: jboss.xml, jbosscmp-jdbc.xml, jboss-web.xml </li>
+			<li> WebLogic: weblogic-ejb-jar.xml, weblogic-cmp-rdbms-jar.xml, weblogic.xml </li>
+		</ul>
+	</p>	
+	
+</section> 
+
+</body>
+</document>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<document>
-
-  <properties>
-    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
-    <title>xPetstore Servlet implementation</title>
-  </properties>
-
-<body>
-
-<section name="The Database">
-	<p>
-   	  	The database is composed of the following tables:
-   	  	<p/>
-		<table width="100%">
-			<tr>
-				<th>Name</th>
-				<th>Description</th>
-			</tr>
-			<tr>
-				<td>T_ACCOUNT</td>
-				<td>Login table for the customers</td>
-			</tr>
-			<tr>
-				<td>T_CUSTOMER</td>
-				<td>Customer' information</td>
-			</tr>
-			<tr>
-				<td>T_CATEGORY</td>
-				<td>The catalog categories (i.e. Fish, Dogs, Cats, etc.)</td>
-			</tr>
-			<tr>
-				<td>T_PRODUCT</td>
-				<td>
-					Catalog products. 
-					Each product may have one or more variants (Items). 
-					A typical variant is usually male or female
-				</td>
-			</tr>
-			<tr>
-				<td>T_ITEM</td>
-				<td>Individual product details</td>
-			</tr>
-			<tr>
-				<td>T_ORDER</td>
-				<td>Customers' orders</td>
-			</tr>
-			<tr>
-				<td>T_ORDER_ITEM</td>
-				<td>Items ordered by the Customers</td>
-			</tr>
-		</table>
-	</p>
-</section>
-
-
-<section name="The Domain">
-	<p>
-		The domain contains all the business objects of the application.
-		The business objects maintains and persists the state of the application into the database.
-		<p/>
-		<img border="1" src="images/servlet-domain.png" />
-	</p>
-</section> 
-
-
-<section name="The Web">
-	<p>
-		<img border="1" src="images/servlet-web.png" />
-	</p>
-</section> 
-
-<section name="The Code Generation Patterns">
-	<p>
-		<b><u>Business Object</u></b><br/>
-		Each business object named <code>xpetstore.domain.*<i>name</i></code> 
-		will have an Hibernate mapping file generate with the name
-		<code>xpetstore.domain.*<i>name</i>.hbm.xml</code>
-	</p>
-	
-	<p>
-		<b><u>WebWork</u></b><br/>
-		All Webwork classes named <code>xpetstore.web.webwork.action.*</code>
-		will be described in <code>WEB-INF/struts-config.xml</code>.
-	</p>
-	
-	<p>
-		<b><u>Web Servlet</u></b><br/>
-		All classes named <code>xpetstore.web.servlet.*</code> 
-		will be described in <code>WEB-INF/web.xml</code>.
-	</p>
-	
-	<p>
-		<b><u>Web Filters</u></b><br/>
-		All classes named <code>xpetstore.web.filter.*</code> 
-		will be described in <code>WEB-INF/web.xml</code>.
-	</p>
-	
-	<p>
-		<b><u>Application Server Deployment Desciptors</u></b><br/>
-		Application server specific deployment descriptors will also be generated:
-		<ul>
-			<li> JBoss: jboss-web.xml </li>
-			<li> WebLogic: weblogic.xml </li>
-		</ul>
-	</p>	
-	
-</section> 
-
-</body>
-</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xdocs/xml/xpetstore_servlet.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="tchbansi at users.sourceforge.net">Herve Tchepannou</author>
+    <title>xPetstore Servlet implementation</title>
+  </properties>
+
+<body>
+
+<section name="The Database">
+	<p>
+   	  	The database is composed of the following tables:
+   	  	<p/>
+		<table width="100%">
+			<tr>
+				<th>Name</th>
+				<th>Description</th>
+			</tr>
+			<tr>
+				<td>T_ACCOUNT</td>
+				<td>Login table for the customers</td>
+			</tr>
+			<tr>
+				<td>T_CUSTOMER</td>
+				<td>Customer' information</td>
+			</tr>
+			<tr>
+				<td>T_CATEGORY</td>
+				<td>The catalog categories (i.e. Fish, Dogs, Cats, etc.)</td>
+			</tr>
+			<tr>
+				<td>T_PRODUCT</td>
+				<td>
+					Catalog products. 
+					Each product may have one or more variants (Items). 
+					A typical variant is usually male or female
+				</td>
+			</tr>
+			<tr>
+				<td>T_ITEM</td>
+				<td>Individual product details</td>
+			</tr>
+			<tr>
+				<td>T_ORDER</td>
+				<td>Customers' orders</td>
+			</tr>
+			<tr>
+				<td>T_ORDER_ITEM</td>
+				<td>Items ordered by the Customers</td>
+			</tr>
+		</table>
+	</p>
+</section>
+
+
+<section name="The Domain">
+	<p>
+		The domain contains all the business objects of the application.
+		The business objects maintains and persists the state of the application into the database.
+		<p/>
+		<img border="1" src="images/servlet-domain.png" />
+	</p>
+</section> 
+
+
+<section name="The Web">
+	<p>
+		<img border="1" src="images/servlet-web.png" />
+	</p>
+</section> 
+
+<section name="The Code Generation Patterns">
+	<p>
+		<b><u>Business Object</u></b><br/>
+		Each business object named <code>xpetstore.domain.*<i>name</i></code> 
+		will have an Hibernate mapping file generate with the name
+		<code>xpetstore.domain.*<i>name</i>.hbm.xml</code>
+	</p>
+	
+	<p>
+		<b><u>WebWork</u></b><br/>
+		All Webwork classes named <code>xpetstore.web.webwork.action.*</code>
+		will be described in <code>WEB-INF/struts-config.xml</code>.
+	</p>
+	
+	<p>
+		<b><u>Web Servlet</u></b><br/>
+		All classes named <code>xpetstore.web.servlet.*</code> 
+		will be described in <code>WEB-INF/web.xml</code>.
+	</p>
+	
+	<p>
+		<b><u>Web Filters</u></b><br/>
+		All classes named <code>xpetstore.web.filter.*</code> 
+		will be described in <code>WEB-INF/web.xml</code>.
+	</p>
+	
+	<p>
+		<b><u>Application Server Deployment Desciptors</u></b><br/>
+		Application server specific deployment descriptors will also be generated:
+		<ul>
+			<li> JBoss: jboss-web.xml </li>
+			<li> WebLogic: weblogic.xml </li>
+		</ul>
+	</p>	
+	
+</section> 
+
+</body>
+</document>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="java"/>
-    <classpathentry kind="src" path="resources"/>
-    <classpathentry kind="src" path="test"/>
-    <classpathentry kind="src" path="build/java"/>
-    <classpathentry kind="src" path="web"/>
-    <classpathentry kind="src" path="sql"/>
-    <classpathentry
-        excluding="java/|resources/|test/|build/java/|web/|sql/"
-        kind="src" path=""/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/ant/junit/junit.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/activation.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/j2ee.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/mail.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/servlet.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.struts/struts.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-logging.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-digester.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.junitee/junitee.jar"/>
-    <classpathentry kind="output" path="build/classes"/>
-</classpath>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" path="java"/>
+    <classpathentry kind="src" path="resources"/>
+    <classpathentry kind="src" path="test"/>
+    <classpathentry kind="src" path="build/java"/>
+    <classpathentry kind="src" path="web"/>
+    <classpathentry kind="src" path="sql"/>
+    <classpathentry
+        excluding="java/|resources/|test/|build/java/|web/|sql/"
+        kind="src" path=""/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/ant/junit/junit.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/activation.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/j2ee.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/mail.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/servlet.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.struts/struts.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-logging.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-digester.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.junitee/junitee.jar"/>
+    <classpathentry kind="output" path="build/classes"/>
+</classpath>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>xpetstore-struts</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>xpetstore-struts</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-<project name="xpetstore-ejb-database" default="all" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- database config -->
-		<property file="${conf.dir}/db/database.properties" />
-		<echo>Database=${database}</echo>	
-		<property file="${conf.dir}/db/${database}.properties" /> 	
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Data                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="data" depends="init">
-        <echo message="url=${db.url}"/>
-        <sql 
-        	src="${sql.dir}/data.sql"
-            driver="${db.driver}" 
-            url="${db.url}"
-            userid="${db.user}" 
-            password="${db.password}"
-            classpath="${db.classpath}"
-        />
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-database.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+<project name="xpetstore-ejb-database" default="all" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- database config -->
+		<property file="${conf.dir}/db/database.properties" />
+		<echo>Database=${database}</echo>	
+		<property file="${conf.dir}/db/${database}.properties" /> 	
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Data                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="data" depends="init">
+        <echo message="url=${db.url}"/>
+        <sql 
+        	src="${sql.dir}/data.sql"
+            driver="${db.driver}" 
+            url="${db.url}"
+            userid="${db.user}" 
+            password="${db.password}"
+            classpath="${db.classpath}"
+        />
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,207 +0,0 @@
-<project name="xpetstore-ejb-jboss" default="all" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<property file="${conf.dir}/as/jboss.properties" />		
-       	
-   		<!-- Paths -->
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-        </path>
-        
-		<!-- JBoss type mappings -->
-        <condition property="jboss.typemapping" value="${jboss.typemapping.hsqldb}">
-   	    	<equals arg1="${database}" arg2="hsqldb" />
-       	</condition>
-       	
-        <condition property="jboss.typemapping" value="${jboss.typemapping.pointbase}">
-   	    	<equals arg1="${database}" arg2="pointbase" />
-       	</condition>
-       	
-        <condition property="jboss.typemapping" value="${jboss.typemapping.postgres}">
-   	    	<equals arg1="${database}" arg2="postgres" />
-       	</condition>
-       	
-        <condition property="jboss.typemapping" value="${jboss.typemapping.postgres72}">
-   	    	<equals arg1="${database}" arg2="postgres72" />
-       	</condition>
-       	
-        <condition property="jboss.typemapping" value="${jboss.typemapping.mssql}">
-   	    	<equals arg1="${database}" arg2="mssql" />
-       	</condition>  
-       	          
-        <condition property="jboss.typemapping" value="${jboss.typemapping.mssql2000}">
-   	    	<equals arg1="${database}" arg2="mssql2000" />
-       	</condition>   
-       	         
-        <condition property="jboss.typemapping" value="${jboss.typemapping.sapdb}">
-   	    	<equals arg1="${database}" arg2="sapdb" />
-       	</condition>    
-       		        
-        <condition property="jboss.typemapping" value="${jboss.typemapping.mysql}">
-   	    	<equals arg1="${database}" arg2="mysql" />
-       	</condition>    
-       		       
-        <condition property="jboss.typemapping" value="${jboss.typemapping.oracle7}">
-   	    	<equals arg1="${database}" arg2="oracle7" />
-       	</condition> 
-       		       
-        <condition property="jboss.typemapping" value="${jboss.typemapping.oracle8}">
-   	    	<equals arg1="${database}" arg2="oracle8" />
-       	</condition> 
-       		       
-        <condition property="jboss.typemapping" value="${jboss.typemapping.oracle9i}">
-   	    	<equals arg1="${database}" arg2="oracle9i" />
-       	</condition>         
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet" depends="init">
-		<antcall target="xdoclet.ejb" />
-		<antcall target="xdoclet.web" />
-	</target>
-	
-	<target name="xdoclet.ejb" depends="init">
-       	<taskdef 
-       		name="ejbdoclet" 
-       		classname="xdoclet.modules.ejb.EjbDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>
-	
-        <ejbdoclet destdir="${build.java.dir}">
-            <fileset dir="${java.dir}" includes="**/*EJB.java" />
-            <fileset dir="${java.dir}" includes="**/*MDB.java" />
-
-            <jboss 
-            	destdir="${build.dir}/META-INF"
-                version="${jboss.version}" 
-                typemapping="${jboss.typemapping}" 
-                datasource="${jboss.datasource}"
-                xmlencoding="UTF-8"
-            />
-        </ejbdoclet>
-	</target>
-
-	<target name="xdoclet.web" depends="init">
-      	<taskdef 
-       		name="webdoclet" 
-       		classname="xdoclet.modules.web.WebDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-      	<webdoclet 
-       		destdir="${build.dir}/WEB-INF" 
-       		mergedir="${xdoclet.merge.dir}/web"
-       	>
-       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
-       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
-       		
-       		<jbosswebxml />
-       	</webdoclet>  		
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Test                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="test" depends="init">
-		<taskdef 
-			name="runservertests"
-			classname="org.apache.cactus.ant.RunServerTestsTask"
-		>
-			<classpath>
-				<fileset dir="${lib.cactus.dir}"	includes="**/*.jar" />
-			</classpath>   
-		</taskdef>
-		
-		<runservertests
-    		testURL="http://localhost:${jboss.http.port}/xpetstore-test/TestServlet"
-    		stopTarget="undeploy"
-    		startTarget="deploy"
-    		testTarget="test.run"
-    	/>
-	</target>
-	
-	
-	<target name="test.run" depends="init">
-		<taskdef
-    		name="junitee" 
-    		classname="org.junitee.anttask.JUnitEETask"
-    	>
-			<classpath>
-				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
-			</classpath>
-    	</taskdef>
-    	
-    	<ant antfile="build-database.xml" target="data" />
-    	
-  		<junitee 
-  			url="http://localhost:${jboss.http.port}/xpetstore-test/TestServlet" 
-  			haltonfailure="false"
-  			printsummary="true"
-  		>
-    		<test runall="true" todir="${build.junit.dir}">
-    			<formatter type="xml" />
-    		</test>
-  		</junitee>  		
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-        <copy todir="${jboss.deploy.dir}">
-            <fileset dir="${dist.dir}" includes="${ear.name}" />
-        </copy>
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy" depends="init">
-        <delete>
-            <fileset dir="${jboss.deploy.dir}" includes="${ear.name}" />
-        </delete>
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,207 @@
+<project name="xpetstore-ejb-jboss" default="all" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<property file="${conf.dir}/as/jboss.properties" />		
+       	
+   		<!-- Paths -->
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+        </path>
+        
+		<!-- JBoss type mappings -->
+        <condition property="jboss.typemapping" value="${jboss.typemapping.hsqldb}">
+   	    	<equals arg1="${database}" arg2="hsqldb" />
+       	</condition>
+       	
+        <condition property="jboss.typemapping" value="${jboss.typemapping.pointbase}">
+   	    	<equals arg1="${database}" arg2="pointbase" />
+       	</condition>
+       	
+        <condition property="jboss.typemapping" value="${jboss.typemapping.postgres}">
+   	    	<equals arg1="${database}" arg2="postgres" />
+       	</condition>
+       	
+        <condition property="jboss.typemapping" value="${jboss.typemapping.postgres72}">
+   	    	<equals arg1="${database}" arg2="postgres72" />
+       	</condition>
+       	
+        <condition property="jboss.typemapping" value="${jboss.typemapping.mssql}">
+   	    	<equals arg1="${database}" arg2="mssql" />
+       	</condition>  
+       	          
+        <condition property="jboss.typemapping" value="${jboss.typemapping.mssql2000}">
+   	    	<equals arg1="${database}" arg2="mssql2000" />
+       	</condition>   
+       	         
+        <condition property="jboss.typemapping" value="${jboss.typemapping.sapdb}">
+   	    	<equals arg1="${database}" arg2="sapdb" />
+       	</condition>    
+       		        
+        <condition property="jboss.typemapping" value="${jboss.typemapping.mysql}">
+   	    	<equals arg1="${database}" arg2="mysql" />
+       	</condition>    
+       		       
+        <condition property="jboss.typemapping" value="${jboss.typemapping.oracle7}">
+   	    	<equals arg1="${database}" arg2="oracle7" />
+       	</condition> 
+       		       
+        <condition property="jboss.typemapping" value="${jboss.typemapping.oracle8}">
+   	    	<equals arg1="${database}" arg2="oracle8" />
+       	</condition> 
+       		       
+        <condition property="jboss.typemapping" value="${jboss.typemapping.oracle9i}">
+   	    	<equals arg1="${database}" arg2="oracle9i" />
+       	</condition>         
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet" depends="init">
+		<antcall target="xdoclet.ejb" />
+		<antcall target="xdoclet.web" />
+	</target>
+	
+	<target name="xdoclet.ejb" depends="init">
+       	<taskdef 
+       		name="ejbdoclet" 
+       		classname="xdoclet.modules.ejb.EjbDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>
+	
+        <ejbdoclet destdir="${build.java.dir}">
+            <fileset dir="${java.dir}" includes="**/*EJB.java" />
+            <fileset dir="${java.dir}" includes="**/*MDB.java" />
+
+            <jboss 
+            	destdir="${build.dir}/META-INF"
+                version="${jboss.version}" 
+                typemapping="${jboss.typemapping}" 
+                datasource="${jboss.datasource}"
+                xmlencoding="UTF-8"
+            />
+        </ejbdoclet>
+	</target>
+
+	<target name="xdoclet.web" depends="init">
+      	<taskdef 
+       		name="webdoclet" 
+       		classname="xdoclet.modules.web.WebDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+      	<webdoclet 
+       		destdir="${build.dir}/WEB-INF" 
+       		mergedir="${xdoclet.merge.dir}/web"
+       	>
+       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
+       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
+       		
+       		<jbosswebxml />
+       	</webdoclet>  		
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Test                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="test" depends="init">
+		<taskdef 
+			name="runservertests"
+			classname="org.apache.cactus.ant.RunServerTestsTask"
+		>
+			<classpath>
+				<fileset dir="${lib.cactus.dir}"	includes="**/*.jar" />
+			</classpath>   
+		</taskdef>
+		
+		<runservertests
+    		testURL="http://localhost:${jboss.http.port}/xpetstore-test/TestServlet"
+    		stopTarget="undeploy"
+    		startTarget="deploy"
+    		testTarget="test.run"
+    	/>
+	</target>
+	
+	
+	<target name="test.run" depends="init">
+		<taskdef
+    		name="junitee" 
+    		classname="org.junitee.anttask.JUnitEETask"
+    	>
+			<classpath>
+				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
+			</classpath>
+    	</taskdef>
+    	
+    	<ant antfile="build-database.xml" target="data" />
+    	
+  		<junitee 
+  			url="http://localhost:${jboss.http.port}/xpetstore-test/TestServlet" 
+  			haltonfailure="false"
+  			printsummary="true"
+  		>
+    		<test runall="true" todir="${build.junit.dir}">
+    			<formatter type="xml" />
+    		</test>
+  		</junitee>  		
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+        <copy todir="${jboss.deploy.dir}">
+            <fileset dir="${dist.dir}" includes="${ear.name}" />
+        </copy>
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy" depends="init">
+        <delete>
+            <fileset dir="${jboss.deploy.dir}" includes="${ear.name}" />
+        </delete>
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,164 +0,0 @@
-<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<property file="${conf.dir}/as/orion.properties" />		
-       	
-   		<!-- Paths -->
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-        </path>
-        
-        <path id="orion.class.path">
-			<pathelement location="${orion.home.dir}/orion.jar" />
-            <pathelement location="${orion.home.dir}/ejb.jar" />
-            <pathelement location="${orion.home.dir}/jndi.jar" />
-        </path>
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet" depends="init">
-		<antcall target="xdoclet.ejb" />
-	</target>
-	
-	<target name="xdoclet.ejb" depends="init">
-       	<taskdef 
-       		name="ejbdoclet" 
-       		classname="xdoclet.modules.ejb.EjbDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>
-	
-        <ejbdoclet destdir="${build.java.dir}">
-            <fileset dir="${java.dir}" includes="**/*EJB.java" />
-            <fileset dir="${java.dir}" includes="**/*MDB.java" />
-
-            <orion 
-            	destdir="${build.dir}/META-INF"
-            	 deploymentVersion="${orion.version}"
-            />
-        </ejbdoclet>
-	</target>	
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Test                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="test" depends="init">
-		<taskdef 
-			name="runservertests"
-			classname="org.apache.cactus.ant.RunServerTestsTask"
-		>
-			<classpath>
-				<fileset dir="${lib.cactus.dir}"	includes="**/*.jar" />
-			</classpath>   
-		</taskdef>
-		
-		<runservertests
-    		testURL="http://localhost:${orion.http.port}/xpetstore-test/TestServlet"
-    		stopTarget="undeploy"
-    		startTarget="deploy"
-    		testTarget="test.run"
-    	/>
-	</target>
-	
-	
-	<target name="test.run" depends="init">
-		<taskdef
-    		name="junitee" 
-    		classname="org.junitee.anttask.JUnitEETask"
-    	>
-			<classpath>
-				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
-			</classpath>
-    	</taskdef>
-    	
-    	<ant antfile="build-database.xml" target="data" />
-    	
-  		<junitee 
-  			url="http://localhost:${orion.http.port}/xpetstore-test/TestServlet" 
-  			haltonfailure="false"
-  			printsummary="true"
-  		>
-    		<test runall="true" todir="${build.junit.dir}">
-    			<formatter type="xml" />
-    		</test>
-  		</junitee>  		
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-		<java 
-			classname="com.evermind.client.orion.OrionConsoleAdmin" 
-			fork="yes"
-			classpathref="orion.class.path"
-		>
-			<arg value="${orion.deploy.ormi}" />
-            <arg value="${orion.user.name}" />
-            <arg value="${orion.user.password}" />
-            <arg value="-deploy" />
-            <arg value="-file" />
-            <arg value="${dist.dir}/${ear.name}" />
-            <arg value="-deploymentName" />
-            <arg value="${app.name}" />
-		</java>	
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy" depends="init">
-		<java 
-			classname="com.evermind.client.orion.OrionConsoleAdmin" 
-			fork="yes"
-			classpathref="orion.class.path"
-		>
-			<arg value="${orion.deploy.ormi}" />
-            <arg value="${orion.user.name}" />
-            <arg value="${orion.user.password}" />
-            <arg value="-undeploy" />
-            <arg value="${app.name}" />
-		</java>	
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-orion.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,164 @@
+<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<property file="${conf.dir}/as/orion.properties" />		
+       	
+   		<!-- Paths -->
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+        </path>
+        
+        <path id="orion.class.path">
+			<pathelement location="${orion.home.dir}/orion.jar" />
+            <pathelement location="${orion.home.dir}/ejb.jar" />
+            <pathelement location="${orion.home.dir}/jndi.jar" />
+        </path>
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet" depends="init">
+		<antcall target="xdoclet.ejb" />
+	</target>
+	
+	<target name="xdoclet.ejb" depends="init">
+       	<taskdef 
+       		name="ejbdoclet" 
+       		classname="xdoclet.modules.ejb.EjbDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>
+	
+        <ejbdoclet destdir="${build.java.dir}">
+            <fileset dir="${java.dir}" includes="**/*EJB.java" />
+            <fileset dir="${java.dir}" includes="**/*MDB.java" />
+
+            <orion 
+            	destdir="${build.dir}/META-INF"
+            	 deploymentVersion="${orion.version}"
+            />
+        </ejbdoclet>
+	</target>	
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Test                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="test" depends="init">
+		<taskdef 
+			name="runservertests"
+			classname="org.apache.cactus.ant.RunServerTestsTask"
+		>
+			<classpath>
+				<fileset dir="${lib.cactus.dir}"	includes="**/*.jar" />
+			</classpath>   
+		</taskdef>
+		
+		<runservertests
+    		testURL="http://localhost:${orion.http.port}/xpetstore-test/TestServlet"
+    		stopTarget="undeploy"
+    		startTarget="deploy"
+    		testTarget="test.run"
+    	/>
+	</target>
+	
+	
+	<target name="test.run" depends="init">
+		<taskdef
+    		name="junitee" 
+    		classname="org.junitee.anttask.JUnitEETask"
+    	>
+			<classpath>
+				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
+			</classpath>
+    	</taskdef>
+    	
+    	<ant antfile="build-database.xml" target="data" />
+    	
+  		<junitee 
+  			url="http://localhost:${orion.http.port}/xpetstore-test/TestServlet" 
+  			haltonfailure="false"
+  			printsummary="true"
+  		>
+    		<test runall="true" todir="${build.junit.dir}">
+    			<formatter type="xml" />
+    		</test>
+  		</junitee>  		
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+		<java 
+			classname="com.evermind.client.orion.OrionConsoleAdmin" 
+			fork="yes"
+			classpathref="orion.class.path"
+		>
+			<arg value="${orion.deploy.ormi}" />
+            <arg value="${orion.user.name}" />
+            <arg value="${orion.user.password}" />
+            <arg value="-deploy" />
+            <arg value="-file" />
+            <arg value="${dist.dir}/${ear.name}" />
+            <arg value="-deploymentName" />
+            <arg value="${app.name}" />
+		</java>	
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy" depends="init">
+		<java 
+			classname="com.evermind.client.orion.OrionConsoleAdmin" 
+			fork="yes"
+			classpathref="orion.class.path"
+		>
+			<arg value="${orion.deploy.ormi}" />
+            <arg value="${orion.user.name}" />
+            <arg value="${orion.user.password}" />
+            <arg value="-undeploy" />
+            <arg value="${app.name}" />
+		</java>	
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,159 +0,0 @@
-<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<property file="${conf.dir}/as/weblogic.properties" />		
-       	
-   		<!-- Paths -->
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-        </path>
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet" depends="init">
-		<antcall target="xdoclet.ejb" />
-		<antcall target="xdoclet.web" />
-	</target>
-	
-	<target name="xdoclet.ejb" depends="init">
-       	<taskdef 
-       		name="ejbdoclet" 
-       		classname="xdoclet.modules.ejb.EjbDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>
-	
-        <ejbdoclet destdir="${build.java.dir}">
-            <fileset dir="${java.dir}" includes="**/*EJB.java" />
-            <fileset dir="${java.dir}" includes="**/*MDB.java" />
-
-            <weblogic destdir="${build.dir}/META-INF"
-            	datasource="${weblogic.datasource}"
-            	createtables="${weblogic.create.table}"
-            />
-        </ejbdoclet>
-	</target>
-	
-	<target name="xdoclet.web" depends="init" if="orion">
-      	<taskdef 
-       		name="webdoclet" 
-       		classname="xdoclet.modules.web.WebDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-      	<webdoclet 
-       		destdir="${build.dir}/WEB-INF" 
-       		mergedir="${xdoclet.merge.dir}/web"
-       	>
-       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
-       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
-       		
-       		<weblogicwebxml />
-       	</webdoclet>  		
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Test                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="test" depends="init">
-		<taskdef 
-			name="runservertests"
-			classname="org.apache.cactus.ant.RunServerTestsTask"
-		>
-			<classpath>
-				<fileset dir="${lib.cactus.dir}"	includes="**/*.jar" />
-			</classpath>   
-		</taskdef>
-		
-		<runservertests
-    		testURL="http://localhost:${weblogic.http.port}/xpetstore-test/TestServlet"
-    		stopTarget="undeploy"
-    		startTarget="deploy"
-    		testTarget="test.run"
-    	/>
-	</target>
-	
-	
-	<target name="test.run" depends="init">
-		<taskdef
-    		name="junitee" 
-    		classname="org.junitee.anttask.JUnitEETask"
-    	>
-			<classpath>
-				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
-			</classpath>
-    	</taskdef>
-    	
-    	<ant antfile="build-database.xml" target="data" />
-    	
-  		<junitee 
-  			url="http://localhost:${weblogic.http.port}/xpetstore-test/TestServlet" 
-  			haltonfailure="false"
-  			printsummary="true"
-  		>
-    		<test runall="true" todir="${build.junit.dir}">
-    			<formatter type="xml" />
-    		</test>
-  		</junitee>  		
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-        <copy todir="${weblogic.deploy.dir}">
-            <fileset dir="${dist.dir}" includes="${ear.name}" />
-        </copy>
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy" depends="init">
-        <delete>
-            <fileset dir="${weblogic.deploy.dir}" includes="${ear.name}" />
-        </delete>
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build-weblogic.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,159 @@
+<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<property file="${conf.dir}/as/weblogic.properties" />		
+       	
+   		<!-- Paths -->
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+        </path>
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet" depends="init">
+		<antcall target="xdoclet.ejb" />
+		<antcall target="xdoclet.web" />
+	</target>
+	
+	<target name="xdoclet.ejb" depends="init">
+       	<taskdef 
+       		name="ejbdoclet" 
+       		classname="xdoclet.modules.ejb.EjbDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>
+	
+        <ejbdoclet destdir="${build.java.dir}">
+            <fileset dir="${java.dir}" includes="**/*EJB.java" />
+            <fileset dir="${java.dir}" includes="**/*MDB.java" />
+
+            <weblogic destdir="${build.dir}/META-INF"
+            	datasource="${weblogic.datasource}"
+            	createtables="${weblogic.create.table}"
+            />
+        </ejbdoclet>
+	</target>
+	
+	<target name="xdoclet.web" depends="init" if="orion">
+      	<taskdef 
+       		name="webdoclet" 
+       		classname="xdoclet.modules.web.WebDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+      	<webdoclet 
+       		destdir="${build.dir}/WEB-INF" 
+       		mergedir="${xdoclet.merge.dir}/web"
+       	>
+       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
+       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
+       		
+       		<weblogicwebxml />
+       	</webdoclet>  		
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Test                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="test" depends="init">
+		<taskdef 
+			name="runservertests"
+			classname="org.apache.cactus.ant.RunServerTestsTask"
+		>
+			<classpath>
+				<fileset dir="${lib.cactus.dir}"	includes="**/*.jar" />
+			</classpath>   
+		</taskdef>
+		
+		<runservertests
+    		testURL="http://localhost:${weblogic.http.port}/xpetstore-test/TestServlet"
+    		stopTarget="undeploy"
+    		startTarget="deploy"
+    		testTarget="test.run"
+    	/>
+	</target>
+	
+	
+	<target name="test.run" depends="init">
+		<taskdef
+    		name="junitee" 
+    		classname="org.junitee.anttask.JUnitEETask"
+    	>
+			<classpath>
+				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
+			</classpath>
+    	</taskdef>
+    	
+    	<ant antfile="build-database.xml" target="data" />
+    	
+  		<junitee 
+  			url="http://localhost:${weblogic.http.port}/xpetstore-test/TestServlet" 
+  			haltonfailure="false"
+  			printsummary="true"
+  		>
+    		<test runall="true" todir="${build.junit.dir}">
+    			<formatter type="xml" />
+    		</test>
+  		</junitee>  		
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+        <copy todir="${weblogic.deploy.dir}">
+            <fileset dir="${dist.dir}" includes="${ear.name}" />
+        </copy>
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy" depends="init">
+        <delete>
+            <fileset dir="${weblogic.deploy.dir}" includes="${ear.name}" />
+        </delete>
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.bat
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.bat (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.bat)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-#==========================================================
-# Ant properties
-#
-# Author: Herve Tchepannou
-#==========================================================
-
-#------------------------------------------------------------
-# Application information
-#------------------------------------------------------------
-app.name=xpetstore-ejb3
-
-
-#------------------------------------------------------------
-# Java Compiler to option
-#------------------------------------------------------------
-
-compiler.type=jikes
-compiler.type=modern
-compiler.deprecation=on
-compiler.debug=off
-
-
-#------------------------------------------------------------
-# Directories
-#------------------------------------------------------------
-
-conf.dir=${basedir}/../conf
-
-dist.dir=${basedir}/../dist
-
-lib.dir=${basedir}/../lib
-lib.cactus.dir=${lib.dir}/main/org.apache.cactus
-lib.commons.dir=${lib.dir}/main/org.apache.commons
-lib.j2ee.dir=${lib.dir}/main/javax.j2ee
-lib.jalopy.dir=${lib.dir}/main/de.hunsicker.jalopy
-lib.javancss.dir=${lib.dir}/main/javancss
-lib.jdom.dir=${lib.dir}/main/org.jdom
-lib.junit.dir=${lib.dir}/ant/junit
-lib.junitee.dir=${lib.dir}/main/org.junitee
-lib.log4j.dir=${lib.dir}/main/org.apache.log4j
-lib.oro.dir=${lib.dir}/main/org.apache.oro
-lib.struts.dir=${lib.dir}/main/org.apache.struts
-lib.sitemesh.dir=${lib.dir}/main/com.opensymphony.module.sitemesh
-lib.xdoclet.dir=${lib.dir}/main/xdoclet
-
-java.dir=${basedir}/java
-resources.dir=${basedir}/resources
-sql.dir=${basedir}/sql
-test.dir=${basedir}/test
-web.dir=${basedir}/web
-
-build.dir=${basedir}/build
-build.class.dir=${build.dir}/classes
-build.java.dir=${build.dir}/java
-build.junit.dir=${build.dir}/junit
-build.metrics.dir=${build.dir}/metrics
-
-xdoclet.merge.dir=xdoclet
-
-
-#------------------------------------------------------------
-# Archive files
-#------------------------------------------------------------
-
-jar.name=${app.name}.ejb3
-war.name=${app.name}.war
-war.test.name=${app.name}-test.war
-ear.name=${app.name}.ear
-
-
-#------------------------------------------------------------
-# EJB configuration
-#------------------------------------------------------------
-
-ejb.cmp.version=2.x
-ejb.spec.version=2.0
-jsp.spec.version=1.2
-servlet.spec.version=2.3
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+#==========================================================
+# Ant properties
+#
+# Author: Herve Tchepannou
+#==========================================================
+
+#------------------------------------------------------------
+# Application information
+#------------------------------------------------------------
+app.name=xpetstore-ejb3
+
+
+#------------------------------------------------------------
+# Java Compiler to option
+#------------------------------------------------------------
+
+compiler.type=jikes
+compiler.type=modern
+compiler.deprecation=on
+compiler.debug=off
+
+
+#------------------------------------------------------------
+# Directories
+#------------------------------------------------------------
+
+conf.dir=${basedir}/../conf
+
+dist.dir=${basedir}/../dist
+
+lib.dir=${basedir}/../lib
+lib.cactus.dir=${lib.dir}/main/org.apache.cactus
+lib.commons.dir=${lib.dir}/main/org.apache.commons
+lib.j2ee.dir=${lib.dir}/main/javax.j2ee
+lib.jalopy.dir=${lib.dir}/main/de.hunsicker.jalopy
+lib.javancss.dir=${lib.dir}/main/javancss
+lib.jdom.dir=${lib.dir}/main/org.jdom
+lib.junit.dir=${lib.dir}/ant/junit
+lib.junitee.dir=${lib.dir}/main/org.junitee
+lib.log4j.dir=${lib.dir}/main/org.apache.log4j
+lib.oro.dir=${lib.dir}/main/org.apache.oro
+lib.struts.dir=${lib.dir}/main/org.apache.struts
+lib.sitemesh.dir=${lib.dir}/main/com.opensymphony.module.sitemesh
+lib.xdoclet.dir=${lib.dir}/main/xdoclet
+
+java.dir=${basedir}/java
+resources.dir=${basedir}/resources
+sql.dir=${basedir}/sql
+test.dir=${basedir}/test
+web.dir=${basedir}/web
+
+build.dir=${basedir}/build
+build.class.dir=${build.dir}/classes
+build.java.dir=${build.dir}/java
+build.junit.dir=${build.dir}/junit
+build.metrics.dir=${build.dir}/metrics
+
+xdoclet.merge.dir=xdoclet
+
+
+#------------------------------------------------------------
+# Archive files
+#------------------------------------------------------------
+
+jar.name=${app.name}.ejb3
+war.name=${app.name}.war
+war.test.name=${app.name}-test.war
+ear.name=${app.name}.ear
+
+
+#------------------------------------------------------------
+# EJB configuration
+#------------------------------------------------------------
+
+ejb.cmp.version=2.x
+ejb.spec.version=2.0
+jsp.spec.version=1.2
+servlet.spec.version=2.3
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.sh
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.sh (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.sh)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,679 +0,0 @@
-<project name="xpetstore-ejb" default="all" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-                
-        <!-- Directories -->
-       	<mkdir dir="${build.dir}" />
-       	<mkdir dir="${build.class.dir}" />
-       	<mkdir dir="${build.java.dir}" />
-       	<mkdir dir="${build.junit.dir}" />
-       	<mkdir dir="${build.metrics.dir}" />
-       	<mkdir dir="${dist.dir}" />
-        
-		<!-- database config -->
-		<property file="${conf.dir}/db/database.properties" />
-		<echo>Database=${database}</echo>
-		
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<echo>Application server=${app.server}</echo>	
-		
-        <condition property="jboss">
-   	    	<equals arg1="${app.server}" arg2="jboss" />
-       	</condition>
-		
-        <condition property="orion">
-   	    	<equals arg1="${app.server}" arg2="orion" />
-       	</condition>
-		
-        <condition property="weblogic">
-   	    	<equals arg1="${app.server}" arg2="weblogic" />
-       	</condition>
-		
-   		<!-- Paths -->
-        <path id="project.class.path">
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-    		<fileset dir="${lib.junit.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.junitee.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.struts.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-        </path>
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-    		<fileset dir="${lib.junitee.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.struts.dir}" 	includes="**/*.jar" />
-        </path>                       	
-                     
-	</target>
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Main                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="all">
-		<antcall target="clean" />
-		<antcall target="xdoclet" />
-		<antcall target="compile" />
-		<antcall target="jar" />
-		<antcall target="war" />
-		<antcall target="ear" />
-	</target>    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Clean                                          -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="clean" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Cleaning                                             +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<delete>
-			<fileset dir="${build.dir}" />
-		</delete>
-	</target>
-	
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Running xDoclet                                      +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="xdoclet.ejb" />
-		<antcall target="xdoclet.web" />
-		<antcall target="xdoclet.test" />
-		<antcall target="xdoclet.jboss" />
-		<antcall target="xdoclet.orion" />
-		<antcall target="xdoclet.weblogic" />
-	</target>
-
-
-	<target name="xdoclet.ejb" depends="init">
-       	<taskdef 
-       		name="ejbdoclet" 
-       		classname="xdoclet.modules.ejb.EjbDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>
-	
-        <ejbdoclet destdir="${build.java.dir}">
-            <fileset dir="${java.dir}" includes="**/*EJB.java" />
-            <fileset dir="${java.dir}" includes="**/*MDB.java" />
-
-            <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-                        
-            <remoteinterface pattern="{0}Remote"/>
-            <homeinterface  pattern="{0}RemoteHome"/>
-            <localinterface />
-            <localhomeinterface />
-            <entitypk/>
-            <entitycmp/>
-            <session /> 
-            <utilobject cacheHomes="yes">
-                <packageSubstitution packages="ejb" substituteWith="util"/>
-            </utilobject>
-            <valueobject pattern="{0}Value">
-                <packageSubstitution packages="ejb" substituteWith="model"/>
-            </valueobject>
-            
-            <deploymentdescriptor destdir="${build.dir}/META-INF"/>            
-        </ejbdoclet>
-	</target>
-
-
-	<target name="xdoclet.web" depends="init">
-      	<taskdef 
-       		name="webdoclet" 
-       		classname="xdoclet.modules.web.WebDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-      	<webdoclet 
-       		destdir="${build.dir}/WEB-INF" 
-       		mergedir="${xdoclet.merge.dir}/web"
-       	>
-       		<fileset dir="${web.dir}"  includes="**/*Action.java" />
-       		<fileset dir="${web.dir}"  includes="**/*Form.java" />
-       		<fileset dir="${web.dir}"  includes="**/*Tag.java" />
-       		<fileset dir="${web.dir}"  includes="**/*Servlet.java" />
-       		<fileset dir="${web.dir}"  includes="**/*Filter.java" />
-       		
-       		<jsptaglib
-       			shortname="xpetstore"
-       			description="xPetStore TagLib"
-       			jspversion="${jsp.spec.version}"
-       			filename="xpetstore.tld"
-       		/>
-       		
-       		<deploymentdescriptor 
-       			servletspec="${servlet.spec.version}"
-       			distributable="false" 
-       		>
-       			<taglib
-                    uri="xpetstore"
-                    location="/WEB-INF/xpetstore.tld"
-                />
-       			<taglib
-                    uri="struts-bean"
-                    location="/WEB-INF/struts-bean.tld"
-                />
-       			<taglib
-                    uri="struts-html"
-                    location="/WEB-INF/struts-html.tld"
-                />
-       			<taglib
-                    uri="struts-logic"
-                    location="/WEB-INF/struts-logic.tld"
-                />
-       			<taglib
-                    uri="struts-nested"
-                    location="/WEB-INF/struts-nested.tld"
-                />
-       			<taglib
-                    uri="struts-tiles"
-                    location="/WEB-INF/struts-tiles.tld"
-                />
-       			<taglib
-                    uri="sitemesh-decorator"
-                    location="/WEB-INF/sitemesh-decorator.tld"
-                />
-       			<taglib
-                    uri="sitemesh-page"
-                    location="/WEB-INF/sitemesh-page.tld"
-                />
-            </deploymentdescriptor>
-            
-            <strutsconfigxml/>
-       	</webdoclet>
-	</target>
-
-	<target name="xdoclet.test" depends="init">
-      	<taskdef 
-       		name="webdoclet" 
-       		classname="xdoclet.modules.web.WebDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-      	<webdoclet destdir="${build.dir}/WEB-INF/test" >
-       		<fileset dir="${test.dir}"  includes="**/*Servlet.java" />
-       		
-       		<deploymentdescriptor 
-       			servletspec="${servlet.spec.version}"
-       			distributable="false" 
-       		/>
-       	</webdoclet>
-	</target>
-
-	<target name="xdoclet.jboss" depends="init" if="jboss">
-		<ant antfile="build-jboss.xml" target="xdoclet" />
-	</target>
-
-	<target name="xdoclet.orion" depends="init" if="orion">
-		<ant antfile="build-orion.xml" target="xdoclet" />
-	</target>
-
-	<target name="xdoclet.weblogic" depends="init" if="weblogic">
-		<ant antfile="build-weblogic.xml" target="xdoclet" />
-	</target>
-		
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Compile                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="compile" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Compiling                                            +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-      	<javac
-            destdir="${build.class.dir}"
-            debug="${compiler.debug}" 
-            deprecation="${compiler.deprecation}"
-            compiler="${compiler.type}"
-            classpathref="project.class.path"
-        >
-            <src path="${build.java.dir}" />
-            <src path="${java.dir}" />
-            <src path="${test.dir}" />
-            <src path="${web.dir}" />
-        </javac>
-        
-        <copy todir="${build.class.dir}">
-        	<fileset dir="${resources.dir}" includes="**/*.properties" />
-        </copy>
-	</target>
-
-
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Jar                                            -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="jar" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Building jar files                                   +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<delete>
-			<fileset dir="${dist.dir}" includes="${jar.name}" />
-		</delete>
-		
-      	<jar
-            basedir="${build.class.dir}" 
-            excludes="**" 
-            jarfile="${dist.dir}/${jar.name}"
-         >
-            <fileset dir="${build.class.dir}">
-            	<include name="**/*.class" />
-            	
-            	<exclude name="**/web/**/*" />
-            	<exclude name="**/test/**/*" />
-            </fileset>
-            
-            <metainf dir="${build.dir}/META-INF" includes="*.xml" />
-            <metainf dir="${java.dir}/META-INF"  includes="*.xml" excludes="application.xml" />
-        </jar>        		
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- War                                            -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="war" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Building war files                                   +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="war.junitee" />
-		<antcall target="war.struts" />
-	</target>
-	
-	<target name="war.junitee" depends="init">
-		<delete>
-			<fileset dir="${dist.dir}" includes="${war.test.name}" />
-		</delete>
-		
-    	<taskdef
-    		name="juniteewar" 
-    		classname="org.junitee.anttask.JUnitEEWarTask"
-    	>
-			<classpath>
-				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
-			</classpath>    	
-    	</taskdef>
-    		         
-		<juniteewar 
-			destFile="${dist.dir}/${war.test.name}"
-			webxml="${build.dir}/WEB-INF/test/web.xml"
-		>
-    		<lib dir="${lib.junit.dir}" 	includes="junit.jar" />
-    		<lib dir="${lib.junitee.dir}" 	includes="junitee.jar" />
-    		
-    		<classes dir="${build.class.dir}" 		includes="**/test/**/*.class" />
-    		
-  			<testcases dir="${build.class.dir}" 	includes="**/*Test.class" />
-		</juniteewar>	
-	</target>
-
-	<target name="war.struts" depends="init">
-		<delete>
-			<fileset dir="${dist.dir}" includes="${war.name}" />
-		</delete>
-		
-		<war 
-			destFile="${dist.dir}/${war.name}"
-			webxml="${build.dir}/WEB-INF/web.xml"
-		>
-    		<fileset dir="${web.dir}/jsp"  		 includes="**/*" />
-    		<fileset dir="${web.dir}/css"  		 includes="**/*" />
-    		<fileset dir="${web.dir}">
-    			<include name="WEB-INF/*" />
-    			<include name="images/*" />
-    			<include name="dataimages/*" />
-    		</fileset>
-    		<fileset dir="${build.dir}">	
-    			<include name="WEB-INF/*" />
-    			
-    			<exclude name="WEB-INF/web.xml" />
-    		</fileset>
-    		
-    		<lib dir="${lib.commons.dir}" 	 includes="*.jar" />
-    		<lib dir="${lib.log4j.dir}" 	 includes="log4j.jar" />
-    		<lib dir="${lib.oro.dir}" 	 	 includes="*.jar" />
-    		<lib dir="${lib.sitemesh.dir}" 	 includes="sitemesh.jar" />
-    		<lib dir="${lib.struts.dir}" 	 includes="*.jar" />
-    		
-    		<classes dir="${build.class.dir}">
-    			<include name="**/web/**/*.class" />
-    			<include name="**/*.properties" />
-    			
-    			<exclude name="**/test/**/*" />
-    		</classes>
-    		<classes 
-    			dir="${resources.dir}" 	
-    			includes="Resources.properties" 
-    		/>
-		</war>
-	</target>
-	
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Ear                                            -->
-<!--                                                -->
-<!-- ============================================== -->
-	<target name="ear" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Building ear files                                   +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<delete>
-			<fileset dir="${dist.dir}" includes="${ear.name}" />
-		</delete>
-		
-		<ear 
-			destfile="${dist.dir}/${ear.name}" 
-			appxml="${java.dir}/META-INF/application.xml"
-		>
-      		<fileset dir="${dist.dir}"	includes="${jar.name}" />
-      		<fileset dir="${dist.dir}"	includes="${war.name}" />
-      		<fileset dir="${dist.dir}"	includes="${war.test.name}" />
-      	</ear>
-	</target>	
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Test                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="test">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Testing                                              +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="test.jboss" />
-		<antcall target="test.orion" />
-		<antcall target="test.weblogic" />
-		<antcall target="test.report" />
-	</target>
-	
-	<target name="test.jboss" depends="init" if="jboss">
-		<ant antfile="build-jboss.xml" target="test" />
-	</target>
-	
-	<target name="test.orion" depends="init" if="orion">
-		<ant antfile="build-orion.xml" target="test" />
-	</target>	
-	
-	<target name="test.weblogic" depends="init" if="weblogic">
-		<ant antfile="build-weblogic.xml" target="test" />
-	</target>	
-	
-	<target name="test.report" depends="init">
-		<junitreport todir="${build.junit.dir}">
-  			<fileset dir="${build.junit.dir}" 	includes="TEST-*.xml" />  			
-  			<report	 format="frames" 			todir="${build.junit.dir}" />
-		</junitreport>
-	</target>
-	
-	
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Deploying into the application server                +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="deploy.jboss" />
-		<antcall target="deploy.orion" />
-		<antcall target="deploy.weblogic" />
-	</target>	
-	
-	<target name="deploy.jboss" depends="init" if="jboss">
-		<ant antfile="build-jboss.xml" target="deploy" />
-	</target>
-	
-	<target name="deploy.orion" depends="init" if="orion">
-		<ant antfile="build-orion.xml" target="deploy" />
-	</target>
-	
-	<target name="deploy.weblogic" depends="init" if="weblogic">
-		<ant antfile="build-weblogic.xml" target="deploy" />
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Undeploying from the application server              +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="undeploy.jboss" />
-		<antcall target="undeploy.orion" />
-		<antcall target="undeploy.weblogic" />
-	</target>	
-
-	<target name="undeploy.jboss" depends="init" if="jboss">
-		<ant antfile="build-jboss.xml" target="undeploy" />
-	</target>
-
-	<target name="undeploy.orion" depends="init" if="orion">
-		<ant antfile="build-orion.xml" target="undeploy" />
-	</target>
-
-	<target name="undeploy.weblogic" depends="init" if="weblogic">
-		<ant antfile="build-weblogic.xml" target="undeploy" />
-	</target>
-
-	
-	
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- DB                                             -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="db" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Initialize the database                              +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<ant antfile="build-database.xml" target="data" />
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Formatting                                     -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="jalopy" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Formatting the source code                           +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<taskdef
-            name="jalopy"
-            classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"
-        >
-			<classpath>
-				<fileset dir="${lib.jalopy.dir}" includes="**/*.jar" />
-				<fileset dir="${lib.log4j.dir}"  includes="**/*.jar" />
-				<fileset dir="${lib.jdom.dir}"   includes="**/*.jar" />
-				<fileset dir="${lib.oro.dir}" 	 includes="**/*.jar" />
-			</classpath>
-		</taskdef>
-        		
-  		<jalopy 
-            convention="${conf.dir}/jalopy.xml"
-            loglevel="warn"
-            threads="2"
-        >
-      		<fileset dir="${build.java.dir}" includes="**/*.java" />
-      		<fileset dir="${java.dir}" 	  	 includes="**/*.java" />
-      		<fileset dir="${web.dir}" 		 includes="**/*.java" />
-      		<fileset dir="${test.dir}" 		 includes="**/*.java" />
-    	</jalopy>		
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Metrics                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="metrics" depends="init">
-		<taskdef 
-	   		name="javancss"
-	        classname="javancss.JavancssAntTask"
-	    >
-			<classpath>
-				<fileset dir="${lib.javancss.dir}" includes="**/*.jar" />
-			</classpath>
-	   	</taskdef>
-
-
-		<!-- Business classes -->
-		<javancss
-			srcdir="${java.dir}"
-			includes="**/*.java"
-    		generateReport="true"
-            outputfile="${build.metrics.dir}/business.xml"
-            format="xml"
-            functionMetrics="false"
-    	/>
-    	
-    	<xslt
-    		destdir="${build.metrics.dir}"
-    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
-    		in="${build.metrics.dir}/business.xml"
-    		out="${build.metrics.dir}/business.html"
-    	/>
-
-
-		<!-- xdoclet classes -->
-		<javancss
-			srcdir="${build.java.dir}"
-			includes="**/*.java"
-    		generateReport="true"
-            outputfile="${build.metrics.dir}/xdoclet.xml"
-            format="xml"
-            functionMetrics="false"
-    	/>
-    	
-    	<xslt
-    		destdir="${build.metrics.dir}"
-    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
-    		in="${build.metrics.dir}/xdoclet.xml"
-    		out="${build.metrics.dir}/xdoclet.html"
-    	/>
-
-    	
-		<!-- Web classes -->
-		<javancss
-			srcdir="${web.dir}"
-			includes="**/*.java"
-    		generateReport="true"
-            outputfile="${build.metrics.dir}/web.xml"
-            format="xml"
-            functionMetrics="false"
-    	/>
-    	
-    	<xslt
-    		destdir="${build.metrics.dir}"
-    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
-    		in="${build.metrics.dir}/web.xml"
-    		out="${build.metrics.dir}/web.html"
-    	/>
-	</target>
-
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,679 @@
+<project name="xpetstore-ejb" default="all" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+                
+        <!-- Directories -->
+       	<mkdir dir="${build.dir}" />
+       	<mkdir dir="${build.class.dir}" />
+       	<mkdir dir="${build.java.dir}" />
+       	<mkdir dir="${build.junit.dir}" />
+       	<mkdir dir="${build.metrics.dir}" />
+       	<mkdir dir="${dist.dir}" />
+        
+		<!-- database config -->
+		<property file="${conf.dir}/db/database.properties" />
+		<echo>Database=${database}</echo>
+		
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<echo>Application server=${app.server}</echo>	
+		
+        <condition property="jboss">
+   	    	<equals arg1="${app.server}" arg2="jboss" />
+       	</condition>
+		
+        <condition property="orion">
+   	    	<equals arg1="${app.server}" arg2="orion" />
+       	</condition>
+		
+        <condition property="weblogic">
+   	    	<equals arg1="${app.server}" arg2="weblogic" />
+       	</condition>
+		
+   		<!-- Paths -->
+        <path id="project.class.path">
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+    		<fileset dir="${lib.junit.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.junitee.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.struts.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+        </path>
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+    		<fileset dir="${lib.junitee.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.struts.dir}" 	includes="**/*.jar" />
+        </path>                       	
+                     
+	</target>
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Main                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="all">
+		<antcall target="clean" />
+		<antcall target="xdoclet" />
+		<antcall target="compile" />
+		<antcall target="jar" />
+		<antcall target="war" />
+		<antcall target="ear" />
+	</target>    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Clean                                          -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="clean" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Cleaning                                             +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<delete>
+			<fileset dir="${build.dir}" />
+		</delete>
+	</target>
+	
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Running xDoclet                                      +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="xdoclet.ejb" />
+		<antcall target="xdoclet.web" />
+		<antcall target="xdoclet.test" />
+		<antcall target="xdoclet.jboss" />
+		<antcall target="xdoclet.orion" />
+		<antcall target="xdoclet.weblogic" />
+	</target>
+
+
+	<target name="xdoclet.ejb" depends="init">
+       	<taskdef 
+       		name="ejbdoclet" 
+       		classname="xdoclet.modules.ejb.EjbDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>
+	
+        <ejbdoclet destdir="${build.java.dir}">
+            <fileset dir="${java.dir}" includes="**/*EJB.java" />
+            <fileset dir="${java.dir}" includes="**/*MDB.java" />
+
+            <packageSubstitution packages="ejb" substituteWith="interfaces"/>
+                        
+            <remoteinterface pattern="{0}Remote"/>
+            <homeinterface  pattern="{0}RemoteHome"/>
+            <localinterface />
+            <localhomeinterface />
+            <entitypk/>
+            <entitycmp/>
+            <session /> 
+            <utilobject cacheHomes="yes">
+                <packageSubstitution packages="ejb" substituteWith="util"/>
+            </utilobject>
+            <valueobject pattern="{0}Value">
+                <packageSubstitution packages="ejb" substituteWith="model"/>
+            </valueobject>
+            
+            <deploymentdescriptor destdir="${build.dir}/META-INF"/>            
+        </ejbdoclet>
+	</target>
+
+
+	<target name="xdoclet.web" depends="init">
+      	<taskdef 
+       		name="webdoclet" 
+       		classname="xdoclet.modules.web.WebDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+      	<webdoclet 
+       		destdir="${build.dir}/WEB-INF" 
+       		mergedir="${xdoclet.merge.dir}/web"
+       	>
+       		<fileset dir="${web.dir}"  includes="**/*Action.java" />
+       		<fileset dir="${web.dir}"  includes="**/*Form.java" />
+       		<fileset dir="${web.dir}"  includes="**/*Tag.java" />
+       		<fileset dir="${web.dir}"  includes="**/*Servlet.java" />
+       		<fileset dir="${web.dir}"  includes="**/*Filter.java" />
+       		
+       		<jsptaglib
+       			shortname="xpetstore"
+       			description="xPetStore TagLib"
+       			jspversion="${jsp.spec.version}"
+       			filename="xpetstore.tld"
+       		/>
+       		
+       		<deploymentdescriptor 
+       			servletspec="${servlet.spec.version}"
+       			distributable="false" 
+       		>
+       			<taglib
+                    uri="xpetstore"
+                    location="/WEB-INF/xpetstore.tld"
+                />
+       			<taglib
+                    uri="struts-bean"
+                    location="/WEB-INF/struts-bean.tld"
+                />
+       			<taglib
+                    uri="struts-html"
+                    location="/WEB-INF/struts-html.tld"
+                />
+       			<taglib
+                    uri="struts-logic"
+                    location="/WEB-INF/struts-logic.tld"
+                />
+       			<taglib
+                    uri="struts-nested"
+                    location="/WEB-INF/struts-nested.tld"
+                />
+       			<taglib
+                    uri="struts-tiles"
+                    location="/WEB-INF/struts-tiles.tld"
+                />
+       			<taglib
+                    uri="sitemesh-decorator"
+                    location="/WEB-INF/sitemesh-decorator.tld"
+                />
+       			<taglib
+                    uri="sitemesh-page"
+                    location="/WEB-INF/sitemesh-page.tld"
+                />
+            </deploymentdescriptor>
+            
+            <strutsconfigxml/>
+       	</webdoclet>
+	</target>
+
+	<target name="xdoclet.test" depends="init">
+      	<taskdef 
+       		name="webdoclet" 
+       		classname="xdoclet.modules.web.WebDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+      	<webdoclet destdir="${build.dir}/WEB-INF/test" >
+       		<fileset dir="${test.dir}"  includes="**/*Servlet.java" />
+       		
+       		<deploymentdescriptor 
+       			servletspec="${servlet.spec.version}"
+       			distributable="false" 
+       		/>
+       	</webdoclet>
+	</target>
+
+	<target name="xdoclet.jboss" depends="init" if="jboss">
+		<ant antfile="build-jboss.xml" target="xdoclet" />
+	</target>
+
+	<target name="xdoclet.orion" depends="init" if="orion">
+		<ant antfile="build-orion.xml" target="xdoclet" />
+	</target>
+
+	<target name="xdoclet.weblogic" depends="init" if="weblogic">
+		<ant antfile="build-weblogic.xml" target="xdoclet" />
+	</target>
+		
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Compile                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="compile" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Compiling                                            +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+      	<javac
+            destdir="${build.class.dir}"
+            debug="${compiler.debug}" 
+            deprecation="${compiler.deprecation}"
+            compiler="${compiler.type}"
+            classpathref="project.class.path"
+        >
+            <src path="${build.java.dir}" />
+            <src path="${java.dir}" />
+            <src path="${test.dir}" />
+            <src path="${web.dir}" />
+        </javac>
+        
+        <copy todir="${build.class.dir}">
+        	<fileset dir="${resources.dir}" includes="**/*.properties" />
+        </copy>
+	</target>
+
+
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Jar                                            -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="jar" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Building jar files                                   +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<delete>
+			<fileset dir="${dist.dir}" includes="${jar.name}" />
+		</delete>
+		
+      	<jar
+            basedir="${build.class.dir}" 
+            excludes="**" 
+            jarfile="${dist.dir}/${jar.name}"
+         >
+            <fileset dir="${build.class.dir}">
+            	<include name="**/*.class" />
+            	
+            	<exclude name="**/web/**/*" />
+            	<exclude name="**/test/**/*" />
+            </fileset>
+            
+            <metainf dir="${build.dir}/META-INF" includes="*.xml" />
+            <metainf dir="${java.dir}/META-INF"  includes="*.xml" excludes="application.xml" />
+        </jar>        		
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- War                                            -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="war" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Building war files                                   +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="war.junitee" />
+		<antcall target="war.struts" />
+	</target>
+	
+	<target name="war.junitee" depends="init">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${war.test.name}" />
+		</delete>
+		
+    	<taskdef
+    		name="juniteewar" 
+    		classname="org.junitee.anttask.JUnitEEWarTask"
+    	>
+			<classpath>
+				<fileset dir="${lib.junitee.dir}"   includes="**/*.jar" />
+			</classpath>    	
+    	</taskdef>
+    		         
+		<juniteewar 
+			destFile="${dist.dir}/${war.test.name}"
+			webxml="${build.dir}/WEB-INF/test/web.xml"
+		>
+    		<lib dir="${lib.junit.dir}" 	includes="junit.jar" />
+    		<lib dir="${lib.junitee.dir}" 	includes="junitee.jar" />
+    		
+    		<classes dir="${build.class.dir}" 		includes="**/test/**/*.class" />
+    		
+  			<testcases dir="${build.class.dir}" 	includes="**/*Test.class" />
+		</juniteewar>	
+	</target>
+
+	<target name="war.struts" depends="init">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${war.name}" />
+		</delete>
+		
+		<war 
+			destFile="${dist.dir}/${war.name}"
+			webxml="${build.dir}/WEB-INF/web.xml"
+		>
+    		<fileset dir="${web.dir}/jsp"  		 includes="**/*" />
+    		<fileset dir="${web.dir}/css"  		 includes="**/*" />
+    		<fileset dir="${web.dir}">
+    			<include name="WEB-INF/*" />
+    			<include name="images/*" />
+    			<include name="dataimages/*" />
+    		</fileset>
+    		<fileset dir="${build.dir}">	
+    			<include name="WEB-INF/*" />
+    			
+    			<exclude name="WEB-INF/web.xml" />
+    		</fileset>
+    		
+    		<lib dir="${lib.commons.dir}" 	 includes="*.jar" />
+    		<lib dir="${lib.log4j.dir}" 	 includes="log4j.jar" />
+    		<lib dir="${lib.oro.dir}" 	 	 includes="*.jar" />
+    		<lib dir="${lib.sitemesh.dir}" 	 includes="sitemesh.jar" />
+    		<lib dir="${lib.struts.dir}" 	 includes="*.jar" />
+    		
+    		<classes dir="${build.class.dir}">
+    			<include name="**/web/**/*.class" />
+    			<include name="**/*.properties" />
+    			
+    			<exclude name="**/test/**/*" />
+    		</classes>
+    		<classes 
+    			dir="${resources.dir}" 	
+    			includes="Resources.properties" 
+    		/>
+		</war>
+	</target>
+	
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Ear                                            -->
+<!--                                                -->
+<!-- ============================================== -->
+	<target name="ear" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Building ear files                                   +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<delete>
+			<fileset dir="${dist.dir}" includes="${ear.name}" />
+		</delete>
+		
+		<ear 
+			destfile="${dist.dir}/${ear.name}" 
+			appxml="${java.dir}/META-INF/application.xml"
+		>
+      		<fileset dir="${dist.dir}"	includes="${jar.name}" />
+      		<fileset dir="${dist.dir}"	includes="${war.name}" />
+      		<fileset dir="${dist.dir}"	includes="${war.test.name}" />
+      	</ear>
+	</target>	
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Test                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="test">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Testing                                              +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="test.jboss" />
+		<antcall target="test.orion" />
+		<antcall target="test.weblogic" />
+		<antcall target="test.report" />
+	</target>
+	
+	<target name="test.jboss" depends="init" if="jboss">
+		<ant antfile="build-jboss.xml" target="test" />
+	</target>
+	
+	<target name="test.orion" depends="init" if="orion">
+		<ant antfile="build-orion.xml" target="test" />
+	</target>	
+	
+	<target name="test.weblogic" depends="init" if="weblogic">
+		<ant antfile="build-weblogic.xml" target="test" />
+	</target>	
+	
+	<target name="test.report" depends="init">
+		<junitreport todir="${build.junit.dir}">
+  			<fileset dir="${build.junit.dir}" 	includes="TEST-*.xml" />  			
+  			<report	 format="frames" 			todir="${build.junit.dir}" />
+		</junitreport>
+	</target>
+	
+	
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Deploying into the application server                +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="deploy.jboss" />
+		<antcall target="deploy.orion" />
+		<antcall target="deploy.weblogic" />
+	</target>	
+	
+	<target name="deploy.jboss" depends="init" if="jboss">
+		<ant antfile="build-jboss.xml" target="deploy" />
+	</target>
+	
+	<target name="deploy.orion" depends="init" if="orion">
+		<ant antfile="build-orion.xml" target="deploy" />
+	</target>
+	
+	<target name="deploy.weblogic" depends="init" if="weblogic">
+		<ant antfile="build-weblogic.xml" target="deploy" />
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Undeploying from the application server              +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="undeploy.jboss" />
+		<antcall target="undeploy.orion" />
+		<antcall target="undeploy.weblogic" />
+	</target>	
+
+	<target name="undeploy.jboss" depends="init" if="jboss">
+		<ant antfile="build-jboss.xml" target="undeploy" />
+	</target>
+
+	<target name="undeploy.orion" depends="init" if="orion">
+		<ant antfile="build-orion.xml" target="undeploy" />
+	</target>
+
+	<target name="undeploy.weblogic" depends="init" if="weblogic">
+		<ant antfile="build-weblogic.xml" target="undeploy" />
+	</target>
+
+	
+	
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- DB                                             -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="db" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Initialize the database                              +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<ant antfile="build-database.xml" target="data" />
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Formatting                                     -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="jalopy" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Formatting the source code                           +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<taskdef
+            name="jalopy"
+            classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"
+        >
+			<classpath>
+				<fileset dir="${lib.jalopy.dir}" includes="**/*.jar" />
+				<fileset dir="${lib.log4j.dir}"  includes="**/*.jar" />
+				<fileset dir="${lib.jdom.dir}"   includes="**/*.jar" />
+				<fileset dir="${lib.oro.dir}" 	 includes="**/*.jar" />
+			</classpath>
+		</taskdef>
+        		
+  		<jalopy 
+            convention="${conf.dir}/jalopy.xml"
+            loglevel="warn"
+            threads="2"
+        >
+      		<fileset dir="${build.java.dir}" includes="**/*.java" />
+      		<fileset dir="${java.dir}" 	  	 includes="**/*.java" />
+      		<fileset dir="${web.dir}" 		 includes="**/*.java" />
+      		<fileset dir="${test.dir}" 		 includes="**/*.java" />
+    	</jalopy>		
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Metrics                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="metrics" depends="init">
+		<taskdef 
+	   		name="javancss"
+	        classname="javancss.JavancssAntTask"
+	    >
+			<classpath>
+				<fileset dir="${lib.javancss.dir}" includes="**/*.jar" />
+			</classpath>
+	   	</taskdef>
+
+
+		<!-- Business classes -->
+		<javancss
+			srcdir="${java.dir}"
+			includes="**/*.java"
+    		generateReport="true"
+            outputfile="${build.metrics.dir}/business.xml"
+            format="xml"
+            functionMetrics="false"
+    	/>
+    	
+    	<xslt
+    		destdir="${build.metrics.dir}"
+    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
+    		in="${build.metrics.dir}/business.xml"
+    		out="${build.metrics.dir}/business.html"
+    	/>
+
+
+		<!-- xdoclet classes -->
+		<javancss
+			srcdir="${build.java.dir}"
+			includes="**/*.java"
+    		generateReport="true"
+            outputfile="${build.metrics.dir}/xdoclet.xml"
+            format="xml"
+            functionMetrics="false"
+    	/>
+    	
+    	<xslt
+    		destdir="${build.metrics.dir}"
+    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
+    		in="${build.metrics.dir}/xdoclet.xml"
+    		out="${build.metrics.dir}/xdoclet.html"
+    	/>
+
+    	
+		<!-- Web classes -->
+		<javancss
+			srcdir="${web.dir}"
+			includes="**/*.java"
+    		generateReport="true"
+            outputfile="${build.metrics.dir}/web.xml"
+            format="xml"
+            functionMetrics="false"
+    	/>
+    	
+    	<xslt
+    		destdir="${build.metrics.dir}"
+    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
+    		in="${build.metrics.dir}/web.xml"
+    		out="${build.metrics.dir}/web.html"
+    	/>
+	</target>
+
+	
+</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-<application>
-  <display-name>xPetstore - EJB</display-name>
-  
-  <module>
-    <ejb>xpetstore-ejb3.ejb3</ejb>
-  </module>
-  
-  <module>
-    <web>
-      <web-uri>xpetstore-ejb3.war</web-uri>
-      <context-root>xpetstore-ejb</context-root>
-    </web>
-  </module>
-  
-  <module>
-    <web>
-      <web-uri>xpetstore-ejb3-test.war</web-uri>
-      <context-root>xpetstore-test</context-root>
-    </web>
-  </module>
-  
-</application>
-
-

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
+
+<application>
+  <display-name>xPetstore - EJB</display-name>
+  
+  <module>
+    <ejb>xpetstore-ejb3.ejb3</ejb>
+  </module>
+  
+  <module>
+    <web>
+      <web-uri>xpetstore-ejb3.war</web-uri>
+      <context-root>xpetstore-ejb</context-root>
+    </web>
+  </module>
+  
+  <module>
+    <web>
+      <web-uri>xpetstore-ejb3-test.war</web-uri>
+      <context-root>xpetstore-test</context-root>
+    </web>
+  </module>
+  
+</application>
+
+

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,92 +0,0 @@
-package xpetstore.domain.catalog.dao;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import java.util.ArrayList;
-
-import xpetstore.util.Page;
-
-import xpetstore.domain.catalog.ejb.Product;
-
-
-/**
- * This is a DAO class for complex db queries that can't be
- * resolved by finders
- *
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class ProductDAO
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    private static final String SQL_FIND_BY_KEY = "SELECT productId,name,description FROM T_PRODUCT WHERE (productId LIKE ?) OR (name LIKE ?) OR (description LIKE ?)";
-
-    //~ Instance fields --------------------------------------------------------
-
-    private Connection _cnn;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public ProductDAO( Connection cnn )
-    {
-        _cnn = cnn;
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public Page findByKey( String key,
-                           int    start,
-                           int    count )
-        throws SQLException
-    {
-		PreparedStatement stmt = null;
-		ResultSet rs = null;
-    	try
-    	{
-        stmt = _cnn.prepareStatement( SQL_FIND_BY_KEY, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY );
-
-        stmt.setString( 1, key );
-        stmt.setString( 2, key );
-        stmt.setString( 3, key );
-
-        rs = stmt.executeQuery(  );
-
-        return toPage( rs, start, count );
-    	}
-    	finally
-    	{
-    		if ( stmt != null )
-    		{
-    			stmt.close();
-    		}
-    		if ( rs != null )
-    		{
-    			rs.close();
-    		}
-    	}
-    }
-
-    private Page toPage( ResultSet rs,
-                         int       start,
-                         int       count )
-        throws SQLException
-    {
-        int       i;
-        int       size;
-        int       imax = start + count;
-        ArrayList lst = new ArrayList(  );
-
-        for ( i = size = 0; rs.next(  ); i++, size++ )
-        {
-            if ( ( i >= start ) && ( i < imax ) )
-            {
-                lst.add( new Product( rs.getString( 1 ), rs.getString( 2 ), rs.getString( 3 ) ) );
-            }
-        }
-
-        return new Page( lst, start, ( start + count ) < size );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/dao/ProductDAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,92 @@
+package xpetstore.domain.catalog.dao;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import java.util.ArrayList;
+
+import xpetstore.util.Page;
+
+import xpetstore.domain.catalog.ejb.Product;
+
+
+/**
+ * This is a DAO class for complex db queries that can't be
+ * resolved by finders
+ *
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class ProductDAO
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    private static final String SQL_FIND_BY_KEY = "SELECT productId,name,description FROM T_PRODUCT WHERE (productId LIKE ?) OR (name LIKE ?) OR (description LIKE ?)";
+
+    //~ Instance fields --------------------------------------------------------
+
+    private Connection _cnn;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public ProductDAO( Connection cnn )
+    {
+        _cnn = cnn;
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public Page findByKey( String key,
+                           int    start,
+                           int    count )
+        throws SQLException
+    {
+		PreparedStatement stmt = null;
+		ResultSet rs = null;
+    	try
+    	{
+        stmt = _cnn.prepareStatement( SQL_FIND_BY_KEY, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY );
+
+        stmt.setString( 1, key );
+        stmt.setString( 2, key );
+        stmt.setString( 3, key );
+
+        rs = stmt.executeQuery(  );
+
+        return toPage( rs, start, count );
+    	}
+    	finally
+    	{
+    		if ( stmt != null )
+    		{
+    			stmt.close();
+    		}
+    		if ( rs != null )
+    		{
+    			rs.close();
+    		}
+    	}
+    }
+
+    private Page toPage( ResultSet rs,
+                         int       start,
+                         int       count )
+        throws SQLException
+    {
+        int       i;
+        int       size;
+        int       imax = start + count;
+        ArrayList lst = new ArrayList(  );
+
+        for ( i = size = 0; rs.next(  ); i++, size++ )
+        {
+            if ( ( i >= start ) && ( i < imax ) )
+            {
+                lst.add( new Product( rs.getString( 1 ), rs.getString( 2 ), rs.getString( 3 ) ) );
+            }
+        }
+
+        return new Page( lst, start, ( start + count ) < size );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,128 +0,0 @@
-package xpetstore.domain.catalog.ejb;
-
-import java.util.Collection;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-
-/**
- *
- * @ ejb.bean
- *      name="Category"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="categoryId"
- *      schema="Category"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.value-object
- *      name="Category"
- *      match="*"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_CATEGORY"
- * @ ejb.finder
- *      signature="Collection findAll()"
- *      query="SELECT OBJECT(c) FROM Category c"
- *
- * @ jboss.query
- *      signature="Collection findAll()"
- *      strategy="on-load"
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name="Category")
- at Table(name="T_CATEGORY")
-public class Category
-{
-   private String categoryId;
-   private String name;
-   private String description;
-   private Collection products;
-   
-   public Category()
-   {
-      
-   }
-   
-    /**
-     * @ ejb.pk-field
-     * @ ejb.persistence
-     *      column-name="categoryId"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="Supports"
-     */
-   @Id
-   @Column(name="categoryId")
-    public String getCategoryId(  )
-    {
-       return categoryId;
-    }
-
-    public void setCategoryId( String categoryId )
-    {
-       this.categoryId = categoryId;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="name"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(50)"
-     */
-    @Column(name="name", length=50)
-    public String getName(  )
-    {
-       return name;
-    }
-
-    public void setName( String name )
-    {
-       this.name = name;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="description"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(255)"
-     */
-    @Column(name="description", length=255)
-    public String getDescription(  )
-    {
-       return description;
-    }
-
-    public void setDescription( String description )
-    {
-       this.description = description;
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.relation
-     *      name="category-products"
-     *      role-name="category-has-products"
-     */
-    @OneToMany(targetEntity=Product.class, cascade={CascadeType.ALL})
-    @JoinColumn(name="CATEGORY_ID")
-    public Collection getProducts(  )
-    {
-       return products;
-    }
-
-    public void setProducts( Collection products )
-    {
-       this.products = products;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Category.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,128 @@
+package xpetstore.domain.catalog.ejb;
+
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Category"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="categoryId"
+ *      schema="Category"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.value-object
+ *      name="Category"
+ *      match="*"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_CATEGORY"
+ * @ ejb.finder
+ *      signature="Collection findAll()"
+ *      query="SELECT OBJECT(c) FROM Category c"
+ *
+ * @ jboss.query
+ *      signature="Collection findAll()"
+ *      strategy="on-load"
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name="Category")
+ at Table(name="T_CATEGORY")
+public class Category
+{
+   private String categoryId;
+   private String name;
+   private String description;
+   private Collection products;
+   
+   public Category()
+   {
+      
+   }
+   
+    /**
+     * @ ejb.pk-field
+     * @ ejb.persistence
+     *      column-name="categoryId"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="Supports"
+     */
+   @Id
+   @Column(name="categoryId")
+    public String getCategoryId(  )
+    {
+       return categoryId;
+    }
+
+    public void setCategoryId( String categoryId )
+    {
+       this.categoryId = categoryId;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="name"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(50)"
+     */
+    @Column(name="name", length=50)
+    public String getName(  )
+    {
+       return name;
+    }
+
+    public void setName( String name )
+    {
+       this.name = name;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="description"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(255)"
+     */
+    @Column(name="description", length=255)
+    public String getDescription(  )
+    {
+       return description;
+    }
+
+    public void setDescription( String description )
+    {
+       this.description = description;
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.relation
+     *      name="category-products"
+     *      role-name="category-has-products"
+     */
+    @OneToMany(targetEntity=Product.class, cascade={CascadeType.ALL})
+    @JoinColumn(name="CATEGORY_ID")
+    public Collection getProducts(  )
+    {
+       return products;
+    }
+
+    public void setProducts( Collection products )
+    {
+       this.products = products;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,172 +0,0 @@
-package xpetstore.domain.catalog.ejb;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
-import javax.persistence.Table;
-
-
-/**
- *
- * @ ejb.bean
- *      name="Item"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="itemId"
- *      schema="Item"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.value-object
- *      name="Item"
- *      match="*"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_ITEM"
- *
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name="Item")
- at Table(name="T_ITEM")
-public class Item
-{
-   private String itemId;
-   private String status;
-   private double listPrice;
-   private double unitCost;
-   private String imagePath;
-   private Product product;
-   
-   public Item()
-   {
-      
-   }
-   
-    /**
-     * @ ejb.pk-field
-     * @ ejb.persistence
-     *      column-name="itemId"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="Supports"
-     */
-   @Id
-   @Column(name="itemId")
-    public String getItemId(  )
-   {
-      return itemId;
-   }
-
-    public void setItemId( String itemId )
-    {
-       this.itemId = itemId;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="description"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(255)"
-     */
-    @Column(name="description", length=255)
-    public String getDescription(  )
-    {
-       return status;
-    }
-
-    public void setDescription( String status )
-    {
-       this.status = status;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="listPrice"
-     */
-    @Column(name="listPrice")
-    public double getListPrice(  )
-    {
-       return listPrice;
-    }
-
-    public void setListPrice( double listPrice )
-    {
-       this.listPrice = listPrice;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="unitCost"
-     */
-    @Column(name="unitCost")
-    public double getUnitCost(  )
-    {
-       return unitCost;
-    }
-
-    public void setUnitCost( double unitCost )
-    {
-       this.unitCost = unitCost;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="imagePath"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(255)"
-     */
-    @Column(name="imagePath", length=255)
-    public String getImagePath(  )
-    {
-       return imagePath;
-    }
-
-    public void setImagePath( String imagePath )
-    {
-       this.imagePath = imagePath;
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.relation
-     *      name="product-items"
-     *      role-name="item-belongs_to-product"
-     *      cascade-delete="yes"
-     *
-     * @ jboss.relation
-     *      fk-column="product_fk"
-     *      related-pk-field="productId"
-     *      fk-contraint="${db.foreign.key}
-     *
-     * @ weblogic.column-map
-     *      foreign-key-column="product_fk"
-     */
-    @ManyToOne(cascade={CascadeType.ALL})
-    @JoinColumn(name="PRODUCT_ID")
-    public Product getProduct(  )
-    {
-       return product;
-    }
-
-    public void setProduct( Product product )
-    {
-       this.product = product;
-    }
-    
-    public String toString()
-    {
-       StringBuffer buffer = new StringBuffer(200);
-       buffer.append("[Item: itemId " + itemId);
-       buffer.append(", product " + product);
-       buffer.append("]");
-       
-       return buffer.toString();
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Item.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,172 @@
+package xpetstore.domain.catalog.ejb;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import javax.persistence.Table;
+
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Item"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="itemId"
+ *      schema="Item"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.value-object
+ *      name="Item"
+ *      match="*"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_ITEM"
+ *
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name="Item")
+ at Table(name="T_ITEM")
+public class Item
+{
+   private String itemId;
+   private String status;
+   private double listPrice;
+   private double unitCost;
+   private String imagePath;
+   private Product product;
+   
+   public Item()
+   {
+      
+   }
+   
+    /**
+     * @ ejb.pk-field
+     * @ ejb.persistence
+     *      column-name="itemId"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="Supports"
+     */
+   @Id
+   @Column(name="itemId")
+    public String getItemId(  )
+   {
+      return itemId;
+   }
+
+    public void setItemId( String itemId )
+    {
+       this.itemId = itemId;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="description"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(255)"
+     */
+    @Column(name="description", length=255)
+    public String getDescription(  )
+    {
+       return status;
+    }
+
+    public void setDescription( String status )
+    {
+       this.status = status;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="listPrice"
+     */
+    @Column(name="listPrice")
+    public double getListPrice(  )
+    {
+       return listPrice;
+    }
+
+    public void setListPrice( double listPrice )
+    {
+       this.listPrice = listPrice;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="unitCost"
+     */
+    @Column(name="unitCost")
+    public double getUnitCost(  )
+    {
+       return unitCost;
+    }
+
+    public void setUnitCost( double unitCost )
+    {
+       this.unitCost = unitCost;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="imagePath"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(255)"
+     */
+    @Column(name="imagePath", length=255)
+    public String getImagePath(  )
+    {
+       return imagePath;
+    }
+
+    public void setImagePath( String imagePath )
+    {
+       this.imagePath = imagePath;
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.relation
+     *      name="product-items"
+     *      role-name="item-belongs_to-product"
+     *      cascade-delete="yes"
+     *
+     * @ jboss.relation
+     *      fk-column="product_fk"
+     *      related-pk-field="productId"
+     *      fk-contraint="${db.foreign.key}
+     *
+     * @ weblogic.column-map
+     *      foreign-key-column="product_fk"
+     */
+    @ManyToOne(cascade={CascadeType.ALL})
+    @JoinColumn(name="PRODUCT_ID")
+    public Product getProduct(  )
+    {
+       return product;
+    }
+
+    public void setProduct( Product product )
+    {
+       this.product = product;
+    }
+    
+    public String toString()
+    {
+       StringBuffer buffer = new StringBuffer(200);
+       buffer.append("[Item: itemId " + itemId);
+       buffer.append(", product " + product);
+       buffer.append("]");
+       
+       return buffer.toString();
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,170 +0,0 @@
-package xpetstore.domain.catalog.ejb;
-
-import java.util.Collection;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
-import javax.persistence.Table;
-
-
-/**
- *
- * @ ejb.bean
- *      name="Product"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="productId"
- *      schema="Product"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.value-object
- *      name="Product"
- *      match="*"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_PRODUCT"
- *
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name="Product")
- at Table(name="T_PRODUCT")
-public class Product
-{
-   private String productId;
-   private String name;
-   private String description;
-   private Collection items;
-   private Category category;
-   
-   public Product()
-   {
-      
-   }
-   
-   public Product(String productId, String name, String description)
-   {
-      this.productId = productId;
-      this.name = name;
-      this.description = description;
-   }
-   
-    /**
-     * @ ejb.pk-field
-     * @ ejb.persistence
-     *      column-name="productId"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="Supports"
-     */
-   @Id
-   @Column(name="productId", length=10)
-    public String getProductId(  )
-    {
-       return productId;
-    }
-
-    public void setProductId( String productId )
-    {
-       this.productId = productId;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="name"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(50)"
-     */
-    @Column(name="name", length=50)
-    public String getName(  )
-    {
-       return name;
-    }
-
-    public void setName( String name )
-    {
-       this.name = name;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="description"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(255)"
-     */
-    @Column(name="description", length=255)
-    public String getDescription(  )
-    {
-       return description;
-    }
-
-    public void setDescription( String description )
-    {
-       this.description = description;
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.relation
-     *      name="product-items"
-     *      role-name="product-has-items"
-     */
-    @OneToMany(targetEntity=Item.class, cascade={CascadeType.ALL})
-    @JoinColumn(name="PRODUCT_ID")
-    public Collection getItems(  )
-    {
-       return items;
-    }
-
-    public void setItems( Collection items )
-    {
-       this.items = items;
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.relation
-     *      name="category-products"
-     *      role-name="product-belongs_to-category"
-     *      cascade-delete="yes"
-     *
-     * @ jboss.relation
-     *      fk-column="category_fk"
-     *      related-pk-field="categoryId"
-     *      fk-contraint="${db.foreign.key}"
-     *
-     * @ weblogic.column-map
-     *      foreign-key-column="category_fk"
-     */
-    @ManyToOne(cascade={CascadeType.ALL})
-    @JoinColumn(name="CATEGORY_ID")
-    public Category getCategory(  )
-    {
-       return category;
-    }
-
-    public void setCategory( Category category )
-    {
-       this.category = category;
-    }
-    
-    public String toString()
-    {
-       StringBuffer buffer = new StringBuffer(200);
-       buffer.append("[Product: productId " + productId);
-       buffer.append(", name " + name);
-       buffer.append("]");
-       
-       return buffer.toString();
-    }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/catalog/ejb/Product.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,170 @@
+package xpetstore.domain.catalog.ejb;
+
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+import javax.persistence.Table;
+
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Product"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="productId"
+ *      schema="Product"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.value-object
+ *      name="Product"
+ *      match="*"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_PRODUCT"
+ *
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name="Product")
+ at Table(name="T_PRODUCT")
+public class Product
+{
+   private String productId;
+   private String name;
+   private String description;
+   private Collection items;
+   private Category category;
+   
+   public Product()
+   {
+      
+   }
+   
+   public Product(String productId, String name, String description)
+   {
+      this.productId = productId;
+      this.name = name;
+      this.description = description;
+   }
+   
+    /**
+     * @ ejb.pk-field
+     * @ ejb.persistence
+     *      column-name="productId"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="Supports"
+     */
+   @Id
+   @Column(name="productId", length=10)
+    public String getProductId(  )
+    {
+       return productId;
+    }
+
+    public void setProductId( String productId )
+    {
+       this.productId = productId;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="name"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(50)"
+     */
+    @Column(name="name", length=50)
+    public String getName(  )
+    {
+       return name;
+    }
+
+    public void setName( String name )
+    {
+       this.name = name;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="description"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(255)"
+     */
+    @Column(name="description", length=255)
+    public String getDescription(  )
+    {
+       return description;
+    }
+
+    public void setDescription( String description )
+    {
+       this.description = description;
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.relation
+     *      name="product-items"
+     *      role-name="product-has-items"
+     */
+    @OneToMany(targetEntity=Item.class, cascade={CascadeType.ALL})
+    @JoinColumn(name="PRODUCT_ID")
+    public Collection getItems(  )
+    {
+       return items;
+    }
+
+    public void setItems( Collection items )
+    {
+       this.items = items;
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.relation
+     *      name="category-products"
+     *      role-name="product-belongs_to-category"
+     *      cascade-delete="yes"
+     *
+     * @ jboss.relation
+     *      fk-column="category_fk"
+     *      related-pk-field="categoryId"
+     *      fk-contraint="${db.foreign.key}"
+     *
+     * @ weblogic.column-map
+     *      foreign-key-column="category_fk"
+     */
+    @ManyToOne(cascade={CascadeType.ALL})
+    @JoinColumn(name="CATEGORY_ID")
+    public Category getCategory(  )
+    {
+       return category;
+    }
+
+    public void setCategory( Category category )
+    {
+       this.category = category;
+    }
+    
+    public String toString()
+    {
+       StringBuffer buffer = new StringBuffer(200);
+       buffer.append("[Product: productId " + productId);
+       buffer.append(", name " + name);
+       buffer.append("]");
+       
+       return buffer.toString();
+    }
+
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,393 +0,0 @@
-package xpetstore.domain.customer.ejb;
-
-import javax.ejb.CreateException;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import xpetstore.domain.signon.ejb.Account;
-
-/**
- *
- * @ ejb.bean
- *      name="Customer"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="userId"
- *      schema="Customer"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.value-object
- *      name="Customer"
- *      match="*"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_CUSTOMER"
- * @ ejb.finder
- *      signature="Customer findByEmail(java.lang.String email)"
- *      query="SELECT OBJECT(c) FROM Customer AS c WHERE c.email = ?1"
- *
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name="Customer")
- at Table(name="T_CUSTOMER")
-public class Customer
-{
-   private String userId;
-   private String firstname;
-   private String lastname;
-   private String email;
-   private String telephone;
-   private String localeId;
-   private String street1;
-   private String street2;
-   private String city;
-   private String state;
-   private String zipcode;
-   private String country;
-   private String creditCardNumber;
-   private String creditCardExpiryDate;
-   private String creditCardType;
-   private Account account;
-   
-   public Customer()
-   {
-      
-   }
-   
-   public Customer( Account  account )
-   {
-      setUserId( account.getUserId(  ) );
-   }
-   
-   public Customer(String userId, String firstname, String lastname, String email, String telephone, String localeId, String street1, String street2, String city, String state, String zipcode, String country, String creditCardNumber, String creditCardType, String creditCardExpiryDate)
-   {
-      this.userId = userId;
-      this.firstname = firstname;
-      this.lastname = lastname;
-      this.email = email;
-      this.telephone = telephone;
-      this.localeId = localeId;
-      this.street1 = street1;
-      this.street2 = street2;
-      this.city = city;
-      this.state = state;
-      this.zipcode = zipcode;
-      this.country = country;
-      this.creditCardNumber = creditCardNumber;
-      this.creditCardExpiryDate = creditCardExpiryDate;
-      this.creditCardType = creditCardType;
-   }
-    /**
-     * @ ejb.pk-field
-     * @ ejb.persistence
-     *      column-name="userId"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="Supports"
-     */
-   @Id
-   @Column(name="userId", length=10)
-    public String getUserId(  )
-    {
-       return userId;
-    }
-
-    public void setUserId( String userId )
-    {
-       this.userId = userId;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="firstname"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(50)"
-     */
-    @Column(name="firstname", length=50)
-    public String getFirstname(  )
-    {
-       return firstname;
-    }
-
-    public void setFirstname( String firstname )
-    {
-       this.firstname = firstname;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="lastname"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(50)"
-     */
-    @Column(name="lastname", length=50)
-    public String getLastname(  )
-    {
-       return lastname;
-    }
-
-    public void setLastname( String lastname )
-    {
-       this.lastname = lastname;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="email"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(255)"
-     */
-    @Column(name="email", length=255)
-    public String getEmail(  )
-    {
-       return email;
-    }
-
-    public void setEmail( String email )
-    {
-       this.email = email;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="telephone"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     */
-    @Column(name="telephone", length=10)
-    public String getTelephone(  )
-    {
-       return telephone;
-    }
-
-    public void setTelephone( String telephone )
-    {
-       this.telephone = telephone;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="language"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(3)"
-     */
-    @Column(name="language", length=3)
-    public String getLanguage(  )
-    {
-       return localeId;
-    }
-
-    public void setLanguage( String localeId )
-    {
-       this.localeId = localeId;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="street1"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(50)"
-     */
-    @Column(name="street1", length=3)
-    public String getStreet1(  )
-    {
-       return street1;
-    }
-
-    public void setStreet1( java.lang.String street1 )
-    {
-       this.street1 = street1;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="street2"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(50)"
-     */
-    @Column(name="street2", length=50)
-    public String getStreet2(  )
-    {
-       return street2;
-    }
-
-    public void setStreet2( String street2 )
-    {
-       this.street2 = street2;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="city"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(25)"
-     */
-    @Column(name="city", length=25)
-    public java.lang.String getCity(  )
-    {
-       return city;
-    }
-
-    public void setCity( String city )
-    {
-       this.city = city;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="state"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(3)"
-     */
-    @Column(name="state", length=3)
-    public String getState(  )
-    {
-       return state;
-    }
-
-    public void setState( String state )
-    {
-       this.state = state;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="zipcode"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     */
-    @Column(name="zipcode", length=10)
-    public String getZipcode(  )
-    {
-       return zipcode;
-    }
-
-    public void setZipcode( String zipcode )
-    {
-       this.zipcode = zipcode;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="country"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(3)"
-     */
-    @Column(name="country", length=3)
-    public java.lang.String getCountry(  )
-    {
-       return country;
-    }
-
-    public void setCountry( String country )
-    {
-       this.country = country;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="creditCardNumber"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(25)"
-     */
-    @Column(name="creditCardNumber", length=25)
-    public String getCreditCardNumber(  )
-    {
-       return creditCardNumber;
-    }
-
-    public void setCreditCardNumber( String creditCardNumber )
-    {
-       this.creditCardNumber = creditCardNumber;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="creditCardType"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(25)"
-     */
-    @Column(name="creditCardType", length=25)
-    public String getCreditCardType(  )
-    {
-       return creditCardType;
-    }
-
-    public void setCreditCardType( String creditCardType )
-    {
-       this.creditCardType = creditCardType;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="creditCardExpiryDate"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     */
-    @Column(name="creditCardExpiryDate", length=10)
-    public String getCreditCardExpiryDate(  )
-    {
-       return creditCardExpiryDate;
-    }
-
-    public void setCreditCardExpiryDate( String creditCardExpiryDate )
-    {
-       this.creditCardExpiryDate = creditCardExpiryDate;
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.relation
-     *      name="customer-account"
-     *      role-name="customer-has-account"
-     *      target-ejb="Account"
-     *      target-role-name="account-belongs_to-customer"
-     *      target-cascade-delete="yes"
-     * @ ejb.value-object
-     *      compose="xpetstore.domain.signon.model.AccountValue"
-     *      compose-name="AccountValue"
-     *      members="xpetstore.domain.signon.interfaces.Account"
-     *      members-name="AccountValue"
-     *      relation="external"
-     *
-     * @ jboss.relation
-     *      fk-column="account_fk"
-     *      related-pk-field="userId"
-     *      fk-contraint="${db.foreign.key}
-     *
-     * @ weblogic.column-map
-     *      foreign-key-column="account_fk"
-     */
-    @ManyToOne(cascade={CascadeType.ALL})
-    @JoinColumn(name="ACCOUNT_ID")
-    public Account getAccount(  )
-    {
-       return account;
-    }
-
-    public void setAccount( Account account )
-    {
-       this.account = account;
-    }
-    
-    public String toString()
-    {
-       StringBuffer buffer = new StringBuffer(200);
-       buffer.append("[Customer: userId " + userId);
-       buffer.append(", email " + email);
-       buffer.append(", account " + account);
-       buffer.append("]");
-       
-       return buffer.toString();
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/customer/ejb/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,393 @@
+package xpetstore.domain.customer.ejb;
+
+import javax.ejb.CreateException;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import xpetstore.domain.signon.ejb.Account;
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Customer"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="userId"
+ *      schema="Customer"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.value-object
+ *      name="Customer"
+ *      match="*"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_CUSTOMER"
+ * @ ejb.finder
+ *      signature="Customer findByEmail(java.lang.String email)"
+ *      query="SELECT OBJECT(c) FROM Customer AS c WHERE c.email = ?1"
+ *
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name="Customer")
+ at Table(name="T_CUSTOMER")
+public class Customer
+{
+   private String userId;
+   private String firstname;
+   private String lastname;
+   private String email;
+   private String telephone;
+   private String localeId;
+   private String street1;
+   private String street2;
+   private String city;
+   private String state;
+   private String zipcode;
+   private String country;
+   private String creditCardNumber;
+   private String creditCardExpiryDate;
+   private String creditCardType;
+   private Account account;
+   
+   public Customer()
+   {
+      
+   }
+   
+   public Customer( Account  account )
+   {
+      setUserId( account.getUserId(  ) );
+   }
+   
+   public Customer(String userId, String firstname, String lastname, String email, String telephone, String localeId, String street1, String street2, String city, String state, String zipcode, String country, String creditCardNumber, String creditCardType, String creditCardExpiryDate)
+   {
+      this.userId = userId;
+      this.firstname = firstname;
+      this.lastname = lastname;
+      this.email = email;
+      this.telephone = telephone;
+      this.localeId = localeId;
+      this.street1 = street1;
+      this.street2 = street2;
+      this.city = city;
+      this.state = state;
+      this.zipcode = zipcode;
+      this.country = country;
+      this.creditCardNumber = creditCardNumber;
+      this.creditCardExpiryDate = creditCardExpiryDate;
+      this.creditCardType = creditCardType;
+   }
+    /**
+     * @ ejb.pk-field
+     * @ ejb.persistence
+     *      column-name="userId"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="Supports"
+     */
+   @Id
+   @Column(name="userId", length=10)
+    public String getUserId(  )
+    {
+       return userId;
+    }
+
+    public void setUserId( String userId )
+    {
+       this.userId = userId;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="firstname"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(50)"
+     */
+    @Column(name="firstname", length=50)
+    public String getFirstname(  )
+    {
+       return firstname;
+    }
+
+    public void setFirstname( String firstname )
+    {
+       this.firstname = firstname;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="lastname"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(50)"
+     */
+    @Column(name="lastname", length=50)
+    public String getLastname(  )
+    {
+       return lastname;
+    }
+
+    public void setLastname( String lastname )
+    {
+       this.lastname = lastname;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="email"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(255)"
+     */
+    @Column(name="email", length=255)
+    public String getEmail(  )
+    {
+       return email;
+    }
+
+    public void setEmail( String email )
+    {
+       this.email = email;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="telephone"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     */
+    @Column(name="telephone", length=10)
+    public String getTelephone(  )
+    {
+       return telephone;
+    }
+
+    public void setTelephone( String telephone )
+    {
+       this.telephone = telephone;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="language"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(3)"
+     */
+    @Column(name="language", length=3)
+    public String getLanguage(  )
+    {
+       return localeId;
+    }
+
+    public void setLanguage( String localeId )
+    {
+       this.localeId = localeId;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="street1"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(50)"
+     */
+    @Column(name="street1", length=3)
+    public String getStreet1(  )
+    {
+       return street1;
+    }
+
+    public void setStreet1( java.lang.String street1 )
+    {
+       this.street1 = street1;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="street2"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(50)"
+     */
+    @Column(name="street2", length=50)
+    public String getStreet2(  )
+    {
+       return street2;
+    }
+
+    public void setStreet2( String street2 )
+    {
+       this.street2 = street2;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="city"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(25)"
+     */
+    @Column(name="city", length=25)
+    public java.lang.String getCity(  )
+    {
+       return city;
+    }
+
+    public void setCity( String city )
+    {
+       this.city = city;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="state"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(3)"
+     */
+    @Column(name="state", length=3)
+    public String getState(  )
+    {
+       return state;
+    }
+
+    public void setState( String state )
+    {
+       this.state = state;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="zipcode"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     */
+    @Column(name="zipcode", length=10)
+    public String getZipcode(  )
+    {
+       return zipcode;
+    }
+
+    public void setZipcode( String zipcode )
+    {
+       this.zipcode = zipcode;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="country"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(3)"
+     */
+    @Column(name="country", length=3)
+    public java.lang.String getCountry(  )
+    {
+       return country;
+    }
+
+    public void setCountry( String country )
+    {
+       this.country = country;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="creditCardNumber"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(25)"
+     */
+    @Column(name="creditCardNumber", length=25)
+    public String getCreditCardNumber(  )
+    {
+       return creditCardNumber;
+    }
+
+    public void setCreditCardNumber( String creditCardNumber )
+    {
+       this.creditCardNumber = creditCardNumber;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="creditCardType"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(25)"
+     */
+    @Column(name="creditCardType", length=25)
+    public String getCreditCardType(  )
+    {
+       return creditCardType;
+    }
+
+    public void setCreditCardType( String creditCardType )
+    {
+       this.creditCardType = creditCardType;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="creditCardExpiryDate"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     */
+    @Column(name="creditCardExpiryDate", length=10)
+    public String getCreditCardExpiryDate(  )
+    {
+       return creditCardExpiryDate;
+    }
+
+    public void setCreditCardExpiryDate( String creditCardExpiryDate )
+    {
+       this.creditCardExpiryDate = creditCardExpiryDate;
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.relation
+     *      name="customer-account"
+     *      role-name="customer-has-account"
+     *      target-ejb="Account"
+     *      target-role-name="account-belongs_to-customer"
+     *      target-cascade-delete="yes"
+     * @ ejb.value-object
+     *      compose="xpetstore.domain.signon.model.AccountValue"
+     *      compose-name="AccountValue"
+     *      members="xpetstore.domain.signon.interfaces.Account"
+     *      members-name="AccountValue"
+     *      relation="external"
+     *
+     * @ jboss.relation
+     *      fk-column="account_fk"
+     *      related-pk-field="userId"
+     *      fk-contraint="${db.foreign.key}
+     *
+     * @ weblogic.column-map
+     *      foreign-key-column="account_fk"
+     */
+    @ManyToOne(cascade={CascadeType.ALL})
+    @JoinColumn(name="ACCOUNT_ID")
+    public Account getAccount(  )
+    {
+       return account;
+    }
+
+    public void setAccount( Account account )
+    {
+       this.account = account;
+    }
+    
+    public String toString()
+    {
+       StringBuffer buffer = new StringBuffer(200);
+       buffer.append("[Customer: userId " + userId);
+       buffer.append(", email " + email);
+       buffer.append(", account " + account);
+       buffer.append("]");
+       
+       return buffer.toString();
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,352 +0,0 @@
-package xpetstore.domain.order.ejb;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.FinderException;
-
-import javax.annotation.EJB;
-
-import javax.naming.NamingException;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Table;
-
-import xpetstore.domain.customer.ejb.Customer;
-import xpetstore.domain.catalog.ejb.Item;
-
-import xpetstore.util.uidgen.ejb.*;
-
-/**
- *
- * @ ejb.bean
- *      name="Order"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="orderUId"
- *      schema="Order"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.value-object
- *      name="Order"
- *      match="*"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_ORDER"
- * @ ejb.finder
- *      signature="Collection findByCustomer(java.lang.String userId)"
- *      query="SELECT OBJECT(o) FROM Order AS o WHERE o.customer.userId = ?1"
- * @ ejb.ejb-ref
- *      ejb-name="OrderItem"
- *      view-type="local"
- *      ref-name="ejb/OrderItemLocal"
- * @ ejb.ejb-ref
- *      ejb-name="UIDGenerator"
- *      view-type="local"
- *      ref-name="ejb/UIDGeneratorLocal"
- *
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name = "Order")
- at Table(name = "T_ORDER")
-public class Order
-{
-    public static final String COUNTER_NAME = "Order";
-    
-    private Integer orderUid;
-    private Date orderDate;
-    private String status;
-    private String street1;
-    private String street2;
-    private String city;
-    private String state;
-    private String zipcode;
-    private String country;
-    private String creditCardNumber;
-    private String creditCardType;
-    private String creditCardExpiryDate;
-    private Collection orderItems;
-    private Customer customer;
-    
-    public Order()
-    {
-    }
-
-    /**
-       * @ ejb.interface-method
-       */
-    public void addOrderItem( OrderItem orderItem )
-    {
-       if (orderItems == null)
-          orderItems = new java.util.ArrayList();
-       
-         orderItems.add(orderItem);
-    }
-
-    /**
-       * @ ejb.interface-method
-       */
-    public void changeStatus( String status )
-    {
-        setStatus( status );
-    }
-
-    /**
-       * @ ejb.interface-method
-       */
-    public double calculateTotal(  )
-    {
-        double   total = 0;
-        Iterator it = getOrderItems(  ).iterator(  );
-        while ( it.hasNext(  ) )
-        {
-            total += ( ( OrderItem ) it.next(  ) ).calculateSubTotal(  );
-        }
-
-        return total;
-    }
-
-    /**
-       * @ ejb.pk-field
-       * @ ejb.persistence column-name="orderUId"
-       * @ ejb.interface-method
-       * @ ejb.transaction
-       *   type="Supports"
-       */
-   @Id
-   @GeneratedValue(strategy= GenerationType.SEQUENCE)
-    @Column(name="orderUId")
-    public Integer getOrderUId(  )
-    {
-       return orderUid;
-    }
-
-    public void setOrderUId( Integer orderUId )
-    {
-       this.orderUid = orderUId;
-    }
-
-    /**
-       * @ ejb.persistence column-name="orderDate"
-       */
-    @Column(name="orderDate")
-    public Date getOrderDate(  )
-    {
-       return orderDate;
-    }
-
-    public void setOrderDate( Date orderDate )
-    {
-       this.orderDate = orderDate;
-    }
-
-    /**
-       * @ ejb.persistence column-name="status" jdbc-type="VARCHAR"
-       *   sql-type="varchar(25)"
-       */
-    @Column(name="status", length=25)
-    public String getStatus(  )
-    {
-       return status;
-    }
-
-    public void setStatus( String status )
-    {
-       this.status = status;
-    }
-
-    /**
-       * @ ejb.persistence column-name="street1" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(50)"
-       */
-    @Column(name="street1", length=50)
-    public String getStreet1(  )
-    {
-       return street1;
-    }
-
-    public void setStreet1( java.lang.String street1 )
-    {
-       this.street1 = street1;
-    }
-
-    /**
-       * @ ejb.persistence column-name="street2" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(50)"
-       */
-    @Column(name="street2", length=50)
-    public String getStreet2(  )
-    {
-       return street2;
-    }
-
-    public void setStreet2( String street2 )
-    {
-       this.street2 = street2;
-    }
-
-    /**
-       * @ ejb.persistence column-name="city" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(25)"
-       */
-    @Column(name="city", length=25)
-    public java.lang.String getCity(  )
-    {
-       return city;
-    }
-
-    public void setCity( String city )
-    {
-       this.city = city;
-    }
-
-    /**
-       * @ ejb.persistence column-name="state" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(3)"
-       */
-    @Column(name="state", length=3)
-    public String getState(  )
-    {
-       return state;
-    }
-
-    public void setState( String state )
-    {
-       this.state = state;
-    }
-
-    /**
-       * @ ejb.persistence column-name="zipcode" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(10)"
-       */
-    @Column(name="zipcode", length=10)
-    public String getZipcode(  )
-    {
-       return zipcode;
-    }
-
-    public void setZipcode( String zipcode )
-    {
-       this.zipcode = zipcode;
-    }
-
-    /**
-       * @ ejb.persistence column-name="country" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(3)"
-       */
-    @Column(name="country", length=10)
-    public java.lang.String getCountry(  )
-    {
-       return country;
-    }
-
-    public void setCountry( String country )
-    {
-       this.country = country;
-    }
-
-    /**
-       * @ ejb.persistence column-name="creditCardNumber" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(25)"
-       */
-    @Column(name="creditCardNumber", length=25)
-    public String getCreditCardNumber(  )
-    {
-       return creditCardNumber;
-    }
-
-    public void setCreditCardNumber( String creditCardNumber )
-    {
-       this.creditCardNumber = creditCardNumber;
-    }
-
-    /**
-       * @ ejb.persistence column-name="creditCardType" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(25)"
-       */
-    @Column(name="creditCardType", length=25)
-    public String getCreditCardType(  )
-    {
-       return creditCardType;
-    }
-
-    public void setCreditCardType( String creditCardType )
-    {
-       this.creditCardType = creditCardType;
-    }
-
-    /**
-       * @ ejb.persistence column-name="creditCardExpiryDate" jdbc-type="VARCHAR"
-       *                  sql-type="varchar(10)"
-       */
-    @Column(name="creditCardExpiryDate", length=10)
-    public String getCreditCardExpiryDate(  )
-    {
-       return creditCardExpiryDate;
-    }
-
-    public void setCreditCardExpiryDate( String creditCardExpiryDate )
-    {
-       this.creditCardExpiryDate = creditCardExpiryDate;
-    }
-
-    /**
-       * @ ejb.interface-method
-       * @ ejb.relation name="order-customer"
-       *               role-name="order-belongs_to-customer"
-       *               target-ejb="Customer"
-       *               target-role-name="customer-has-orders"
-       *               target=multiple="yes"
-       * @ jboss.relation fk-column="customer_fk" related-pk-field="userId"
-       * @ weblogic.column-map foreign-key-column="customer_fk"
-       */
-    @ManyToOne(cascade={CascadeType.ALL})
-    @JoinColumn(name="CUSTOMER_ID")
-    public Customer getCustomer(  )
-    {
-       return customer;
-    }
-
-    /**
-       * @ ejb.interface-method
-       */
-    public void setCustomer( Customer customer )
-    {
-       this.customer = customer;
-    }
-
-    /**
-       * @ ejb.interface-method
-       * @ ejb.relation name="order-orderItem" role-name="order-has-orderItems"
-       *               target-ejb="OrderItem"
-       *               target-role-name="orderItem-belongs_to-order"
-       *               target-cascade-delete="yes"
-       * @ jboss.target-relation fk-column="order_fk" related-pk-field="orderUId"
-       *                        fk-contraint="${db.foreign.key}
-       * @ weblogic.target-column-map foreign-key-column="order_fk"
-       */
-    @OneToMany(targetEntity=OrderItem.class, cascade={CascadeType.ALL})
-    @JoinColumn(name="ORDER_ID")
-    public Collection getOrderItems(  )
-    {
-       return orderItems;
-    }
-
-    public void setOrderItems( Collection orderItems )
-    {
-       this.orderItems = orderItems;
-    }
-   
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/Order.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,352 @@
+package xpetstore.domain.order.ejb;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.FinderException;
+
+import javax.annotation.EJB;
+
+import javax.naming.NamingException;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Table;
+
+import xpetstore.domain.customer.ejb.Customer;
+import xpetstore.domain.catalog.ejb.Item;
+
+import xpetstore.util.uidgen.ejb.*;
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Order"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="orderUId"
+ *      schema="Order"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.value-object
+ *      name="Order"
+ *      match="*"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_ORDER"
+ * @ ejb.finder
+ *      signature="Collection findByCustomer(java.lang.String userId)"
+ *      query="SELECT OBJECT(o) FROM Order AS o WHERE o.customer.userId = ?1"
+ * @ ejb.ejb-ref
+ *      ejb-name="OrderItem"
+ *      view-type="local"
+ *      ref-name="ejb/OrderItemLocal"
+ * @ ejb.ejb-ref
+ *      ejb-name="UIDGenerator"
+ *      view-type="local"
+ *      ref-name="ejb/UIDGeneratorLocal"
+ *
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name = "Order")
+ at Table(name = "T_ORDER")
+public class Order
+{
+    public static final String COUNTER_NAME = "Order";
+    
+    private Integer orderUid;
+    private Date orderDate;
+    private String status;
+    private String street1;
+    private String street2;
+    private String city;
+    private String state;
+    private String zipcode;
+    private String country;
+    private String creditCardNumber;
+    private String creditCardType;
+    private String creditCardExpiryDate;
+    private Collection orderItems;
+    private Customer customer;
+    
+    public Order()
+    {
+    }
+
+    /**
+       * @ ejb.interface-method
+       */
+    public void addOrderItem( OrderItem orderItem )
+    {
+       if (orderItems == null)
+          orderItems = new java.util.ArrayList();
+       
+         orderItems.add(orderItem);
+    }
+
+    /**
+       * @ ejb.interface-method
+       */
+    public void changeStatus( String status )
+    {
+        setStatus( status );
+    }
+
+    /**
+       * @ ejb.interface-method
+       */
+    public double calculateTotal(  )
+    {
+        double   total = 0;
+        Iterator it = getOrderItems(  ).iterator(  );
+        while ( it.hasNext(  ) )
+        {
+            total += ( ( OrderItem ) it.next(  ) ).calculateSubTotal(  );
+        }
+
+        return total;
+    }
+
+    /**
+       * @ ejb.pk-field
+       * @ ejb.persistence column-name="orderUId"
+       * @ ejb.interface-method
+       * @ ejb.transaction
+       *   type="Supports"
+       */
+   @Id
+   @GeneratedValue(strategy= GenerationType.SEQUENCE)
+    @Column(name="orderUId")
+    public Integer getOrderUId(  )
+    {
+       return orderUid;
+    }
+
+    public void setOrderUId( Integer orderUId )
+    {
+       this.orderUid = orderUId;
+    }
+
+    /**
+       * @ ejb.persistence column-name="orderDate"
+       */
+    @Column(name="orderDate")
+    public Date getOrderDate(  )
+    {
+       return orderDate;
+    }
+
+    public void setOrderDate( Date orderDate )
+    {
+       this.orderDate = orderDate;
+    }
+
+    /**
+       * @ ejb.persistence column-name="status" jdbc-type="VARCHAR"
+       *   sql-type="varchar(25)"
+       */
+    @Column(name="status", length=25)
+    public String getStatus(  )
+    {
+       return status;
+    }
+
+    public void setStatus( String status )
+    {
+       this.status = status;
+    }
+
+    /**
+       * @ ejb.persistence column-name="street1" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(50)"
+       */
+    @Column(name="street1", length=50)
+    public String getStreet1(  )
+    {
+       return street1;
+    }
+
+    public void setStreet1( java.lang.String street1 )
+    {
+       this.street1 = street1;
+    }
+
+    /**
+       * @ ejb.persistence column-name="street2" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(50)"
+       */
+    @Column(name="street2", length=50)
+    public String getStreet2(  )
+    {
+       return street2;
+    }
+
+    public void setStreet2( String street2 )
+    {
+       this.street2 = street2;
+    }
+
+    /**
+       * @ ejb.persistence column-name="city" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(25)"
+       */
+    @Column(name="city", length=25)
+    public java.lang.String getCity(  )
+    {
+       return city;
+    }
+
+    public void setCity( String city )
+    {
+       this.city = city;
+    }
+
+    /**
+       * @ ejb.persistence column-name="state" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(3)"
+       */
+    @Column(name="state", length=3)
+    public String getState(  )
+    {
+       return state;
+    }
+
+    public void setState( String state )
+    {
+       this.state = state;
+    }
+
+    /**
+       * @ ejb.persistence column-name="zipcode" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(10)"
+       */
+    @Column(name="zipcode", length=10)
+    public String getZipcode(  )
+    {
+       return zipcode;
+    }
+
+    public void setZipcode( String zipcode )
+    {
+       this.zipcode = zipcode;
+    }
+
+    /**
+       * @ ejb.persistence column-name="country" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(3)"
+       */
+    @Column(name="country", length=10)
+    public java.lang.String getCountry(  )
+    {
+       return country;
+    }
+
+    public void setCountry( String country )
+    {
+       this.country = country;
+    }
+
+    /**
+       * @ ejb.persistence column-name="creditCardNumber" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(25)"
+       */
+    @Column(name="creditCardNumber", length=25)
+    public String getCreditCardNumber(  )
+    {
+       return creditCardNumber;
+    }
+
+    public void setCreditCardNumber( String creditCardNumber )
+    {
+       this.creditCardNumber = creditCardNumber;
+    }
+
+    /**
+       * @ ejb.persistence column-name="creditCardType" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(25)"
+       */
+    @Column(name="creditCardType", length=25)
+    public String getCreditCardType(  )
+    {
+       return creditCardType;
+    }
+
+    public void setCreditCardType( String creditCardType )
+    {
+       this.creditCardType = creditCardType;
+    }
+
+    /**
+       * @ ejb.persistence column-name="creditCardExpiryDate" jdbc-type="VARCHAR"
+       *                  sql-type="varchar(10)"
+       */
+    @Column(name="creditCardExpiryDate", length=10)
+    public String getCreditCardExpiryDate(  )
+    {
+       return creditCardExpiryDate;
+    }
+
+    public void setCreditCardExpiryDate( String creditCardExpiryDate )
+    {
+       this.creditCardExpiryDate = creditCardExpiryDate;
+    }
+
+    /**
+       * @ ejb.interface-method
+       * @ ejb.relation name="order-customer"
+       *               role-name="order-belongs_to-customer"
+       *               target-ejb="Customer"
+       *               target-role-name="customer-has-orders"
+       *               target=multiple="yes"
+       * @ jboss.relation fk-column="customer_fk" related-pk-field="userId"
+       * @ weblogic.column-map foreign-key-column="customer_fk"
+       */
+    @ManyToOne(cascade={CascadeType.ALL})
+    @JoinColumn(name="CUSTOMER_ID")
+    public Customer getCustomer(  )
+    {
+       return customer;
+    }
+
+    /**
+       * @ ejb.interface-method
+       */
+    public void setCustomer( Customer customer )
+    {
+       this.customer = customer;
+    }
+
+    /**
+       * @ ejb.interface-method
+       * @ ejb.relation name="order-orderItem" role-name="order-has-orderItems"
+       *               target-ejb="OrderItem"
+       *               target-role-name="orderItem-belongs_to-order"
+       *               target-cascade-delete="yes"
+       * @ jboss.target-relation fk-column="order_fk" related-pk-field="orderUId"
+       *                        fk-contraint="${db.foreign.key}
+       * @ weblogic.target-column-map foreign-key-column="order_fk"
+       */
+    @OneToMany(targetEntity=OrderItem.class, cascade={CascadeType.ALL})
+    @JoinColumn(name="ORDER_ID")
+    public Collection getOrderItems(  )
+    {
+       return orderItems;
+    }
+
+    public void setOrderItems( Collection orderItems )
+    {
+       this.orderItems = orderItems;
+    }
+   
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,164 +0,0 @@
-package xpetstore.domain.order.ejb;
-
-import javax.annotation.EJB;
-import javax.ejb.EJBException;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import xpetstore.domain.catalog.ejb.Item;
-
-import xpetstore.util.uidgen.ejb.UIDGenerator;
-
-
-/**
- *
- * @ ejb.bean
- *      name="OrderItem"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="orderItemUId"
- *      schema="OrderItem"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.value-object
- *      name="OrderItem"
- *      match="*"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_ORDER_ITEM"
- * @ ejb.ejb-ref
- *      ejb-name="UIDGenerator"
- *      view-type="local"
- * 		ref-name="ejb/UIDGeneratorLocal"
- *
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name = "OrderItem")
- at Table(name = "T_ORDER_ITEM")
-public class OrderItem
-{
-
-    public static final String COUNTER_NAME = "OrderItem";
-    
-    private Integer orderItemUId;
-    private int quantity;
-    private double unitPrice;
-    private Item item;
-    
-    public OrderItem()
-    {
-       
-    }
-    
-    public OrderItem( int quantity, double unitPrice )
-   {
-       setQuantity( quantity );
-       setUnitPrice( unitPrice );
-   }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="Supports"
-     */
-    public double calculateSubTotal(  )
-    {
-        return Math.max( getQuantity(  ) * getUnitPrice(  ), 0 );
-    }
-
-    /**
-     * @ ejb.pk-field
-     * @ ejb.persistence
-     *      column-name="orderItemUId"
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="Supports"
-     */
-   @Id
-   @GeneratedValue(strategy= GenerationType.AUTO)
-    @Column(name="orderItemUId")
-    public Integer getOrderItemUId(  )
-    {
-       return orderItemUId;
-    }
-
-    public void setOrderItemUId( Integer orderItemUId )
-    {
-       this.orderItemUId = orderItemUId;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="quantity"
-     */
-    @Column(name="quantity")
-    public int getQuantity(  )
-    {
-       return quantity;
-    }
-
-    public void setQuantity( int quantity )
-    {
-       this.quantity = quantity;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="unitPrice"
-     */
-    @Column(name="unitPrice")
-    public double getUnitPrice(  )
-    {
-       return unitPrice;
-    }
-
-    public void setUnitPrice( double unitPrice )
-    {
-       this.unitPrice = unitPrice;
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.relation
-     *      name="orderItem-item"
-     *      role-name="orderItem-refers_to-item"
-     *      cascade-delete="yes"
-     *      target-ejb="Item"
-     *      target-role-name="item-is_refered_by-orderItems"
-     *      target-multiple="yes"
-     * @ ejb.value-object
-     *      aggregate="xpetstore.domain.catalog.model.ItemValue"
-     *      aggregate-name="Item"
-     *      members="xpetstore.domain.catalog.interfaces.Item"
-     *      members-name="Item"
-     *      relation="external"
-     *
-     * @ jboss.relation
-     *      fk-column="itemId_fk"
-     *      related-pk-field="itemId"
-     *
-     * @ weblogic.column-map
-     *      foreign-key-column="itemId_fk"
-     */
-    @ManyToOne(targetEntity=Item.class, cascade={CascadeType.ALL})
-    @JoinColumn(name="itemId_fk")
-    public Item getItem(  )
-    {
-       return item;
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public void setItem( Item item )
-    {
-       this.item = item;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/ejb/OrderItem.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,164 @@
+package xpetstore.domain.order.ejb;
+
+import javax.annotation.EJB;
+import javax.ejb.EJBException;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import xpetstore.domain.catalog.ejb.Item;
+
+import xpetstore.util.uidgen.ejb.UIDGenerator;
+
+
+/**
+ *
+ * @ ejb.bean
+ *      name="OrderItem"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="orderItemUId"
+ *      schema="OrderItem"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.value-object
+ *      name="OrderItem"
+ *      match="*"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_ORDER_ITEM"
+ * @ ejb.ejb-ref
+ *      ejb-name="UIDGenerator"
+ *      view-type="local"
+ * 		ref-name="ejb/UIDGeneratorLocal"
+ *
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name = "OrderItem")
+ at Table(name = "T_ORDER_ITEM")
+public class OrderItem
+{
+
+    public static final String COUNTER_NAME = "OrderItem";
+    
+    private Integer orderItemUId;
+    private int quantity;
+    private double unitPrice;
+    private Item item;
+    
+    public OrderItem()
+    {
+       
+    }
+    
+    public OrderItem( int quantity, double unitPrice )
+   {
+       setQuantity( quantity );
+       setUnitPrice( unitPrice );
+   }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="Supports"
+     */
+    public double calculateSubTotal(  )
+    {
+        return Math.max( getQuantity(  ) * getUnitPrice(  ), 0 );
+    }
+
+    /**
+     * @ ejb.pk-field
+     * @ ejb.persistence
+     *      column-name="orderItemUId"
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="Supports"
+     */
+   @Id
+   @GeneratedValue(strategy= GenerationType.AUTO)
+    @Column(name="orderItemUId")
+    public Integer getOrderItemUId(  )
+    {
+       return orderItemUId;
+    }
+
+    public void setOrderItemUId( Integer orderItemUId )
+    {
+       this.orderItemUId = orderItemUId;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="quantity"
+     */
+    @Column(name="quantity")
+    public int getQuantity(  )
+    {
+       return quantity;
+    }
+
+    public void setQuantity( int quantity )
+    {
+       this.quantity = quantity;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="unitPrice"
+     */
+    @Column(name="unitPrice")
+    public double getUnitPrice(  )
+    {
+       return unitPrice;
+    }
+
+    public void setUnitPrice( double unitPrice )
+    {
+       this.unitPrice = unitPrice;
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.relation
+     *      name="orderItem-item"
+     *      role-name="orderItem-refers_to-item"
+     *      cascade-delete="yes"
+     *      target-ejb="Item"
+     *      target-role-name="item-is_refered_by-orderItems"
+     *      target-multiple="yes"
+     * @ ejb.value-object
+     *      aggregate="xpetstore.domain.catalog.model.ItemValue"
+     *      aggregate-name="Item"
+     *      members="xpetstore.domain.catalog.interfaces.Item"
+     *      members-name="Item"
+     *      relation="external"
+     *
+     * @ jboss.relation
+     *      fk-column="itemId_fk"
+     *      related-pk-field="itemId"
+     *
+     * @ weblogic.column-map
+     *      foreign-key-column="itemId_fk"
+     */
+    @ManyToOne(targetEntity=Item.class, cascade={CascadeType.ALL})
+    @JoinColumn(name="itemId_fk")
+    public Item getItem(  )
+    {
+       return item;
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public void setItem( Item item )
+    {
+       this.item = item;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-package xpetstore.domain.order.model;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public abstract class OrderStatus
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String PENDING = "pending";
-    public static final String TO_DELIVER = "to-deliver";
-    public static final String WAITING = "waiting";
-    public static final String DELIVERED = "delivered";
-    public static final String CANCELLED = "cancelled";
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/order/model/OrderStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+package xpetstore.domain.order.model;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public abstract class OrderStatus
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String PENDING = "pending";
+    public static final String TO_DELIVER = "to-deliver";
+    public static final String WAITING = "waiting";
+    public static final String DELIVERED = "delivered";
+    public static final String CANCELLED = "cancelled";
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,109 +0,0 @@
-package xpetstore.domain.signon.ejb;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-
-/**
- *
- * @ ejb.bean
- *      name="Account"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="userId"
- *      schema="Account"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.value-object
- *      name="Account"
- *      match="*"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_ACCOUNT"
- *
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name="Account")
- at Table(name="T_ACCOUNT")
-public class Account
-{
-   private String userId;
-   private String password;
-   
-   public Account()
-   {
-      
-   }
-   
-   public Account(String userId, String password)
-   {
-      this.userId = userId;
-      this.password = password;
-   }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="Supports"
-     */
-    public boolean matchPassword( String password )
-    {
-        return ( password == null )
-               ? ( getPassword(  ) == null )
-               : password.equals( getPassword(  ) );
-    }
-
-    /**
-     * @ ejb.pk-field
-     * @ ejb.persistence
-     *      column-name="userId"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    @Id
-    @Column(name="userId", length=10)
-    public String getUserId(  )
-    {
-       return userId;
-    }
-
-    public void setUserId( String userId )
-    {
-       this.userId = userId;
-    }
-
-    /**
-     * @ ejb.persistence
-     *      column-name="pwd"
-     *      jdbc-type="VARCHAR"
-     *      sql-type="varchar(10)"
-     */
-    @Column(name="pwd", length=10)
-    public String getPassword(  )
-    {
-       return password;
-    }
-
-    public void setPassword( String password )
-    {
-       this.password = password;
-    }
-    
-    public String toString()
-    {
-       StringBuffer buffer = new StringBuffer(200);
-       buffer.append("[Account: userId " + userId);
-       buffer.append(", password " + password);
-       buffer.append("]");
-       
-       return buffer.toString();
-    }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/domain/signon/ejb/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,109 @@
+package xpetstore.domain.signon.ejb;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Account"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="userId"
+ *      schema="Account"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.value-object
+ *      name="Account"
+ *      match="*"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_ACCOUNT"
+ *
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name="Account")
+ at Table(name="T_ACCOUNT")
+public class Account
+{
+   private String userId;
+   private String password;
+   
+   public Account()
+   {
+      
+   }
+   
+   public Account(String userId, String password)
+   {
+      this.userId = userId;
+      this.password = password;
+   }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="Supports"
+     */
+    public boolean matchPassword( String password )
+    {
+        return ( password == null )
+               ? ( getPassword(  ) == null )
+               : password.equals( getPassword(  ) );
+    }
+
+    /**
+     * @ ejb.pk-field
+     * @ ejb.persistence
+     *      column-name="userId"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    @Id
+    @Column(name="userId", length=10)
+    public String getUserId(  )
+    {
+       return userId;
+    }
+
+    public void setUserId( String userId )
+    {
+       this.userId = userId;
+    }
+
+    /**
+     * @ ejb.persistence
+     *      column-name="pwd"
+     *      jdbc-type="VARCHAR"
+     *      sql-type="varchar(10)"
+     */
+    @Column(name="pwd", length=10)
+    public String getPassword(  )
+    {
+       return password;
+    }
+
+    public void setPassword( String password )
+    {
+       this.password = password;
+    }
+    
+    public String toString()
+    {
+       StringBuffer buffer = new StringBuffer(200);
+       buffer.append("[Account: userId " + userId);
+       buffer.append(", password " + password);
+       buffer.append("]");
+       
+       return buffer.toString();
+    }
+
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-package xpetstore.services.cart.ejb;
-
-import java.util.Collection;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-public interface Cart
-{
-    void addItem( String itemId );
-   
-    void addItem( String itemId, int qty );
-   
-    void removeItem( String itemId );
- 
-    void updateItems( String itemId[], int newQty[] );
-
-    int getCount(  );
-   
-    double getTotal(  );
-   
-    void empty(  );
-
-    Map getDetails(  );
- 
-    Collection getCartItems(  );
-    
-    void remove();
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/Cart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+package xpetstore.services.cart.ejb;
+
+import java.util.Collection;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+public interface Cart
+{
+    void addItem( String itemId );
+   
+    void addItem( String itemId, int qty );
+   
+    void removeItem( String itemId );
+ 
+    void updateItems( String itemId[], int newQty[] );
+
+    int getCount(  );
+   
+    double getTotal(  );
+   
+    void empty(  );
+
+    Map getDetails(  );
+ 
+    Collection getCartItems(  );
+    
+    void remove();
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,210 +0,0 @@
-package xpetstore.services.cart.ejb;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.jboss.annotation.ejb.LocalBinding;
-
-import xpetstore.domain.catalog.ejb.Item;
-import xpetstore.domain.catalog.ejb.Product;
-
-import xpetstore.services.cart.model.CartItem;
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.util.Debug;
-
-
-/**
- *
- * @ ejb.bean
- *      name="Cart"
- *      type="Stateful"
- *      view-type="local"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.ejb-ref
- *      ejb-name="Item"
- *      view-type="local"
- * 		ref-name="ejb/ItemLocal"
- */
- at Stateful(name="Cart")
- at LocalBinding(jndiBinding="ejb/Cart")
- at Local(Cart.class)
-public class CartBean
-   implements Cart
-{
-
-   @PersistenceContext
-   private EntityManager manager;
-   
-    /** Map of item quantities indexed by itemId */
-    private Map _details = new HashMap(  );
-
-   public CartBean()
-   {
-      
-   }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public void addItem( String itemId )
-    {
-        addItem( itemId, 1 );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public void addItem( String itemId,
-                         int    qty )
-    {
-        Integer curQty = ( Integer ) _details.get( itemId );
-        if ( curQty == null )
-        {
-            _details.put( itemId, new Integer( qty ) );
-        }
-        else
-        {
-            _details.put( itemId, new Integer( qty + curQty.intValue(  ) ) );
-        }
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public void removeItem( String itemId )
-    {
-        _details.remove( itemId );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public void updateItems( String itemId[],
-                             int    newQty[] )
-    {
-        for ( int i = 0; i < itemId.length; i++ )
-        {
-            String id = itemId[ i ];
-            int    qty = newQty[ i ];
-
-            if ( _details.containsKey( id ) )
-            {
-                if ( qty > 0 )
-                {
-                    _details.put( id, new Integer( qty ) );
-                }
-            }
-            else
-            {
-                Debug.print( " can't update item[" + id + "]. This item not in the cart" );
-            }
-        }
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public int getCount(  )
-    {
-        return _details.size(  );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public double getTotal(  )
-    {
-        double   ret = 0.0d;
-        Iterator it = getCartItems(  ).iterator(  );
-        for ( ; it.hasNext(  ); )
-        {
-            CartItem i = ( CartItem ) it.next(  );
-            ret += ( i.getUnitCost(  ) * i.getQuantity(  ) );
-        }
-
-        return ret;
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public void empty(  )
-    {
-        _details.clear(  );
-    }
-
-    /**
-     * @ return Return a Map of quantities indexed by itemId
-     *
-     * @ ejb.interface-method
-     * @ ejb.transaction-type
-     *      type="NotSupported"
-     */
-    public Map getDetails(  )
-    {
-        return _details;
-    }
-
-    /**
-     * @ return Return a list of {@link CartItem} objects
-     *
-     * @ ejb.interface-method
-     * @ ejb.transaction-type
-     *      type="NotSupported"
-     */
-    public Collection getCartItems(  )
-    {
-        try
-        {
-            ArrayList     items = new ArrayList(  );
-            Iterator      it = _details.keySet(  ).iterator(  );
-            while ( it.hasNext(  ) )
-            {
-                String  key = ( String ) it.next(  );
-                Integer value = ( Integer ) _details.get( key );
-                try
-                {
-                    Item    item = manager.find( Item.class, key );
-             
-                    Product prod = item.getProduct(  );
-
-                    CartItem     ci = new CartItem( item.getItemId(  ), prod.getProductId(  ), prod.getName(  ), item.getDescription(  ), value.intValue(  ), item.getListPrice(  ) );
-
-                    items.add( ci );
-                }
-                catch ( Exception cce )
-                {
-                    cce.printStackTrace(  );
-                }
-            }
-
-            // Sort the items
-            Collections.sort( items, new CartItem.ItemIdComparator(  ) );
-            return items;
-        }
-        catch ( Exception e )
-        {
-            return Collections.EMPTY_LIST;
-        }
-    }
-    
-    @Remove
-    public void remove()
-    {
-       
-    }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/ejb/CartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,210 @@
+package xpetstore.services.cart.ejb;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.ejb.Local;
+import javax.ejb.Stateful;
+import javax.ejb.Remove;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.annotation.ejb.LocalBinding;
+
+import xpetstore.domain.catalog.ejb.Item;
+import xpetstore.domain.catalog.ejb.Product;
+
+import xpetstore.services.cart.model.CartItem;
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.util.Debug;
+
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Cart"
+ *      type="Stateful"
+ *      view-type="local"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.ejb-ref
+ *      ejb-name="Item"
+ *      view-type="local"
+ * 		ref-name="ejb/ItemLocal"
+ */
+ at Stateful(name="Cart")
+ at LocalBinding(jndiBinding="ejb/Cart")
+ at Local(Cart.class)
+public class CartBean
+   implements Cart
+{
+
+   @PersistenceContext
+   private EntityManager manager;
+   
+    /** Map of item quantities indexed by itemId */
+    private Map _details = new HashMap(  );
+
+   public CartBean()
+   {
+      
+   }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public void addItem( String itemId )
+    {
+        addItem( itemId, 1 );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public void addItem( String itemId,
+                         int    qty )
+    {
+        Integer curQty = ( Integer ) _details.get( itemId );
+        if ( curQty == null )
+        {
+            _details.put( itemId, new Integer( qty ) );
+        }
+        else
+        {
+            _details.put( itemId, new Integer( qty + curQty.intValue(  ) ) );
+        }
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public void removeItem( String itemId )
+    {
+        _details.remove( itemId );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public void updateItems( String itemId[],
+                             int    newQty[] )
+    {
+        for ( int i = 0; i < itemId.length; i++ )
+        {
+            String id = itemId[ i ];
+            int    qty = newQty[ i ];
+
+            if ( _details.containsKey( id ) )
+            {
+                if ( qty > 0 )
+                {
+                    _details.put( id, new Integer( qty ) );
+                }
+            }
+            else
+            {
+                Debug.print( " can't update item[" + id + "]. This item not in the cart" );
+            }
+        }
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public int getCount(  )
+    {
+        return _details.size(  );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public double getTotal(  )
+    {
+        double   ret = 0.0d;
+        Iterator it = getCartItems(  ).iterator(  );
+        for ( ; it.hasNext(  ); )
+        {
+            CartItem i = ( CartItem ) it.next(  );
+            ret += ( i.getUnitCost(  ) * i.getQuantity(  ) );
+        }
+
+        return ret;
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public void empty(  )
+    {
+        _details.clear(  );
+    }
+
+    /**
+     * @ return Return a Map of quantities indexed by itemId
+     *
+     * @ ejb.interface-method
+     * @ ejb.transaction-type
+     *      type="NotSupported"
+     */
+    public Map getDetails(  )
+    {
+        return _details;
+    }
+
+    /**
+     * @ return Return a list of {@link CartItem} objects
+     *
+     * @ ejb.interface-method
+     * @ ejb.transaction-type
+     *      type="NotSupported"
+     */
+    public Collection getCartItems(  )
+    {
+        try
+        {
+            ArrayList     items = new ArrayList(  );
+            Iterator      it = _details.keySet(  ).iterator(  );
+            while ( it.hasNext(  ) )
+            {
+                String  key = ( String ) it.next(  );
+                Integer value = ( Integer ) _details.get( key );
+                try
+                {
+                    Item    item = manager.find( Item.class, key );
+             
+                    Product prod = item.getProduct(  );
+
+                    CartItem     ci = new CartItem( item.getItemId(  ), prod.getProductId(  ), prod.getName(  ), item.getDescription(  ), value.intValue(  ), item.getListPrice(  ) );
+
+                    items.add( ci );
+                }
+                catch ( Exception cce )
+                {
+                    cce.printStackTrace(  );
+                }
+            }
+
+            // Sort the items
+            Collections.sort( items, new CartItem.ItemIdComparator(  ) );
+            return items;
+        }
+        catch ( Exception e )
+        {
+            return Collections.EMPTY_LIST;
+        }
+    }
+    
+    @Remove
+    public void remove()
+    {
+       
+    }
+
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package xpetstore.services.cart.interfaces;
-
-/**
- * Local home interface for Cart.
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public interface CartLocalHome
-   extends javax.ejb.EJBLocalHome
-{
-   public static final String COMP_NAME="java:comp/env/ejb/Cart";
-   public static final String JNDI_NAME="Cart";
-
-   public xpetstore.services.cart.ejb.Cart create()
-      throws javax.ejb.CreateException;
-
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/interfaces/CartLocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package xpetstore.services.cart.interfaces;
+
+/**
+ * Local home interface for Cart.
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public interface CartLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Cart";
+   public static final String JNDI_NAME="Cart";
+
+   public xpetstore.services.cart.ejb.Cart create()
+      throws javax.ejb.CreateException;
+
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-package xpetstore.services.cart.model;
-
-import java.io.Serializable;
-
-import java.util.Comparator;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class CartItem
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String itemId;
-    private String productId;
-    private String name;
-    private String description;
-    private int    quantity;
-    private double unitCost;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public CartItem( String itemId,
-                     String productId,
-                     String name,
-                     String description,
-                     int    quantity,
-                     double unitCost )
-    {
-        this.itemId      = itemId;
-        this.productId   = productId;
-        this.name        = name;
-        this.description = description;
-        this.quantity    = quantity;
-        this.unitCost    = unitCost;
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public String getItemId(  )
-    {
-        return itemId;
-    }
-
-    public String getProductId(  )
-    {
-        return productId;
-    }
-
-    public String getName(  )
-    {
-        return name;
-    }
-
-    public String getDescription(  )
-    {
-        return description;
-    }
-
-    public int getQuantity(  )
-    {
-        return quantity;
-    }
-
-    public double getUnitCost(  )
-    {
-        return unitCost;
-    }
-
-    public double getTotalCost(  )
-    {
-        return quantity * unitCost;
-    }
-
-    //~ Inner Classes ----------------------------------------------------------
-
-    public static class ItemIdComparator
-        implements Comparator
-    {
-        //~ Methods ------------------------------------------------------------
-
-        public int compare( Object o1,
-                            Object o2 )
-        {
-            if ( ( o1 instanceof CartItem ) && ( o2 instanceof CartItem ) )
-            {
-                return ( ( CartItem ) o1 ).getItemId(  ).compareTo( ( ( CartItem ) o2 ).getItemId(  ) );
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/cart/model/CartItem.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+package xpetstore.services.cart.model;
+
+import java.io.Serializable;
+
+import java.util.Comparator;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class CartItem
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String itemId;
+    private String productId;
+    private String name;
+    private String description;
+    private int    quantity;
+    private double unitCost;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public CartItem( String itemId,
+                     String productId,
+                     String name,
+                     String description,
+                     int    quantity,
+                     double unitCost )
+    {
+        this.itemId      = itemId;
+        this.productId   = productId;
+        this.name        = name;
+        this.description = description;
+        this.quantity    = quantity;
+        this.unitCost    = unitCost;
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public String getItemId(  )
+    {
+        return itemId;
+    }
+
+    public String getProductId(  )
+    {
+        return productId;
+    }
+
+    public String getName(  )
+    {
+        return name;
+    }
+
+    public String getDescription(  )
+    {
+        return description;
+    }
+
+    public int getQuantity(  )
+    {
+        return quantity;
+    }
+
+    public double getUnitCost(  )
+    {
+        return unitCost;
+    }
+
+    public double getTotalCost(  )
+    {
+        return quantity * unitCost;
+    }
+
+    //~ Inner Classes ----------------------------------------------------------
+
+    public static class ItemIdComparator
+        implements Comparator
+    {
+        //~ Methods ------------------------------------------------------------
+
+        public int compare( Object o1,
+                            Object o2 )
+        {
+            if ( ( o1 instanceof CartItem ) && ( o2 instanceof CartItem ) )
+            {
+                return ( ( CartItem ) o1 ).getItemId(  ).compareTo( ( ( CartItem ) o2 ).getItemId(  ) );
+            }
+            else
+            {
+                return 0;
+            }
+        }
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,117 +0,0 @@
-package xpetstore.services.mail.ejb;
-
-import java.util.Date;
-
-import javax.activation.DataHandler;
-
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
-import javax.naming.InitialContext;
-
-import xpetstore.services.mail.model.Email;
-
-import xpetstore.util.Debug;
-import xpetstore.util.JNDINames;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @ejb.bean
- *      name="Mailer"
- *      acknowledge-mode="Auto-acknowledge"
- *      destination-type="javax.jms.Queue"
- *      subscription-durability="Durable"
- *      transaction-type="Container"
- * @ejb.transaction
- *      type="NotSupported"
- * @ejb.resource-ref
- *      res-ref-name="${jndi.mail.session}"
- *      res-type="javax.mail.Session"
- *      res-auth="Container"
- * 		jndi-name="${orion.mail.session}"
- *
- * @jboss.destination-jndi-name
- *      name="${jboss.queue.mail}"
- * @jboss.resource-ref
- *      res-ref-name="${jndi.mail.session}"
- *      jndi-name="${jboss.mail.session}"
- *
- * @weblogic.message-driven
- *      destination-jndi-name="${weblogic.queue.mail}"
- * @weblogic.resource-description
- *      res-ref-name="${jndi.mail.session}"
- *      jndi-name="${weblogic.mail.session}"
- *
- * @orion.bean
- *      connection-factory-location="${orion.queue.ConnectionFactory}"
- *      destination-location="${orion.queue.mail}"
- */
-public class MailerMDB
-    implements MessageDrivenBean,
-                   MessageListener
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * This method expect a <code>javax.jms.ObjectMessage</code> that
-     * contains a {@link Email} as the message object
-     */
-    public void onMessage( Message recvMsg )
-    {
-        try
-        {
-            Debug.print( "MailerMDB.onMessage(" + recvMsg + ")" );
-
-            ObjectMessage msg = ( ObjectMessage ) recvMsg;
-            Email         email = ( Email ) msg.getObject(  );
-
-            send( email.getTo(  ), email.getSubject(  ), email.getBody(  ) );
-        }
-        catch ( Exception e )
-        {
-            Debug.print( "Unable to send the email", e );
-        }
-    }
-
-    public void send( String to,
-                      String subject,
-                      String body )
-        throws Exception
-    {
-        Debug.print( "MailerMDB.send(" + to + "," + subject + ",...)" );
-
-        InitialContext     ic = new InitialContext(  );
-        Session            session = ( Session ) ic.lookup( JNDINames.MAIL_SESSION );
-        javax.mail.Message msg = new MimeMessage( session );
-
-        msg.setFrom(  );
-        msg.setRecipients( javax.mail.Message.RecipientType.TO, InternetAddress.parse( to, false ) );
-        msg.setSubject( subject );
-
-        msg.setDataHandler( new DataHandler( body, "text/html" ) );
-        msg.setHeader( "X-Mailer", "JavaMailer" );
-        msg.setSentDate( new Date(  ) );
-
-        Transport.send( msg );
-    }
-
-    //=============================================
-    // EJB callbacks
-    //=============================================
-    public void ejbCreate(  ) {}
-
-    public void setMessageDrivenContext( MessageDrivenContext mdc ) {}
-
-    public void ejbRemove(  ) {}
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/ejb/MailerMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,117 @@
+package xpetstore.services.mail.ejb;
+
+import java.util.Date;
+
+import javax.activation.DataHandler;
+
+import javax.ejb.MessageDrivenBean;
+import javax.ejb.MessageDrivenContext;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.ObjectMessage;
+
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
+import javax.naming.InitialContext;
+
+import xpetstore.services.mail.model.Email;
+
+import xpetstore.util.Debug;
+import xpetstore.util.JNDINames;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @ejb.bean
+ *      name="Mailer"
+ *      acknowledge-mode="Auto-acknowledge"
+ *      destination-type="javax.jms.Queue"
+ *      subscription-durability="Durable"
+ *      transaction-type="Container"
+ * @ejb.transaction
+ *      type="NotSupported"
+ * @ejb.resource-ref
+ *      res-ref-name="${jndi.mail.session}"
+ *      res-type="javax.mail.Session"
+ *      res-auth="Container"
+ * 		jndi-name="${orion.mail.session}"
+ *
+ * @jboss.destination-jndi-name
+ *      name="${jboss.queue.mail}"
+ * @jboss.resource-ref
+ *      res-ref-name="${jndi.mail.session}"
+ *      jndi-name="${jboss.mail.session}"
+ *
+ * @weblogic.message-driven
+ *      destination-jndi-name="${weblogic.queue.mail}"
+ * @weblogic.resource-description
+ *      res-ref-name="${jndi.mail.session}"
+ *      jndi-name="${weblogic.mail.session}"
+ *
+ * @orion.bean
+ *      connection-factory-location="${orion.queue.ConnectionFactory}"
+ *      destination-location="${orion.queue.mail}"
+ */
+public class MailerMDB
+    implements MessageDrivenBean,
+                   MessageListener
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * This method expect a <code>javax.jms.ObjectMessage</code> that
+     * contains a {@link Email} as the message object
+     */
+    public void onMessage( Message recvMsg )
+    {
+        try
+        {
+            Debug.print( "MailerMDB.onMessage(" + recvMsg + ")" );
+
+            ObjectMessage msg = ( ObjectMessage ) recvMsg;
+            Email         email = ( Email ) msg.getObject(  );
+
+            send( email.getTo(  ), email.getSubject(  ), email.getBody(  ) );
+        }
+        catch ( Exception e )
+        {
+            Debug.print( "Unable to send the email", e );
+        }
+    }
+
+    public void send( String to,
+                      String subject,
+                      String body )
+        throws Exception
+    {
+        Debug.print( "MailerMDB.send(" + to + "," + subject + ",...)" );
+
+        InitialContext     ic = new InitialContext(  );
+        Session            session = ( Session ) ic.lookup( JNDINames.MAIL_SESSION );
+        javax.mail.Message msg = new MimeMessage( session );
+
+        msg.setFrom(  );
+        msg.setRecipients( javax.mail.Message.RecipientType.TO, InternetAddress.parse( to, false ) );
+        msg.setSubject( subject );
+
+        msg.setDataHandler( new DataHandler( body, "text/html" ) );
+        msg.setHeader( "X-Mailer", "JavaMailer" );
+        msg.setSentDate( new Date(  ) );
+
+        Transport.send( msg );
+    }
+
+    //=============================================
+    // EJB callbacks
+    //=============================================
+    public void ejbCreate(  ) {}
+
+    public void setMessageDrivenContext( MessageDrivenContext mdc ) {}
+
+    public void ejbRemove(  ) {}
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-package xpetstore.services.mail.model;
-
-import java.io.Serializable;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class Email
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String to;
-    private String subject;
-    private String body;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public Email( String to,
-                  String subject,
-                  String body )
-    {
-        this.to      = to;
-        this.subject = subject;
-        this.body    = body;
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public String getTo(  )
-    {
-        return to;
-    }
-
-    public String getSubject(  )
-    {
-        return subject;
-    }
-
-    public String getBody(  )
-    {
-        return body;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/mail/model/Email.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+package xpetstore.services.mail.model;
+
+import java.io.Serializable;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class Email
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String to;
+    private String subject;
+    private String body;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public Email( String to,
+                  String subject,
+                  String body )
+    {
+        this.to      = to;
+        this.subject = subject;
+        this.body    = body;
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public String getTo(  )
+    {
+        return to;
+    }
+
+    public String getSubject(  )
+    {
+        return subject;
+    }
+
+    public String getBody(  )
+    {
+        return body;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,221 +0,0 @@
-package xpetstore.services.order.ejb;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import xpetstore.domain.customer.ejb.Customer;
-import xpetstore.domain.order.ejb.Order;
-import xpetstore.domain.order.ejb.OrderItem;
-
-import xpetstore.domain.order.model.OrderStatus;
-
-import xpetstore.services.mail.model.Email;
-import xpetstore.services.order.exceptions.CreditCardException;
-
-import xpetstore.util.Debug;
-import xpetstore.util.JMSUtil;
-import xpetstore.util.JNDINames;
-
-
-/**
- *
- * @ ejb.bean
- *      name="OrderProcessor"
- *      acknowledge-mode="Auto-acknowledge"
- *      destination-type="javax.jms.Queue"
- *      subscription-durability="Durable"
- *      transaction-type="Container"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.ejb-ref
- *      ejb-name="Order"
- *      view-type="local"
- * 		ref-name="ejb/OrderLocal"
- * @ ejb.resource-ref
- *      res-ref-name="${jndi.queue.ConnectionFactory}"
- *      res-type="javax.jms.QueueConnectionFactory"
- *      res-auth="Container"
- * 		jndi-name="${orion.queue.ConnectionFactory}"
- * @ ejb.resource-ref
- *      res-ref-name="${jndi.queue.mail}"
- *      res-type="javax.jms.Queue"
- *      res-auth="Container"
- * 		jndi-name="${orion.queue.mail}"
- *
- * @ jboss.destination-jndi-name
- *      name="${jboss.queue.order}"
- * @ jboss.resource-ref
- *      res-ref-name="${jndi.queue.ConnectionFactory}"
- *      jndi-name="${jboss.queue.ConnectionFactory}"
- * @ jboss.resource-ref
- *      res-ref-name="${jndi.queue.mail}"
- *      jndi-name="${jboss.queue.mail}"
- *
- * @ weblogic.message-driven
- *      destination-jndi-name="${weblogic.queue.order}"
- * @ weblogic.resource-description
- *      res-ref-name="${jndi.queue.ConnectionFactory}"
- *      jndi-name="${weblogic.queue.ConnectionFactory}"
- * @ weblogic.resource-description
- *      res-ref-name="${jndi.queue.mail}"
- *      jndi-name="${weblogic.queue.mail}"
- *
- * @ orion.bean
- *      connection-factory-location="${orion.queue.ConnectionFactory}"
- *      destination-location="${orion.queue.order}"
- */
- at MessageDriven(name="OrderProcessor", activationConfig =
-{
-      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-      @ActivationConfigProperty(propertyName="destination", propertyValue="queue/order")
-})
-public class OrderProcessorMDB
-   implements MessageListener
-{
-   @PersistenceContext
-   private EntityManager manager;
-
-    /**
-     * This method expect a <code>javax.jms.ObjectMessage</code> that
-     * contains the orderUId as the message object
-     */
-    public void onMessage( Message recvMsg )
-    {
-        Integer    orderUId = null;
-        Order order = null;
-
-        try
-        {
-            Debug.print( "OrderProcessorMDB.onMessage(" + recvMsg + ")" );
-
-            /* Get the order to proceed */
-            ObjectMessage msg = ( ObjectMessage ) recvMsg;
-            orderUId = ( Integer ) msg.getObject(  );
-            order    = manager.find( Order.class, orderUId );
-
-            /* Proceed the order */
-            proceedPayment( order );
-            proceedOrder( order );
-        }
-        catch ( CreditCardException c )
-        {
-            try
-            {
-                cancelOrder( order );
-            }
-            catch ( Exception e )
-            {
-                Debug.print( "Unable to cancel the order[" + orderUId + "]", e );
-            }
-        }
-        catch ( Exception e )
-        {
-            Debug.print( "Unable to proceed the order[" + orderUId + "]", e );
-        }
-    }
-
-    private void proceedPayment( Order order )
-        throws CreditCardException {}
-
-    private void proceedOrder( Order order )
-        throws Exception
-    {
-        order.changeStatus( OrderStatus.TO_DELIVER );
-        notifyCustomer( order );
-    }
-
-    private void cancelOrder( Order order )
-        throws Exception
-    {
-        order.changeStatus( OrderStatus.CANCELLED );
-        notifyCustomer( order );
-    }
-
-    private void notifyCustomer( Order order )
-        throws Exception
-    {
-    	Customer customer = order.getCustomer(  );
-    	if ( customer == null)
-    	{
-    		Debug.print( "No customer to notify" );
-    		return;
-    	}
-    	 
-        String to = customer.getEmail(  );
-        String subject = "[Petstore] Order Confirmation";
-        String body = toHtml( order );
-        JMSUtil.sendToJMSQueue( JNDINames.QUEUE_MAIL, new Email( to, subject, body ), false );
-    }
-
-    private String toHtml( Order order )
-    {
-        StringBuffer buff = new StringBuffer(  );
-
-        /* Id/Status */
-        buff.append( "<table border='1' width='100%'>" );
-        buff.append( "<tr><td width='10%'><b>Order ID:</b></td><td>" + order.getOrderUId(  ) + "</td></tr>" );
-        buff.append( "<tr><td width='10%'><b>Status:</b></td><td>" + order.getStatus(  ) + "</td></tr>" );
-        buff.append( "</table>" );
-
-        /* Shipping/Bill address Address */
-        buff.append( "<table border='1' width='100%'><tr>" );
-        buff.append( "<td width='10%' valign='top'><b>Address:</b></td>" );
-        buff.append( "<td>" );
-        buff.append( order.getStreet1(  ) + "<br>" );
-        buff.append( order.getStreet2(  ) + "<br>" );
-        buff.append( order.getCity(  ) + "," + order.getState(  ) + "<br>" );
-        buff.append( order.getZipcode(  ) + "<br>" );
-        buff.append( order.getCountry(  ) );
-        buff.append( "</td>" );
-        buff.append( "</tr></table>" );
-
-        /* Items */
-        Collection orderItems = order.getOrderItems(  );
-        buff.append( "<table border='1' width='100%'>" );
-        buff.append( "<tr>" );
-        buff.append( "<th bgcolor='#c0c0c0'>ID</td>" );
-        buff.append( "<th bgcolor='#c0c0c0'>Description</th>" );
-        buff.append( "<th bgcolor='#c0c0c0'>Unit Price</th>" );
-        buff.append( "<th bgcolor='#c0c0c0'>Quantity</th>" );
-        buff.append( "<th bgcolor='#c0c0c0'>&nbsp;</th>" );
-        buff.append( "</tr>" );
-
-        for ( Iterator it = orderItems.iterator(  ); it.hasNext(  ); )
-        {
-            OrderItem orderItem = ( OrderItem ) it.next(  );
-            buff.append( toHtml( orderItem ) );
-        }
-
-        buff.append( "<tr>" );
-        buff.append( "<td colspan=4 align=right bgcolor='#c0c0c0'>TOTAL:</td>" );
-        buff.append( "<td bgcolor='#c0c0c0'><b>" + order.calculateTotal(  ) + "<b></td>" );
-        buff.append( "</tr>" );
-        buff.append( "</table>" );
-
-        return buff.toString(  );
-    }
-
-    private String toHtml( OrderItem orderItem )
-    {
-        StringBuffer   buff = new StringBuffer(  );
-
-        buff.append( "<tr>" );
-        buff.append( "<td>" + orderItem.getItem(  ).getItemId(  ) + "</td>>" );
-        buff.append( "<td>" + orderItem.getItem(  ).getDescription(  ) + "<br>" );
-        buff.append( "<td>" + orderItem + "</td>" );
-        buff.append( "<td>" + orderItem + "</td>" );
-        buff.append( "<td>" + orderItem.calculateSubTotal(  ) + "</td>" );
-        buff.append( "</tr>" );
-
-        return buff.toString(  );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/ejb/OrderProcessorMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,221 @@
+package xpetstore.services.order.ejb;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.ObjectMessage;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import xpetstore.domain.customer.ejb.Customer;
+import xpetstore.domain.order.ejb.Order;
+import xpetstore.domain.order.ejb.OrderItem;
+
+import xpetstore.domain.order.model.OrderStatus;
+
+import xpetstore.services.mail.model.Email;
+import xpetstore.services.order.exceptions.CreditCardException;
+
+import xpetstore.util.Debug;
+import xpetstore.util.JMSUtil;
+import xpetstore.util.JNDINames;
+
+
+/**
+ *
+ * @ ejb.bean
+ *      name="OrderProcessor"
+ *      acknowledge-mode="Auto-acknowledge"
+ *      destination-type="javax.jms.Queue"
+ *      subscription-durability="Durable"
+ *      transaction-type="Container"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.ejb-ref
+ *      ejb-name="Order"
+ *      view-type="local"
+ * 		ref-name="ejb/OrderLocal"
+ * @ ejb.resource-ref
+ *      res-ref-name="${jndi.queue.ConnectionFactory}"
+ *      res-type="javax.jms.QueueConnectionFactory"
+ *      res-auth="Container"
+ * 		jndi-name="${orion.queue.ConnectionFactory}"
+ * @ ejb.resource-ref
+ *      res-ref-name="${jndi.queue.mail}"
+ *      res-type="javax.jms.Queue"
+ *      res-auth="Container"
+ * 		jndi-name="${orion.queue.mail}"
+ *
+ * @ jboss.destination-jndi-name
+ *      name="${jboss.queue.order}"
+ * @ jboss.resource-ref
+ *      res-ref-name="${jndi.queue.ConnectionFactory}"
+ *      jndi-name="${jboss.queue.ConnectionFactory}"
+ * @ jboss.resource-ref
+ *      res-ref-name="${jndi.queue.mail}"
+ *      jndi-name="${jboss.queue.mail}"
+ *
+ * @ weblogic.message-driven
+ *      destination-jndi-name="${weblogic.queue.order}"
+ * @ weblogic.resource-description
+ *      res-ref-name="${jndi.queue.ConnectionFactory}"
+ *      jndi-name="${weblogic.queue.ConnectionFactory}"
+ * @ weblogic.resource-description
+ *      res-ref-name="${jndi.queue.mail}"
+ *      jndi-name="${weblogic.queue.mail}"
+ *
+ * @ orion.bean
+ *      connection-factory-location="${orion.queue.ConnectionFactory}"
+ *      destination-location="${orion.queue.order}"
+ */
+ at MessageDriven(name="OrderProcessor", activationConfig =
+{
+      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+      @ActivationConfigProperty(propertyName="destination", propertyValue="queue/order")
+})
+public class OrderProcessorMDB
+   implements MessageListener
+{
+   @PersistenceContext
+   private EntityManager manager;
+
+    /**
+     * This method expect a <code>javax.jms.ObjectMessage</code> that
+     * contains the orderUId as the message object
+     */
+    public void onMessage( Message recvMsg )
+    {
+        Integer    orderUId = null;
+        Order order = null;
+
+        try
+        {
+            Debug.print( "OrderProcessorMDB.onMessage(" + recvMsg + ")" );
+
+            /* Get the order to proceed */
+            ObjectMessage msg = ( ObjectMessage ) recvMsg;
+            orderUId = ( Integer ) msg.getObject(  );
+            order    = manager.find( Order.class, orderUId );
+
+            /* Proceed the order */
+            proceedPayment( order );
+            proceedOrder( order );
+        }
+        catch ( CreditCardException c )
+        {
+            try
+            {
+                cancelOrder( order );
+            }
+            catch ( Exception e )
+            {
+                Debug.print( "Unable to cancel the order[" + orderUId + "]", e );
+            }
+        }
+        catch ( Exception e )
+        {
+            Debug.print( "Unable to proceed the order[" + orderUId + "]", e );
+        }
+    }
+
+    private void proceedPayment( Order order )
+        throws CreditCardException {}
+
+    private void proceedOrder( Order order )
+        throws Exception
+    {
+        order.changeStatus( OrderStatus.TO_DELIVER );
+        notifyCustomer( order );
+    }
+
+    private void cancelOrder( Order order )
+        throws Exception
+    {
+        order.changeStatus( OrderStatus.CANCELLED );
+        notifyCustomer( order );
+    }
+
+    private void notifyCustomer( Order order )
+        throws Exception
+    {
+    	Customer customer = order.getCustomer(  );
+    	if ( customer == null)
+    	{
+    		Debug.print( "No customer to notify" );
+    		return;
+    	}
+    	 
+        String to = customer.getEmail(  );
+        String subject = "[Petstore] Order Confirmation";
+        String body = toHtml( order );
+        JMSUtil.sendToJMSQueue( JNDINames.QUEUE_MAIL, new Email( to, subject, body ), false );
+    }
+
+    private String toHtml( Order order )
+    {
+        StringBuffer buff = new StringBuffer(  );
+
+        /* Id/Status */
+        buff.append( "<table border='1' width='100%'>" );
+        buff.append( "<tr><td width='10%'><b>Order ID:</b></td><td>" + order.getOrderUId(  ) + "</td></tr>" );
+        buff.append( "<tr><td width='10%'><b>Status:</b></td><td>" + order.getStatus(  ) + "</td></tr>" );
+        buff.append( "</table>" );
+
+        /* Shipping/Bill address Address */
+        buff.append( "<table border='1' width='100%'><tr>" );
+        buff.append( "<td width='10%' valign='top'><b>Address:</b></td>" );
+        buff.append( "<td>" );
+        buff.append( order.getStreet1(  ) + "<br>" );
+        buff.append( order.getStreet2(  ) + "<br>" );
+        buff.append( order.getCity(  ) + "," + order.getState(  ) + "<br>" );
+        buff.append( order.getZipcode(  ) + "<br>" );
+        buff.append( order.getCountry(  ) );
+        buff.append( "</td>" );
+        buff.append( "</tr></table>" );
+
+        /* Items */
+        Collection orderItems = order.getOrderItems(  );
+        buff.append( "<table border='1' width='100%'>" );
+        buff.append( "<tr>" );
+        buff.append( "<th bgcolor='#c0c0c0'>ID</td>" );
+        buff.append( "<th bgcolor='#c0c0c0'>Description</th>" );
+        buff.append( "<th bgcolor='#c0c0c0'>Unit Price</th>" );
+        buff.append( "<th bgcolor='#c0c0c0'>Quantity</th>" );
+        buff.append( "<th bgcolor='#c0c0c0'>&nbsp;</th>" );
+        buff.append( "</tr>" );
+
+        for ( Iterator it = orderItems.iterator(  ); it.hasNext(  ); )
+        {
+            OrderItem orderItem = ( OrderItem ) it.next(  );
+            buff.append( toHtml( orderItem ) );
+        }
+
+        buff.append( "<tr>" );
+        buff.append( "<td colspan=4 align=right bgcolor='#c0c0c0'>TOTAL:</td>" );
+        buff.append( "<td bgcolor='#c0c0c0'><b>" + order.calculateTotal(  ) + "<b></td>" );
+        buff.append( "</tr>" );
+        buff.append( "</table>" );
+
+        return buff.toString(  );
+    }
+
+    private String toHtml( OrderItem orderItem )
+    {
+        StringBuffer   buff = new StringBuffer(  );
+
+        buff.append( "<tr>" );
+        buff.append( "<td>" + orderItem.getItem(  ).getItemId(  ) + "</td>>" );
+        buff.append( "<td>" + orderItem.getItem(  ).getDescription(  ) + "<br>" );
+        buff.append( "<td>" + orderItem + "</td>" );
+        buff.append( "<td>" + orderItem + "</td>" );
+        buff.append( "<td>" + orderItem.calculateSubTotal(  ) + "</td>" );
+        buff.append( "</tr>" );
+
+        return buff.toString(  );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-package xpetstore.services.order.exceptions;
-
-import xpetstore.util.ChainedException;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class CreditCardException
-    extends ChainedException
-{
-    //~ Constructors -----------------------------------------------------------
-
-    /**
-     * Constructor for CreditCardException.
-     */
-    public CreditCardException(  )
-    {
-        super(  );
-    }
-
-    /**
-     * Constructor for CreditCardException.
-     * @param message
-     */
-    public CreditCardException( String message )
-    {
-        super( message );
-    }
-
-    /**
-     * Constructor for CreditCardException.
-     * @param message
-     * @param cause
-     */
-    public CreditCardException( String    message,
-                                Throwable cause )
-    {
-        super( message, cause );
-    }
-
-    /**
-     * Constructor for CreditCardException.
-     * @param cause
-     */
-    public CreditCardException( Throwable cause )
-    {
-        super( cause );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/order/exceptions/CreditCardException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+package xpetstore.services.order.exceptions;
+
+import xpetstore.util.ChainedException;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class CreditCardException
+    extends ChainedException
+{
+    //~ Constructors -----------------------------------------------------------
+
+    /**
+     * Constructor for CreditCardException.
+     */
+    public CreditCardException(  )
+    {
+        super(  );
+    }
+
+    /**
+     * Constructor for CreditCardException.
+     * @param message
+     */
+    public CreditCardException( String message )
+    {
+        super( message );
+    }
+
+    /**
+     * Constructor for CreditCardException.
+     * @param message
+     * @param cause
+     */
+    public CreditCardException( String    message,
+                                Throwable cause )
+    {
+        super( message, cause );
+    }
+
+    /**
+     * Constructor for CreditCardException.
+     * @param cause
+     */
+    public CreditCardException( Throwable cause )
+    {
+        super( cause );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-package xpetstore.services.petstore.ejb;
-
-import java.util.Date;
-import java.util.Map;
-
-import xpetstore.domain.catalog.ejb.Category;
-import xpetstore.domain.catalog.ejb.Item;
-import xpetstore.domain.catalog.ejb.Product;
-import xpetstore.domain.customer.ejb.Customer;
-import xpetstore.domain.order.ejb.Order;
-
-import xpetstore.services.petstore.exceptions.CartEmptyOrderException;
-import xpetstore.services.petstore.exceptions.DuplicateEmailException;
-import xpetstore.util.Page;
-
-
-public interface Petstore
-{
-    boolean authenticate( String userId, String password );
-   
-    Category getCategory( String categoryId );
-
-    Page getCategories( int start, int count );
-
-    Product getProduct( String productId );
-    
-    Product getProductByItem( String itemId );
-
-    Page getProducts( String categoryId, int start, int count );
-
-    Page searchProducts( String key, int start, int count );
-
-    Item getItem( String itemId );
-
-    Page getItems( String productId, int start, int count );
-    
-    String createCustomer( Customer customer ) throws DuplicateEmailException;
-       
-    void updateCustomer( Customer customer );
-
-    Customer getCustomer( String userId );
-
-    Integer createOrder( String userId, Date orderDate, Map items ) throws CartEmptyOrderException;
-
-    Page getCustomerOrders( String userId, int start, int count );
-
-    Order getOrder( Integer orderUId );
- 
-    Page getOrderItems( Integer orderUId, int start, int count );
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/Petstore.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+package xpetstore.services.petstore.ejb;
+
+import java.util.Date;
+import java.util.Map;
+
+import xpetstore.domain.catalog.ejb.Category;
+import xpetstore.domain.catalog.ejb.Item;
+import xpetstore.domain.catalog.ejb.Product;
+import xpetstore.domain.customer.ejb.Customer;
+import xpetstore.domain.order.ejb.Order;
+
+import xpetstore.services.petstore.exceptions.CartEmptyOrderException;
+import xpetstore.services.petstore.exceptions.DuplicateEmailException;
+import xpetstore.util.Page;
+
+
+public interface Petstore
+{
+    boolean authenticate( String userId, String password );
+   
+    Category getCategory( String categoryId );
+
+    Page getCategories( int start, int count );
+
+    Product getProduct( String productId );
+    
+    Product getProductByItem( String itemId );
+
+    Page getProducts( String categoryId, int start, int count );
+
+    Page searchProducts( String key, int start, int count );
+
+    Item getItem( String itemId );
+
+    Page getItems( String productId, int start, int count );
+    
+    String createCustomer( Customer customer ) throws DuplicateEmailException;
+       
+    void updateCustomer( Customer customer );
+
+    Customer getCustomer( String userId );
+
+    Integer createOrder( String userId, Date orderDate, Map items ) throws CartEmptyOrderException;
+
+    Page getCustomerOrders( String userId, int start, int count );
+
+    Order getOrder( Integer orderUId );
+ 
+    Page getOrderItems( Integer orderUId, int start, int count );
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,441 +0,0 @@
-package xpetstore.services.petstore.ejb;
-
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.ejb.EJBException;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.jboss.annotation.ejb.LocalBinding;
-
-import xpetstore.domain.catalog.ejb.Category;
-import xpetstore.domain.catalog.ejb.Item;
-import xpetstore.domain.catalog.ejb.Product;
-import xpetstore.domain.customer.ejb.Customer;
-import xpetstore.domain.order.ejb.Order;
-import xpetstore.domain.order.ejb.OrderItem;
-import xpetstore.domain.order.model.OrderStatus;
-
-import xpetstore.domain.signon.ejb.Account;
-
-import xpetstore.services.petstore.exceptions.CartEmptyOrderException;
-import xpetstore.services.petstore.exceptions.DuplicateEmailException;
-
-import xpetstore.util.JMSUtil;
-import xpetstore.util.JNDINames;
-import xpetstore.util.Page;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @ ejb.bean
- *      name="Petstore"
- *      type="Stateless"
- *      view-type="local"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.ejb-ref
- *      ejb-name="Category"
- *      view-type="local"
- * 		ref-name="ejb/CategoryLocal"
- * @ ejb.ejb-ref
- *      ejb-name="Item"
- *      view-type="local"
- * 		ref-name="ejb/ItemLocal"
- * @ ejb.ejb-ref
- *      ejb-name="Product"
- *      view-type="local"
- * 		ref-name="ejb/ProductLocal"
- * @ ejb.ejb-ref
- *      ejb-name="Customer"
- *      view-type="local"
- * 		ref-name="ejb/CustomerLocal"
- * @ ejb.ejb-ref
- *      ejb-name="Account"
- *      view-type="local"
- * 		ref-name="ejb/AccountLocal"
- * @ ejb.ejb-ref
- *      ejb-name="Order"
- *      view-type="local"
- * 		ref-name="ejb/OrderLocal"
- * @ ejb.resource-ref
- *      res-ref-name="${jndi.queue.ConnectionFactory}"
- *      res-type="javax.jms.QueueConnectionFactory"
- *      res-auth="Container"
- * 		jndi-name="${orion.queue.ConnectionFactory}"
- * @ ejb.resource-ref
- *      res-ref-name="${jndi.queue.order}"
- *      res-type="javax.jms.Queue"
- *      res-auth="Container"
- * 		jndi-name="${orion.queue.order}"
- * @ ejb.resource-ref
- *      res-ref-name="${jndi.datasource}"
- *      res-type="javax.sql.DataSource"
- *      res-auth="Container"
- * 		jndi-name="${orion.datasource}"
- *
- * @ jboss.resource-ref
- *      res-ref-name="${jndi.queue.ConnectionFactory}"
- *      jndi-name="${jboss.queue.ConnectionFactory}"
- * @ jboss.resource-ref
- *      res-ref-name="${jndi.queue.order}"
- *      jndi-name="${jboss.queue.order}"
- * @ jboss.resource-ref
- *      res-ref-name="${jndi.datasource}"
- *      jndi-name="${jboss.datasource}"
- *
- * @ weblogic.resource-description
- *      res-ref-name="${jndi.queue.ConnectionFactory}"
- *      jndi-name="${weblogic.queue.ConnectionFactory}"
- * @ weblogic.resource-description
- *      res-ref-name="${jndi.queue.order}"
- *      jndi-name="${weblogic.queue.order}"
- * @ weblogic.resource-description
- *      res-ref-name="${jndi.datasource}"
- *      jndi-name="${weblogic.datasource}"
- */
- at Stateless(name="Petstore")
- at LocalBinding(jndiBinding="ejb/Petstore")
- at Local(Petstore.class)
- at TransactionAttribute(TransactionAttributeType.REQUIRED)
-public class PetstoreBean implements Petstore
-{
- //  private static final Logger log = Logger.getLogger(PetstoreBean.class);
-   
-   @PersistenceContext
-   private EntityManager manager;
-   
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public boolean authenticate( String userId,
-                                 String password )
-    {
-       try
-       {
-         Account act = manager.find(Account.class, userId );
-         System.out.println("!! PetstoreBean.authenticate " + act + " " + userId + " " + password);
-         if (act == null)
-            return false;
-         return act.matchPassword( password );
-       }
-       catch (Exception e)
-       {
-          e.printStackTrace();
-          return false;
-       }
-    }
-
- 
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public Category getCategory( String categoryId )
-    {
-        return manager.find(Category.class, categoryId );
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public Page getCategories( int start,
-                               int count )
-    {
-       return toPage( manager.createQuery("SELECT Category c FROM Category").getResultList(), start, count, Category.class );
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public Product getProduct( String productId )
-    {
-        return manager.find( Product.class, productId );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public Product getProductByItem( String itemId )
-    {
-        Item item = manager.find( Item.class, itemId );
-        return item.getProduct(  );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public Page getProducts( String categoryId,
-                             int    start,
-                             int    count )
-    {
-       try
-       {
-          System.out.println("!! PetstoreBean.getProducts manager " + manager);
-         Category cat = manager.find( Category.class, categoryId );
-         System.out.println("!! PetstoreBean.getProducts cat " + cat);
-         if (cat != null)
-            return toPage( cat.getProducts(  ), start, count, Product.class );
-         else
-            return Page.EMPTY_PAGE;
-       }
-       catch (Exception e)
-       {
-          e.printStackTrace();
-          return null;
-       }
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public Page searchProducts( String key,
-                                int    start,
-                                int    count )
-    {    
-       return toPage(manager.createNativeQuery("SELECT productId,name,description FROM T_PRODUCT WHERE (productId LIKE " + key + ") OR (name LIKE " + key + ") OR (description LIKE " + key + ")").getResultList(), start, count, Product.class);
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public Item getItem( String itemId )
-    {
-        return manager.find( Item.class, itemId );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public Page getItems( String productId,
-                          int    start,
-                          int    count )
-    {
-         Product prod = manager.find( Product.class, productId );
-         return toPage( prod.getItems(  ), start, count, Item.class );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public String createCustomer( Customer customer )
-        throws DuplicateEmailException
-    {
-       System.out.println("!!PetstoreBean.createCustomer " + customer);
-       
-        /* Make sure that the customer email is unique */
-         String email = customer.getEmail(  );
-         List customers = null;
-         try
-         {
-            customers = manager.createQuery("SELECT c FROM Customer c WHERE c.email = '" + email + "'").getResultList();
-            
-         } 
-         catch (Exception e)
-         {
-            
-         }
-         
-         if (customers != null && customers.size() > 0)
-            throw new DuplicateEmailException( email );
-      
-         /* create the account */
-         Account account = customer.getAccount(  );
-         
-         customer.setUserId(account.getUserId());
-
-         manager.persist(account);
-         
-         manager.persist(customer);
-         
-         System.out.println("!!PetstoreBean.createCustomer userId " + customer);
-         
-         return customer.getUserId(  );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public void updateCustomer( Customer customer )
-    {
-       manager.merge(customer);
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public Customer getCustomer( String userId )
-    {
-        return manager.find( Customer.class, userId );
-    }
-
-    /**
-     * @param userId        Id of the customer
-     * @param orderDate    Creation date of the order
-     * @param items        <code>java.lang.Map</code> containing the items
-     *                      ordered. The key is the itemId, and the value
-     *                      a </code>java.lang.Integer</code> representing the
-     *                      quantity ordered
-     *
-     * @ ejb.interface-method
-     */
-    public Integer createOrder( String userId,
-                                Date   orderDate,
-                                Map    items )
-        throws CartEmptyOrderException
-    {
-        /* Make sure that the cart is not empty */
-        if ( items.size(  ) == 0 )
-        {
-            throw new CartEmptyOrderException(  );
-        }
-
-        /* Get the customer */
-        Customer cst = manager.find( Customer.class, userId );
-
-        /* Create the order */
-        Order order = new Order(  );
-        order.setOrderDate( orderDate );
-        order.setStatus( OrderStatus.PENDING );
-        order.setStreet1( cst.getStreet1(  ) );
-        order.setStreet2( cst.getStreet2(  ) );
-        order.setCity( cst.getCity(  ) );
-        order.setState( cst.getState(  ) );
-        order.setZipcode( cst.getZipcode(  ) );
-        order.setCountry( cst.getCountry(  ) );
-        order.setCreditCardNumber( cst.getCreditCardNumber(  ) );
-        order.setCreditCardType( cst.getCreditCardType(  ) );
-        order.setCreditCardExpiryDate( cst.getCreditCardExpiryDate(  ) );
-
-        order.setCustomer( cst );
-        
-        manager.persist(order);
-
-        /* Add the items */
-        Iterator keys = items.keySet(  ).iterator(  );
-        while ( keys.hasNext(  ) )
-        {
-            String  itemId = ( String ) keys.next(  );
-            Integer qty = ( Integer ) items.get( itemId );
-            
-            Item item = manager.find(Item.class, itemId);
-            
-            System.out.println("!!PetstoreBean.createOrder item " + item + " " + itemId);
-            
-            OrderItem orderItem = new OrderItem( qty, item.getListPrice(  ) );
-            orderItem.setItem( item );
-            
-            manager.persist(orderItem);
-            
-            order.addOrderItem(orderItem);
-            
-            order.addOrderItem( orderItem );
-        }
-
-        /* Process the item ansynchronously */
-        try
-        {
-            JMSUtil.sendToJMSQueue( JNDINames.QUEUE_ORDER, order.getOrderUId(  ), false );
-        }
-        catch ( Exception e )
-        {
-            throw new EJBException( e );
-        }
-
-        return order.getOrderUId(  );
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public Page getCustomerOrders( String userId,
-                                   int    start,
-                                   int    count )
-    {
-       List col = manager.createQuery("SELECT Order o FROM Order WHERE o.customer.userId = " + userId).getResultList();
-       return toPage( col, start, count, Order.class );
-    }
-
-    /**
-     * @ ejb.interface-method
-     * @ ejb.transaction
-     *      type="NotSupported"
-     */
-    public Order getOrder( Integer orderUId )
-    {
-        return manager.find( Order.class, orderUId );
-    }
-
-    /**
-     * @ ejb.interface-method
-     */
-    public Page getOrderItems( Integer orderUId,
-                               int     start,
-                               int     count )
-    {
-        Collection col;
-      
-         Order order = manager.find( Order.class, orderUId );
-         if (order != null)
-            col = order.getOrderItems(  );
-         else
-            col = new ArrayList(  );
-     
-        return toPage( col, start, count, OrderItem.class );
-    }
-
-    private Page toPage( Collection col,
-                         int        start,
-                         int        count,
-                         Class      type )
-    {
-        int size = col.size(  );
-        if ( size == 0 )
-        {
-            return Page.EMPTY_PAGE;
-        }
-
-        ArrayList lst = new ArrayList(  );
-        Iterator  it = col.iterator(  );
-        for ( int i = 0, imax = start + count; ( i < imax ) && it.hasNext(  );
-              i++ )
-        {
-            Object obj = it.next(  );
-            if ( i >= start )
-            {
-                lst.add( obj );
-            }
-        }
-
-        return new Page( lst, start, ( start + count ) < size );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/ejb/PetstoreBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,441 @@
+package xpetstore.services.petstore.ejb;
+
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.ejb.EJBException;
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.annotation.ejb.LocalBinding;
+
+import xpetstore.domain.catalog.ejb.Category;
+import xpetstore.domain.catalog.ejb.Item;
+import xpetstore.domain.catalog.ejb.Product;
+import xpetstore.domain.customer.ejb.Customer;
+import xpetstore.domain.order.ejb.Order;
+import xpetstore.domain.order.ejb.OrderItem;
+import xpetstore.domain.order.model.OrderStatus;
+
+import xpetstore.domain.signon.ejb.Account;
+
+import xpetstore.services.petstore.exceptions.CartEmptyOrderException;
+import xpetstore.services.petstore.exceptions.DuplicateEmailException;
+
+import xpetstore.util.JMSUtil;
+import xpetstore.util.JNDINames;
+import xpetstore.util.Page;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @ ejb.bean
+ *      name="Petstore"
+ *      type="Stateless"
+ *      view-type="local"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.ejb-ref
+ *      ejb-name="Category"
+ *      view-type="local"
+ * 		ref-name="ejb/CategoryLocal"
+ * @ ejb.ejb-ref
+ *      ejb-name="Item"
+ *      view-type="local"
+ * 		ref-name="ejb/ItemLocal"
+ * @ ejb.ejb-ref
+ *      ejb-name="Product"
+ *      view-type="local"
+ * 		ref-name="ejb/ProductLocal"
+ * @ ejb.ejb-ref
+ *      ejb-name="Customer"
+ *      view-type="local"
+ * 		ref-name="ejb/CustomerLocal"
+ * @ ejb.ejb-ref
+ *      ejb-name="Account"
+ *      view-type="local"
+ * 		ref-name="ejb/AccountLocal"
+ * @ ejb.ejb-ref
+ *      ejb-name="Order"
+ *      view-type="local"
+ * 		ref-name="ejb/OrderLocal"
+ * @ ejb.resource-ref
+ *      res-ref-name="${jndi.queue.ConnectionFactory}"
+ *      res-type="javax.jms.QueueConnectionFactory"
+ *      res-auth="Container"
+ * 		jndi-name="${orion.queue.ConnectionFactory}"
+ * @ ejb.resource-ref
+ *      res-ref-name="${jndi.queue.order}"
+ *      res-type="javax.jms.Queue"
+ *      res-auth="Container"
+ * 		jndi-name="${orion.queue.order}"
+ * @ ejb.resource-ref
+ *      res-ref-name="${jndi.datasource}"
+ *      res-type="javax.sql.DataSource"
+ *      res-auth="Container"
+ * 		jndi-name="${orion.datasource}"
+ *
+ * @ jboss.resource-ref
+ *      res-ref-name="${jndi.queue.ConnectionFactory}"
+ *      jndi-name="${jboss.queue.ConnectionFactory}"
+ * @ jboss.resource-ref
+ *      res-ref-name="${jndi.queue.order}"
+ *      jndi-name="${jboss.queue.order}"
+ * @ jboss.resource-ref
+ *      res-ref-name="${jndi.datasource}"
+ *      jndi-name="${jboss.datasource}"
+ *
+ * @ weblogic.resource-description
+ *      res-ref-name="${jndi.queue.ConnectionFactory}"
+ *      jndi-name="${weblogic.queue.ConnectionFactory}"
+ * @ weblogic.resource-description
+ *      res-ref-name="${jndi.queue.order}"
+ *      jndi-name="${weblogic.queue.order}"
+ * @ weblogic.resource-description
+ *      res-ref-name="${jndi.datasource}"
+ *      jndi-name="${weblogic.datasource}"
+ */
+ at Stateless(name="Petstore")
+ at LocalBinding(jndiBinding="ejb/Petstore")
+ at Local(Petstore.class)
+ at TransactionAttribute(TransactionAttributeType.REQUIRED)
+public class PetstoreBean implements Petstore
+{
+ //  private static final Logger log = Logger.getLogger(PetstoreBean.class);
+   
+   @PersistenceContext
+   private EntityManager manager;
+   
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public boolean authenticate( String userId,
+                                 String password )
+    {
+       try
+       {
+         Account act = manager.find(Account.class, userId );
+         System.out.println("!! PetstoreBean.authenticate " + act + " " + userId + " " + password);
+         if (act == null)
+            return false;
+         return act.matchPassword( password );
+       }
+       catch (Exception e)
+       {
+          e.printStackTrace();
+          return false;
+       }
+    }
+
+ 
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public Category getCategory( String categoryId )
+    {
+        return manager.find(Category.class, categoryId );
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public Page getCategories( int start,
+                               int count )
+    {
+       return toPage( manager.createQuery("SELECT Category c FROM Category").getResultList(), start, count, Category.class );
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public Product getProduct( String productId )
+    {
+        return manager.find( Product.class, productId );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public Product getProductByItem( String itemId )
+    {
+        Item item = manager.find( Item.class, itemId );
+        return item.getProduct(  );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public Page getProducts( String categoryId,
+                             int    start,
+                             int    count )
+    {
+       try
+       {
+          System.out.println("!! PetstoreBean.getProducts manager " + manager);
+         Category cat = manager.find( Category.class, categoryId );
+         System.out.println("!! PetstoreBean.getProducts cat " + cat);
+         if (cat != null)
+            return toPage( cat.getProducts(  ), start, count, Product.class );
+         else
+            return Page.EMPTY_PAGE;
+       }
+       catch (Exception e)
+       {
+          e.printStackTrace();
+          return null;
+       }
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public Page searchProducts( String key,
+                                int    start,
+                                int    count )
+    {    
+       return toPage(manager.createNativeQuery("SELECT productId,name,description FROM T_PRODUCT WHERE (productId LIKE " + key + ") OR (name LIKE " + key + ") OR (description LIKE " + key + ")").getResultList(), start, count, Product.class);
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public Item getItem( String itemId )
+    {
+        return manager.find( Item.class, itemId );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public Page getItems( String productId,
+                          int    start,
+                          int    count )
+    {
+         Product prod = manager.find( Product.class, productId );
+         return toPage( prod.getItems(  ), start, count, Item.class );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public String createCustomer( Customer customer )
+        throws DuplicateEmailException
+    {
+       System.out.println("!!PetstoreBean.createCustomer " + customer);
+       
+        /* Make sure that the customer email is unique */
+         String email = customer.getEmail(  );
+         List customers = null;
+         try
+         {
+            customers = manager.createQuery("SELECT c FROM Customer c WHERE c.email = '" + email + "'").getResultList();
+            
+         } 
+         catch (Exception e)
+         {
+            
+         }
+         
+         if (customers != null && customers.size() > 0)
+            throw new DuplicateEmailException( email );
+      
+         /* create the account */
+         Account account = customer.getAccount(  );
+         
+         customer.setUserId(account.getUserId());
+
+         manager.persist(account);
+         
+         manager.persist(customer);
+         
+         System.out.println("!!PetstoreBean.createCustomer userId " + customer);
+         
+         return customer.getUserId(  );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public void updateCustomer( Customer customer )
+    {
+       manager.merge(customer);
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public Customer getCustomer( String userId )
+    {
+        return manager.find( Customer.class, userId );
+    }
+
+    /**
+     * @param userId        Id of the customer
+     * @param orderDate    Creation date of the order
+     * @param items        <code>java.lang.Map</code> containing the items
+     *                      ordered. The key is the itemId, and the value
+     *                      a </code>java.lang.Integer</code> representing the
+     *                      quantity ordered
+     *
+     * @ ejb.interface-method
+     */
+    public Integer createOrder( String userId,
+                                Date   orderDate,
+                                Map    items )
+        throws CartEmptyOrderException
+    {
+        /* Make sure that the cart is not empty */
+        if ( items.size(  ) == 0 )
+        {
+            throw new CartEmptyOrderException(  );
+        }
+
+        /* Get the customer */
+        Customer cst = manager.find( Customer.class, userId );
+
+        /* Create the order */
+        Order order = new Order(  );
+        order.setOrderDate( orderDate );
+        order.setStatus( OrderStatus.PENDING );
+        order.setStreet1( cst.getStreet1(  ) );
+        order.setStreet2( cst.getStreet2(  ) );
+        order.setCity( cst.getCity(  ) );
+        order.setState( cst.getState(  ) );
+        order.setZipcode( cst.getZipcode(  ) );
+        order.setCountry( cst.getCountry(  ) );
+        order.setCreditCardNumber( cst.getCreditCardNumber(  ) );
+        order.setCreditCardType( cst.getCreditCardType(  ) );
+        order.setCreditCardExpiryDate( cst.getCreditCardExpiryDate(  ) );
+
+        order.setCustomer( cst );
+        
+        manager.persist(order);
+
+        /* Add the items */
+        Iterator keys = items.keySet(  ).iterator(  );
+        while ( keys.hasNext(  ) )
+        {
+            String  itemId = ( String ) keys.next(  );
+            Integer qty = ( Integer ) items.get( itemId );
+            
+            Item item = manager.find(Item.class, itemId);
+            
+            System.out.println("!!PetstoreBean.createOrder item " + item + " " + itemId);
+            
+            OrderItem orderItem = new OrderItem( qty, item.getListPrice(  ) );
+            orderItem.setItem( item );
+            
+            manager.persist(orderItem);
+            
+            order.addOrderItem(orderItem);
+            
+            order.addOrderItem( orderItem );
+        }
+
+        /* Process the item ansynchronously */
+        try
+        {
+            JMSUtil.sendToJMSQueue( JNDINames.QUEUE_ORDER, order.getOrderUId(  ), false );
+        }
+        catch ( Exception e )
+        {
+            throw new EJBException( e );
+        }
+
+        return order.getOrderUId(  );
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public Page getCustomerOrders( String userId,
+                                   int    start,
+                                   int    count )
+    {
+       List col = manager.createQuery("SELECT Order o FROM Order WHERE o.customer.userId = " + userId).getResultList();
+       return toPage( col, start, count, Order.class );
+    }
+
+    /**
+     * @ ejb.interface-method
+     * @ ejb.transaction
+     *      type="NotSupported"
+     */
+    public Order getOrder( Integer orderUId )
+    {
+        return manager.find( Order.class, orderUId );
+    }
+
+    /**
+     * @ ejb.interface-method
+     */
+    public Page getOrderItems( Integer orderUId,
+                               int     start,
+                               int     count )
+    {
+        Collection col;
+      
+         Order order = manager.find( Order.class, orderUId );
+         if (order != null)
+            col = order.getOrderItems(  );
+         else
+            col = new ArrayList(  );
+     
+        return toPage( col, start, count, OrderItem.class );
+    }
+
+    private Page toPage( Collection col,
+                         int        start,
+                         int        count,
+                         Class      type )
+    {
+        int size = col.size(  );
+        if ( size == 0 )
+        {
+            return Page.EMPTY_PAGE;
+        }
+
+        ArrayList lst = new ArrayList(  );
+        Iterator  it = col.iterator(  );
+        for ( int i = 0, imax = start + count; ( i < imax ) && it.hasNext(  );
+              i++ )
+        {
+            Object obj = it.next(  );
+            if ( i >= start )
+            {
+                lst.add( obj );
+            }
+        }
+
+        return new Page( lst, start, ( start + count ) < size );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-package xpetstore.services.petstore.exceptions;
-
-import xpetstore.util.ChainedException;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class CartEmptyOrderException
-    extends ChainedException
-{
-    //~ Constructors -----------------------------------------------------------
-
-    /**
-     * Constructor for ShoppingCartEmptyOrderException.
-     */
-    public CartEmptyOrderException(  )
-    {
-        super(  );
-    }
-
-    /**
-     * Constructor for ShoppingCartEmptyOrderException.
-     * @param message
-     */
-    public CartEmptyOrderException( String message )
-    {
-        super( message );
-    }
-
-    /**
-     * Constructor for ShoppingCartEmptyOrderException.
-     * @param message
-     * @param cause
-     */
-    public CartEmptyOrderException( String    message,
-                                    Throwable cause )
-    {
-        super( message, cause );
-    }
-
-    /**
-     * Constructor for ShoppingCartEmptyOrderException.
-     * @param cause
-     */
-    public CartEmptyOrderException( Throwable cause )
-    {
-        super( cause );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/CartEmptyOrderException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+package xpetstore.services.petstore.exceptions;
+
+import xpetstore.util.ChainedException;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class CartEmptyOrderException
+    extends ChainedException
+{
+    //~ Constructors -----------------------------------------------------------
+
+    /**
+     * Constructor for ShoppingCartEmptyOrderException.
+     */
+    public CartEmptyOrderException(  )
+    {
+        super(  );
+    }
+
+    /**
+     * Constructor for ShoppingCartEmptyOrderException.
+     * @param message
+     */
+    public CartEmptyOrderException( String message )
+    {
+        super( message );
+    }
+
+    /**
+     * Constructor for ShoppingCartEmptyOrderException.
+     * @param message
+     * @param cause
+     */
+    public CartEmptyOrderException( String    message,
+                                    Throwable cause )
+    {
+        super( message, cause );
+    }
+
+    /**
+     * Constructor for ShoppingCartEmptyOrderException.
+     * @param cause
+     */
+    public CartEmptyOrderException( Throwable cause )
+    {
+        super( cause );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-package xpetstore.services.petstore.exceptions;
-
-import xpetstore.util.ChainedException;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class DuplicateAccountException
-    extends ChainedException
-{
-    //~ Constructors -----------------------------------------------------------
-
-    /**
-     * Constructor for DuplicateAccountException.
-     */
-    public DuplicateAccountException(  )
-    {
-        super(  );
-    }
-
-    /**
-     * Constructor for DuplicateAccountException.
-     * @param message
-     */
-    public DuplicateAccountException( String message )
-    {
-        super( message );
-    }
-
-    /**
-     * Constructor for DuplicateAccountException.
-     * @param message
-     * @param cause
-     */
-    public DuplicateAccountException( String    message,
-                                      Throwable cause )
-    {
-        super( message, cause );
-    }
-
-    /**
-     * Constructor for DuplicateAccountException.
-     * @param cause
-     */
-    public DuplicateAccountException( Throwable cause )
-    {
-        super( cause );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateAccountException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+package xpetstore.services.petstore.exceptions;
+
+import xpetstore.util.ChainedException;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class DuplicateAccountException
+    extends ChainedException
+{
+    //~ Constructors -----------------------------------------------------------
+
+    /**
+     * Constructor for DuplicateAccountException.
+     */
+    public DuplicateAccountException(  )
+    {
+        super(  );
+    }
+
+    /**
+     * Constructor for DuplicateAccountException.
+     * @param message
+     */
+    public DuplicateAccountException( String message )
+    {
+        super( message );
+    }
+
+    /**
+     * Constructor for DuplicateAccountException.
+     * @param message
+     * @param cause
+     */
+    public DuplicateAccountException( String    message,
+                                      Throwable cause )
+    {
+        super( message, cause );
+    }
+
+    /**
+     * Constructor for DuplicateAccountException.
+     * @param cause
+     */
+    public DuplicateAccountException( Throwable cause )
+    {
+        super( cause );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-package xpetstore.services.petstore.exceptions;
-
-import xpetstore.util.ChainedException;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class DuplicateEmailException
-    extends ChainedException
-{
-    //~ Constructors -----------------------------------------------------------
-
-    /**
-     * Constructor for DuplicateEmailException.
-     */
-    public DuplicateEmailException(  )
-    {
-        super(  );
-    }
-
-    /**
-     * Constructor for DuplicateEmailException.
-     * @param message
-     */
-    public DuplicateEmailException( String message )
-    {
-        super( message );
-    }
-
-    /**
-     * Constructor for DuplicateEmailException.
-     * @param message
-     * @param cause
-     */
-    public DuplicateEmailException( String    message,
-                                    Throwable cause )
-    {
-        super( message, cause );
-    }
-
-    /**
-     * Constructor for DuplicateEmailException.
-     * @param cause
-     */
-    public DuplicateEmailException( Throwable cause )
-    {
-        super( cause );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/services/petstore/exceptions/DuplicateEmailException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+package xpetstore.services.petstore.exceptions;
+
+import xpetstore.util.ChainedException;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class DuplicateEmailException
+    extends ChainedException
+{
+    //~ Constructors -----------------------------------------------------------
+
+    /**
+     * Constructor for DuplicateEmailException.
+     */
+    public DuplicateEmailException(  )
+    {
+        super(  );
+    }
+
+    /**
+     * Constructor for DuplicateEmailException.
+     * @param message
+     */
+    public DuplicateEmailException( String message )
+    {
+        super( message );
+    }
+
+    /**
+     * Constructor for DuplicateEmailException.
+     * @param message
+     * @param cause
+     */
+    public DuplicateEmailException( String    message,
+                                    Throwable cause )
+    {
+        super( message, cause );
+    }
+
+    /**
+     * Constructor for DuplicateEmailException.
+     * @param cause
+     */
+    public DuplicateEmailException( Throwable cause )
+    {
+        super( cause );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,95 +0,0 @@
-package xpetstore.util;
-
-
-/**
- * Use this class to support chained exceptions in jdk1.3
- *
- * @author Isabelle Therrien
- */
-public class ChainedException
-    extends Exception
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Throwable cause = null;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public ChainedException(  )
-    {
-        super(  );
-    }
-
-    public ChainedException( String message )
-    {
-        super( message );
-    }
-
-    public ChainedException( String    message,
-                             Throwable cause )
-    {
-        super( message );
-        this.cause = cause;
-    }
-
-    public ChainedException( Throwable cause )
-    {
-        super( "no message" );
-        this.cause = cause;
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public Throwable getCause(  )
-    {
-        return cause;
-    }
-
-    public String toString(  )
-    {
-        if ( cause == null )
-        {
-            return super.toString(  );
-        }
-        else
-        {
-            return super.toString(  ) + "  <---- Caused by: " + cause.toString(  ) + " ---->";
-        }
-    }
-
-    public void printStackTrace(  )
-    {
-        super.printStackTrace(  );
-
-        if ( cause != null )
-        {
-            System.err.println( "<---- Caused by:" );
-            cause.printStackTrace(  );
-            System.err.println( "---->" );
-        }
-    }
-
-    public void printStackTrace( java.io.PrintStream ps )
-    {
-        super.printStackTrace( ps );
-
-        if ( cause != null )
-        {
-            ps.println( "<---- Caused by:" );
-            cause.printStackTrace( ps );
-            ps.println( "---->" );
-        }
-    }
-
-    public void printStackTrace( java.io.PrintWriter pw )
-    {
-        super.printStackTrace( pw );
-
-        if ( cause != null )
-        {
-            pw.println( "<---- Caused by:" );
-            cause.printStackTrace( pw );
-            pw.println( "---->" );
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,95 @@
+package xpetstore.util;
+
+
+/**
+ * Use this class to support chained exceptions in jdk1.3
+ *
+ * @author Isabelle Therrien
+ */
+public class ChainedException
+    extends Exception
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Throwable cause = null;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public ChainedException(  )
+    {
+        super(  );
+    }
+
+    public ChainedException( String message )
+    {
+        super( message );
+    }
+
+    public ChainedException( String    message,
+                             Throwable cause )
+    {
+        super( message );
+        this.cause = cause;
+    }
+
+    public ChainedException( Throwable cause )
+    {
+        super( "no message" );
+        this.cause = cause;
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public Throwable getCause(  )
+    {
+        return cause;
+    }
+
+    public String toString(  )
+    {
+        if ( cause == null )
+        {
+            return super.toString(  );
+        }
+        else
+        {
+            return super.toString(  ) + "  <---- Caused by: " + cause.toString(  ) + " ---->";
+        }
+    }
+
+    public void printStackTrace(  )
+    {
+        super.printStackTrace(  );
+
+        if ( cause != null )
+        {
+            System.err.println( "<---- Caused by:" );
+            cause.printStackTrace(  );
+            System.err.println( "---->" );
+        }
+    }
+
+    public void printStackTrace( java.io.PrintStream ps )
+    {
+        super.printStackTrace( ps );
+
+        if ( cause != null )
+        {
+            ps.println( "<---- Caused by:" );
+            cause.printStackTrace( ps );
+            ps.println( "---->" );
+        }
+    }
+
+    public void printStackTrace( java.io.PrintWriter pw )
+    {
+        super.printStackTrace( pw );
+
+        if ( cause != null )
+        {
+            pw.println( "<---- Caused by:" );
+            cause.printStackTrace( pw );
+            pw.println( "---->" );
+        }
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,95 +0,0 @@
-package xpetstore.util;
-
-
-/**
- * Use this class to support chained exceptions in jdk1.3
- *
- * @author Isabelle Therrien
- */
-public class ChainedRuntimeException
-    extends RuntimeException
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Throwable cause = null;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public ChainedRuntimeException(  )
-    {
-        super(  );
-    }
-
-    public ChainedRuntimeException( String message )
-    {
-        super( message );
-    }
-
-    public ChainedRuntimeException( String    message,
-                                    Throwable cause )
-    {
-        super( message );
-        this.cause = cause;
-    }
-
-    public ChainedRuntimeException( Throwable cause )
-    {
-        super( "no message" );
-        this.cause = cause;
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public Throwable getCause(  )
-    {
-        return cause;
-    }
-
-    public String toString(  )
-    {
-        if ( cause == null )
-        {
-            return super.toString(  );
-        }
-        else
-        {
-            return super.toString(  ) + "  <---- Caused by: " + cause.toString(  ) + " ---->";
-        }
-    }
-
-    public void printStackTrace(  )
-    {
-        super.printStackTrace(  );
-
-        if ( cause != null )
-        {
-            System.err.println( "<---- Caused by:" );
-            cause.printStackTrace(  );
-            System.err.println( "---->" );
-        }
-    }
-
-    public void printStackTrace( java.io.PrintStream ps )
-    {
-        super.printStackTrace( ps );
-
-        if ( cause != null )
-        {
-            ps.println( "<---- Caused by:" );
-            cause.printStackTrace( ps );
-            ps.println( "---->" );
-        }
-    }
-
-    public void printStackTrace( java.io.PrintWriter pw )
-    {
-        super.printStackTrace( pw );
-
-        if ( cause != null )
-        {
-            pw.println( "<---- Caused by:" );
-            cause.printStackTrace( pw );
-            pw.println( "---->" );
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/ChainedRuntimeException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,95 @@
+package xpetstore.util;
+
+
+/**
+ * Use this class to support chained exceptions in jdk1.3
+ *
+ * @author Isabelle Therrien
+ */
+public class ChainedRuntimeException
+    extends RuntimeException
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Throwable cause = null;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public ChainedRuntimeException(  )
+    {
+        super(  );
+    }
+
+    public ChainedRuntimeException( String message )
+    {
+        super( message );
+    }
+
+    public ChainedRuntimeException( String    message,
+                                    Throwable cause )
+    {
+        super( message );
+        this.cause = cause;
+    }
+
+    public ChainedRuntimeException( Throwable cause )
+    {
+        super( "no message" );
+        this.cause = cause;
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public Throwable getCause(  )
+    {
+        return cause;
+    }
+
+    public String toString(  )
+    {
+        if ( cause == null )
+        {
+            return super.toString(  );
+        }
+        else
+        {
+            return super.toString(  ) + "  <---- Caused by: " + cause.toString(  ) + " ---->";
+        }
+    }
+
+    public void printStackTrace(  )
+    {
+        super.printStackTrace(  );
+
+        if ( cause != null )
+        {
+            System.err.println( "<---- Caused by:" );
+            cause.printStackTrace(  );
+            System.err.println( "---->" );
+        }
+    }
+
+    public void printStackTrace( java.io.PrintStream ps )
+    {
+        super.printStackTrace( ps );
+
+        if ( cause != null )
+        {
+            ps.println( "<---- Caused by:" );
+            cause.printStackTrace( ps );
+            ps.println( "---->" );
+        }
+    }
+
+    public void printStackTrace( java.io.PrintWriter pw )
+    {
+        super.printStackTrace( pw );
+
+        if ( cause != null )
+        {
+            pw.println( "<---- Caused by:" );
+            cause.printStackTrace( pw );
+            pw.println( "---->" );
+        }
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-package xpetstore.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class CreditCardNames
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String     VISA = "Visa";
-    public static final String     MASTERCARD = "MasterCard";
-    public static final String     AMEX = "American Express";
-    private static final ArrayList __all;
-
-    static
-    {
-        __all = new ArrayList(  );
-        __all.add( VISA );
-        __all.add( MASTERCARD );
-        __all.add( AMEX );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public static Collection all(  )
-    {
-        return __all;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/CreditCardNames.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+package xpetstore.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class CreditCardNames
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String     VISA = "Visa";
+    public static final String     MASTERCARD = "MasterCard";
+    public static final String     AMEX = "American Express";
+    private static final ArrayList __all;
+
+    static
+    {
+        __all = new ArrayList(  );
+        __all.add( VISA );
+        __all.add( MASTERCARD );
+        __all.add( AMEX );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public static Collection all(  )
+    {
+        return __all;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-package xpetstore.util;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class Debug
-{
-    //~ Methods ----------------------------------------------------------------
-
-    public static void print( String msg )
-    {
-        System.out.println( msg );
-    }
-
-    public static void print( String    msg,
-                              Exception cause )
-    {
-        System.out.println( msg );
-        cause.printStackTrace(  );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Debug.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+package xpetstore.util;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class Debug
+{
+    //~ Methods ----------------------------------------------------------------
+
+    public static void print( String msg )
+    {
+        System.out.println( msg );
+    }
+
+    public static void print( String    msg,
+                              Exception cause )
+    {
+        System.out.println( msg );
+        cause.printStackTrace(  );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-package xpetstore.util;
-
-import java.io.Serializable;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class JMSUtil
-{
-    //~ Methods ----------------------------------------------------------------
-
-    public static void sendToJMSQueue( String       queueName,
-                                       Serializable obj,
-                                       boolean      transacted )
-        throws NamingException, 
-                   JMSException
-    {
-        Debug.print( "sendToJMSQueue(" + queueName + "," + obj + "," + transacted + ")" );
-
-        InitialContext  ic = null;
-        QueueConnection cnn = null;
-        QueueSender     sender = null;
-        QueueSession    session = null;
-
-        try
-        {
-            ic = new InitialContext(  );
-
-            Queue                  queue = ( Queue ) ic.lookup( queueName );
-
-            QueueConnectionFactory factory = ( QueueConnectionFactory ) ic.lookup( JNDINames.QUEUE_CONNECTION_FACTORY );
-            cnn     = factory.createQueueConnection(  );
-            session = cnn.createQueueSession( transacted, QueueSession.AUTO_ACKNOWLEDGE );
-
-            ObjectMessage msg = session.createObjectMessage( obj );
-
-            sender = session.createSender( queue );
-            sender.send( msg );
-        }
-        finally
-        {
-            if ( sender != null )
-            {
-                sender.close(  );
-            }
-
-            if ( session != null )
-            {
-                session.close(  );
-            }
-
-            if ( cnn != null )
-            {
-                cnn.close(  );
-            }
-
-            if ( ic != null )
-            {
-                ic.close(  );
-            }
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JMSUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+package xpetstore.util;
+
+import java.io.Serializable;
+
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class JMSUtil
+{
+    //~ Methods ----------------------------------------------------------------
+
+    public static void sendToJMSQueue( String       queueName,
+                                       Serializable obj,
+                                       boolean      transacted )
+        throws NamingException, 
+                   JMSException
+    {
+        Debug.print( "sendToJMSQueue(" + queueName + "," + obj + "," + transacted + ")" );
+
+        InitialContext  ic = null;
+        QueueConnection cnn = null;
+        QueueSender     sender = null;
+        QueueSession    session = null;
+
+        try
+        {
+            ic = new InitialContext(  );
+
+            Queue                  queue = ( Queue ) ic.lookup( queueName );
+
+            QueueConnectionFactory factory = ( QueueConnectionFactory ) ic.lookup( JNDINames.QUEUE_CONNECTION_FACTORY );
+            cnn     = factory.createQueueConnection(  );
+            session = cnn.createQueueSession( transacted, QueueSession.AUTO_ACKNOWLEDGE );
+
+            ObjectMessage msg = session.createObjectMessage( obj );
+
+            sender = session.createSender( queue );
+            sender.send( msg );
+        }
+        finally
+        {
+            if ( sender != null )
+            {
+                sender.close(  );
+            }
+
+            if ( session != null )
+            {
+                session.close(  );
+            }
+
+            if ( cnn != null )
+            {
+                cnn.close(  );
+            }
+
+            if ( ic != null )
+            {
+                ic.close(  );
+            }
+        }
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-package xpetstore.util;
-
-
-/**
- * This class contains the JNDI names of all the resources uses by
- * the components of the service layer
- *
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public abstract class JNDINames
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String QUEUE_CONNECTION_FACTORY = "QueueConnectionFactory";
-    public static final String QUEUE_ORDER = "queue/order";
-    public static final String QUEUE_MAIL = "queue/mail";
-    public static final String MAIL_SESSION = "java:comp/env/mail/xpetstore/MailSession";
-    public static final String JDBC_DATASOURCE = "java:comp/env/jdbc/xpetstore";
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/JNDINames.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+package xpetstore.util;
+
+
+/**
+ * This class contains the JNDI names of all the resources uses by
+ * the components of the service layer
+ *
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public abstract class JNDINames
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String QUEUE_CONNECTION_FACTORY = "QueueConnectionFactory";
+    public static final String QUEUE_ORDER = "queue/order";
+    public static final String QUEUE_MAIL = "queue/mail";
+    public static final String MAIL_SESSION = "java:comp/env/mail/xpetstore/MailSession";
+    public static final String JDBC_DATASOURCE = "java:comp/env/jdbc/xpetstore";
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-package xpetstore.util;
-
-import java.io.Serializable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class Page
-    implements Serializable
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final Page EMPTY_PAGE = new Page( Collections.EMPTY_LIST, 0, false );
-
-    //~ Instance fields --------------------------------------------------------
-
-    Collection list;
-    int        start;
-    boolean    hasNext;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public Page( Collection col,
-                 int        start,
-                 boolean    hasNext )
-    {
-        this.list    = new ArrayList( col );
-        this.start   = start;
-        this.hasNext = hasNext;
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public Collection getList(  )
-    {
-        return list;
-    }
-
-    public boolean isNextPageAvailable(  )
-    {
-        return hasNext;
-    }
-
-    public boolean isPreviousPageAvailable(  )
-    {
-        return start > 0;
-    }
-
-    public int getStartOfNextPage(  )
-    {
-        return start + list.size(  );
-    }
-
-    public int getStartOfPreviousPage(  )
-    {
-        return Math.max( start - list.size(  ), 0 );
-    }
-
-    public int getSize(  )
-    {
-        return list.size(  );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/Page.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+package xpetstore.util;
+
+import java.io.Serializable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class Page
+    implements Serializable
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final Page EMPTY_PAGE = new Page( Collections.EMPTY_LIST, 0, false );
+
+    //~ Instance fields --------------------------------------------------------
+
+    Collection list;
+    int        start;
+    boolean    hasNext;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public Page( Collection col,
+                 int        start,
+                 boolean    hasNext )
+    {
+        this.list    = new ArrayList( col );
+        this.start   = start;
+        this.hasNext = hasNext;
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public Collection getList(  )
+    {
+        return list;
+    }
+
+    public boolean isNextPageAvailable(  )
+    {
+        return hasNext;
+    }
+
+    public boolean isPreviousPageAvailable(  )
+    {
+        return start > 0;
+    }
+
+    public int getStartOfNextPage(  )
+    {
+        return start + list.size(  );
+    }
+
+    public int getStartOfPreviousPage(  )
+    {
+        return Math.max( start - list.size(  ), 0 );
+    }
+
+    public int getSize(  )
+    {
+        return list.size(  );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-package xpetstore.util.uidgen.ejb;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.PostLoad;
-import javax.persistence.PostRemove;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
-import javax.persistence.Table;
-
-/**
- *
- * @ ejb.bean
- *      name="Counter"
- *      type="CMP"
- *      view-type="local"
- *      primkey-field="name"
- *      schema="Counter"
- *      cmp-version="${ejb.cmp.version}"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.persistence
- *      table-name="T_COUNTER"
- *
- * @ jboss.persistence
- *      create-table="${jboss.create.table}"
- *      remove-table="${jboss.remove.table}"
- */
- at Entity(name = "Counter")
- at Table(name = "T_COUNTER")
-public class Counter
-{
-   private String name;
-
-   private int value;
-
-   public Counter(String name)
-   {
-      setName(name);
-      setValue(0);
-   }
-
-   /**
-    * @ ejb.interface-method
-    */
-   public int nextValue()
-   {
-      int value = getValue() + 1;
-      setValue(value);
-
-      return value;
-   }
-
-   @Id
-   protected java.lang.String getName()
-   {
-      return name;
-   }
-
-   protected void setName(java.lang.String name)
-   {
-      this.name = name;
-   }
-
-   protected int getValue()
-   {
-      return value;
-   }
-
-   protected void setValue(int value)
-   {
-      this.value = value;
-   }
-
-   @PostLoad
-   public void ejbLoad()
-   {
-   }
-
-   @PrePersist
-   @PreUpdate
-   public void ejbStore()
-   {
-   }
-
-   @PostRemove
-   public void ejbRemove() throws javax.ejb.RemoveException
-   {
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/Counter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+package xpetstore.util.uidgen.ejb;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.PostLoad;
+import javax.persistence.PostRemove;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
+import javax.persistence.Table;
+
+/**
+ *
+ * @ ejb.bean
+ *      name="Counter"
+ *      type="CMP"
+ *      view-type="local"
+ *      primkey-field="name"
+ *      schema="Counter"
+ *      cmp-version="${ejb.cmp.version}"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.persistence
+ *      table-name="T_COUNTER"
+ *
+ * @ jboss.persistence
+ *      create-table="${jboss.create.table}"
+ *      remove-table="${jboss.remove.table}"
+ */
+ at Entity(name = "Counter")
+ at Table(name = "T_COUNTER")
+public class Counter
+{
+   private String name;
+
+   private int value;
+
+   public Counter(String name)
+   {
+      setName(name);
+      setValue(0);
+   }
+
+   /**
+    * @ ejb.interface-method
+    */
+   public int nextValue()
+   {
+      int value = getValue() + 1;
+      setValue(value);
+
+      return value;
+   }
+
+   @Id
+   protected java.lang.String getName()
+   {
+      return name;
+   }
+
+   protected void setName(java.lang.String name)
+   {
+      this.name = name;
+   }
+
+   protected int getValue()
+   {
+      return value;
+   }
+
+   protected void setValue(int value)
+   {
+      this.value = value;
+   }
+
+   @PostLoad
+   public void ejbLoad()
+   {
+   }
+
+   @PrePersist
+   @PreUpdate
+   public void ejbStore()
+   {
+   }
+
+   @PostRemove
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +0,0 @@
-package xpetstore.util.uidgen.ejb;
-
-public interface UIDGenerator
-{
-   int getUniqueId(String idPrefix);
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGenerator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,6 @@
+package xpetstore.util.uidgen.ejb;
+
+public interface UIDGenerator
+{
+   int getUniqueId(String idPrefix);
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-package xpetstore.util.uidgen.ejb;
-
-import javax.ejb.EJBException;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-/**
- *
- * @ ejb.bean
- *      name="UIDGenerator"
- *      type="Stateless"
- *      view-type="local"
- * @ ejb.transaction
- *      type="Required"
- * @ ejb.ejb-ref
- *      ejb-name="Counter"
- *      view-type="local"
- *      ref-name="ejb/CounterLocal"
- */
-
- at Stateless(name = "UIDGenerator")
- at Local(UIDGenerator.class)
- at TransactionAttribute(TransactionAttributeType.REQUIRED)
-public class UIDGeneratorBean
-{
-   @PersistenceContext
-   private EntityManager manager;
-
-   /**
-    * @ ejb.interface-method
-    */
-   public int getUniqueId(String idPrefix)
-   {
-      return getCounter(idPrefix).nextValue();
-   }
-
-   private Counter getCounter(String name)
-   {
-      Counter counter = null;
-      try
-      {
-         counter = manager.find(Counter.class, name);
-         if (counter == null)
-         {
-            counter = new Counter(name);
-            manager.persist(counter);
-         }
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         throw new EJBException(e);
-      }
-
-      return counter;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/java/xpetstore/util/uidgen/ejb/UIDGeneratorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+package xpetstore.util.uidgen.ejb;
+
+import javax.ejb.EJBException;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @ ejb.bean
+ *      name="UIDGenerator"
+ *      type="Stateless"
+ *      view-type="local"
+ * @ ejb.transaction
+ *      type="Required"
+ * @ ejb.ejb-ref
+ *      ejb-name="Counter"
+ *      view-type="local"
+ *      ref-name="ejb/CounterLocal"
+ */
+
+ at Stateless(name = "UIDGenerator")
+ at Local(UIDGenerator.class)
+ at TransactionAttribute(TransactionAttributeType.REQUIRED)
+public class UIDGeneratorBean
+{
+   @PersistenceContext
+   private EntityManager manager;
+
+   /**
+    * @ ejb.interface-method
+    */
+   public int getUniqueId(String idPrefix)
+   {
+      return getCounter(idPrefix).nextValue();
+   }
+
+   private Counter getCounter(String name)
+   {
+      Counter counter = null;
+      try
+      {
+         counter = manager.find(Counter.class, name);
+         if (counter == null)
+         {
+            counter = new Counter(name);
+            manager.persist(counter);
+         }
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         throw new EJBException(e);
+      }
+
+      return counter;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/lcp.bat
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/lcp.bat (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/lcp.bat)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-errors.suffix=<br>
-
-account_information=Account Information
-address=Address
-authentication_failed=Authentication Failed
-birds=Birds
-cart_empty=The Shopping Cart is empty
-cats=Cats
-ccExpiryDate=Expiry Date
-ccExpiryDate_bad_format=The credit card expiry date has the wrong format
-ccExpiryDate_required=The credit card expiry date is required
-ccInfos=Credit Card Information
-ccNumber=Number
-ccNumber_required=The credit card number is required
-ccType=Type
-ccNumber_type=The credit card type is required
-city=City
-country=Country
-description=Description
-duplicate_account=The user ID you have entered belongs to another customer
-duplicate_email=The email you have entered belongs to another customer
-dogs=Dogs
-email=Email
-email_length=Email must have at least 4 characters
-email_required=Email is required
-firstname=First name
-fish=Fish
-itemId=Item ID
-home=Home
-lastname=Last name
-listPrice=List Price
-name=Name
-no_items=No Items
-no_products=No Products
-password=Password
-password_required=Password is required
-personal_information=Personal Information
-productId=Product ID
-quantity=Quantity
-reptiles=Reptiles
-state=State
-street1=Street1
-street2=Street2
-subTotal=Sub Total
-telephone=Telephone
-total=Total
-unitCost=Unit Cost
-userId=User ID
-userId_length=User ID must have at least 6 characters
-userId_required=User ID is required
-zipcode=Zip Code
-
-cart.title=xPetStore Shopping Cart
-cart.subtitle=Shopping Cart
-category.title=xPetStore Category
-confirmation.title=xPetstore Order Confirmation
-confirmation.subtitle=Order Confirmation
-confirmation.message=Your order has been proceed.<br>You will receive an email shortly.
-index.title=xPetStore
-item.title=xPetStore Item
-login.title=xPetStore Login
-login.message=Please enter your username and password.
-myaccount.title=xPetStore Account
-myaccount.subtitle=My Account
-order.title=xPetStore Order Form
-order.subtitle=Order Form
-product.title=xPetStore Product
-register.title=xPetstore Registration Form
-register.subtitle=Registration Form
-search.title=xPetStore Search
-search.subtitle=xPetStore Search
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/resources/Resources.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+errors.suffix=<br>
+
+account_information=Account Information
+address=Address
+authentication_failed=Authentication Failed
+birds=Birds
+cart_empty=The Shopping Cart is empty
+cats=Cats
+ccExpiryDate=Expiry Date
+ccExpiryDate_bad_format=The credit card expiry date has the wrong format
+ccExpiryDate_required=The credit card expiry date is required
+ccInfos=Credit Card Information
+ccNumber=Number
+ccNumber_required=The credit card number is required
+ccType=Type
+ccNumber_type=The credit card type is required
+city=City
+country=Country
+description=Description
+duplicate_account=The user ID you have entered belongs to another customer
+duplicate_email=The email you have entered belongs to another customer
+dogs=Dogs
+email=Email
+email_length=Email must have at least 4 characters
+email_required=Email is required
+firstname=First name
+fish=Fish
+itemId=Item ID
+home=Home
+lastname=Last name
+listPrice=List Price
+name=Name
+no_items=No Items
+no_products=No Products
+password=Password
+password_required=Password is required
+personal_information=Personal Information
+productId=Product ID
+quantity=Quantity
+reptiles=Reptiles
+state=State
+street1=Street1
+street2=Street2
+subTotal=Sub Total
+telephone=Telephone
+total=Total
+unitCost=Unit Cost
+userId=User ID
+userId_length=User ID must have at least 6 characters
+userId_required=User ID is required
+zipcode=Zip Code
+
+cart.title=xPetStore Shopping Cart
+cart.subtitle=Shopping Cart
+category.title=xPetStore Category
+confirmation.title=xPetstore Order Confirmation
+confirmation.subtitle=Order Confirmation
+confirmation.message=Your order has been proceed.<br>You will receive an email shortly.
+index.title=xPetStore
+item.title=xPetStore Item
+login.title=xPetStore Login
+login.message=Please enter your username and password.
+myaccount.title=xPetStore Account
+myaccount.subtitle=My Account
+order.title=xPetStore Order Form
+order.subtitle=Order Form
+product.title=xPetStore Product
+register.title=xPetstore Registration Form
+register.subtitle=Registration Form
+search.title=xPetStore Search
+search.subtitle=xPetStore Search
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql/data.sql
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql/data.sql (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/sql/data.sql)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,176 +0,0 @@
-package xpetstore.services.cart.test;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.naming.InitialContext;
-
-import junit.framework.TestCase;
-
-import xpetstore.services.cart.ejb.Cart;
-import xpetstore.services.cart.model.CartItem;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class CartTest
-    extends TestCase
-{
-    //~ Constructors -----------------------------------------------------------
-
-    /**
-     * Constructor for CartTest.
-     * @param arg0
-     */
-    public CartTest( String arg0 )
-    {
-        super( arg0 );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public void testCart(  )
-    {
-        Cart cart = null;
-
-        try
-        {
-            cart = (Cart)new InitialContext().lookup("Cart");
-            cart.addItem( "EST-1" );
-            cart.addItem( "EST-2" );
-            cart.addItem( "EST-10" );
-            cart.addItem( "EST-1", 9 );
-            cart.removeItem( "EST-2" );
-
-            // Cart count 
-            assertEquals( "cart.count", 2, cart.getCount(  ) );
-
-            // Cart items 
-            Collection items = cart.getCartItems(  );
-            assertNotNull( "items=null", items );
-            assertEquals( "items.size", 2, items.size(  ) );
-
-            for ( Iterator it = items.iterator(  ); it.hasNext(  ); )
-            {
-                CartItem item = ( CartItem ) it.next(  );
-
-                if ( "EST-1".equals( item.getItemId(  ) ) )
-                {
-                    assertEquals( "item[EST-1].name", "Angelfish", item.getName(  ) );
-                    assertEquals( "item[EST-1].description", "Large", item.getDescription(  ) );
-                    assertEquals( "item[EST-1].productId", "FI-SW-01", item.getProductId(  ) );
-                    assertEquals( "item[EST-1].unitCost", 16.50, item.getUnitCost(  ), 0 );
-                    assertEquals( "item[EST-1].quantity", 10, item.getQuantity(  ) );
-                    assertEquals( "item[EST-1].totalCost", 165.0, item.getTotalCost(  ), 0 );
-                }
-                else if ( "EST-10".equals( item.getItemId(  ) ) )
-                {
-                    assertEquals( "item[EST-10].name", "Bulldog", item.getName(  ) );
-                    assertEquals( "item[EST-10].description", "Spotless Female Puppy", item.getDescription(  ) );
-                    assertEquals( "item[EST-10].productId", "K9-BD-01", item.getProductId(  ) );
-                    assertEquals( "item[EST-10].unitCost", 28.50, item.getUnitCost(  ), 0 );
-                    assertEquals( "item[EST-10].quantity", 1, item.getQuantity(  ) );
-                    assertEquals( "item[EST-10].totalCost", 28.50, item.getTotalCost(  ), 0 );
-                }
-                else
-                {
-                    assertEquals( item.getItemId(  ) + " is invalid", false, true );
-                }
-            }
-
-            // Sub total          
-            assertEquals( "subTotal", 193.5, cart.getTotal(  ), 0 );
-        }
-        catch ( Exception e )
-        {
-            e.printStackTrace(  );
-            fail( "Error=" + e.toString(  ) );
-        }
-        finally
-        {
-            try
-            {
-                if ( cart != null )
-                {
-                    cart.remove(  );
-                }
-            }
-            catch ( Exception e )
-            {
-                fail( "Unable to destroy the card. Error=" + e.toString(  ) );
-            }
-        }
-    }
-
-    public void testUpdateCart(  )
-    {
-        Cart cart = null;
-
-        try
-        {
-            cart = (Cart)new InitialContext().lookup("Cart");
-            cart.addItem( "EST-1" );
-            cart.addItem( "EST-10" );
-            cart.updateItems( new String[] { "EST-1", "EST-10" }, new int[] { 10, 11 } );
-
-            // Cart count 
-            assertEquals( "cart.count", 2, cart.getCount(  ) );
-
-            // Cart items 
-            Collection items = cart.getCartItems(  );
-            assertNotNull( "items=null", items );
-            assertEquals( "items.size", 2, items.size(  ) );
-
-            for ( Iterator it = items.iterator(  ); it.hasNext(  ); )
-            {
-                CartItem item = ( CartItem ) it.next(  );
-
-                if ( "EST-1".equals( item.getItemId(  ) ) )
-                {
-                    assertEquals( "item[EST-1].name", "Angelfish", item.getName(  ) );
-                    assertEquals( "item[EST-1].description", "Large", item.getDescription(  ) );
-                    assertEquals( "item[EST-1].productId", "FI-SW-01", item.getProductId(  ) );
-                    assertEquals( "item[EST-1].unitCost", 16.50, item.getUnitCost(  ), 0 );
-                    assertEquals( "item[EST-1].quantity", 10, item.getQuantity(  ) );
-                    assertEquals( "item[EST-1].totalCost", 165.0, item.getTotalCost(  ), 0 );
-                }
-                else if ( "EST-10".equals( item.getItemId(  ) ) )
-                {
-                    assertEquals( "item[EST-10].name", "Bulldog", item.getName(  ) );
-                    assertEquals( "item[EST-10].description", "Spotless Female Puppy", item.getDescription(  ) );
-                    assertEquals( "item[EST-10].productId", "K9-BD-01", item.getProductId(  ) );
-                    assertEquals( "item[EST-10].unitCost", 28.50, item.getUnitCost(  ), 0 );
-                    assertEquals( "item[EST-10].quantity", 11, item.getQuantity(  ) );
-                    assertEquals( "item[EST-10].totalCost", 313.50, item.getTotalCost(  ), 0 );
-                }
-                else
-                {
-                    assertEquals( item.getItemId(  ) + " is invalid", false, true );
-                }
-            }
-
-            // Sub total          
-            assertEquals( "subTotal", 478.5, cart.getTotal(  ), 0 );
-        }
-        catch ( Exception e )
-        {
-            e.printStackTrace(  );
-            fail( "Error=" + e.toString(  ) );
-        }
-        finally
-        {
-            try
-            {
-                if ( cart != null )
-                {
-                    cart.remove(  );
-                }
-            }
-            catch ( Exception e )
-            {
-                fail( "Unable to destroy the card. Error=" + e.toString(  ) );
-            }
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/cart/test/CartTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,176 @@
+package xpetstore.services.cart.test;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.naming.InitialContext;
+
+import junit.framework.TestCase;
+
+import xpetstore.services.cart.ejb.Cart;
+import xpetstore.services.cart.model.CartItem;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class CartTest
+    extends TestCase
+{
+    //~ Constructors -----------------------------------------------------------
+
+    /**
+     * Constructor for CartTest.
+     * @param arg0
+     */
+    public CartTest( String arg0 )
+    {
+        super( arg0 );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public void testCart(  )
+    {
+        Cart cart = null;
+
+        try
+        {
+            cart = (Cart)new InitialContext().lookup("Cart");
+            cart.addItem( "EST-1" );
+            cart.addItem( "EST-2" );
+            cart.addItem( "EST-10" );
+            cart.addItem( "EST-1", 9 );
+            cart.removeItem( "EST-2" );
+
+            // Cart count 
+            assertEquals( "cart.count", 2, cart.getCount(  ) );
+
+            // Cart items 
+            Collection items = cart.getCartItems(  );
+            assertNotNull( "items=null", items );
+            assertEquals( "items.size", 2, items.size(  ) );
+
+            for ( Iterator it = items.iterator(  ); it.hasNext(  ); )
+            {
+                CartItem item = ( CartItem ) it.next(  );
+
+                if ( "EST-1".equals( item.getItemId(  ) ) )
+                {
+                    assertEquals( "item[EST-1].name", "Angelfish", item.getName(  ) );
+                    assertEquals( "item[EST-1].description", "Large", item.getDescription(  ) );
+                    assertEquals( "item[EST-1].productId", "FI-SW-01", item.getProductId(  ) );
+                    assertEquals( "item[EST-1].unitCost", 16.50, item.getUnitCost(  ), 0 );
+                    assertEquals( "item[EST-1].quantity", 10, item.getQuantity(  ) );
+                    assertEquals( "item[EST-1].totalCost", 165.0, item.getTotalCost(  ), 0 );
+                }
+                else if ( "EST-10".equals( item.getItemId(  ) ) )
+                {
+                    assertEquals( "item[EST-10].name", "Bulldog", item.getName(  ) );
+                    assertEquals( "item[EST-10].description", "Spotless Female Puppy", item.getDescription(  ) );
+                    assertEquals( "item[EST-10].productId", "K9-BD-01", item.getProductId(  ) );
+                    assertEquals( "item[EST-10].unitCost", 28.50, item.getUnitCost(  ), 0 );
+                    assertEquals( "item[EST-10].quantity", 1, item.getQuantity(  ) );
+                    assertEquals( "item[EST-10].totalCost", 28.50, item.getTotalCost(  ), 0 );
+                }
+                else
+                {
+                    assertEquals( item.getItemId(  ) + " is invalid", false, true );
+                }
+            }
+
+            // Sub total          
+            assertEquals( "subTotal", 193.5, cart.getTotal(  ), 0 );
+        }
+        catch ( Exception e )
+        {
+            e.printStackTrace(  );
+            fail( "Error=" + e.toString(  ) );
+        }
+        finally
+        {
+            try
+            {
+                if ( cart != null )
+                {
+                    cart.remove(  );
+                }
+            }
+            catch ( Exception e )
+            {
+                fail( "Unable to destroy the card. Error=" + e.toString(  ) );
+            }
+        }
+    }
+
+    public void testUpdateCart(  )
+    {
+        Cart cart = null;
+
+        try
+        {
+            cart = (Cart)new InitialContext().lookup("Cart");
+            cart.addItem( "EST-1" );
+            cart.addItem( "EST-10" );
+            cart.updateItems( new String[] { "EST-1", "EST-10" }, new int[] { 10, 11 } );
+
+            // Cart count 
+            assertEquals( "cart.count", 2, cart.getCount(  ) );
+
+            // Cart items 
+            Collection items = cart.getCartItems(  );
+            assertNotNull( "items=null", items );
+            assertEquals( "items.size", 2, items.size(  ) );
+
+            for ( Iterator it = items.iterator(  ); it.hasNext(  ); )
+            {
+                CartItem item = ( CartItem ) it.next(  );
+
+                if ( "EST-1".equals( item.getItemId(  ) ) )
+                {
+                    assertEquals( "item[EST-1].name", "Angelfish", item.getName(  ) );
+                    assertEquals( "item[EST-1].description", "Large", item.getDescription(  ) );
+                    assertEquals( "item[EST-1].productId", "FI-SW-01", item.getProductId(  ) );
+                    assertEquals( "item[EST-1].unitCost", 16.50, item.getUnitCost(  ), 0 );
+                    assertEquals( "item[EST-1].quantity", 10, item.getQuantity(  ) );
+                    assertEquals( "item[EST-1].totalCost", 165.0, item.getTotalCost(  ), 0 );
+                }
+                else if ( "EST-10".equals( item.getItemId(  ) ) )
+                {
+                    assertEquals( "item[EST-10].name", "Bulldog", item.getName(  ) );
+                    assertEquals( "item[EST-10].description", "Spotless Female Puppy", item.getDescription(  ) );
+                    assertEquals( "item[EST-10].productId", "K9-BD-01", item.getProductId(  ) );
+                    assertEquals( "item[EST-10].unitCost", 28.50, item.getUnitCost(  ), 0 );
+                    assertEquals( "item[EST-10].quantity", 11, item.getQuantity(  ) );
+                    assertEquals( "item[EST-10].totalCost", 313.50, item.getTotalCost(  ), 0 );
+                }
+                else
+                {
+                    assertEquals( item.getItemId(  ) + " is invalid", false, true );
+                }
+            }
+
+            // Sub total          
+            assertEquals( "subTotal", 478.5, cart.getTotal(  ), 0 );
+        }
+        catch ( Exception e )
+        {
+            e.printStackTrace(  );
+            fail( "Error=" + e.toString(  ) );
+        }
+        finally
+        {
+            try
+            {
+                if ( cart != null )
+                {
+                    cart.remove(  );
+                }
+            }
+            catch ( Exception e )
+            {
+                fail( "Unable to destroy the card. Error=" + e.toString(  ) );
+            }
+        }
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,407 +0,0 @@
-package xpetstore.services.petstore.test;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.naming.InitialContext;
-
-import javax.ejb.FinderException;
-
-import junit.framework.TestCase;
-
-import xpetstore.domain.catalog.ejb.Category;
-import xpetstore.domain.catalog.ejb.Item;
-import xpetstore.domain.catalog.ejb.Product;
-import xpetstore.domain.customer.ejb.Customer;
-import xpetstore.domain.order.ejb.OrderItem;
-import xpetstore.domain.order.ejb.Order;
-import xpetstore.domain.signon.ejb.Account;
-
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.util.Page;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class PetstoreTest
-    extends TestCase
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    private static Petstore _petstore;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public PetstoreTest( String arg0 )
-    {
-        super( arg0 );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    //================================================
-    // signon Test cases
-    //================================================
-    public void testAuthenticate(  )
-    {
-        boolean result;
-
-        try
-        {
-            result = _petstore.authenticate( "user1", "password1" );
-            assertEquals( "Unable to authenticate 'user1'", true, result );
-        }
-        catch ( Exception e )
-        {
-            fail( "Unable to authenticate. Error=" + e.toString(  ) );
-        }
-    }
-
-    //================================================
-    // Customer Test cases
-    //================================================    
-    public void testCreateCustomer(  )
-    {
-        try
-        {
-            String        userId = "CST-" + ( System.currentTimeMillis(  ) % 100000 );
-            Account  act0 = new Account( userId, "password" );
-            Customer cst0 = new Customer( null, "firstname", "lastname", userId + "@foo.com", "123-456", "en", "street1.1", "street1.2", "city", "CA", "A1A-1A1", "US", "111-111-111", "Visa", "01-11" );
-
-            //System.out.println( "creating customer=" + cst0 );
-            String        id = _petstore.createCustomer( cst0 );
-            Customer cst = _petstore.getCustomer( id );
-            Account  act = cst.getAccount(  );
-
-            assertEquals( "firstname", "firstname", cst.getFirstname(  ) );
-            assertEquals( "lastname", "lastname", cst.getLastname(  ) );
-            assertEquals( "telephone", "123-456", cst.getTelephone(  ) );
-            assertEquals( "email", userId + "@foo.com", cst.getEmail(  ) );
-            assertEquals( "language", "en", cst.getLanguage(  ) );
-            assertEquals( "street1", "street1.1", cst.getStreet1(  ) );
-            assertEquals( "street2", "street1.2", cst.getStreet2(  ) );
-            assertEquals( "city", "city", cst.getCity(  ) );
-            assertEquals( "zipcode", "A1A-1A1", cst.getZipcode(  ) );
-            assertEquals( "state", "CA", cst.getState(  ) );
-            assertEquals( "country", "US", cst.getCountry(  ) );
-            assertEquals( "creditCardType", "Visa", cst.getCreditCardType(  ) );
-            assertEquals( "creditCardNumber", "111-111-111", cst.getCreditCardNumber(  ) );
-            assertEquals( "creditCardExpiryDate", "01-11", cst.getCreditCardExpiryDate(  ) );
-            assertEquals( "account.userId", userId, act.getUserId(  ) );
-            assertEquals( "account.password", "password", act.getPassword(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Unable to create the user. Error=" + e.toString(  ) );
-        }
-    }
-
-    public void testUpdateCustomer(  )
-    {
-        try
-        {
-            String        userId = "CST-" + ( System.currentTimeMillis(  ) % 1000000 );
-            Account  act0 = new Account( userId, "password" );
-            Customer cst0 = new Customer( null, "firstnam", "lastnam", userId + "@foo.com", "222-22", "f", "street2.", "street2.", "city", "O", "A1A-1A1", "C", "111-111-111", "Visa", "01-21" );
-
-            //System.out.println( "creating customer=" + cst0 );
-            String        id = _petstore.createCustomer( cst0 );
-
-            Account  act1 = new Account( userId, "password1" );
-            Customer cst1 = new Customer( id, "firstname2", "lastname2", userId + "-2 at foo.com", "222-222", "fr", "street2.1", "street2.2", "city2", "ON", "A2A-2A2", "CA", "222-222-222", "Amex", "02-22" );
-            cst1.setAccount( act1 );
-
-            //System.out.println( "updating customer=" + cst1 );
-            _petstore.updateCustomer( cst1 );
-
-            Customer cst = _petstore.getCustomer( id );
-            Account  act = cst.getAccount(  );
-
-            //System.out.println( "customer=" + cst );
-            assertEquals( "firstname", "firstname2", cst.getFirstname(  ) );
-            assertEquals( "lastname", "lastname2", cst.getLastname(  ) );
-            assertEquals( "telephone", "222-222", cst.getTelephone(  ) );
-            assertEquals( "email", userId + "-2 at foo.com", cst.getEmail(  ) );
-            assertEquals( "language", "fr", cst.getLanguage(  ) );
-            assertEquals( "street1", "street2.1", cst.getStreet1(  ) );
-            assertEquals( "street2", "street2.2", cst.getStreet2(  ) );
-            assertEquals( "city", "city2", cst.getCity(  ) );
-            assertEquals( "zipcode", "A2A-2A2", cst.getZipcode(  ) );
-            assertEquals( "state", "ON", cst.getState(  ) );
-            assertEquals( "country", "CA", cst.getCountry(  ) );
-            assertEquals( "creditCardType", "Amex", cst.getCreditCardType(  ) );
-            assertEquals( "creditCardNumber", "222-222-222", cst.getCreditCardNumber(  ) );
-            assertEquals( "creditCardExpiryDate", "02-22", cst.getCreditCardExpiryDate(  ) );
-            assertEquals( "account.userId", userId, act.getUserId(  ) );
-            assertEquals( "account.password", "password1", act.getPassword(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Unable to create the customer. Error=" + e.toString(  ) );
-        }
-    }
-
-    //================================================
-    // Categories Test cases
-    //================================================    
-    public void testGetCategory(  )
-    {
-        try
-        {
-            Category cat = _petstore.getCategory( "FISH" );
-            assertNotNull( "category[FISH] not found", cat );
-            assertEquals( "categoryId", "FISH", cat.getCategoryId(  ) );
-            assertEquals( "name", "Fish", cat.getName(  ) );
-            assertEquals( "description", "description of FISH", cat.getDescription(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    public void testGetCategories(  )
-    {
-        try
-        {
-            Page pg = _petstore.getCategories( 0, 10 );
-            assertNotNull( "page", pg );
-            assertEquals( "page.size", 5, pg.getSize(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    //================================================
-    // Products Test cases
-    //================================================    
-    public void testGetProduct(  )
-    {
-        try
-        {
-            Product prod = _petstore.getProduct( "K9-DL-01" );
-            assertNotNull( "product[K9-DL-01] not found", prod );
-            assertEquals( "productId", "K9-DL-01", prod.getProductId(  ) );
-            assertEquals( "name", "Dalmation", prod.getName(  ) );
-            assertEquals( "description", "Great dog for a fire station", prod.getDescription(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    public void testGetProducts(  )
-    {
-        try
-        {
-            Page pg = _petstore.getProducts( "FISH", 0, 10 );
-            assertNotNull( "page", pg );
-            assertEquals( "page.size", 4, pg.getSize(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    public void testSearchProducts(  )
-    {
-        try
-        {
-            Page pg = _petstore.searchProducts( "fish", 0, 10 );
-            assertNotNull( "page", pg );
-            assertEquals( "page.size", 4, pg.getSize(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    //================================================
-    // Products Test cases
-    //================================================    
-    public void testGetItem(  )
-    {
-        try
-        {
-            Item item = _petstore.getItem( "EST-1" );
-            assertNotNull( "Item[EST-1] not found", item );
-            assertEquals( "productId", "EST-1", item.getItemId(  ) );
-            assertEquals( "name", "Large", item.getDescription(  ) );
-            assertEquals( "listPrice", 16.50, item.getListPrice(  ), 0 );
-            assertEquals( "unitCost", 10.00, item.getUnitCost(  ), 0 );
-            assertEquals( "itemPath", "fish1.jpg", item.getImagePath(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    public void testGetItems(  )
-    {
-        try
-        {
-            Page pg = _petstore.getItems( "FI-SW-02", 0, 10 );
-            assertNotNull( "page", pg );
-            assertEquals( "page.size", 2, pg.getSize(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    //================================================
-    // Order Test cases
-    //================================================    
-    public void testOrder(  )
-    {
-        try
-        {
-            // Fill the cart 
-            HashMap map = new HashMap(  );
-            map.put( "EST-1", new Integer( 10 ) );
-            map.put( "EST-10", new Integer( 1 ) );
-
-            // Customer 
-            String userId = "user1";
-
-            // Order
-            Date       now = new Date(  );
-            Integer    orderUId = _petstore.createOrder( userId, now, map );
-            Order order = _petstore.getOrder( orderUId );
-
-            //System.out.println( "order=" + order );
-            assertNotNull( "order=null", order );
-            assertEquals( "order.orderUID", orderUId, order.getOrderUId(  ) );
-            assertNotNull( "order.date=null", order.getOrderDate(  ) );
-            assertEquals( "order.date", now.getTime(  ) / 100000, order.getOrderDate(  ).getTime(  ) / 100000, 1000 );
-            assertEquals( "street1", "street1.1", order.getStreet1(  ) );
-            assertEquals( "street2", "street1.2", order.getStreet2(  ) );
-            assertEquals( "city", "city1", order.getCity(  ) );
-            assertEquals( "state", "ST1", order.getState(  ) );
-            assertEquals( "zipcode", "A1B-1C1", order.getZipcode(  ) );
-            assertEquals( "country", "US", order.getCountry(  ) );
-            assertEquals( "creditCardType", "Visa", order.getCreditCardType(  ) );
-            assertEquals( "creditCardNumber", "111-111-111", order.getCreditCardNumber(  ) );
-            assertEquals( "creditCardExpiryDate", "01-11", order.getCreditCardExpiryDate(  ) );
-            assertNotNull( "order.status=null", order.getStatus(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    public void testOrderItems(  )
-    {
-        try
-        {
-            // Fill the cart 
-            HashMap map = new HashMap(  );
-            map.put( "EST-1", new Integer( 10 ) );
-            map.put( "EST-10", new Integer( 1 ) );
-
-            // Customer 
-            String userId = "user1";
-
-            // Order
-            Date    now = new Date(  );
-            Integer orderUId = _petstore.createOrder( userId, now, map );
-
-            // Order items 
-            Page page = _petstore.getOrderItems( orderUId, 0, Integer.MAX_VALUE );
-            assertEquals( "page.size", 2, page.getSize(  ) );
-
-            Iterator it = page.getList(  ).iterator(  );
-
-            for ( int i = 0; it.hasNext(  ); )
-            {
-                String         prefix = "order#" + i;
-                OrderItem value = ( OrderItem ) it.next(  );
-                Item      item = value.getItem(  );
-
-                assertNotNull( prefix + ".item", value.getItem(  ) );
-
-                if ( "EST-1".equals( item.getItemId(  ) ) )
-                {
-                    assertEquals( prefix + ".quantity", 10, value.getQuantity(  ) );
-                    assertEquals( prefix + ".unitPrice", 16.5, value.getUnitPrice(  ), 0 );
-                }
-                else if ( "EST-10".equals( item.getItemId(  ) ) )
-                {
-                    assertEquals( prefix + ".quantity", 1, value.getQuantity(  ) );
-                    assertEquals( prefix + ".unitPrice", 28.5, value.getUnitPrice(  ), 0 );
-                }
-                else
-                {
-                    fail( prefix + ".id is invalid: " + item.getItemId(  ) );
-                }
-            }
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    public void testMyOrders(  )
-    {
-        try
-        {
-            // Fill the cart 
-            HashMap map = new HashMap(  );
-            map.put( "EST-1", new Integer( 10 ) );
-            map.put( "EST-10", new Integer( 1 ) );
-
-            // Customer 
-            String        userId = "CST-" + ( System.currentTimeMillis(  ) % 1000000 );
-            Account  act0 = new Account( userId, "password" );
-            Customer cst0 = new Customer( null, "firstname", "lastname", userId + "@localdomain", "123-456", "en", "street1.1", "street1.2", "city", "CA", "A1A-1A1", "US", "111-111-111", "Visa", "01-01-11" );
-            cst0.setAccount( act0 );
-            _petstore.createCustomer( cst0 );
-
-            // Order
-            Date now = new Date(  );
-            _petstore.createOrder( userId, now, map );
-
-            _petstore.createOrder( userId, now, map );
-
-            Page orders = _petstore.getCustomerOrders( userId, 0, 10 );
-            assertNotNull( "customer[" + userId + "] - orders=null", orders );
-            assertEquals( "customer[" + userId + "] - orders.size", 1, orders.getSize(  ) );
-        }
-        catch ( Exception e )
-        {
-            fail( "Error=" + e.toString(  ) );
-        }
-    }
-
-    //================================================
-    // junit.framework.TestCase functions
-    //================================================
-    protected void setUp(  )
-    {
-        if ( _petstore == null )
-        {
-            try
-            {
-                System.out.println( "Creating the Petstore object" );
-                _petstore = (Petstore)new InitialContext().lookup("Petstore");
-            }
-            catch ( Exception e )
-            {
-                e.printStackTrace(  );
-                fail( "Unable to create the Petstore object. Error=" + e.toString(  ) );
-            }
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/petstore/test/PetstoreTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,407 @@
+package xpetstore.services.petstore.test;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.naming.InitialContext;
+
+import javax.ejb.FinderException;
+
+import junit.framework.TestCase;
+
+import xpetstore.domain.catalog.ejb.Category;
+import xpetstore.domain.catalog.ejb.Item;
+import xpetstore.domain.catalog.ejb.Product;
+import xpetstore.domain.customer.ejb.Customer;
+import xpetstore.domain.order.ejb.OrderItem;
+import xpetstore.domain.order.ejb.Order;
+import xpetstore.domain.signon.ejb.Account;
+
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.util.Page;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class PetstoreTest
+    extends TestCase
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    private static Petstore _petstore;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public PetstoreTest( String arg0 )
+    {
+        super( arg0 );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    //================================================
+    // signon Test cases
+    //================================================
+    public void testAuthenticate(  )
+    {
+        boolean result;
+
+        try
+        {
+            result = _petstore.authenticate( "user1", "password1" );
+            assertEquals( "Unable to authenticate 'user1'", true, result );
+        }
+        catch ( Exception e )
+        {
+            fail( "Unable to authenticate. Error=" + e.toString(  ) );
+        }
+    }
+
+    //================================================
+    // Customer Test cases
+    //================================================    
+    public void testCreateCustomer(  )
+    {
+        try
+        {
+            String        userId = "CST-" + ( System.currentTimeMillis(  ) % 100000 );
+            Account  act0 = new Account( userId, "password" );
+            Customer cst0 = new Customer( null, "firstname", "lastname", userId + "@foo.com", "123-456", "en", "street1.1", "street1.2", "city", "CA", "A1A-1A1", "US", "111-111-111", "Visa", "01-11" );
+
+            //System.out.println( "creating customer=" + cst0 );
+            String        id = _petstore.createCustomer( cst0 );
+            Customer cst = _petstore.getCustomer( id );
+            Account  act = cst.getAccount(  );
+
+            assertEquals( "firstname", "firstname", cst.getFirstname(  ) );
+            assertEquals( "lastname", "lastname", cst.getLastname(  ) );
+            assertEquals( "telephone", "123-456", cst.getTelephone(  ) );
+            assertEquals( "email", userId + "@foo.com", cst.getEmail(  ) );
+            assertEquals( "language", "en", cst.getLanguage(  ) );
+            assertEquals( "street1", "street1.1", cst.getStreet1(  ) );
+            assertEquals( "street2", "street1.2", cst.getStreet2(  ) );
+            assertEquals( "city", "city", cst.getCity(  ) );
+            assertEquals( "zipcode", "A1A-1A1", cst.getZipcode(  ) );
+            assertEquals( "state", "CA", cst.getState(  ) );
+            assertEquals( "country", "US", cst.getCountry(  ) );
+            assertEquals( "creditCardType", "Visa", cst.getCreditCardType(  ) );
+            assertEquals( "creditCardNumber", "111-111-111", cst.getCreditCardNumber(  ) );
+            assertEquals( "creditCardExpiryDate", "01-11", cst.getCreditCardExpiryDate(  ) );
+            assertEquals( "account.userId", userId, act.getUserId(  ) );
+            assertEquals( "account.password", "password", act.getPassword(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Unable to create the user. Error=" + e.toString(  ) );
+        }
+    }
+
+    public void testUpdateCustomer(  )
+    {
+        try
+        {
+            String        userId = "CST-" + ( System.currentTimeMillis(  ) % 1000000 );
+            Account  act0 = new Account( userId, "password" );
+            Customer cst0 = new Customer( null, "firstnam", "lastnam", userId + "@foo.com", "222-22", "f", "street2.", "street2.", "city", "O", "A1A-1A1", "C", "111-111-111", "Visa", "01-21" );
+
+            //System.out.println( "creating customer=" + cst0 );
+            String        id = _petstore.createCustomer( cst0 );
+
+            Account  act1 = new Account( userId, "password1" );
+            Customer cst1 = new Customer( id, "firstname2", "lastname2", userId + "-2 at foo.com", "222-222", "fr", "street2.1", "street2.2", "city2", "ON", "A2A-2A2", "CA", "222-222-222", "Amex", "02-22" );
+            cst1.setAccount( act1 );
+
+            //System.out.println( "updating customer=" + cst1 );
+            _petstore.updateCustomer( cst1 );
+
+            Customer cst = _petstore.getCustomer( id );
+            Account  act = cst.getAccount(  );
+
+            //System.out.println( "customer=" + cst );
+            assertEquals( "firstname", "firstname2", cst.getFirstname(  ) );
+            assertEquals( "lastname", "lastname2", cst.getLastname(  ) );
+            assertEquals( "telephone", "222-222", cst.getTelephone(  ) );
+            assertEquals( "email", userId + "-2 at foo.com", cst.getEmail(  ) );
+            assertEquals( "language", "fr", cst.getLanguage(  ) );
+            assertEquals( "street1", "street2.1", cst.getStreet1(  ) );
+            assertEquals( "street2", "street2.2", cst.getStreet2(  ) );
+            assertEquals( "city", "city2", cst.getCity(  ) );
+            assertEquals( "zipcode", "A2A-2A2", cst.getZipcode(  ) );
+            assertEquals( "state", "ON", cst.getState(  ) );
+            assertEquals( "country", "CA", cst.getCountry(  ) );
+            assertEquals( "creditCardType", "Amex", cst.getCreditCardType(  ) );
+            assertEquals( "creditCardNumber", "222-222-222", cst.getCreditCardNumber(  ) );
+            assertEquals( "creditCardExpiryDate", "02-22", cst.getCreditCardExpiryDate(  ) );
+            assertEquals( "account.userId", userId, act.getUserId(  ) );
+            assertEquals( "account.password", "password1", act.getPassword(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Unable to create the customer. Error=" + e.toString(  ) );
+        }
+    }
+
+    //================================================
+    // Categories Test cases
+    //================================================    
+    public void testGetCategory(  )
+    {
+        try
+        {
+            Category cat = _petstore.getCategory( "FISH" );
+            assertNotNull( "category[FISH] not found", cat );
+            assertEquals( "categoryId", "FISH", cat.getCategoryId(  ) );
+            assertEquals( "name", "Fish", cat.getName(  ) );
+            assertEquals( "description", "description of FISH", cat.getDescription(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    public void testGetCategories(  )
+    {
+        try
+        {
+            Page pg = _petstore.getCategories( 0, 10 );
+            assertNotNull( "page", pg );
+            assertEquals( "page.size", 5, pg.getSize(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    //================================================
+    // Products Test cases
+    //================================================    
+    public void testGetProduct(  )
+    {
+        try
+        {
+            Product prod = _petstore.getProduct( "K9-DL-01" );
+            assertNotNull( "product[K9-DL-01] not found", prod );
+            assertEquals( "productId", "K9-DL-01", prod.getProductId(  ) );
+            assertEquals( "name", "Dalmation", prod.getName(  ) );
+            assertEquals( "description", "Great dog for a fire station", prod.getDescription(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    public void testGetProducts(  )
+    {
+        try
+        {
+            Page pg = _petstore.getProducts( "FISH", 0, 10 );
+            assertNotNull( "page", pg );
+            assertEquals( "page.size", 4, pg.getSize(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    public void testSearchProducts(  )
+    {
+        try
+        {
+            Page pg = _petstore.searchProducts( "fish", 0, 10 );
+            assertNotNull( "page", pg );
+            assertEquals( "page.size", 4, pg.getSize(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    //================================================
+    // Products Test cases
+    //================================================    
+    public void testGetItem(  )
+    {
+        try
+        {
+            Item item = _petstore.getItem( "EST-1" );
+            assertNotNull( "Item[EST-1] not found", item );
+            assertEquals( "productId", "EST-1", item.getItemId(  ) );
+            assertEquals( "name", "Large", item.getDescription(  ) );
+            assertEquals( "listPrice", 16.50, item.getListPrice(  ), 0 );
+            assertEquals( "unitCost", 10.00, item.getUnitCost(  ), 0 );
+            assertEquals( "itemPath", "fish1.jpg", item.getImagePath(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    public void testGetItems(  )
+    {
+        try
+        {
+            Page pg = _petstore.getItems( "FI-SW-02", 0, 10 );
+            assertNotNull( "page", pg );
+            assertEquals( "page.size", 2, pg.getSize(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    //================================================
+    // Order Test cases
+    //================================================    
+    public void testOrder(  )
+    {
+        try
+        {
+            // Fill the cart 
+            HashMap map = new HashMap(  );
+            map.put( "EST-1", new Integer( 10 ) );
+            map.put( "EST-10", new Integer( 1 ) );
+
+            // Customer 
+            String userId = "user1";
+
+            // Order
+            Date       now = new Date(  );
+            Integer    orderUId = _petstore.createOrder( userId, now, map );
+            Order order = _petstore.getOrder( orderUId );
+
+            //System.out.println( "order=" + order );
+            assertNotNull( "order=null", order );
+            assertEquals( "order.orderUID", orderUId, order.getOrderUId(  ) );
+            assertNotNull( "order.date=null", order.getOrderDate(  ) );
+            assertEquals( "order.date", now.getTime(  ) / 100000, order.getOrderDate(  ).getTime(  ) / 100000, 1000 );
+            assertEquals( "street1", "street1.1", order.getStreet1(  ) );
+            assertEquals( "street2", "street1.2", order.getStreet2(  ) );
+            assertEquals( "city", "city1", order.getCity(  ) );
+            assertEquals( "state", "ST1", order.getState(  ) );
+            assertEquals( "zipcode", "A1B-1C1", order.getZipcode(  ) );
+            assertEquals( "country", "US", order.getCountry(  ) );
+            assertEquals( "creditCardType", "Visa", order.getCreditCardType(  ) );
+            assertEquals( "creditCardNumber", "111-111-111", order.getCreditCardNumber(  ) );
+            assertEquals( "creditCardExpiryDate", "01-11", order.getCreditCardExpiryDate(  ) );
+            assertNotNull( "order.status=null", order.getStatus(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    public void testOrderItems(  )
+    {
+        try
+        {
+            // Fill the cart 
+            HashMap map = new HashMap(  );
+            map.put( "EST-1", new Integer( 10 ) );
+            map.put( "EST-10", new Integer( 1 ) );
+
+            // Customer 
+            String userId = "user1";
+
+            // Order
+            Date    now = new Date(  );
+            Integer orderUId = _petstore.createOrder( userId, now, map );
+
+            // Order items 
+            Page page = _petstore.getOrderItems( orderUId, 0, Integer.MAX_VALUE );
+            assertEquals( "page.size", 2, page.getSize(  ) );
+
+            Iterator it = page.getList(  ).iterator(  );
+
+            for ( int i = 0; it.hasNext(  ); )
+            {
+                String         prefix = "order#" + i;
+                OrderItem value = ( OrderItem ) it.next(  );
+                Item      item = value.getItem(  );
+
+                assertNotNull( prefix + ".item", value.getItem(  ) );
+
+                if ( "EST-1".equals( item.getItemId(  ) ) )
+                {
+                    assertEquals( prefix + ".quantity", 10, value.getQuantity(  ) );
+                    assertEquals( prefix + ".unitPrice", 16.5, value.getUnitPrice(  ), 0 );
+                }
+                else if ( "EST-10".equals( item.getItemId(  ) ) )
+                {
+                    assertEquals( prefix + ".quantity", 1, value.getQuantity(  ) );
+                    assertEquals( prefix + ".unitPrice", 28.5, value.getUnitPrice(  ), 0 );
+                }
+                else
+                {
+                    fail( prefix + ".id is invalid: " + item.getItemId(  ) );
+                }
+            }
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    public void testMyOrders(  )
+    {
+        try
+        {
+            // Fill the cart 
+            HashMap map = new HashMap(  );
+            map.put( "EST-1", new Integer( 10 ) );
+            map.put( "EST-10", new Integer( 1 ) );
+
+            // Customer 
+            String        userId = "CST-" + ( System.currentTimeMillis(  ) % 1000000 );
+            Account  act0 = new Account( userId, "password" );
+            Customer cst0 = new Customer( null, "firstname", "lastname", userId + "@localdomain", "123-456", "en", "street1.1", "street1.2", "city", "CA", "A1A-1A1", "US", "111-111-111", "Visa", "01-01-11" );
+            cst0.setAccount( act0 );
+            _petstore.createCustomer( cst0 );
+
+            // Order
+            Date now = new Date(  );
+            _petstore.createOrder( userId, now, map );
+
+            _petstore.createOrder( userId, now, map );
+
+            Page orders = _petstore.getCustomerOrders( userId, 0, 10 );
+            assertNotNull( "customer[" + userId + "] - orders=null", orders );
+            assertEquals( "customer[" + userId + "] - orders.size", 1, orders.getSize(  ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Error=" + e.toString(  ) );
+        }
+    }
+
+    //================================================
+    // junit.framework.TestCase functions
+    //================================================
+    protected void setUp(  )
+    {
+        if ( _petstore == null )
+        {
+            try
+            {
+                System.out.println( "Creating the Petstore object" );
+                _petstore = (Petstore)new InitialContext().lookup("Petstore");
+            }
+            catch ( Exception e )
+            {
+                e.printStackTrace(  );
+                fail( "Unable to create the Petstore object. Error=" + e.toString(  ) );
+            }
+        }
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
- * Created on May 1, 2003
- */
-package xpetstore.services.test;
-
-import org.junitee.servlet.JUnitEEServlet;
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- * 
- * @web.servlet
- *      name="EJBTestServlet"
- *      display-name="Servlet for testing EJB"
- *      load-on-startup="1"
- * @web.servlet-mapping
- * 		url-pattern="/TestServlet/*"
- * @ web.ejb-local-ref
- * 		name="ejb/Petstore"
- * 		type="Session"
- * 		local="xpetstore.services.petstore.ejb.Petstore"
- * 		link="Petstore"
- * @ web.ejb-local-ref
- * 		name="ejb/Cart"
- * 		type="Session"
- *      home="xpetstore.services.cart.interfaces.CartLocalHome"
- * 		local="xpetstore.services.cart.ejb.Cart"
- * 		link="Cart"
- */
-public class EJBTestServlet extends JUnitEEServlet {
-
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/test/xpetstore/services/test/EJBTestServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * Created on May 1, 2003
+ */
+package xpetstore.services.test;
+
+import org.junitee.servlet.JUnitEEServlet;
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ * 
+ * @web.servlet
+ *      name="EJBTestServlet"
+ *      display-name="Servlet for testing EJB"
+ *      load-on-startup="1"
+ * @web.servlet-mapping
+ * 		url-pattern="/TestServlet/*"
+ * @ web.ejb-local-ref
+ * 		name="ejb/Petstore"
+ * 		type="Session"
+ * 		local="xpetstore.services.petstore.ejb.Petstore"
+ * 		link="Petstore"
+ * @ web.ejb-local-ref
+ * 		name="ejb/Cart"
+ * 		type="Session"
+ *      home="xpetstore.services.cart.interfaces.CartLocalHome"
+ * 		local="xpetstore.services.cart.ejb.Cart"
+ * 		link="Cart"
+ */
+public class EJBTestServlet extends JUnitEEServlet {
+
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<decorators defaultdir="/decorators">
-     <decorator name="default" page="default.jsp">
-        <pattern>*</pattern>
-    </decorator>
-</decorators>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/decorators.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<decorators defaultdir="/decorators">
+     <decorator name="default" page="default.jsp">
+        <pattern>*</pattern>
+    </decorator>
+</decorators>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-decorator.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-decorator.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-decorator.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-page.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-page.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh-page.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-<sitemesh>
-
-	<page-parsers>
-		<parser default="true" class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" />
-		<parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
-	</page-parsers>
-
-	<decorator-mappers>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
-			<param name="property.1" value="meta.decorator" />
-			<param name="property.2" value="decorator" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
-			<param name="match.MSIE" value="ie" />
-			<param name="match.Mozilla [" value="ns" />
-			<param name="match.Opera" value="opera" />
-			<param name="match.Lynx" value="lynx" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
-			<param name="decorator" value="printable" />
-			<param name="parameter.name" value="printable" />
-			<param name="parameter.value" value="true" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
-			<param name="decorator" value="robot" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
-			<param name="decorator.parameter" value="decorator" />
-			<param name="parameter.name" value="confirm" />
-			<param name="parameter.value" value="true" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper">
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
-			<param name="config" value="/WEB-INF/decorators.xml" />
-		</mapper>
-
-	</decorator-mappers>
-
-</sitemesh>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/sitemesh.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+<sitemesh>
+
+	<page-parsers>
+		<parser default="true" class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" />
+		<parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
+	</page-parsers>
+
+	<decorator-mappers>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
+			<param name="property.1" value="meta.decorator" />
+			<param name="property.2" value="decorator" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
+			<param name="match.MSIE" value="ie" />
+			<param name="match.Mozilla [" value="ns" />
+			<param name="match.Opera" value="opera" />
+			<param name="match.Lynx" value="lynx" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
+			<param name="decorator" value="printable" />
+			<param name="parameter.name" value="printable" />
+			<param name="parameter.value" value="true" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
+			<param name="decorator" value="robot" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
+			<param name="decorator.parameter" value="decorator" />
+			<param name="parameter.name" value="confirm" />
+			<param name="parameter.value" value="true" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper">
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
+			<param name="config" value="/WEB-INF/decorators.xml" />
+		</mapper>
+
+	</decorator-mappers>
+
+</sitemesh>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-bean.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-bean.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-bean.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-html.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-html.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-html.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-logic.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-logic.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-logic.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-nested.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-nested.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-nested.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-tiles.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-tiles.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/WEB-INF/struts-tiles.tld)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css/style.css
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css/style.css (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/css/style.css)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/bird2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/cat2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog3.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog3.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog3.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog4.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog4.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog4.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog5.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog5.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog5.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog6.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog6.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/dog6.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish3.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish3.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish3.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish4.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish4.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/fish4.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/lizard1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/lizard1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/lizard1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/snake1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/snake1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/dataimages/snake1.jpg)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_birds.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_birds.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_birds.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_cats.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_cats.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_cats.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_dogs.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_dogs.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_dogs.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_fish.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_fish.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_fish.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_reptiles.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_reptiles.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/banner_reptiles.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/birds_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/birds_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/birds_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-sidebar.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-sidebar.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-sidebar.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-topbar.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-topbar.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/bkg-topbar.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_add_to_cart.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_add_to_cart.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_add_to_cart.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_checkout.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_checkout.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_checkout.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_continue.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_continue.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_continue.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_next.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_next.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_next.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_prev.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_prev.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_prev.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_previous.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_previous.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_previous.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_proceed.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_proceed.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_proceed.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_register_now.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_register_now.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_register_now.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_remove.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_remove.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_remove.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_submit.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_submit.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_submit.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_update_cart.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_update_cart.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/button_update_cart.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cart.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cart.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cart.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cartHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cartHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cartHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cats_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cats_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/cats_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/dogs_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/dogs_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/dogs_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/fish_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/fish_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/fish_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/help.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/help.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/help.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/helpHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/helpHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/helpHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/logo-topbar.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/logo-topbar.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/logo-topbar.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_account.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_account.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_account.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_accountHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_accountHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/my_accountHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/poweredby.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/poweredby.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/poweredby.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/reptiles_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/reptiles_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/reptiles_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/search.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/search.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/search.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/separator.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/separator.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/separator.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sflogo.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sflogo.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sflogo.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-in.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-in.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-in.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-inHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-inHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-inHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-out.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-out.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-out.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-outHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-outHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sign-outHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_birds.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_birds.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_birds.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_cats.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_cats.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_cats.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_dogs.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_dogs.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_dogs.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_fish.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_fish.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_fish.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_reptiles.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_reptiles.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/sm_reptiles.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/splash.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/splash.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/splash.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/struts-power.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/struts-power.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/struts-power.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/xdoclet.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/xdoclet.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/images/xdoclet.gif)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/cart.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/cart.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/cart.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/category.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/category.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/category.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/checkout.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/checkout.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/checkout.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/confirmation.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/confirmation.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/confirmation.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/customerEditor.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/customerEditor.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/customerEditor.jsp)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/default.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/default.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/default.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/footer.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/footer.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/footer.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/header.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/header.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/header.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/navigation.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/navigation.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/decorators/navigation.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/index.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/index.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/index.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/item.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/item.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/item.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/myaccount.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/myaccount.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/myaccount.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/product.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/product.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/product.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/register.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/register.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/register.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/search.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/search.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/search.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/signon.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/signon.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/jsp/signon.jsp)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,154 +0,0 @@
-/*
- * Created on 26-Feb-2003
- */
-package xpetstore.web.filter;
-
-import java.io.IOException;
-
-import java.util.HashMap;
-import java.util.StringTokenizer;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * This filter protects some URI and make sure that only signed-on users
- * can access them
- *
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @web.filter
- *      name="signon"
- *      display-name="xPetstore Struts Signon Filter"
- *
- * @web.filter-mapping
- *      servlet-name="action"
- *
- * @web.filter-init-param
- *      name="signon.action"
- *         value="/signon.jspa"
- *
- * @web.filter-init-param
- *      name="protected.uri"
- *         value="checkout.jspa,order.jspa"
- */
-public class SignOnFilter
-    implements Filter
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    private static final Log __log = LogFactory.getLog( SignOnFilter.class );
-
-    //~ Instance fields --------------------------------------------------------
-
-    private String       _signon;
-    private HashMap      _protectedUris = new HashMap(  );
-    private FilterConfig _config;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
-     */
-    public void init( FilterConfig config )
-        throws ServletException
-    {
-        __log.info( "init()" );
-
-        _config = config;
-
-        /* SignOn action */
-        _signon = config.getInitParameter( "signon.action" );
-        __log.info( "...signon.action=" + _signon );
-
-        /* Protected Uri */
-        String          uri = config.getInitParameter( "protected.uri" );
-        StringTokenizer tok = new StringTokenizer( uri, "," );
-
-        while ( tok.hasMoreTokens(  ) )
-        {
-            String url = tok.nextToken(  );
-            _protectedUris.put( url, url );
-
-            __log.info( "...Adding URI to protect: " + url );
-        }
-    }
-
-    /**
-     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
-     */
-    public void doFilter( ServletRequest  request,
-                          ServletResponse response,
-                          FilterChain     chain )
-        throws IOException, 
-                   ServletException
-    {
-        __log.info( "doFilter()" );
-
-        HttpServletRequest req = ( HttpServletRequest ) request;
-
-        /* Uri */
-        String uri = req.getRequestURI(  );
-
-        if ( uri.startsWith( "/" ) )
-        {
-            uri = uri.substring( 1 );
-        }
-
-        int i = uri.indexOf( "/" );
-
-        if ( i >= 0 )
-        {
-            uri = uri.substring( i + 1 );
-        }
-
-        __log.info( "...uri=" + uri );
-
-        /* check if signon is required */
-        if ( isProtected( uri ) && !isSignedIn( req ) )
-        {
-            __log.info( "...User not logged in. Redirecting to: " + _signon );
-
-            String forward = _signon + "?redirectUri=" + uri;
-            _config.getServletContext(  ).getRequestDispatcher( forward ).forward( request, response );
-        }
-        else
-        {
-            chain.doFilter( request, response );
-        }
-    }
-
-    /**
-     * @see javax.servlet.Filter#destroy()
-     */
-    public void destroy(  )
-    {
-        _protectedUris.clear(  );
-    }
-
-    public boolean isProtected( String uri )
-    {
-        return ( _protectedUris.get( uri ) != null );
-    }
-
-    public boolean isSignedIn( HttpServletRequest request )
-    {
-        HttpSession session = request.getSession( false );
-
-        return ( session == null )
-               ? false
-               : ( session.getAttribute( BaseAction.USERID_KEY ) != null );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/filter/SignOnFilter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,154 @@
+/*
+ * Created on 26-Feb-2003
+ */
+package xpetstore.web.filter;
+
+import java.io.IOException;
+
+import java.util.HashMap;
+import java.util.StringTokenizer;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * This filter protects some URI and make sure that only signed-on users
+ * can access them
+ *
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @web.filter
+ *      name="signon"
+ *      display-name="xPetstore Struts Signon Filter"
+ *
+ * @web.filter-mapping
+ *      servlet-name="action"
+ *
+ * @web.filter-init-param
+ *      name="signon.action"
+ *         value="/signon.jspa"
+ *
+ * @web.filter-init-param
+ *      name="protected.uri"
+ *         value="checkout.jspa,order.jspa"
+ */
+public class SignOnFilter
+    implements Filter
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    private static final Log __log = LogFactory.getLog( SignOnFilter.class );
+
+    //~ Instance fields --------------------------------------------------------
+
+    private String       _signon;
+    private HashMap      _protectedUris = new HashMap(  );
+    private FilterConfig _config;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+     */
+    public void init( FilterConfig config )
+        throws ServletException
+    {
+        __log.info( "init()" );
+
+        _config = config;
+
+        /* SignOn action */
+        _signon = config.getInitParameter( "signon.action" );
+        __log.info( "...signon.action=" + _signon );
+
+        /* Protected Uri */
+        String          uri = config.getInitParameter( "protected.uri" );
+        StringTokenizer tok = new StringTokenizer( uri, "," );
+
+        while ( tok.hasMoreTokens(  ) )
+        {
+            String url = tok.nextToken(  );
+            _protectedUris.put( url, url );
+
+            __log.info( "...Adding URI to protect: " + url );
+        }
+    }
+
+    /**
+     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+     */
+    public void doFilter( ServletRequest  request,
+                          ServletResponse response,
+                          FilterChain     chain )
+        throws IOException, 
+                   ServletException
+    {
+        __log.info( "doFilter()" );
+
+        HttpServletRequest req = ( HttpServletRequest ) request;
+
+        /* Uri */
+        String uri = req.getRequestURI(  );
+
+        if ( uri.startsWith( "/" ) )
+        {
+            uri = uri.substring( 1 );
+        }
+
+        int i = uri.indexOf( "/" );
+
+        if ( i >= 0 )
+        {
+            uri = uri.substring( i + 1 );
+        }
+
+        __log.info( "...uri=" + uri );
+
+        /* check if signon is required */
+        if ( isProtected( uri ) && !isSignedIn( req ) )
+        {
+            __log.info( "...User not logged in. Redirecting to: " + _signon );
+
+            String forward = _signon + "?redirectUri=" + uri;
+            _config.getServletContext(  ).getRequestDispatcher( forward ).forward( request, response );
+        }
+        else
+        {
+            chain.doFilter( request, response );
+        }
+    }
+
+    /**
+     * @see javax.servlet.Filter#destroy()
+     */
+    public void destroy(  )
+    {
+        _protectedUris.clear(  );
+    }
+
+    public boolean isProtected( String uri )
+    {
+        return ( _protectedUris.get( uri ) != null );
+    }
+
+    public boolean isSignedIn( HttpServletRequest request )
+    {
+        HttpSession session = request.getSession( false );
+
+        return ( session == null )
+               ? false
+               : ( session.getAttribute( BaseAction.USERID_KEY ) != null );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * Created on Apr 28, 2003
- */
-package xpetstore.web.servlet;
-
-/**
- *
- * @web.servlet
- *      name="action"
- *      display-name="xPetstore Struts Action Servlet"
- *      load-on-startup="1"
- * @web.servlet-mapping
- * 		url-pattern="*.jspa"
- * @web.servlet-init-param
- * 		name="application"
- * 		value="Resources"
- * 		descriptiorn="Application resource bundle"
- * @web.servlet-init-param
- * 		name="config"
- * 		value="/WEB-INF/struts-config.xml"
- * 		descriptiorn="Struts configuration file"
- * @ web.ejb-local-ref
- * 		name="ejb/Petstore"
- * 		type="Session"
- * 		local="xpetstore.services.petstore.ejb.Petstore"
- * 		link="Petstore"
- * @ web.ejb-local-ref
- * 		name="ejb/Cart"
- * 		type="Session"
- * 		local="xpetstore.services.cart.ejb.Cart"
- * 		link="Cart"
- */
-public class ActionServlet extends org.apache.struts.action.ActionServlet {
-
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/servlet/ActionServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * Created on Apr 28, 2003
+ */
+package xpetstore.web.servlet;
+
+/**
+ *
+ * @web.servlet
+ *      name="action"
+ *      display-name="xPetstore Struts Action Servlet"
+ *      load-on-startup="1"
+ * @web.servlet-mapping
+ * 		url-pattern="*.jspa"
+ * @web.servlet-init-param
+ * 		name="application"
+ * 		value="Resources"
+ * 		descriptiorn="Application resource bundle"
+ * @web.servlet-init-param
+ * 		name="config"
+ * 		value="/WEB-INF/struts-config.xml"
+ * 		descriptiorn="Struts configuration file"
+ * @ web.ejb-local-ref
+ * 		name="ejb/Petstore"
+ * 		type="Session"
+ * 		local="xpetstore.services.petstore.ejb.Petstore"
+ * 		link="Petstore"
+ * @ web.ejb-local-ref
+ * 		name="ejb/Cart"
+ * 		type="Session"
+ * 		local="xpetstore.services.cart.ejb.Cart"
+ * 		link="Cart"
+ */
+public class ActionServlet extends org.apache.struts.action.ActionServlet {
+
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,130 +0,0 @@
-package xpetstore.web.struts.action;
-
-import java.util.ResourceBundle;
-
-import javax.naming.InitialContext;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.customer.ejb.Customer;
-
-import xpetstore.services.cart.ejb.Cart;
-import xpetstore.services.petstore.ejb.Petstore;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public abstract class BaseAction
-    extends Action
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String BUNDLE_NAME = "Resources";
-    public static final String CART_KEY = "cart";
-    public static final String ERROR = "error";
-    public static final String MESSAGE_KEY = "message";
-    public static final String SUCCESS = "success";
-    public static final String USERID_KEY = "userId";
-    public static final String USERNAME_KEY = "username";
-
-    //~ Instance fields --------------------------------------------------------
-
-    protected Log _log = LogFactory.getLog( getClass(  ) );
-
-    //~ Methods ----------------------------------------------------------------
-
-    protected void clearSession( HttpServletRequest request )
-        throws Exception
-    {
-        HttpSession session = request.getSession(  );
-
-        session.removeAttribute( USERID_KEY );
-        session.removeAttribute( USERNAME_KEY );
-
-        Cart cart = getCart( false, request );
-
-        if ( cart != null )
-        {
-            session.removeAttribute( CART_KEY );
-            cart.remove(  );
-        }
-    }
-
-    protected abstract ActionForward doExecute( ActionMapping       mapping,
-                                                ActionForm          form,
-                                                HttpServletRequest  request,
-                                                HttpServletResponse response )
-        throws Exception;
-
-    /**
-     *
-     * @see org.apache.struts.action.Action#execute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    public ActionForward execute( ActionMapping       mapping,
-                                  ActionForm          form,
-                                  HttpServletRequest  request,
-                                  HttpServletResponse response )
-        throws Exception
-    {
-        _log.info( "execute()" );
-
-        return doExecute( mapping, form, request, response );
-    }
-
-    public Cart getCart( boolean            create,
-                              HttpServletRequest request )
-        throws Exception
-    {
-        HttpSession session = request.getSession(  );
-        Cart   cart = ( Cart ) session.getAttribute( CART_KEY );
-        if ( ( cart == null ) && create )
-        {
-            cart = (Cart)new InitialContext().lookup("ejb/Cart");
-            session.setAttribute( CART_KEY, cart );
-        }
-
-        return cart;
-    }
-
-    public Cart getCart( HttpServletRequest request )
-        throws Exception
-    {
-        return getCart( true, request );
-    }
-
-    public Petstore getPetstore(  )
-        throws Exception
-    {
-        return (Petstore)new InitialContext().lookup("ejb/Petstore");
-    }
-
-    public String getString( String key )
-    {
-        try
-        {
-            return ResourceBundle.getBundle( BUNDLE_NAME ).getString( key );
-        }
-        catch ( Exception e )
-        {
-            return "???" + key + "???";
-        }
-    }
-
-    protected void initSession( Customer      customer,
-                                HttpServletRequest request )
-    {
-        HttpSession session = request.getSession(  );
-        session.setAttribute( USERID_KEY, customer.getUserId(  ) );
-        session.setAttribute( USERNAME_KEY, customer.getFirstname(  ) + " " + customer.getLastname(  ) );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,130 @@
+package xpetstore.web.struts.action;
+
+import java.util.ResourceBundle;
+
+import javax.naming.InitialContext;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.customer.ejb.Customer;
+
+import xpetstore.services.cart.ejb.Cart;
+import xpetstore.services.petstore.ejb.Petstore;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public abstract class BaseAction
+    extends Action
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String BUNDLE_NAME = "Resources";
+    public static final String CART_KEY = "cart";
+    public static final String ERROR = "error";
+    public static final String MESSAGE_KEY = "message";
+    public static final String SUCCESS = "success";
+    public static final String USERID_KEY = "userId";
+    public static final String USERNAME_KEY = "username";
+
+    //~ Instance fields --------------------------------------------------------
+
+    protected Log _log = LogFactory.getLog( getClass(  ) );
+
+    //~ Methods ----------------------------------------------------------------
+
+    protected void clearSession( HttpServletRequest request )
+        throws Exception
+    {
+        HttpSession session = request.getSession(  );
+
+        session.removeAttribute( USERID_KEY );
+        session.removeAttribute( USERNAME_KEY );
+
+        Cart cart = getCart( false, request );
+
+        if ( cart != null )
+        {
+            session.removeAttribute( CART_KEY );
+            cart.remove(  );
+        }
+    }
+
+    protected abstract ActionForward doExecute( ActionMapping       mapping,
+                                                ActionForm          form,
+                                                HttpServletRequest  request,
+                                                HttpServletResponse response )
+        throws Exception;
+
+    /**
+     *
+     * @see org.apache.struts.action.Action#execute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    public ActionForward execute( ActionMapping       mapping,
+                                  ActionForm          form,
+                                  HttpServletRequest  request,
+                                  HttpServletResponse response )
+        throws Exception
+    {
+        _log.info( "execute()" );
+
+        return doExecute( mapping, form, request, response );
+    }
+
+    public Cart getCart( boolean            create,
+                              HttpServletRequest request )
+        throws Exception
+    {
+        HttpSession session = request.getSession(  );
+        Cart   cart = ( Cart ) session.getAttribute( CART_KEY );
+        if ( ( cart == null ) && create )
+        {
+            cart = (Cart)new InitialContext().lookup("ejb/Cart");
+            session.setAttribute( CART_KEY, cart );
+        }
+
+        return cart;
+    }
+
+    public Cart getCart( HttpServletRequest request )
+        throws Exception
+    {
+        return getCart( true, request );
+    }
+
+    public Petstore getPetstore(  )
+        throws Exception
+    {
+        return (Petstore)new InitialContext().lookup("ejb/Petstore");
+    }
+
+    public String getString( String key )
+    {
+        try
+        {
+            return ResourceBundle.getBundle( BUNDLE_NAME ).getString( key );
+        }
+        catch ( Exception e )
+        {
+            return "???" + key + "???";
+        }
+    }
+
+    protected void initSession( Customer      customer,
+                                HttpServletRequest request )
+    {
+        HttpSession session = request.getSession(  );
+        session.setAttribute( USERID_KEY, customer.getUserId(  ) );
+        session.setAttribute( USERNAME_KEY, customer.getFirstname(  ) + " " + customer.getLastname(  ) );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,85 +0,0 @@
-package xpetstore.web.struts.action;
-
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class BaseForm
-    extends ActionForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _redirectUri = "";
-
-    //~ Methods ----------------------------------------------------------------
-
-    public void checkCreditCardDateFormat( String       value,
-                                           String       msg,
-                                           ActionErrors errors )
-    {
-        boolean err = false;
-
-        try
-        {
-            int i = value.indexOf( "-" );
-
-            if ( ( err = ( i >= 0 ) ) )
-            {
-                int lhs = Integer.parseInt( value.substring( 0, i ) );
-                int rhs = Integer.parseInt( value.substring( i + 1 ) );
-                err = !( ( lhs >= 1 ) && ( lhs <= 12 ) && ( rhs >= 0 ) );
-            }
-        }
-        catch ( Exception e )
-        {
-            err = true;
-        }
-
-        if ( err )
-        {
-            errors.add( "ActionForm", new ActionError( msg ) );
-        }
-    }
-
-    public void checkLength( String       value,
-                             int          len,
-                             String       msg,
-                             ActionErrors errors )
-    {
-        if ( ( value == null ) || ( value.length(  ) < len ) )
-        {
-            errors.add( "ActionForm", new ActionError( msg ) );
-        }
-    }
-
-    public void checkNotEmpty( String       value,
-                               String       msg,
-                               ActionErrors errors )
-    {
-        if ( ( value == null ) || ( value.trim(  ).length(  ) == 0 ) )
-        {
-            errors.add( "ActionForm", new ActionError( msg ) );
-        }
-    }
-
-    /**
-     * @return String
-     */
-    public String getRedirectUri(  )
-    {
-        return _redirectUri;
-    }
-
-    /**
-     * Sets the redirectUri.
-     * @param redirectUri The redirectUri to set
-     */
-    public void setRedirectUri( String redirectUri )
-    {
-        _redirectUri = redirectUri;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/BaseForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+package xpetstore.web.struts.action;
+
+import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class BaseForm
+    extends ActionForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _redirectUri = "";
+
+    //~ Methods ----------------------------------------------------------------
+
+    public void checkCreditCardDateFormat( String       value,
+                                           String       msg,
+                                           ActionErrors errors )
+    {
+        boolean err = false;
+
+        try
+        {
+            int i = value.indexOf( "-" );
+
+            if ( ( err = ( i >= 0 ) ) )
+            {
+                int lhs = Integer.parseInt( value.substring( 0, i ) );
+                int rhs = Integer.parseInt( value.substring( i + 1 ) );
+                err = !( ( lhs >= 1 ) && ( lhs <= 12 ) && ( rhs >= 0 ) );
+            }
+        }
+        catch ( Exception e )
+        {
+            err = true;
+        }
+
+        if ( err )
+        {
+            errors.add( "ActionForm", new ActionError( msg ) );
+        }
+    }
+
+    public void checkLength( String       value,
+                             int          len,
+                             String       msg,
+                             ActionErrors errors )
+    {
+        if ( ( value == null ) || ( value.length(  ) < len ) )
+        {
+            errors.add( "ActionForm", new ActionError( msg ) );
+        }
+    }
+
+    public void checkNotEmpty( String       value,
+                               String       msg,
+                               ActionErrors errors )
+    {
+        if ( ( value == null ) || ( value.trim(  ).length(  ) == 0 ) )
+        {
+            errors.add( "ActionForm", new ActionError( msg ) );
+        }
+    }
+
+    /**
+     * @return String
+     */
+    public String getRedirectUri(  )
+    {
+        return _redirectUri;
+    }
+
+    /**
+     * Sets the redirectUri.
+     * @param redirectUri The redirectUri to set
+     */
+    public void setRedirectUri( String redirectUri )
+    {
+        _redirectUri = redirectUri;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-package xpetstore.web.struts.action.cart;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.web.struts.action.BaseAction;
-import xpetstore.web.struts.action.item.ItemForm;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="itemForm"
- *      path="/addItem"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/cart.jspa"
- */
-public class AddItemAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        ItemForm frm = ( ItemForm ) form;
-        String   itemId = frm.getItemId(  );
-
-        getCart( request ).addItem( itemId );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/AddItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+package xpetstore.web.struts.action.cart;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.web.struts.action.BaseAction;
+import xpetstore.web.struts.action.item.ItemForm;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="itemForm"
+ *      path="/addItem"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/cart.jspa"
+ */
+public class AddItemAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        ItemForm frm = ( ItemForm ) form;
+        String   itemId = frm.getItemId(  );
+
+        getCart( request ).addItem( itemId );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-package xpetstore.web.struts.action.cart;
-
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.services.cart.ejb.Cart;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="cartForm"
- *      path="/cart"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/cart.jsp"
- */
-public class CartAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        CartForm  frm = ( CartForm ) form;
-
-        Cart cart = getCart( request );
-
-        /* Cart items */
-        Collection items = cart.getCartItems(  );
-        frm.setCartItems( items );
-
-        /* Total */
-        double total = cart.getTotal(  );
-        frm.setTotal( total );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+package xpetstore.web.struts.action.cart;
+
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.services.cart.ejb.Cart;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="cartForm"
+ *      path="/cart"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/cart.jsp"
+ */
+public class CartAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        CartForm  frm = ( CartForm ) form;
+
+        Cart cart = getCart( request );
+
+        /* Cart items */
+        Collection items = cart.getCartItems(  );
+        frm.setCartItems( items );
+
+        /* Total */
+        double total = cart.getTotal(  );
+        frm.setTotal( total );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,85 +0,0 @@
-package xpetstore.web.struts.action.cart;
-
-import java.util.Collection;
-
-import xpetstore.domain.customer.ejb.Customer;
-
-import xpetstore.web.struts.action.*;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="cartForm"
- */
-public class CartForm
-    extends BaseForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Collection    _cartItems;
-    private Customer _customer;
-    private String        _itemId[];
-    private int           _quantity[];
-    public double         _total;
-
-    //~ Methods ----------------------------------------------------------------
-
-    public Collection getCartItems(  )
-    {
-        return _cartItems;
-    }
-
-    /**
-     * @return CustomerValue
-     */
-    public Customer getCustomer(  )
-    {
-        return _customer;
-    }
-
-    public String[] getItemId(  )
-    {
-        return _itemId;
-    }
-
-    public int[] getQuantity(  )
-    {
-        return _quantity;
-    }
-
-    public double getTotal(  )
-    {
-        return _total;
-    }
-
-    public void setCartItems( Collection cartItems )
-    {
-        _cartItems = cartItems;
-    }
-
-    /**
-     * Sets the customer.
-     * @param customer The customer to set
-     */
-    public void setCustomer( Customer customer )
-    {
-        _customer = customer;
-    }
-
-    public void setItemId( String itemId[] )
-    {
-        _itemId = itemId;
-    }
-
-    public void setQuantity( int quantity[] )
-    {
-        _quantity = quantity;
-    }
-
-    public void setTotal( double total )
-    {
-        _total = total;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CartForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+package xpetstore.web.struts.action.cart;
+
+import java.util.Collection;
+
+import xpetstore.domain.customer.ejb.Customer;
+
+import xpetstore.web.struts.action.*;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="cartForm"
+ */
+public class CartForm
+    extends BaseForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Collection    _cartItems;
+    private Customer _customer;
+    private String        _itemId[];
+    private int           _quantity[];
+    public double         _total;
+
+    //~ Methods ----------------------------------------------------------------
+
+    public Collection getCartItems(  )
+    {
+        return _cartItems;
+    }
+
+    /**
+     * @return CustomerValue
+     */
+    public Customer getCustomer(  )
+    {
+        return _customer;
+    }
+
+    public String[] getItemId(  )
+    {
+        return _itemId;
+    }
+
+    public int[] getQuantity(  )
+    {
+        return _quantity;
+    }
+
+    public double getTotal(  )
+    {
+        return _total;
+    }
+
+    public void setCartItems( Collection cartItems )
+    {
+        _cartItems = cartItems;
+    }
+
+    /**
+     * Sets the customer.
+     * @param customer The customer to set
+     */
+    public void setCustomer( Customer customer )
+    {
+        _customer = customer;
+    }
+
+    public void setItemId( String itemId[] )
+    {
+        _itemId = itemId;
+    }
+
+    public void setQuantity( int quantity[] )
+    {
+        _quantity = quantity;
+    }
+
+    public void setTotal( double total )
+    {
+        _total = total;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-package xpetstore.web.struts.action.cart;
-
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.customer.ejb.Customer;
-
-import xpetstore.services.cart.ejb.Cart;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="cartForm"
- *      path="/checkout"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/checkout.jsp"
- */
-public class CheckoutAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        String    userId = ( String ) request.getSession(  ).getAttribute( USERID_KEY );
-        CartForm  frm = ( CartForm ) form;
-        Cart cart = getCart( request );
-
-        /* Order */
-        Customer cust = getPetstore(  ).getCustomer( userId );
-        frm.setCustomer( cust );
-
-        /* Cart items */
-        Collection items = cart.getCartItems(  );
-        frm.setCartItems( items );
-
-        /* Total */
-        frm.setTotal( cart.getTotal(  ) );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/CheckoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+package xpetstore.web.struts.action.cart;
+
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.customer.ejb.Customer;
+
+import xpetstore.services.cart.ejb.Cart;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="cartForm"
+ *      path="/checkout"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/checkout.jsp"
+ */
+public class CheckoutAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        String    userId = ( String ) request.getSession(  ).getAttribute( USERID_KEY );
+        CartForm  frm = ( CartForm ) form;
+        Cart cart = getCart( request );
+
+        /* Order */
+        Customer cust = getPetstore(  ).getCustomer( userId );
+        frm.setCustomer( cust );
+
+        /* Cart items */
+        Collection items = cart.getCartItems(  );
+        frm.setCartItems( items );
+
+        /* Total */
+        frm.setTotal( cart.getTotal(  ) );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-package xpetstore.web.struts.action.cart;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.web.struts.action.BaseAction;
-import xpetstore.web.struts.action.item.ItemForm;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="itemForm"
- *      path="/removeItem"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/cart.jspa"
- */
-public class RemoveItemAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        ItemForm frm = ( ItemForm ) form;
-        String   itemId = frm.getItemId(  );
-
-        getCart( request ).removeItem( itemId );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/RemoveItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+package xpetstore.web.struts.action.cart;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.web.struts.action.BaseAction;
+import xpetstore.web.struts.action.item.ItemForm;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="itemForm"
+ *      path="/removeItem"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/cart.jspa"
+ */
+public class RemoveItemAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        ItemForm frm = ( ItemForm ) form;
+        String   itemId = frm.getItemId(  );
+
+        getCart( request ).removeItem( itemId );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-package xpetstore.web.struts.action.cart;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.services.cart.ejb.Cart;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="cartForm"
- *      path="/updateCart"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/cart.jspa"
- */
-public class UpdateCartAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        CartForm  frm = ( CartForm ) form;
-
-        Cart cart = getCart( request );
-
-        /* Cart items */
-        cart.updateItems( frm.getItemId(  ), frm.getQuantity(  ) );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/cart/UpdateCartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+package xpetstore.web.struts.action.cart;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.services.cart.ejb.Cart;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="cartForm"
+ *      path="/updateCart"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/cart.jspa"
+ */
+public class UpdateCartAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        CartForm  frm = ( CartForm ) form;
+
+        Cart cart = getCart( request );
+
+        /* Cart items */
+        cart.updateItems( frm.getItemId(  ), frm.getQuantity(  ) );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-package xpetstore.web.struts.action.category;
-
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.catalog.ejb.Category;
-
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="categoryForm"
- *      path="/category"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="category.jsp"
- */
-public class CategoryAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        CategoryForm  frm = ( CategoryForm ) form;
-        String        categoryId = frm.getCategoryId(  );
-        Petstore petstore = getPetstore(  );
-
-        /* Category*/
-        Category category = petstore.getCategory( categoryId );
-        frm.setCategory( category );
-
-        /* Items */
-        Collection products = petstore.getProducts( categoryId, 0, Integer.MAX_VALUE ).getList(  );
-        frm.setProducts( products );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+package xpetstore.web.struts.action.category;
+
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.catalog.ejb.Category;
+
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="categoryForm"
+ *      path="/category"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="category.jsp"
+ */
+public class CategoryAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        CategoryForm  frm = ( CategoryForm ) form;
+        String        categoryId = frm.getCategoryId(  );
+        Petstore petstore = getPetstore(  );
+
+        /* Category*/
+        Category category = petstore.getCategory( categoryId );
+        frm.setCategory( category );
+
+        /* Items */
+        Collection products = petstore.getProducts( categoryId, 0, Integer.MAX_VALUE ).getList(  );
+        frm.setProducts( products );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-package xpetstore.web.struts.action.category;
-
-import java.util.Collection;
-
-import xpetstore.domain.catalog.ejb.Category;
-
-import xpetstore.web.struts.action.*;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="categoryForm"
- */
-public class CategoryForm
-    extends BaseForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String      _categoryId = "";
-    private Category    _category = new Category(  );
-    private Collection  _products;
-
-    public CategoryForm()
-    {
-    }
-
-    /**
-     * @return String
-     */
-    public String getCategoryId(  )
-    {
-        return _categoryId;
-    }
-
-    /**
-     * @return CategoryValue
-     */
-    public Category getCategory(  )
-    {
-       if (_category == null)
-          _category = new Category();
-       System.out.println("!! CategoryForm.getCategory " + _category);
-        return _category;
-    }
-
-    /**
-     * @return Collection
-     */
-    public Collection getProducts(  )
-    {
-        return _products;
-    }
-
-    /**
-     * Sets the categoryId.
-     * @param categoryId The categoryId to set
-     */
-    public void setCategoryId( String categoryId )
-    {
-        _categoryId = categoryId;
-    }
-
-    /**
-     * Sets the categoryValue.
-     * @param categoryValue The categoryValue to set
-     */
-    public void setCategory( Category category )
-    {
-        _category = category;
-    }
-
-    /**
-     * Sets the productValues.
-     * @param productValues The productValues to set
-     */
-    public void setProducts( Collection products )
-    {
-        _products = products;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/category/CategoryForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+package xpetstore.web.struts.action.category;
+
+import java.util.Collection;
+
+import xpetstore.domain.catalog.ejb.Category;
+
+import xpetstore.web.struts.action.*;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="categoryForm"
+ */
+public class CategoryForm
+    extends BaseForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String      _categoryId = "";
+    private Category    _category = new Category(  );
+    private Collection  _products;
+
+    public CategoryForm()
+    {
+    }
+
+    /**
+     * @return String
+     */
+    public String getCategoryId(  )
+    {
+        return _categoryId;
+    }
+
+    /**
+     * @return CategoryValue
+     */
+    public Category getCategory(  )
+    {
+       if (_category == null)
+          _category = new Category();
+       System.out.println("!! CategoryForm.getCategory " + _category);
+        return _category;
+    }
+
+    /**
+     * @return Collection
+     */
+    public Collection getProducts(  )
+    {
+        return _products;
+    }
+
+    /**
+     * Sets the categoryId.
+     * @param categoryId The categoryId to set
+     */
+    public void setCategoryId( String categoryId )
+    {
+        _categoryId = categoryId;
+    }
+
+    /**
+     * Sets the categoryValue.
+     * @param categoryValue The categoryValue to set
+     */
+    public void setCategory( Category category )
+    {
+        _category = category;
+    }
+
+    /**
+     * Sets the productValues.
+     * @param productValues The productValues to set
+     */
+    public void setProducts( Collection products )
+    {
+        _products = products;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-package xpetstore.web.struts.action.customer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.customer.ejb.Customer;
-
-import xpetstore.services.petstore.exceptions.DuplicateAccountException;
-import xpetstore.services.petstore.exceptions.DuplicateEmailException;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="customerForm"
- *      path="/createCustomer"
- *      scope="request"
- *      validate="true"
- *      input="/register.jsp"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/signon.jspa"
- *
- * @struts.action-forward
- *      name="error"
- *      path="/register.jsp"
- */
-public class CreateCustomerAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        CustomerForm  frm = ( CustomerForm ) form;
-        Customer cust = frm.getCustomer(  );
-
-        try
-        {
-            getPetstore(  ).createCustomer( cust );
-            return mapping.findForward( SUCCESS );
-        }
-        catch ( DuplicateAccountException da )
-        {
-            request.setAttribute( MESSAGE_KEY, "duplicate_account" );
-
-            return mapping.findForward( ERROR );
-        }
-        catch ( DuplicateEmailException de )
-        {
-            request.setAttribute( MESSAGE_KEY, "duplicate_email" );
-
-            return mapping.findForward( ERROR );
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CreateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+package xpetstore.web.struts.action.customer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.customer.ejb.Customer;
+
+import xpetstore.services.petstore.exceptions.DuplicateAccountException;
+import xpetstore.services.petstore.exceptions.DuplicateEmailException;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="customerForm"
+ *      path="/createCustomer"
+ *      scope="request"
+ *      validate="true"
+ *      input="/register.jsp"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/signon.jspa"
+ *
+ * @struts.action-forward
+ *      name="error"
+ *      path="/register.jsp"
+ */
+public class CreateCustomerAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        CustomerForm  frm = ( CustomerForm ) form;
+        Customer cust = frm.getCustomer(  );
+
+        try
+        {
+            getPetstore(  ).createCustomer( cust );
+            return mapping.findForward( SUCCESS );
+        }
+        catch ( DuplicateAccountException da )
+        {
+            request.setAttribute( MESSAGE_KEY, "duplicate_account" );
+
+            return mapping.findForward( ERROR );
+        }
+        catch ( DuplicateEmailException de )
+        {
+            request.setAttribute( MESSAGE_KEY, "duplicate_email" );
+
+            return mapping.findForward( ERROR );
+        }
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-package xpetstore.web.struts.action.customer;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.customer.ejb.Customer;
-import xpetstore.domain.signon.ejb.Account;
-
-import xpetstore.web.struts.action.*;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="customerForm"
- */
-public class CustomerForm
-    extends BaseForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Customer _customer = new Customer(  );
-
-    //~ Constructors -----------------------------------------------------------
-
-    public CustomerForm(  )
-    {
-        _customer.setAccount( new Account(  ) );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public ActionErrors validate( ActionMapping      mapping,
-                                  HttpServletRequest request )
-    {
-        ActionErrors errors = new ActionErrors(  );
-
-        Account account = getCustomer(  ).getAccount(  );
-        String       userId = account.getUserId(  );
-        String       passwd = account.getPassword(  );
-        checkNotEmpty( userId, "userId_required", errors );
-        checkLength( userId, 4, "userId_length", errors );
-        checkNotEmpty( passwd, "password_required", errors );
-        checkLength( passwd, 4, "password_length", errors );
-
-        checkNotEmpty( _customer.getEmail(  ), "email_required", errors );
-        checkNotEmpty( _customer.getCreditCardType(  ), "ccType_required", errors );
-        checkNotEmpty( _customer.getCreditCardNumber(  ), "ccNumber_required", errors );
-        checkNotEmpty( _customer.getCreditCardExpiryDate(  ), "ccExpiryDate_required", errors );
-        checkCreditCardDateFormat( _customer.getCreditCardExpiryDate(  ), "ccExpiryDate_bad_format", errors );
-
-        return errors;
-    }
-
-    public Customer getCustomer(  )
-    {
-        return _customer;
-    }
-
-    public void setCustomer( Customer customer )
-    {
-        _customer = customer;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/CustomerForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+package xpetstore.web.struts.action.customer;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.customer.ejb.Customer;
+import xpetstore.domain.signon.ejb.Account;
+
+import xpetstore.web.struts.action.*;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="customerForm"
+ */
+public class CustomerForm
+    extends BaseForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Customer _customer = new Customer(  );
+
+    //~ Constructors -----------------------------------------------------------
+
+    public CustomerForm(  )
+    {
+        _customer.setAccount( new Account(  ) );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public ActionErrors validate( ActionMapping      mapping,
+                                  HttpServletRequest request )
+    {
+        ActionErrors errors = new ActionErrors(  );
+
+        Account account = getCustomer(  ).getAccount(  );
+        String       userId = account.getUserId(  );
+        String       passwd = account.getPassword(  );
+        checkNotEmpty( userId, "userId_required", errors );
+        checkLength( userId, 4, "userId_length", errors );
+        checkNotEmpty( passwd, "password_required", errors );
+        checkLength( passwd, 4, "password_length", errors );
+
+        checkNotEmpty( _customer.getEmail(  ), "email_required", errors );
+        checkNotEmpty( _customer.getCreditCardType(  ), "ccType_required", errors );
+        checkNotEmpty( _customer.getCreditCardNumber(  ), "ccNumber_required", errors );
+        checkNotEmpty( _customer.getCreditCardExpiryDate(  ), "ccExpiryDate_required", errors );
+        checkCreditCardDateFormat( _customer.getCreditCardExpiryDate(  ), "ccExpiryDate_bad_format", errors );
+
+        return errors;
+    }
+
+    public Customer getCustomer(  )
+    {
+        return _customer;
+    }
+
+    public void setCustomer( Customer customer )
+    {
+        _customer = customer;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-package xpetstore.web.struts.action.customer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.customer.ejb.Customer;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="customerForm"
- *      path="/myaccount"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/myaccount.jsp"
- */
-public class MyAccountAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        CustomerForm  frm = ( CustomerForm ) form;
-        String        userId = ( String ) request.getSession(  ).getAttribute( USERID_KEY );
-
-        Customer cst = getPetstore(  ).getCustomer( userId );
-        frm.setCustomer( cst );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/MyAccountAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+package xpetstore.web.struts.action.customer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.customer.ejb.Customer;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="customerForm"
+ *      path="/myaccount"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/myaccount.jsp"
+ */
+public class MyAccountAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        CustomerForm  frm = ( CustomerForm ) form;
+        String        userId = ( String ) request.getSession(  ).getAttribute( USERID_KEY );
+
+        Customer cst = getPetstore(  ).getCustomer( userId );
+        frm.setCustomer( cst );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-package xpetstore.web.struts.action.customer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="customerForm"
- *      path="/register"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/register.jsp"
- */
-public class RegisterAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/RegisterAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+package xpetstore.web.struts.action.customer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="customerForm"
+ *      path="/register"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/register.jsp"
+ */
+public class RegisterAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-package xpetstore.web.struts.action.customer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.customer.ejb.Customer;
-
-import xpetstore.services.petstore.exceptions.DuplicateEmailException;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="customerForm"
- *      path="/updateCustomer"
- *      scope="request"
- *      validate="true"
- *      input="/myaccount.jsp"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/index.jsp"
- *
- * @struts.action-forward
- *      name="error"
- *      path="/myaccount.jsp"
- */
-public class UpdateCustomerAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        CustomerForm  frm = ( CustomerForm ) form;
-        Customer cust = frm.getCustomer(  );
-
-        try
-        {
-            getPetstore(  ).updateCustomer( cust );
-
-            initSession( cust, request );
-
-            return mapping.findForward( SUCCESS );
-        }
-        catch ( DuplicateEmailException de )
-        {
-            request.setAttribute( MESSAGE_KEY, "duplicate_email" );
-
-            return mapping.findForward( ERROR );
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/customer/UpdateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+package xpetstore.web.struts.action.customer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.customer.ejb.Customer;
+
+import xpetstore.services.petstore.exceptions.DuplicateEmailException;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="customerForm"
+ *      path="/updateCustomer"
+ *      scope="request"
+ *      validate="true"
+ *      input="/myaccount.jsp"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/index.jsp"
+ *
+ * @struts.action-forward
+ *      name="error"
+ *      path="/myaccount.jsp"
+ */
+public class UpdateCustomerAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        CustomerForm  frm = ( CustomerForm ) form;
+        Customer cust = frm.getCustomer(  );
+
+        try
+        {
+            getPetstore(  ).updateCustomer( cust );
+
+            initSession( cust, request );
+
+            return mapping.findForward( SUCCESS );
+        }
+        catch ( DuplicateEmailException de )
+        {
+            request.setAttribute( MESSAGE_KEY, "duplicate_email" );
+
+            return mapping.findForward( ERROR );
+        }
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-package xpetstore.web.struts.action.item;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.catalog.ejb.Item;
-import xpetstore.domain.catalog.ejb.Product;
-
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="itemForm"
- *      path="/item"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/item.jsp"
- */
-public class ItemAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        ItemForm      frm = ( ItemForm ) form;
-        String        itemId = frm.getItemId(  );
-        Petstore petstore = getPetstore(  );
-
-        /* Item */
-        Item item = petstore.getItem( itemId );
-        frm.setItem( item );
-
-        /* Product */
-        Product product = petstore.getProductByItem( itemId );
-        frm.setProduct( product );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+package xpetstore.web.struts.action.item;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.catalog.ejb.Item;
+import xpetstore.domain.catalog.ejb.Product;
+
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="itemForm"
+ *      path="/item"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/item.jsp"
+ */
+public class ItemAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        ItemForm      frm = ( ItemForm ) form;
+        String        itemId = frm.getItemId(  );
+        Petstore petstore = getPetstore(  );
+
+        /* Item */
+        Item item = petstore.getItem( itemId );
+        frm.setItem( item );
+
+        /* Product */
+        Product product = petstore.getProductByItem( itemId );
+        frm.setProduct( product );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-package xpetstore.web.struts.action.item;
-
-import xpetstore.domain.catalog.ejb.Item;
-import xpetstore.domain.catalog.ejb.Product;
-
-import xpetstore.web.struts.action.*;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="itemForm"
- */
-public class ItemForm
-    extends BaseForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String       _itemId;
-    private Item    _item = new Item(  );
-    private Product _product;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return String
-     */
-    public String getItemId(  )
-    {
-        return _itemId;
-    }
-
-    /**
-     * @return ItemValue
-     */
-    public Item getItem(  )
-    {
-        return _item;
-    }
-
-    /**
-     * @return ProductValue
-     */
-    public Product getProduct(  )
-    {
-        return _product;
-    }
-
-    /**
-     * Sets the itemId.
-     * @param itemId The itemId to set
-     */
-    public void setItemId( String itemId )
-    {
-        _itemId = itemId;
-    }
-
-    /**
-     * Sets the itemValue.
-     * @param itemValue The itemValue to set
-     */
-    public void setItem( Item item )
-    {
-        _item = item;
-    }
-
-    /**
-     * Sets the productValue.
-     * @param productValue The productValue to set
-     */
-    public void setProduct( Product product )
-    {
-        _product = product;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/item/ItemForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+package xpetstore.web.struts.action.item;
+
+import xpetstore.domain.catalog.ejb.Item;
+import xpetstore.domain.catalog.ejb.Product;
+
+import xpetstore.web.struts.action.*;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="itemForm"
+ */
+public class ItemForm
+    extends BaseForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String       _itemId;
+    private Item    _item = new Item(  );
+    private Product _product;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return String
+     */
+    public String getItemId(  )
+    {
+        return _itemId;
+    }
+
+    /**
+     * @return ItemValue
+     */
+    public Item getItem(  )
+    {
+        return _item;
+    }
+
+    /**
+     * @return ProductValue
+     */
+    public Product getProduct(  )
+    {
+        return _product;
+    }
+
+    /**
+     * Sets the itemId.
+     * @param itemId The itemId to set
+     */
+    public void setItemId( String itemId )
+    {
+        _itemId = itemId;
+    }
+
+    /**
+     * Sets the itemValue.
+     * @param itemValue The itemValue to set
+     */
+    public void setItem( Item item )
+    {
+        _item = item;
+    }
+
+    /**
+     * Sets the productValue.
+     * @param productValue The productValue to set
+     */
+    public void setProduct( Product product )
+    {
+        _product = product;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-package xpetstore.web.struts.action.order;
-
-import java.util.Date;
-import java.util.HashMap;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.order.ejb.Order;
-import xpetstore.services.cart.ejb.Cart;
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="orderForm"
- *      path="/createOrder"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/confirmation.jsp"
- */
-public class CreateOrderAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-       try 
-       {
-       System.out.println("!!CreateOrderAction.doExecute");
-        OrderForm     frm = ( OrderForm ) form;
-        String        userId = ( String ) request.getSession(  ).getAttribute( USERID_KEY );
-        Petstore petstore = getPetstore(  );
-
-        /* Proceed the order */
-        HashMap items = new HashMap(  );
-
-        for ( int i = 0, len = frm.getItemId(  ).length; i < len; i++ )
-        {
-            items.put( frm.getItemId(  )[ i ], new Integer( frm.getQuantity(  )[ i ] ) );
-        }
-
-        Integer orderUId = petstore.createOrder( userId, new Date(  ), items );
-        frm.getOrder(  ).setOrderUId( orderUId );
-
-        /* Invalidating the current cart */
-        Cart cart = getCart( false, request );
-
-        if ( cart != null )
-        {
-            request.getSession(  ).removeAttribute( CART_KEY );
-            cart.remove(  );
-        }
-
-        return mapping.findForward( SUCCESS );
-       }
-       catch (Exception e)
-       {
-          e.printStackTrace();
-          throw e;
-       }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/CreateOrderAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+package xpetstore.web.struts.action.order;
+
+import java.util.Date;
+import java.util.HashMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.order.ejb.Order;
+import xpetstore.services.cart.ejb.Cart;
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="orderForm"
+ *      path="/createOrder"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/confirmation.jsp"
+ */
+public class CreateOrderAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+       try 
+       {
+       System.out.println("!!CreateOrderAction.doExecute");
+        OrderForm     frm = ( OrderForm ) form;
+        String        userId = ( String ) request.getSession(  ).getAttribute( USERID_KEY );
+        Petstore petstore = getPetstore(  );
+
+        /* Proceed the order */
+        HashMap items = new HashMap(  );
+
+        for ( int i = 0, len = frm.getItemId(  ).length; i < len; i++ )
+        {
+            items.put( frm.getItemId(  )[ i ], new Integer( frm.getQuantity(  )[ i ] ) );
+        }
+
+        Integer orderUId = petstore.createOrder( userId, new Date(  ), items );
+        frm.getOrder(  ).setOrderUId( orderUId );
+
+        /* Invalidating the current cart */
+        Cart cart = getCart( false, request );
+
+        if ( cart != null )
+        {
+            request.getSession(  ).removeAttribute( CART_KEY );
+            cart.remove(  );
+        }
+
+        return mapping.findForward( SUCCESS );
+       }
+       catch (Exception e)
+       {
+          e.printStackTrace();
+          throw e;
+       }
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-package xpetstore.web.struts.action.order;
-
-import xpetstore.domain.order.ejb.Order;
-
-import xpetstore.web.struts.action.cart.*;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="orderForm"
- */
-public class OrderForm
-    extends CartForm
-{
-   private Order _order = new Order(  );
-   
-    public OrderForm()
-    {
-       
-    }
-
-    public Order getOrder(  )
-    {
-        return _order;
-    }
-
-    public void setOrder( Order order )
-    {
-        _order = order;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/order/OrderForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+package xpetstore.web.struts.action.order;
+
+import xpetstore.domain.order.ejb.Order;
+
+import xpetstore.web.struts.action.cart.*;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="orderForm"
+ */
+public class OrderForm
+    extends CartForm
+{
+   private Order _order = new Order(  );
+   
+    public OrderForm()
+    {
+       
+    }
+
+    public Order getOrder(  )
+    {
+        return _order;
+    }
+
+    public void setOrder( Order order )
+    {
+        _order = order;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-package xpetstore.web.struts.action.product;
-
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.catalog.ejb.Product;
-
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="productForm"
- *      path="/product"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="product.jsp"
- */
-public class ProductAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        ProductForm   frm = ( ProductForm ) form;
-        String        productId = frm.getProductId(  );
-        Petstore petstore = getPetstore(  );
-
-        /* Product */
-        Product product = petstore.getProduct( productId );
-        frm.setProduct( product );
-
-        /* Items */
-        Collection items = petstore.getItems( productId, 0, Integer.MAX_VALUE ).getList(  );
-        frm.setItems( items );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+package xpetstore.web.struts.action.product;
+
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.catalog.ejb.Product;
+
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="productForm"
+ *      path="/product"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="product.jsp"
+ */
+public class ProductAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        ProductForm   frm = ( ProductForm ) form;
+        String        productId = frm.getProductId(  );
+        Petstore petstore = getPetstore(  );
+
+        /* Product */
+        Product product = petstore.getProduct( productId );
+        frm.setProduct( product );
+
+        /* Items */
+        Collection items = petstore.getItems( productId, 0, Integer.MAX_VALUE ).getList(  );
+        frm.setItems( items );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,77 +0,0 @@
-package xpetstore.web.struts.action.product;
-
-import java.util.Collection;
-
-import xpetstore.domain.catalog.ejb.Product;
-
-import xpetstore.web.struts.action.BaseForm;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="productForm"
- */
-public class ProductForm
-    extends BaseForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String       _productId;
-    private Product     _product = new Product(  );
-    private Collection   _items;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return Collection
-     */
-    public Collection getItems(  )
-    {
-        return _items;
-    }
-
-    /**
-     * @return String
-     */
-    public String getProductId(  )
-    {
-        return _productId;
-    }
-
-    /**
-     * @return ProductValue
-     */
-    public Product getProduct(  )
-    {
-        return _product;
-    }
-
-    /**
-     * Sets the itemValues.
-     * @param itemValues The itemValues to set
-     */
-    public void setItems( Collection items )
-    {
-        _items = items;
-    }
-
-    /**
-     * Sets the productId.
-     * @param productId The productId to set
-     */
-    public void setProductId( String productId )
-    {
-        _productId = productId;
-    }
-
-    /**
-     * Sets the productValue.
-     * @param productValue The productValue to set
-     */
-    public void setProduct( Product product )
-    {
-        _product = product;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/ProductForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,77 @@
+package xpetstore.web.struts.action.product;
+
+import java.util.Collection;
+
+import xpetstore.domain.catalog.ejb.Product;
+
+import xpetstore.web.struts.action.BaseForm;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="productForm"
+ */
+public class ProductForm
+    extends BaseForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String       _productId;
+    private Product     _product = new Product(  );
+    private Collection   _items;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return Collection
+     */
+    public Collection getItems(  )
+    {
+        return _items;
+    }
+
+    /**
+     * @return String
+     */
+    public String getProductId(  )
+    {
+        return _productId;
+    }
+
+    /**
+     * @return ProductValue
+     */
+    public Product getProduct(  )
+    {
+        return _product;
+    }
+
+    /**
+     * Sets the itemValues.
+     * @param itemValues The itemValues to set
+     */
+    public void setItems( Collection items )
+    {
+        _items = items;
+    }
+
+    /**
+     * Sets the productId.
+     * @param productId The productId to set
+     */
+    public void setProductId( String productId )
+    {
+        _productId = productId;
+    }
+
+    /**
+     * Sets the productValue.
+     * @param productValue The productValue to set
+     */
+    public void setProduct( Product product )
+    {
+        _product = product;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-package xpetstore.web.struts.action.product;
-
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author Herve Tchepannou
- *
- * @struts.action
- *      name="searchForm"
- *      path="/search"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="search.jsp"
- */
-public class SearchAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        SearchForm    frm = ( SearchForm ) form;
-        String        keyword = frm.getKeyword(  );
-        Petstore petstore = getPetstore(  );
-
-        Collection    products = petstore.searchProducts( keyword, 0, Integer.MAX_VALUE ).getList(  );
-        frm.setProductValues( products );
-
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+package xpetstore.web.struts.action.product;
+
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author Herve Tchepannou
+ *
+ * @struts.action
+ *      name="searchForm"
+ *      path="/search"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="search.jsp"
+ */
+public class SearchAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        SearchForm    frm = ( SearchForm ) form;
+        String        keyword = frm.getKeyword(  );
+        Petstore petstore = getPetstore(  );
+
+        Collection    products = petstore.searchProducts( keyword, 0, Integer.MAX_VALUE ).getList(  );
+        frm.setProductValues( products );
+
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-package xpetstore.web.struts.action.product;
-
-import java.util.Collection;
-
-import xpetstore.web.struts.action.*;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="searchForm"
- */
-public class SearchForm
-    extends BaseForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String     _keyword;
-    private Collection _productValues;
-
-    //~ Methods ----------------------------------------------------------------
-
-    public String getKeyword(  )
-    {
-        return _keyword;
-    }
-
-    public void setKeyword( String keyword )
-    {
-        _keyword = keyword;
-    }
-
-    public Collection getProductValues(  )
-    {
-        return _productValues;
-    }
-
-    public void setProductValues( Collection productValues )
-    {
-        _productValues = productValues;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/product/SearchForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+package xpetstore.web.struts.action.product;
+
+import java.util.Collection;
+
+import xpetstore.web.struts.action.*;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="searchForm"
+ */
+public class SearchForm
+    extends BaseForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String     _keyword;
+    private Collection _productValues;
+
+    //~ Methods ----------------------------------------------------------------
+
+    public String getKeyword(  )
+    {
+        return _keyword;
+    }
+
+    public void setKeyword( String keyword )
+    {
+        _keyword = keyword;
+    }
+
+    public Collection getProductValues(  )
+    {
+        return _productValues;
+    }
+
+    public void setProductValues( Collection productValues )
+    {
+        _productValues = productValues;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-package xpetstore.web.struts.action.signon;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.customer.ejb.Customer;
-import xpetstore.domain.signon.ejb.Account;
-
-import xpetstore.services.petstore.ejb.Petstore;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="signonForm"
- *      path="/login"
- *      input="/login.jsp"
- *      scope="request"
- *      validate="true"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/index.jsp"
- *
- * @struts.action-forward
- *      name="error"
- *      path="/signon.jsp"
- */
-public class LoginAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    public ActionForward doExecute( ActionMapping       mapping,
-                                    ActionForm          form,
-                                    HttpServletRequest  request,
-                                    HttpServletResponse response )
-        throws Exception
-    {
-        SignonForm    frm = ( SignonForm ) form;
-        Account  account = frm.getAccount(  );
-        String        redirectUri = frm.getRedirectUri(  );
-        Petstore petstore = getPetstore(  );
-
-        if ( petstore.authenticate( account.getUserId(  ), account.getPassword(  ) ) )
-        {
-            Customer cust = petstore.getCustomer( account.getUserId(  ) );
-            initSession( cust, request );
-
-            if ( ( redirectUri == null ) || ( redirectUri.length(  ) == 0 ) )
-            {
-                return mapping.findForward( SUCCESS );
-            }
-            else
-            {
-                _log.info( "...redirecting to: " + redirectUri );
-                response.sendRedirect( redirectUri );
-                return null;
-            }
-        }
-        else
-        {
-            request.setAttribute( MESSAGE_KEY, getString( "authentication_failed" ) );
-
-            return mapping.findForward( ERROR );
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LoginAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+package xpetstore.web.struts.action.signon;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.customer.ejb.Customer;
+import xpetstore.domain.signon.ejb.Account;
+
+import xpetstore.services.petstore.ejb.Petstore;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="signonForm"
+ *      path="/login"
+ *      input="/login.jsp"
+ *      scope="request"
+ *      validate="true"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/index.jsp"
+ *
+ * @struts.action-forward
+ *      name="error"
+ *      path="/signon.jsp"
+ */
+public class LoginAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    public ActionForward doExecute( ActionMapping       mapping,
+                                    ActionForm          form,
+                                    HttpServletRequest  request,
+                                    HttpServletResponse response )
+        throws Exception
+    {
+        SignonForm    frm = ( SignonForm ) form;
+        Account  account = frm.getAccount(  );
+        String        redirectUri = frm.getRedirectUri(  );
+        Petstore petstore = getPetstore(  );
+
+        if ( petstore.authenticate( account.getUserId(  ), account.getPassword(  ) ) )
+        {
+            Customer cust = petstore.getCustomer( account.getUserId(  ) );
+            initSession( cust, request );
+
+            if ( ( redirectUri == null ) || ( redirectUri.length(  ) == 0 ) )
+            {
+                return mapping.findForward( SUCCESS );
+            }
+            else
+            {
+                _log.info( "...redirecting to: " + redirectUri );
+                response.sendRedirect( redirectUri );
+                return null;
+            }
+        }
+        else
+        {
+            request.setAttribute( MESSAGE_KEY, getString( "authentication_failed" ) );
+
+            return mapping.findForward( ERROR );
+        }
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-package xpetstore.web.struts.action.signon;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="signonForm"
- *      path="/logout"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/index.jsp"
- */
-public class LogoutAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        clearSession( request );
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/LogoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+package xpetstore.web.struts.action.signon;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="signonForm"
+ *      path="/logout"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/index.jsp"
+ */
+public class LogoutAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        clearSession( request );
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-package xpetstore.web.struts.action.signon;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.web.struts.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.action
- *      name="signonForm"
- *      path="/signon"
- *      scope="request"
- *      validate="false"
- *
- * @struts.action-forward
- *      name="success"
- *      path="/signon.jsp"
- */
-public class SignonAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
-     */
-    protected ActionForward doExecute( ActionMapping       mapping,
-                                       ActionForm          form,
-                                       HttpServletRequest  request,
-                                       HttpServletResponse response )
-        throws Exception
-    {
-        return mapping.findForward( SUCCESS );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+package xpetstore.web.struts.action.signon;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.web.struts.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.action
+ *      name="signonForm"
+ *      path="/signon"
+ *      scope="request"
+ *      validate="false"
+ *
+ * @struts.action-forward
+ *      name="success"
+ *      path="/signon.jsp"
+ */
+public class SignonAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.struts.action.BaseAction#doExecute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    protected ActionForward doExecute( ActionMapping       mapping,
+                                       ActionForm          form,
+                                       HttpServletRequest  request,
+                                       HttpServletResponse response )
+        throws Exception
+    {
+        return mapping.findForward( SUCCESS );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-package xpetstore.web.struts.action.signon;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMapping;
-
-import xpetstore.domain.signon.ejb.Account;
-
-import xpetstore.web.struts.action.*;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @struts.form
- *      name="signonForm"
- */
-public class SignonForm
-    extends BaseForm
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Account _account = new Account(  );
-
-    //~ Methods ----------------------------------------------------------------
-
-    public ActionErrors validate( ActionMapping      mapping,
-                                  HttpServletRequest request )
-    {
-        ActionErrors errors = new ActionErrors(  );
-
-        checkNotEmpty( _account.getUserId(  ), "userId_required", errors );
-        checkNotEmpty( _account.getPassword(  ), "password_required", errors );
-
-        return errors;
-    }
-
-    public Account getAccount(  )
-    {
-        return _account;
-    }
-
-    public void setAccount( Account account )
-    {
-        _account = account;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/struts/action/signon/SignonForm.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+package xpetstore.web.struts.action.signon;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionMapping;
+
+import xpetstore.domain.signon.ejb.Account;
+
+import xpetstore.web.struts.action.*;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @struts.form
+ *      name="signonForm"
+ */
+public class SignonForm
+    extends BaseForm
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Account _account = new Account(  );
+
+    //~ Methods ----------------------------------------------------------------
+
+    public ActionErrors validate( ActionMapping      mapping,
+                                  HttpServletRequest request )
+    {
+        ActionErrors errors = new ActionErrors(  );
+
+        checkNotEmpty( _account.getUserId(  ), "userId_required", errors );
+        checkNotEmpty( _account.getPassword(  ), "password_required", errors );
+
+        return errors;
+    }
+
+    public Account getAccount(  )
+    {
+        return _account;
+    }
+
+    public void setAccount( Account account )
+    {
+        _account = account;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,152 +0,0 @@
-package xpetstore.web.taglib;
-
-import java.util.Iterator;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import xpetstore.util.CreditCardNames;
-
-
-/**
- * This is an example of JSP taglib.
- * This taglib show the list of all the credit card to use for payments
- *
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @jsp.tag
- *         name="creditcard"
- *         body-content="empty"
- *         display-name="xPetStore CreditCard Tag"
- */
-public class CreditCardTag
-    extends TagSupport
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _name;
-    private String _css;
-    private String _value;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see javax.servlet.jsp.tagext.Tag#doEndTag()
-     */
-    public int doEndTag(  )
-        throws JspException
-    {
-        try
-        {
-            StringBuffer buff = new StringBuffer(  );
-
-            /* <select> */
-            buff.append( "<select name='" ).append( _name ).append( "'" );
-
-            if ( _css != null )
-            {
-                buff.append( " class='" ).append( _css ).append( "'" );
-            }
-
-            buff.append( ">" );
-
-            Iterator it = CreditCardNames.all(  ).iterator(  );
-
-            while ( it.hasNext(  ) )
-            {
-                String cc = it.next(  ).toString(  );
-
-                /* <option> */
-                buff.append( "<option value='" ).append( cc ).append( "'" );
-
-                if ( cc.equals( _value ) )
-                {
-                    buff.append( " selected" );
-                }
-
-                buff.append( ">" );
-
-                /* value */
-                buff.append( cc );
-
-                /* </option> */
-                buff.append( "</option>" );
-            }
-
-            /* </select> */
-            buff.append( "</select>" );
-
-            pageContext.getOut(  ).println( buff.toString(  ) );
-
-            System.out.println( "customerForm=" + pageContext.getAttribute( "customerForm" ) );
-
-            return EVAL_PAGE;
-        }
-        catch ( Exception e )
-        {
-            throw new JspException( e );
-        }
-    }
-
-    /**
-     * Returns the css.
-     * @return String
-     *
-     * @jsp.attribute
-     */
-    public String getCss(  )
-    {
-        return _css;
-    }
-
-    /**
-     * Returns the name.
-     * @return String
-     *
-     * @jsp.attribute
-     *         required="true"
-     */
-    public String getName(  )
-    {
-        return _name;
-    }
-
-    /**
-     * Returns the value.
-     * @return String
-     *
-     * @jsp.attribute
-     *      rtexprvalue="true"
-     */
-    public String getValue(  )
-    {
-        return _value;
-    }
-
-    /**
-     * Sets the css.
-     * @param css The css to set
-     */
-    public void setCss( String css )
-    {
-        _css = css;
-    }
-
-    /**
-     * Sets the name.
-     * @param name The name to set
-     */
-    public void setName( String name )
-    {
-        _name = name;
-    }
-
-    /**
-     * Sets the value.
-     * @param value The value to set
-     */
-    public void setValue( String value )
-    {
-        _value = value;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/web/xpetstore/web/taglib/CreditCardTag.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,152 @@
+package xpetstore.web.taglib;
+
+import java.util.Iterator;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import xpetstore.util.CreditCardNames;
+
+
+/**
+ * This is an example of JSP taglib.
+ * This taglib show the list of all the credit card to use for payments
+ *
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @jsp.tag
+ *         name="creditcard"
+ *         body-content="empty"
+ *         display-name="xPetStore CreditCard Tag"
+ */
+public class CreditCardTag
+    extends TagSupport
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _name;
+    private String _css;
+    private String _value;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see javax.servlet.jsp.tagext.Tag#doEndTag()
+     */
+    public int doEndTag(  )
+        throws JspException
+    {
+        try
+        {
+            StringBuffer buff = new StringBuffer(  );
+
+            /* <select> */
+            buff.append( "<select name='" ).append( _name ).append( "'" );
+
+            if ( _css != null )
+            {
+                buff.append( " class='" ).append( _css ).append( "'" );
+            }
+
+            buff.append( ">" );
+
+            Iterator it = CreditCardNames.all(  ).iterator(  );
+
+            while ( it.hasNext(  ) )
+            {
+                String cc = it.next(  ).toString(  );
+
+                /* <option> */
+                buff.append( "<option value='" ).append( cc ).append( "'" );
+
+                if ( cc.equals( _value ) )
+                {
+                    buff.append( " selected" );
+                }
+
+                buff.append( ">" );
+
+                /* value */
+                buff.append( cc );
+
+                /* </option> */
+                buff.append( "</option>" );
+            }
+
+            /* </select> */
+            buff.append( "</select>" );
+
+            pageContext.getOut(  ).println( buff.toString(  ) );
+
+            System.out.println( "customerForm=" + pageContext.getAttribute( "customerForm" ) );
+
+            return EVAL_PAGE;
+        }
+        catch ( Exception e )
+        {
+            throw new JspException( e );
+        }
+    }
+
+    /**
+     * Returns the css.
+     * @return String
+     *
+     * @jsp.attribute
+     */
+    public String getCss(  )
+    {
+        return _css;
+    }
+
+    /**
+     * Returns the name.
+     * @return String
+     *
+     * @jsp.attribute
+     *         required="true"
+     */
+    public String getName(  )
+    {
+        return _name;
+    }
+
+    /**
+     * Returns the value.
+     * @return String
+     *
+     * @jsp.attribute
+     *      rtexprvalue="true"
+     */
+    public String getValue(  )
+    {
+        return _value;
+    }
+
+    /**
+     * Sets the css.
+     * @param css The css to set
+     */
+    public void setCss( String css )
+    {
+        _css = css;
+    }
+
+    /**
+     * Sets the name.
+     * @param name The name to set
+     */
+    public void setName( String name )
+    {
+        _name = name;
+    }
+
+    /**
+     * Sets the value.
+     * @param value The value to set
+     */
+    public void setValue( String value )
+    {
+        _value = value;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<!-- Sitemesh -->
-<filter-mapping>
-    <filter-name>sitemesh</filter-name>
-    <url-pattern>/*</url-pattern>
-</filter-mapping>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filter-mappings.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<!-- Sitemesh -->
+<filter-mapping>
+    <filter-name>sitemesh</filter-name>
+    <url-pattern>/*</url-pattern>
+</filter-mapping>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<!-- Sitemesh -->
-<filter>
-	<filter-name>sitemesh</filter-name>
-  	<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-</filter>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/filters.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<!-- Sitemesh -->
+<filter>
+	<filter-name>sitemesh</filter-name>
+  	<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+</filter>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-<!-- Welcome files -->
-<welcome-file-list>
-	<welcome-file>index.jsp</welcome-file>
-</welcome-file-list>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-ejb3/xdoclet/web/welcomefiles.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+<!-- Welcome files -->
+<welcome-file-list>
+	<welcome-file>index.jsp</welcome-file>
+</welcome-file-list>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="java"/>
-    <classpathentry kind="src" path="resources"/>
-    <classpathentry kind="src" path="web"/>
-    <classpathentry kind="src" path="build/java"/>
-    <classpathentry kind="src" path="sql"/>
-    <classpathentry excluding="java/|resources/|web/|build/java/|sql/"
-        kind="src" path=""/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/c3p0.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-collections.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/cglib.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/hibernate.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/jcs.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/odmg.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/servlet.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-lang.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-logging.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/com.opensymphony.module.webwork/webwork.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.log4j/log4j.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/mail.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/activation.jar"/>
-    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.jdom/jdom.jar"/>
-    <classpathentry kind="output" path="build/classes"/>
-</classpath>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" path="java"/>
+    <classpathentry kind="src" path="resources"/>
+    <classpathentry kind="src" path="web"/>
+    <classpathentry kind="src" path="build/java"/>
+    <classpathentry kind="src" path="sql"/>
+    <classpathentry excluding="java/|resources/|web/|build/java/|sql/"
+        kind="src" path=""/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/c3p0.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-collections.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/cglib.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/hibernate.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/jcs.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/cirrus.hibernate/odmg.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/servlet.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-lang.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.commons/commons-logging.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/com.opensymphony.module.webwork/webwork.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.apache.log4j/log4j.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/mail.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/javax.j2ee/activation.jar"/>
+    <classpathentry kind="var" path="XPETSTORE_HOME/lib/main/org.jdom/jdom.jar"/>
+    <classpathentry kind="output" path="build/classes"/>
+</classpath>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>xpetstore-webwork</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/.project	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>xpetstore-webwork</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/Untitled 1
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/Untitled 1 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/Untitled 1)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-<project name="xpetstore-servlet-database" default="all" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- database config -->
-		<property file="${conf.dir}/db/database.properties" />
-		<echo>Database=${database}</echo>	
-		<property file="${conf.dir}/db/${database}.properties" /> 	
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Data                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="data" depends="init">
-		<!-- Schema -->
-        <sql 
-        	src="${build.sql.dir}/schemas.sql"
-            driver="${db.driver}" 
-            url="${db.url}"
-            userid="${db.user}" 
-            password="${db.password}"
-            classpath="${db.classpath}"
-            onerror="continue"
-        />
-        
-        <!-- Data -->
-        <sql 
-        	src="${sql.dir}/data.sql"
-            driver="${db.driver}" 
-            url="${db.url}"
-            userid="${db.user}" 
-            password="${db.password}"
-            classpath="${db.classpath}"
-        />
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-database.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+<project name="xpetstore-servlet-database" default="all" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- database config -->
+		<property file="${conf.dir}/db/database.properties" />
+		<echo>Database=${database}</echo>	
+		<property file="${conf.dir}/db/${database}.properties" /> 	
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Data                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="data" depends="init">
+		<!-- Schema -->
+        <sql 
+        	src="${build.sql.dir}/schemas.sql"
+            driver="${db.driver}" 
+            url="${db.url}"
+            userid="${db.user}" 
+            password="${db.password}"
+            classpath="${db.classpath}"
+            onerror="continue"
+        />
+        
+        <!-- Data -->
+        <sql 
+        	src="${sql.dir}/data.sql"
+            driver="${db.driver}" 
+            url="${db.url}"
+            userid="${db.user}" 
+            password="${db.password}"
+            classpath="${db.classpath}"
+        />
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-<project name="xpetstore-servlet-jboss" default="xdoclet" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<property file="${conf.dir}/as/jboss.properties" />		
-       	
-   		<!-- Paths -->
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-        </path>
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet" depends="init">
-		<antcall target="xdoclet.web" />
-	</target>
-	
-	<target name="xdoclet.web" depends="init">
-      	<taskdef 
-       		name="webdoclet" 
-       		classname="xdoclet.modules.web.WebDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-      	<webdoclet 
-       		destdir="${build.dir}/WEB-INF" 
-       		mergedir="${xdoclet.merge.dir}/web"
-       	>
-       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
-       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
-       		
-       		<jbosswebxml />
-       	</webdoclet>
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-        <copy todir="${jboss.deploy.dir}">
-            <fileset dir="${dist.dir}" includes="${ear.name}" />
-        </copy>
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy" depends="init">
-        <delete>
-            <fileset dir="${jboss.deploy.dir}" includes="${ear.name}" />
-        </delete>
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+<project name="xpetstore-servlet-jboss" default="xdoclet" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<property file="${conf.dir}/as/jboss.properties" />		
+       	
+   		<!-- Paths -->
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+        </path>
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet" depends="init">
+		<antcall target="xdoclet.web" />
+	</target>
+	
+	<target name="xdoclet.web" depends="init">
+      	<taskdef 
+       		name="webdoclet" 
+       		classname="xdoclet.modules.web.WebDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+      	<webdoclet 
+       		destdir="${build.dir}/WEB-INF" 
+       		mergedir="${xdoclet.merge.dir}/web"
+       	>
+       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
+       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
+       		
+       		<jbosswebxml />
+       	</webdoclet>
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+        <copy todir="${jboss.deploy.dir}">
+            <fileset dir="${dist.dir}" includes="${ear.name}" />
+        </copy>
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy" depends="init">
+        <delete>
+            <fileset dir="${jboss.deploy.dir}" includes="${ear.name}" />
+        </delete>
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,118 +0,0 @@
-<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<property file="${conf.dir}/as/orion.properties" />		
-       	
-   		<!-- Paths -->
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-        </path>
-        
-        <path id="orion.class.path">
-			<pathelement location="${orion.home.dir}/orion.jar" />
-            <pathelement location="${orion.home.dir}/ejb.jar" />
-            <pathelement location="${orion.home.dir}/jndi.jar" />
-        </path>
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet" depends="init">
-		<antcall target="xdoclet.web" />
-	</target>
-	
-	<target name="xdoclet.web" depends="init">
-		<copy todir="${build.dir}/WEB-INF">
-			<fileset dir="${xdoclet.merge.dir}/orion/WEB-INF" includes="orion-web.xml" />
-		</copy>
-		
-		<replace file="${build.dir}/WEB-INF/orion-web.xml">
-			<replacefilter 
-			    token="@orion.mail.session@" 
-			    value="${orion.mail.session}"
-			/>
-			<replacefilter 
-			    token="@jndi.mail.session@" 
-			    value="${jndi.mail.session}"
-			/>
-			<replacefilter 
-			    token="@orion.version@" 
-			    value="${orion.version}"
-			/>
-		</replace>
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-		<java 
-			classname="com.evermind.client.orion.OrionConsoleAdmin" 
-			fork="yes"
-			classpathref="orion.class.path"
-		>
-			<arg value="${orion.deploy.ormi}" />
-            <arg value="${orion.user.name}" />
-            <arg value="${orion.user.password}" />
-            <arg value="-deploy" />
-            <arg value="-file" />
-            <arg value="${dist.dir}/${ear.name}" />
-            <arg value="-deploymentName" />
-            <arg value="${app.name}" />
-		</java>	
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy" depends="init">
-		<java 
-			classname="com.evermind.client.orion.OrionConsoleAdmin" 
-			fork="yes"
-			classpathref="orion.class.path"
-		>
-			<arg value="${orion.deploy.ormi}" />
-            <arg value="${orion.user.name}" />
-            <arg value="${orion.user.password}" />
-            <arg value="-undeploy" />
-            <arg value="${app.name}" />
-		</java>	
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-orion.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,118 @@
+<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<property file="${conf.dir}/as/orion.properties" />		
+       	
+   		<!-- Paths -->
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+        </path>
+        
+        <path id="orion.class.path">
+			<pathelement location="${orion.home.dir}/orion.jar" />
+            <pathelement location="${orion.home.dir}/ejb.jar" />
+            <pathelement location="${orion.home.dir}/jndi.jar" />
+        </path>
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet" depends="init">
+		<antcall target="xdoclet.web" />
+	</target>
+	
+	<target name="xdoclet.web" depends="init">
+		<copy todir="${build.dir}/WEB-INF">
+			<fileset dir="${xdoclet.merge.dir}/orion/WEB-INF" includes="orion-web.xml" />
+		</copy>
+		
+		<replace file="${build.dir}/WEB-INF/orion-web.xml">
+			<replacefilter 
+			    token="@orion.mail.session@" 
+			    value="${orion.mail.session}"
+			/>
+			<replacefilter 
+			    token="@jndi.mail.session@" 
+			    value="${jndi.mail.session}"
+			/>
+			<replacefilter 
+			    token="@orion.version@" 
+			    value="${orion.version}"
+			/>
+		</replace>
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+		<java 
+			classname="com.evermind.client.orion.OrionConsoleAdmin" 
+			fork="yes"
+			classpathref="orion.class.path"
+		>
+			<arg value="${orion.deploy.ormi}" />
+            <arg value="${orion.user.name}" />
+            <arg value="${orion.user.password}" />
+            <arg value="-deploy" />
+            <arg value="-file" />
+            <arg value="${dist.dir}/${ear.name}" />
+            <arg value="-deploymentName" />
+            <arg value="${app.name}" />
+		</java>	
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy" depends="init">
+		<java 
+			classname="com.evermind.client.orion.OrionConsoleAdmin" 
+			fork="yes"
+			classpathref="orion.class.path"
+		>
+			<arg value="${orion.deploy.ormi}" />
+            <arg value="${orion.user.name}" />
+            <arg value="${orion.user.password}" />
+            <arg value="-undeploy" />
+            <arg value="${app.name}" />
+		</java>	
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-<project name="xpetstore-servlet-jboss" default="xdoclet" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<property file="${conf.dir}/as/tomcat.properties" />		
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet" depends="init">
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-        <delete>
-            <fileset dir="${tomcat.deploy.dir}" includes="xpetstore-servlet/**" />
-        </delete>
-		<unwar src="${dist.dir}/${war.name}" dest="${tomcat.deploy.dir}/xpetstore-servlet" />
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy" depends="init">
-        <delete>
-            <fileset dir="${tomcat.deploy.dir}" includes="xpetstore-servlet/**" />
-        </delete>
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-tomcat.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+<project name="xpetstore-servlet-jboss" default="xdoclet" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<property file="${conf.dir}/as/tomcat.properties" />		
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet" depends="init">
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+        <delete>
+            <fileset dir="${tomcat.deploy.dir}" includes="xpetstore-servlet/**" />
+        </delete>
+		<unwar src="${dist.dir}/${war.name}" dest="${tomcat.deploy.dir}/xpetstore-servlet" />
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy" depends="init">
+        <delete>
+            <fileset dir="${tomcat.deploy.dir}" includes="xpetstore-servlet/**" />
+        </delete>
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,89 +0,0 @@
-<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<property file="${conf.dir}/as/weblogic.properties" />		
-       	
-   		<!-- Paths -->
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-        </path>
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet" depends="init">
-		<antcall target="xdoclet.web" />
-	</target>
-	
-	<target name="xdoclet.web" depends="init">
-      	<taskdef 
-       		name="webdoclet" 
-       		classname="xdoclet.modules.web.WebDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-      	<webdoclet 
-       		destdir="${build.dir}/WEB-INF" 
-       		mergedir="${xdoclet.merge.dir}/web"
-       	>
-       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
-       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
-       		
-       		<weblogicwebxml />
-       	</webdoclet>  		
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-        <copy todir="${weblogic.deploy.dir}">
-            <fileset dir="${dist.dir}" includes="${ear.name}" />
-        </copy>
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy" depends="init">
-        <delete>
-            <fileset dir="${weblogic.deploy.dir}" includes="${ear.name}" />
-        </delete>
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build-weblogic.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,89 @@
+<project name="xpetstore-servlet-orion" default="xdoclet" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<property file="${conf.dir}/as/weblogic.properties" />		
+       	
+   		<!-- Paths -->
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+        </path>
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet" depends="init">
+		<antcall target="xdoclet.web" />
+	</target>
+	
+	<target name="xdoclet.web" depends="init">
+      	<taskdef 
+       		name="webdoclet" 
+       		classname="xdoclet.modules.web.WebDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+      	<webdoclet 
+       		destdir="${build.dir}/WEB-INF" 
+       		mergedir="${xdoclet.merge.dir}/web"
+       	>
+       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
+       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
+       		
+       		<weblogicwebxml />
+       	</webdoclet>  		
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+        <copy todir="${weblogic.deploy.dir}">
+            <fileset dir="${dist.dir}" includes="${ear.name}" />
+        </copy>
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy" depends="init">
+        <delete>
+            <fileset dir="${weblogic.deploy.dir}" includes="${ear.name}" />
+        </delete>
+	</target>
+	
+</project>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.bat
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.bat (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.bat)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-#==========================================================
-# Ant properties
-#
-# Author: Herve Tchepannou
-#==========================================================
-
-#------------------------------------------------------------
-# Application information
-#------------------------------------------------------------
-
-app.name=xpetstore-servlet
-
-
-#------------------------------------------------------------
-# Java Compiler to option
-#------------------------------------------------------------
-
-compiler.type=jikes
-compiler.type=modern
-compiler.deprecation=on
-compiler.debug=off
-
-
-#------------------------------------------------------------
-# Directories
-#------------------------------------------------------------
-
-conf.dir=${basedir}/../conf
-
-dist.dir=${basedir}/../dist
-
-lib.dir=${basedir}/../lib
-lib.cactus.dir=${lib.dir}/main/org.apache.cactus
-lib.commons.dir=${lib.dir}/main/org.apache.commons
-lib.j2ee.dir=${lib.dir}/main/javax.j2ee
-lib.jalopy.dir=${lib.dir}/main/de.hunsicker.jalopy
-lib.hibernate.dir=${lib.dir}/main/cirrus.hibernate
-lib.javancss.dir=${lib.dir}/main/javancss
-lib.jdom.dir=${lib.dir}/main/org.jdom
-lib.junit.dir=${lib.dir}/ant/junit
-lib.junitee.dir=${lib.dir}/main/org.junitee
-lib.log4j.dir=${lib.dir}/main/org.apache.log4j
-lib.oro.dir=${lib.dir}/main/org.apache.oro
-lib.struts.dir=${lib.dir}/main/org.apache.struts
-lib.sitemesh.dir=${lib.dir}/main/com.opensymphony.module.sitemesh
-lib.velocity.dir=${lib.dir}/main/org.apache.velocity
-lib.webwork.dir=${lib.dir}/main/com.opensymphony.module.webwork
-lib.xdoclet.dir=${lib.dir}/main/xdoclet
-
-java.dir=${basedir}/java
-resources.dir=${basedir}/resources
-sql.dir=${basedir}/sql
-test.dir=${basedir}/test
-web.dir=${basedir}/web
-
-build.class.dir=${build.dir}/classes
-build.dir=${basedir}/build
-build.java.dir=${build.dir}/java
-build.junit.dir=${build.dir}/junit
-build.metrics.dir=${build.dir}/metrics
-build.sql.dir=${build.dir}/sql
-
-xdoclet.merge.dir=xdoclet
-
-
-#------------------------------------------------------------
-# Archive files
-#------------------------------------------------------------
-
-war.name=${app.name}.war
-ear.name=${app.name}.ear
-
-
-#------------------------------------------------------------
-# EJB configuration
-#------------------------------------------------------------
-
-ejb.cmp.version=2.x
-ejb.spec.version=2.0
-jsp.spec.version=1.2
-servlet.spec.version=2.3
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+#==========================================================
+# Ant properties
+#
+# Author: Herve Tchepannou
+#==========================================================
+
+#------------------------------------------------------------
+# Application information
+#------------------------------------------------------------
+
+app.name=xpetstore-servlet
+
+
+#------------------------------------------------------------
+# Java Compiler to option
+#------------------------------------------------------------
+
+compiler.type=jikes
+compiler.type=modern
+compiler.deprecation=on
+compiler.debug=off
+
+
+#------------------------------------------------------------
+# Directories
+#------------------------------------------------------------
+
+conf.dir=${basedir}/../conf
+
+dist.dir=${basedir}/../dist
+
+lib.dir=${basedir}/../lib
+lib.cactus.dir=${lib.dir}/main/org.apache.cactus
+lib.commons.dir=${lib.dir}/main/org.apache.commons
+lib.j2ee.dir=${lib.dir}/main/javax.j2ee
+lib.jalopy.dir=${lib.dir}/main/de.hunsicker.jalopy
+lib.hibernate.dir=${lib.dir}/main/cirrus.hibernate
+lib.javancss.dir=${lib.dir}/main/javancss
+lib.jdom.dir=${lib.dir}/main/org.jdom
+lib.junit.dir=${lib.dir}/ant/junit
+lib.junitee.dir=${lib.dir}/main/org.junitee
+lib.log4j.dir=${lib.dir}/main/org.apache.log4j
+lib.oro.dir=${lib.dir}/main/org.apache.oro
+lib.struts.dir=${lib.dir}/main/org.apache.struts
+lib.sitemesh.dir=${lib.dir}/main/com.opensymphony.module.sitemesh
+lib.velocity.dir=${lib.dir}/main/org.apache.velocity
+lib.webwork.dir=${lib.dir}/main/com.opensymphony.module.webwork
+lib.xdoclet.dir=${lib.dir}/main/xdoclet
+
+java.dir=${basedir}/java
+resources.dir=${basedir}/resources
+sql.dir=${basedir}/sql
+test.dir=${basedir}/test
+web.dir=${basedir}/web
+
+build.class.dir=${build.dir}/classes
+build.dir=${basedir}/build
+build.java.dir=${build.dir}/java
+build.junit.dir=${build.dir}/junit
+build.metrics.dir=${build.dir}/metrics
+build.sql.dir=${build.dir}/sql
+
+xdoclet.merge.dir=xdoclet
+
+
+#------------------------------------------------------------
+# Archive files
+#------------------------------------------------------------
+
+war.name=${app.name}.war
+ear.name=${app.name}.ear
+
+
+#------------------------------------------------------------
+# EJB configuration
+#------------------------------------------------------------
+
+ejb.cmp.version=2.x
+ejb.spec.version=2.0
+jsp.spec.version=1.2
+servlet.spec.version=2.3
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.sh
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.sh (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.sh)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,637 +0,0 @@
-<project name="xpetstore-servlet" default="all" basedir="./">
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Initialization                                 -->
-<!--                                                -->
-<!-- ============================================== -->
-	<target name="init">
-	
-    	<!-- General config -->
-        <tstamp />
-        <property environment="env" />        
-        <property file="${basedir}/build.properties" />
-        
-        <!-- Directories -->
-       	<mkdir dir="${build.dir}" />
-       	<mkdir dir="${build.class.dir}" />
-       	<mkdir dir="${build.java.dir}" />
-       	<mkdir dir="${build.junit.dir}" />
-       	<mkdir dir="${build.metrics.dir}" />
-       	<mkdir dir="${build.sql.dir}" />
-       	<mkdir dir="${dist.dir}" />
-        
-		<!-- database config -->
-		<property file="${conf.dir}/db/database.properties" />
-		<echo>Database=${database}</echo>
-		<property file="${conf.dir}/db/${database}.properties" />
-		
-		<!-- Application server -->
-        <property file="${conf.dir}/as/appserver.properties" />    
-		<echo>Application server=${app.server}</echo>	
-		<property file="${conf.dir}/as/${app.server}.properties" />
-		
-        <condition property="jboss">
-   	    	<equals arg1="${app.server}" arg2="jboss" />
-       	</condition>
-		
-        <condition property="orion">
-   	    	<equals arg1="${app.server}" arg2="orion" />
-       	</condition>
-		
-        <condition property="weblogic">
-   	    	<equals arg1="${app.server}" arg2="weblogic" />
-       	</condition>
-		
-        <condition property="tomcat">
-   	    	<equals arg1="${app.server}" arg2="tomcat" />
-       	</condition>
-       	
-   		<!-- Paths -->
-        <path id="project.class.path">
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-    		<fileset dir="${lib.junit.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.hibernate.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.jdom.dir}"		includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.webwork.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}"		includes="**/*.jar" />
-        </path>
-        <path id="xdoclet.class.path">
-    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
-    		<fileset dir="${lib.hibernate.dir}"	includes="**/*.jar" />
-    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
-    		<fileset dir="${lib.webwork.dir}"	includes="**/*.jar" />
-        </path>                       	
-                     
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Main                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="all" depends="init">
-		<antcall target="clean" />
-		<antcall target="xdoclet" />
-		<antcall target="compile" />
-		<antcall target="jar" />
-		<antcall target="war" />
-		<antcall target="ear" />
-	</target>
-    
-    
-    
-    
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Clean                                          -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="clean" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Cleaning                                             +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<delete>
-			<fileset dir="${build.dir}" />
-		</delete>
-	</target>
-	
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- xDoclet                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="xdoclet">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Running xDoclet                                      +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="xdoclet.hibernate.mapping" />
-		<antcall target="xdoclet.hibernate.properties" />
-		<antcall target="xdoclet.hibernate.ddl" />
-		<antcall target="xdoclet.web" />
-		<antcall target="xdoclet.jboss" />
-		<antcall target="xdoclet.orion" />
-		<antcall target="xdoclet.weblogic" />
-		<antcall target="xdoclet.tomcat" />
-	</target>
-
-
-	<target name="xdoclet.hibernate.mapping" depends="init">
-       	<delete>
-        	<fileset dir="${build.java.dir}" includes="**/*.hbm.xml"/>
-        </delete>
-	
-		<taskdef
-            name="hibernatedoclet"
-            classname="xdoclet.modules.hibernate.HibernateDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-		<hibernatedoclet destdir="${build.java.dir}">
-			<fileset dir="${java.dir}">
-  				<include name="**/domain/**/*.java" /> 
-  			</fileset>
-  			
-  			<hibernate />
-  		</hibernatedoclet>	
-  	</target>
-  	
-  	
-  	<target name="xdoclet.hibernate.properties" depends="init">	 	
-  	
-  		<echo file="${build.class.dir}/hibernate.properties" append="false">
-hibernate.connection.datasource=${hibernate.datasource}
-		</echo>
-		
-  		<echo file="${build.class.dir}/hibernate.properties" append="true">
-hibernate.use_outer_join=${hibernate.outer.join}
-  		</echo>
-  		
-  		<echo file="${build.class.dir}/hibernate.properties" append="true">
-hibernate.jdbc.use_scrollable_resultset=${hibernate.scrollable.recordset}
-  		</echo>
-  		
-  		<echo file="${build.class.dir}/hibernate.properties" append="true">
-hibernate.dialect=${hibernate.dialect}
-  		</echo>
-  		
-  		<echo file="${build.class.dir}/hibernate.properties" append="true">
-hibernate.show_sql=${hibernate.show.sql}
-  		</echo>
-  		
-  	</target>
-  	
-  	
-	<target name="xdoclet.hibernate.ddl" depends="init">
- 		<!-- Mapping Files -->
-		<fileset id="hibernate.mapping.files" dir="${build.java.dir}">
-    		<include name="**/*.hbm.xml" />
-		</fileset>
-    	<pathconvert refid="hibernate.mapping.files" property="hibernate.mappings" pathsep=" "/>
-    	
-    	<!-- Compile the domain classes -->
-    	<javac
-    		srcdir="${java.dir}"
-            destdir="${build.class.dir}"
-            debug="${compiler.debug}" 
-            deprecation="${compiler.deprecation}"
-            compiler="${compiler.type}"
-            classpathref="project.class.path"
-        >
-        	<include name="**/domain/**/*.java" />
-        </javac>
-        
-    	<!-- Generate the DDL -->
-	    <java 
-	    	classname="cirrus.hibernate.tools.SchemaExport" 
-	    	fork="true"
-	    >
-        	<arg line="--quiet --delimiter=; --format --text --output=${build.sql.dir}/schemas.sql ${hibernate.mappings}"/>
-        	<jvmarg value="-Dhibernate.dialect=${hibernate.dialect}"/>
-         	<jvmarg value="-Dhibernate.connection.driver_class=${db.driver}"/>
-         	<jvmarg value="-Dhibernate.connection.url=${db.url}"/>
-         	<jvmarg value="-Dhibernate.connection.username=${db.user}"/>
-         	<jvmarg value="-Dhibernate.connection.password=${db.password}"/>
-         	
-         	<classpath>
-				<dirset dir="${build.class.dir}" />
-				<path 	refid="project.class.path"/>
-		 	</classpath>
-    	</java>
-	</target>  	
-  	
-		
-	<target name="xdoclet.web" depends="init">
-      	<taskdef 
-       		name="webdoclet" 
-       		classname="xdoclet.modules.web.WebDocletTask"
-       		classpathref="xdoclet.class.path"
-       	/>	
-       	
-      	<webdoclet 
-       		destdir="${build.dir}/WEB-INF" 
-       		mergedir="${xdoclet.merge.dir}/web"
-       	>
-       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
-       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
-       		<fileset dir="${web.dir}" includes="**/*Action.java" />
-       		
-       		<deploymentdescriptor 
-       			servletspec="${servlet.spec.version}"
-       			distributable="false" 
-       		>
-       			<taglib
-                    uri="sitemesh-decorator"
-                    location="/WEB-INF/sitemesh-decorator.tld"
-                />
-       			<taglib
-                    uri="sitemesh-page"
-                    location="/WEB-INF/sitemesh-page.tld"
-                />
-       			<taglib
-                    uri="webwork"
-                    location="/WEB-INF/lib/webwork.jar"
-                />
-            </deploymentdescriptor>
-            
-            <webworkconfigproperties destdir="${build.class.dir}" />
-       	</webdoclet>
-	</target>
-	
-	<target name="xdoclet.jboss" depends="init" if="jboss">
-		<ant antfile="build-jboss.xml" target="xdoclet" />
-	</target>
-	
-	<target name="xdoclet.orion" depends="init" if="orion">
-		<ant antfile="build-orion.xml" target="xdoclet" />
-	</target>
-	
-	<target name="xdoclet.weblogic" depends="init" if="weblogic">
-		<ant antfile="build-weblogic.xml" target="xdoclet" />
-	</target>
-	
-	<target name="xdoclet.tomcat" depends="init" if="tomcat">
-		<ant antfile="build-tomcat.xml" target="xdoclet" />
-	</target>
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Compile                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="compile" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Compiling                                            +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-      	<javac
-            destdir="${build.class.dir}"
-            debug="${compiler.debug}" 
-            deprecation="${compiler.deprecation}"
-            compiler="${compiler.type}"
-            classpathref="project.class.path"
-        >
-        	<src path="${java.dir}" />
-            <src path="${build.java.dir}" />
-            <src path="${web.dir}" />
-        </javac>
-        
-        <copy todir="${build.class.dir}">
-        	<fileset dir="${resources.dir}" includes="**/*.properties" />
-        </copy>
-	</target>
-
-
-	
-	
-	
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Jar                                            -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="jar" depends="init">
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- War                                            -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="war" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Building war files                                   +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="war.webwork" />
-	</target>
-	
-	<target name="war.webwork" depends="init">
-		<delete>
-			<fileset dir="${dist.dir}" includes="${war.name}" />
-		</delete>
-		
-		<war 
-			destFile="${dist.dir}/${war.name}"
-			webxml="${build.dir}/WEB-INF/web.xml"
-		>
-    		<fileset dir="${web.dir}/jsp"  		 includes="**/*" />
-    		<fileset dir="${web.dir}/css"  		 includes="**/*" />
-    		<fileset dir="${web.dir}/vm"  		 includes="**/*" />
-    		<fileset dir="${web.dir}">
-    			<include name="images/*" />
-    			<include name="dataimages/*" />
-    		</fileset>
-    		<fileset dir="${build.dir}">	
-    			<include name="WEB-INF/*" />
-    			
-    			<exclude name="WEB-INF/web.xml" />
-    		</fileset>
-    		
-    		<lib dir="${lib.commons.dir}"    includes="*.jar" />
-    		<lib dir="${lib.hibernate.dir}"  includes="*.jar" />
-    		<lib dir="${lib.jdom.dir}" 	 	 includes="jdom.jar" />
-    		<lib dir="${lib.junit.dir}" 	 includes="junit.jar" />
-    		<lib dir="${lib.log4j.dir}" 	 includes="log4j.jar" />
-    		<lib dir="${lib.sitemesh.dir}" 	 includes="sitemesh.jar" />
-    		<lib dir="${lib.velocity.dir}" 	 includes="velocity.jar" />
-    		<lib dir="${lib.webwork.dir}" 	 includes="*.jar" />
-    		
-    		<classes dir="${build.class.dir}">
-    			<include name="**/*.properties" />
-    			<include name="**/web/**/*.class" />
-    			<include name="**/domain/**/*.class" />
-            	<include name="**/util/**/*.class" />
-            	
-            	<exclude name="**/test/**/*" />
-    		</classes>    		
-    		<classes 
-    			dir="${build.java.dir}" 	
-    			includes="**/*.hbm.xml" 
-    		/>
-    		<classes 
-    			dir="${resources.dir}" 	
-    			includes="**/*" 
-    		/>
-    		
-    		<webinf dir="${web.dir}/WEB-INF">
-    			<include name="**/*" />
-    		</webinf>
-    		<webinf dir="${build.dir}/WEB-INF">
-    			<include name="**/*" />
-    			<exclude name="web.xml" />
-    		</webinf>
-		</war>  
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Ear                                            -->
-<!--                                                -->
-<!-- ============================================== -->
-	<target name="ear" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Building ear files                                   +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<delete>
-			<fileset dir="${dist.dir}" includes="${ear.name}" />
-		</delete>
-		
-		<ear 
-			destfile="${dist.dir}/${ear.name}" 
-			appxml="${java.dir}/META-INF/application.xml"
-		>
-      		<fileset dir="${dist.dir}"	includes="${war.name}" />
-      	</ear>
-      </target>	
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Test                                           -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="test" depends="init">
-	</target>	
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Deploy                                         -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="deploy" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Deploying into the application server                +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="deploy.jboss" />
-		<antcall target="deploy.orion" />
-		<antcall target="deploy.weblogic" />
-		<antcall target="deploy.tomcat" />
-	</target>
-	
-	<target name="deploy.jboss" if="jboss">
-		<ant antfile="build-jboss.xml" target="deploy" />
-	</target>	
-	
-	<target name="deploy.orion" if="orion">
-		<ant antfile="build-orion.xml" target="deploy" />
-	</target>	
-	
-	<target name="deploy.weblogic" if="weblogic">
-		<ant antfile="build-weblogic.xml" target="deploy" />
-	</target>	
-	
-	<target name="deploy.tomcat" if="tomcat">
-		<ant antfile="build-tomcat.xml" target="deploy" />
-	</target>	
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Undeploy                                       -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="undeploy">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Undeploying from the application server              +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<antcall target="undeploy.jboss" />
-		<antcall target="undeploy.orion" />
-		<antcall target="undeploy.weblogic" />
-		<antcall target="undeploy.tomcat" />
-	</target>	
-
-	<target name="undeploy.jboss" depends="init" if="jboss">
-		<ant antfile="build-jboss.xml" target="undeploy" />
-	</target>
-
-	<target name="undeploy.orion" depends="init" if="orion">
-		<ant antfile="build-orion.xml" target="undeploy" />
-	</target>
-	
-	<target name="undeploy.weblogic" if="weblogic">
-		<ant antfile="build-weblogic.xml" target="undeploy" />
-	</target>	
-	
-	<target name="undeploy.tomcat" if="tomcat">
-		<ant antfile="build-tomcat.xml" target="undeploy" />
-	</target>	
-	
-	
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- DB                                             -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="db" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Initialize the database                              +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<ant antfile="build-database.xml" target="data" />
-	</target>
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Formatting                                     -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="jalopy" depends="init">
-		<echo>+ ===================================================== +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+  Formatting the source code                           +</echo>
-		<echo>+                                                       +</echo>
-		<echo>+ ===================================================== +</echo>
-		
-		<taskdef
-            name="jalopy"
-            classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"
-        >
-			<classpath>
-				<fileset dir="${lib.jalopy.dir}" includes="**/*.jar" />
-				<fileset dir="${lib.log4j.dir}"  includes="**/*.jar" />
-				<fileset dir="${lib.jdom.dir}"   includes="**/*.jar" />
-				<fileset dir="${lib.oro.dir}"    includes="**/*.jar" />
-			</classpath>
-		</taskdef>
-        		
-  		<jalopy 
-            convention="${conf.dir}/jalopy.xml"
-            loglevel="warn"
-            threads="2"
-        >
-      		<fileset dir="${build.java.dir}" includes="**/*.java" />
-      		<fileset dir="${java.dir}" 	  	 includes="**/*.java" />
-      		<fileset dir="${web.dir}" 		 includes="**/*.java" />
-    	</jalopy>		
-	</target>
-
-
-
-
-<!-- ============================================== -->
-<!--                                                -->
-<!-- Metrics                                        -->
-<!--                                                -->
-<!-- ============================================== -->
-
-	<target name="metrics" depends="init">
-		<taskdef 
-	   		name="javancss"
-	        classname="javancss.JavancssAntTask"
-	    >
-			<classpath>
-				<fileset dir="${lib.javancss.dir}" includes="**/*.jar" />
-			</classpath>
-	   	</taskdef>
-
-		<!-- Business classes -->
-		<javancss
-			srcdir="${java.dir}"
-			includes="**/*.java"
-    		generateReport="true"
-            outputfile="${build.metrics.dir}/business.xml"
-            format="xml"
-            functionMetrics="false"
-    	/>
-    	
-    	<xslt
-    		destdir="${build.metrics.dir}"
-    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
-    		in="${build.metrics.dir}/business.xml"
-    		out="${build.metrics.dir}/business.html"
-    	/>
-		
-		<!-- xdoclet classes -->
-		<javancss
-			srcdir="${build.java.dir}"
-			includes="**/*.java"
-    		generateReport="true"
-            outputfile="${build.metrics.dir}/xdoclet.xml"
-            format="xml"
-            functionMetrics="false"
-    	/>
-    	
-    	<xslt
-    		destdir="${build.metrics.dir}"
-    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
-    		in="${build.metrics.dir}/xdoclet.xml"
-    		out="${build.metrics.dir}/xdoclet.html"
-    	/>
-		
-		<!-- Web classes -->
-		<javancss
-			srcdir="${web.dir}"
-			includes="**/*.java"
-    		generateReport="true"
-            outputfile="${build.metrics.dir}/web.xml"
-            format="xml"
-            functionMetrics="false"
-    	/>
-    	
-    	<xslt
-    		destdir="${build.metrics.dir}"
-    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
-    		in="${build.metrics.dir}/web.xml"
-    		out="${build.metrics.dir}/web.html"
-    	/>
-	</target>
-	
-</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,637 @@
+<project name="xpetstore-servlet" default="all" basedir="./">
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Initialization                                 -->
+<!--                                                -->
+<!-- ============================================== -->
+	<target name="init">
+	
+    	<!-- General config -->
+        <tstamp />
+        <property environment="env" />        
+        <property file="${basedir}/build.properties" />
+        
+        <!-- Directories -->
+       	<mkdir dir="${build.dir}" />
+       	<mkdir dir="${build.class.dir}" />
+       	<mkdir dir="${build.java.dir}" />
+       	<mkdir dir="${build.junit.dir}" />
+       	<mkdir dir="${build.metrics.dir}" />
+       	<mkdir dir="${build.sql.dir}" />
+       	<mkdir dir="${dist.dir}" />
+        
+		<!-- database config -->
+		<property file="${conf.dir}/db/database.properties" />
+		<echo>Database=${database}</echo>
+		<property file="${conf.dir}/db/${database}.properties" />
+		
+		<!-- Application server -->
+        <property file="${conf.dir}/as/appserver.properties" />    
+		<echo>Application server=${app.server}</echo>	
+		<property file="${conf.dir}/as/${app.server}.properties" />
+		
+        <condition property="jboss">
+   	    	<equals arg1="${app.server}" arg2="jboss" />
+       	</condition>
+		
+        <condition property="orion">
+   	    	<equals arg1="${app.server}" arg2="orion" />
+       	</condition>
+		
+        <condition property="weblogic">
+   	    	<equals arg1="${app.server}" arg2="weblogic" />
+       	</condition>
+		
+        <condition property="tomcat">
+   	    	<equals arg1="${app.server}" arg2="tomcat" />
+       	</condition>
+       	
+   		<!-- Paths -->
+        <path id="project.class.path">
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+    		<fileset dir="${lib.junit.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.hibernate.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.jdom.dir}"		includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.webwork.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}"		includes="**/*.jar" />
+        </path>
+        <path id="xdoclet.class.path">
+    		<fileset dir="${lib.xdoclet.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.log4j.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.commons.dir}" 	includes="**/*.jar" />
+    		<fileset dir="${lib.hibernate.dir}"	includes="**/*.jar" />
+    		<fileset dir="${lib.j2ee.dir}" 		includes="**/*.jar" />
+    		<fileset dir="${lib.webwork.dir}"	includes="**/*.jar" />
+        </path>                       	
+                     
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Main                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="all" depends="init">
+		<antcall target="clean" />
+		<antcall target="xdoclet" />
+		<antcall target="compile" />
+		<antcall target="jar" />
+		<antcall target="war" />
+		<antcall target="ear" />
+	</target>
+    
+    
+    
+    
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Clean                                          -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="clean" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Cleaning                                             +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<delete>
+			<fileset dir="${build.dir}" />
+		</delete>
+	</target>
+	
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- xDoclet                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="xdoclet">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Running xDoclet                                      +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="xdoclet.hibernate.mapping" />
+		<antcall target="xdoclet.hibernate.properties" />
+		<antcall target="xdoclet.hibernate.ddl" />
+		<antcall target="xdoclet.web" />
+		<antcall target="xdoclet.jboss" />
+		<antcall target="xdoclet.orion" />
+		<antcall target="xdoclet.weblogic" />
+		<antcall target="xdoclet.tomcat" />
+	</target>
+
+
+	<target name="xdoclet.hibernate.mapping" depends="init">
+       	<delete>
+        	<fileset dir="${build.java.dir}" includes="**/*.hbm.xml"/>
+        </delete>
+	
+		<taskdef
+            name="hibernatedoclet"
+            classname="xdoclet.modules.hibernate.HibernateDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+		<hibernatedoclet destdir="${build.java.dir}">
+			<fileset dir="${java.dir}">
+  				<include name="**/domain/**/*.java" /> 
+  			</fileset>
+  			
+  			<hibernate />
+  		</hibernatedoclet>	
+  	</target>
+  	
+  	
+  	<target name="xdoclet.hibernate.properties" depends="init">	 	
+  	
+  		<echo file="${build.class.dir}/hibernate.properties" append="false">
+hibernate.connection.datasource=${hibernate.datasource}
+		</echo>
+		
+  		<echo file="${build.class.dir}/hibernate.properties" append="true">
+hibernate.use_outer_join=${hibernate.outer.join}
+  		</echo>
+  		
+  		<echo file="${build.class.dir}/hibernate.properties" append="true">
+hibernate.jdbc.use_scrollable_resultset=${hibernate.scrollable.recordset}
+  		</echo>
+  		
+  		<echo file="${build.class.dir}/hibernate.properties" append="true">
+hibernate.dialect=${hibernate.dialect}
+  		</echo>
+  		
+  		<echo file="${build.class.dir}/hibernate.properties" append="true">
+hibernate.show_sql=${hibernate.show.sql}
+  		</echo>
+  		
+  	</target>
+  	
+  	
+	<target name="xdoclet.hibernate.ddl" depends="init">
+ 		<!-- Mapping Files -->
+		<fileset id="hibernate.mapping.files" dir="${build.java.dir}">
+    		<include name="**/*.hbm.xml" />
+		</fileset>
+    	<pathconvert refid="hibernate.mapping.files" property="hibernate.mappings" pathsep=" "/>
+    	
+    	<!-- Compile the domain classes -->
+    	<javac
+    		srcdir="${java.dir}"
+            destdir="${build.class.dir}"
+            debug="${compiler.debug}" 
+            deprecation="${compiler.deprecation}"
+            compiler="${compiler.type}"
+            classpathref="project.class.path"
+        >
+        	<include name="**/domain/**/*.java" />
+        </javac>
+        
+    	<!-- Generate the DDL -->
+	    <java 
+	    	classname="cirrus.hibernate.tools.SchemaExport" 
+	    	fork="true"
+	    >
+        	<arg line="--quiet --delimiter=; --format --text --output=${build.sql.dir}/schemas.sql ${hibernate.mappings}"/>
+        	<jvmarg value="-Dhibernate.dialect=${hibernate.dialect}"/>
+         	<jvmarg value="-Dhibernate.connection.driver_class=${db.driver}"/>
+         	<jvmarg value="-Dhibernate.connection.url=${db.url}"/>
+         	<jvmarg value="-Dhibernate.connection.username=${db.user}"/>
+         	<jvmarg value="-Dhibernate.connection.password=${db.password}"/>
+         	
+         	<classpath>
+				<dirset dir="${build.class.dir}" />
+				<path 	refid="project.class.path"/>
+		 	</classpath>
+    	</java>
+	</target>  	
+  	
+		
+	<target name="xdoclet.web" depends="init">
+      	<taskdef 
+       		name="webdoclet" 
+       		classname="xdoclet.modules.web.WebDocletTask"
+       		classpathref="xdoclet.class.path"
+       	/>	
+       	
+      	<webdoclet 
+       		destdir="${build.dir}/WEB-INF" 
+       		mergedir="${xdoclet.merge.dir}/web"
+       	>
+       		<fileset dir="${web.dir}" includes="**/*Servlet.java" />
+       		<fileset dir="${web.dir}" includes="**/*Filter.java" />
+       		<fileset dir="${web.dir}" includes="**/*Action.java" />
+       		
+       		<deploymentdescriptor 
+       			servletspec="${servlet.spec.version}"
+       			distributable="false" 
+       		>
+       			<taglib
+                    uri="sitemesh-decorator"
+                    location="/WEB-INF/sitemesh-decorator.tld"
+                />
+       			<taglib
+                    uri="sitemesh-page"
+                    location="/WEB-INF/sitemesh-page.tld"
+                />
+       			<taglib
+                    uri="webwork"
+                    location="/WEB-INF/lib/webwork.jar"
+                />
+            </deploymentdescriptor>
+            
+            <webworkconfigproperties destdir="${build.class.dir}" />
+       	</webdoclet>
+	</target>
+	
+	<target name="xdoclet.jboss" depends="init" if="jboss">
+		<ant antfile="build-jboss.xml" target="xdoclet" />
+	</target>
+	
+	<target name="xdoclet.orion" depends="init" if="orion">
+		<ant antfile="build-orion.xml" target="xdoclet" />
+	</target>
+	
+	<target name="xdoclet.weblogic" depends="init" if="weblogic">
+		<ant antfile="build-weblogic.xml" target="xdoclet" />
+	</target>
+	
+	<target name="xdoclet.tomcat" depends="init" if="tomcat">
+		<ant antfile="build-tomcat.xml" target="xdoclet" />
+	</target>
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Compile                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="compile" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Compiling                                            +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+      	<javac
+            destdir="${build.class.dir}"
+            debug="${compiler.debug}" 
+            deprecation="${compiler.deprecation}"
+            compiler="${compiler.type}"
+            classpathref="project.class.path"
+        >
+        	<src path="${java.dir}" />
+            <src path="${build.java.dir}" />
+            <src path="${web.dir}" />
+        </javac>
+        
+        <copy todir="${build.class.dir}">
+        	<fileset dir="${resources.dir}" includes="**/*.properties" />
+        </copy>
+	</target>
+
+
+	
+	
+	
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Jar                                            -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="jar" depends="init">
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- War                                            -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="war" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Building war files                                   +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="war.webwork" />
+	</target>
+	
+	<target name="war.webwork" depends="init">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${war.name}" />
+		</delete>
+		
+		<war 
+			destFile="${dist.dir}/${war.name}"
+			webxml="${build.dir}/WEB-INF/web.xml"
+		>
+    		<fileset dir="${web.dir}/jsp"  		 includes="**/*" />
+    		<fileset dir="${web.dir}/css"  		 includes="**/*" />
+    		<fileset dir="${web.dir}/vm"  		 includes="**/*" />
+    		<fileset dir="${web.dir}">
+    			<include name="images/*" />
+    			<include name="dataimages/*" />
+    		</fileset>
+    		<fileset dir="${build.dir}">	
+    			<include name="WEB-INF/*" />
+    			
+    			<exclude name="WEB-INF/web.xml" />
+    		</fileset>
+    		
+    		<lib dir="${lib.commons.dir}"    includes="*.jar" />
+    		<lib dir="${lib.hibernate.dir}"  includes="*.jar" />
+    		<lib dir="${lib.jdom.dir}" 	 	 includes="jdom.jar" />
+    		<lib dir="${lib.junit.dir}" 	 includes="junit.jar" />
+    		<lib dir="${lib.log4j.dir}" 	 includes="log4j.jar" />
+    		<lib dir="${lib.sitemesh.dir}" 	 includes="sitemesh.jar" />
+    		<lib dir="${lib.velocity.dir}" 	 includes="velocity.jar" />
+    		<lib dir="${lib.webwork.dir}" 	 includes="*.jar" />
+    		
+    		<classes dir="${build.class.dir}">
+    			<include name="**/*.properties" />
+    			<include name="**/web/**/*.class" />
+    			<include name="**/domain/**/*.class" />
+            	<include name="**/util/**/*.class" />
+            	
+            	<exclude name="**/test/**/*" />
+    		</classes>    		
+    		<classes 
+    			dir="${build.java.dir}" 	
+    			includes="**/*.hbm.xml" 
+    		/>
+    		<classes 
+    			dir="${resources.dir}" 	
+    			includes="**/*" 
+    		/>
+    		
+    		<webinf dir="${web.dir}/WEB-INF">
+    			<include name="**/*" />
+    		</webinf>
+    		<webinf dir="${build.dir}/WEB-INF">
+    			<include name="**/*" />
+    			<exclude name="web.xml" />
+    		</webinf>
+		</war>  
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Ear                                            -->
+<!--                                                -->
+<!-- ============================================== -->
+	<target name="ear" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Building ear files                                   +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<delete>
+			<fileset dir="${dist.dir}" includes="${ear.name}" />
+		</delete>
+		
+		<ear 
+			destfile="${dist.dir}/${ear.name}" 
+			appxml="${java.dir}/META-INF/application.xml"
+		>
+      		<fileset dir="${dist.dir}"	includes="${war.name}" />
+      	</ear>
+      </target>	
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Test                                           -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="test" depends="init">
+	</target>	
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Deploy                                         -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="deploy" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Deploying into the application server                +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="deploy.jboss" />
+		<antcall target="deploy.orion" />
+		<antcall target="deploy.weblogic" />
+		<antcall target="deploy.tomcat" />
+	</target>
+	
+	<target name="deploy.jboss" if="jboss">
+		<ant antfile="build-jboss.xml" target="deploy" />
+	</target>	
+	
+	<target name="deploy.orion" if="orion">
+		<ant antfile="build-orion.xml" target="deploy" />
+	</target>	
+	
+	<target name="deploy.weblogic" if="weblogic">
+		<ant antfile="build-weblogic.xml" target="deploy" />
+	</target>	
+	
+	<target name="deploy.tomcat" if="tomcat">
+		<ant antfile="build-tomcat.xml" target="deploy" />
+	</target>	
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Undeploy                                       -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="undeploy">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Undeploying from the application server              +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<antcall target="undeploy.jboss" />
+		<antcall target="undeploy.orion" />
+		<antcall target="undeploy.weblogic" />
+		<antcall target="undeploy.tomcat" />
+	</target>	
+
+	<target name="undeploy.jboss" depends="init" if="jboss">
+		<ant antfile="build-jboss.xml" target="undeploy" />
+	</target>
+
+	<target name="undeploy.orion" depends="init" if="orion">
+		<ant antfile="build-orion.xml" target="undeploy" />
+	</target>
+	
+	<target name="undeploy.weblogic" if="weblogic">
+		<ant antfile="build-weblogic.xml" target="undeploy" />
+	</target>	
+	
+	<target name="undeploy.tomcat" if="tomcat">
+		<ant antfile="build-tomcat.xml" target="undeploy" />
+	</target>	
+	
+	
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- DB                                             -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="db" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Initialize the database                              +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<ant antfile="build-database.xml" target="data" />
+	</target>
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Formatting                                     -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="jalopy" depends="init">
+		<echo>+ ===================================================== +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+  Formatting the source code                           +</echo>
+		<echo>+                                                       +</echo>
+		<echo>+ ===================================================== +</echo>
+		
+		<taskdef
+            name="jalopy"
+            classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"
+        >
+			<classpath>
+				<fileset dir="${lib.jalopy.dir}" includes="**/*.jar" />
+				<fileset dir="${lib.log4j.dir}"  includes="**/*.jar" />
+				<fileset dir="${lib.jdom.dir}"   includes="**/*.jar" />
+				<fileset dir="${lib.oro.dir}"    includes="**/*.jar" />
+			</classpath>
+		</taskdef>
+        		
+  		<jalopy 
+            convention="${conf.dir}/jalopy.xml"
+            loglevel="warn"
+            threads="2"
+        >
+      		<fileset dir="${build.java.dir}" includes="**/*.java" />
+      		<fileset dir="${java.dir}" 	  	 includes="**/*.java" />
+      		<fileset dir="${web.dir}" 		 includes="**/*.java" />
+    	</jalopy>		
+	</target>
+
+
+
+
+<!-- ============================================== -->
+<!--                                                -->
+<!-- Metrics                                        -->
+<!--                                                -->
+<!-- ============================================== -->
+
+	<target name="metrics" depends="init">
+		<taskdef 
+	   		name="javancss"
+	        classname="javancss.JavancssAntTask"
+	    >
+			<classpath>
+				<fileset dir="${lib.javancss.dir}" includes="**/*.jar" />
+			</classpath>
+	   	</taskdef>
+
+		<!-- Business classes -->
+		<javancss
+			srcdir="${java.dir}"
+			includes="**/*.java"
+    		generateReport="true"
+            outputfile="${build.metrics.dir}/business.xml"
+            format="xml"
+            functionMetrics="false"
+    	/>
+    	
+    	<xslt
+    		destdir="${build.metrics.dir}"
+    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
+    		in="${build.metrics.dir}/business.xml"
+    		out="${build.metrics.dir}/business.html"
+    	/>
+		
+		<!-- xdoclet classes -->
+		<javancss
+			srcdir="${build.java.dir}"
+			includes="**/*.java"
+    		generateReport="true"
+            outputfile="${build.metrics.dir}/xdoclet.xml"
+            format="xml"
+            functionMetrics="false"
+    	/>
+    	
+    	<xslt
+    		destdir="${build.metrics.dir}"
+    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
+    		in="${build.metrics.dir}/xdoclet.xml"
+    		out="${build.metrics.dir}/xdoclet.html"
+    	/>
+		
+		<!-- Web classes -->
+		<javancss
+			srcdir="${web.dir}"
+			includes="**/*.java"
+    		generateReport="true"
+            outputfile="${build.metrics.dir}/web.xml"
+            format="xml"
+            functionMetrics="false"
+    	/>
+    	
+    	<xslt
+    		destdir="${build.metrics.dir}"
+    		style="${lib.javancss.dir}/xslt/javancss2html.xsl"
+    		in="${build.metrics.dir}/web.xml"
+    		out="${build.metrics.dir}/web.html"
+    	/>
+	</target>
+	
+</project>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-<application>
-  <display-name>xPetstore - Servlet</display-name>
-  
-  <module>
-    <web>
-      <web-uri>xpetstore-servlet.war</web-uri>
-      <context-root>xpetstore-servlet</context-root>
-    </web>
-  </module>
-  
-</application>
-
-

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
+
+<application>
+  <display-name>xPetstore - Servlet</display-name>
+  
+  <module>
+    <web>
+      <web-uri>xpetstore-servlet.war</web-uri>
+      <context-root>xpetstore-servlet</context-root>
+    </web>
+  </module>
+  
+</application>
+
+

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
- * Generated file - Do not edit!
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-
-/**
- *
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @hibernate.class
- *         table="T_ACCOUNT"
- */
-public class Account
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _userId = "";
-    private String _password = "";
-
-    //~ Constructors -----------------------------------------------------------
-
-    public Account(  )
-    {
-        super(  );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public boolean matchPassword( String password )
-    {
-        return ( password == null )
-               ? ( _password == null )
-               : password.equals( _password );
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         column="pwd"
-     *      length="10"
-     *      not-null="true"
-     */
-    public String getPassword(  )
-    {
-        return _password;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.id
-     *      generator-class="assigned"
-     *      length="10"
-     */
-    public String getUserId(  )
-    {
-        return _userId;
-    }
-
-    public void set( Account account )
-    {
-        _password = account.getPassword(  );
-    }
-
-    /**
-     * Sets the password.
-     * @param password The password to set
-     */
-    public void setPassword( String password )
-    {
-        _password = password;
-    }
-
-    /**
-     * Sets the userId.
-     * @param userId The userId to set
-     */
-    public void setUserId( String userId )
-    {
-        _userId = userId;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * Generated file - Do not edit!
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+
+/**
+ *
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @hibernate.class
+ *         table="T_ACCOUNT"
+ */
+public class Account
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _userId = "";
+    private String _password = "";
+
+    //~ Constructors -----------------------------------------------------------
+
+    public Account(  )
+    {
+        super(  );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public boolean matchPassword( String password )
+    {
+        return ( password == null )
+               ? ( _password == null )
+               : password.equals( _password );
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         column="pwd"
+     *      length="10"
+     *      not-null="true"
+     */
+    public String getPassword(  )
+    {
+        return _password;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.id
+     *      generator-class="assigned"
+     *      length="10"
+     */
+    public String getUserId(  )
+    {
+        return _userId;
+    }
+
+    public void set( Account account )
+    {
+        _password = account.getPassword(  );
+    }
+
+    /**
+     * Sets the password.
+     * @param password The password to set
+     */
+    public void setPassword( String password )
+    {
+        _password = password;
+    }
+
+    /**
+     * Sets the userId.
+     * @param userId The userId to set
+     */
+    public void setUserId( String userId )
+    {
+        _userId = userId;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,167 +0,0 @@
-/*
- * Created on Feb 22, 2003
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class Address
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _city = "";
-    private String _country = "";
-    private String _state = "";
-    private String _street1 = "";
-    private String _street2 = "";
-    private String _zipcode = "";
-
-    //~ Constructors -----------------------------------------------------------
-
-    public Address(  )
-    {
-        super(  );
-    }
-
-    public Address( Address addr )
-    {
-        set( addr );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         length="25"
-     */
-    public String getCity(  )
-    {
-        return _city;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         length="3"
-     */
-    public String getCountry(  )
-    {
-        return _country;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         length="3"
-     */
-    public String getState(  )
-    {
-        return _state;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         length="50"
-     */
-    public String getStreet1(  )
-    {
-        return _street1;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         length="50"
-     */
-    public String getStreet2(  )
-    {
-        return _street2;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         length="10"
-     */
-    public String getZipcode(  )
-    {
-        return _zipcode;
-    }
-
-    public void set( Address address )
-    {
-        _street1 = address.getStreet1(  );
-        _street2 = address.getStreet2(  );
-        _city    = address.getCity(  );
-        _state   = address.getState(  );
-        _country = address.getCountry(  );
-        _zipcode = address.getZipcode(  );
-    }
-
-    /**
-     * Sets the city.
-     * @param city The city to set
-     */
-    public void setCity( String city )
-    {
-        _city = city;
-    }
-
-    /**
-     * Sets the country.
-     * @param country The country to set
-     */
-    public void setCountry( String country )
-    {
-        _country = country;
-    }
-
-    /**
-     * Sets the state.
-     * @param state The state to set
-     */
-    public void setState( String state )
-    {
-        _state = state;
-    }
-
-    /**
-     * Sets the street1.
-     * @param street1 The street1 to set
-     */
-    public void setStreet1( String street1 )
-    {
-        _street1 = street1;
-    }
-
-    /**
-     * Sets the street2.
-     * @param street2 The street2 to set
-     */
-    public void setStreet2( String street2 )
-    {
-        _street2 = street2;
-    }
-
-    /**
-     * Sets the zipcode.
-     * @param zipcode The zipcode to set
-     */
-    public void setZipcode( String zipcode )
-    {
-        _zipcode = zipcode;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Address.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,167 @@
+/*
+ * Created on Feb 22, 2003
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class Address
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _city = "";
+    private String _country = "";
+    private String _state = "";
+    private String _street1 = "";
+    private String _street2 = "";
+    private String _zipcode = "";
+
+    //~ Constructors -----------------------------------------------------------
+
+    public Address(  )
+    {
+        super(  );
+    }
+
+    public Address( Address addr )
+    {
+        set( addr );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         length="25"
+     */
+    public String getCity(  )
+    {
+        return _city;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         length="3"
+     */
+    public String getCountry(  )
+    {
+        return _country;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         length="3"
+     */
+    public String getState(  )
+    {
+        return _state;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         length="50"
+     */
+    public String getStreet1(  )
+    {
+        return _street1;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         length="50"
+     */
+    public String getStreet2(  )
+    {
+        return _street2;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         length="10"
+     */
+    public String getZipcode(  )
+    {
+        return _zipcode;
+    }
+
+    public void set( Address address )
+    {
+        _street1 = address.getStreet1(  );
+        _street2 = address.getStreet2(  );
+        _city    = address.getCity(  );
+        _state   = address.getState(  );
+        _country = address.getCountry(  );
+        _zipcode = address.getZipcode(  );
+    }
+
+    /**
+     * Sets the city.
+     * @param city The city to set
+     */
+    public void setCity( String city )
+    {
+        _city = city;
+    }
+
+    /**
+     * Sets the country.
+     * @param country The country to set
+     */
+    public void setCountry( String country )
+    {
+        _country = country;
+    }
+
+    /**
+     * Sets the state.
+     * @param state The state to set
+     */
+    public void setState( String state )
+    {
+        _state = state;
+    }
+
+    /**
+     * Sets the street1.
+     * @param street1 The street1 to set
+     */
+    public void setStreet1( String street1 )
+    {
+        _street1 = street1;
+    }
+
+    /**
+     * Sets the street2.
+     * @param street2 The street2 to set
+     */
+    public void setStreet2( String street2 )
+    {
+        _street2 = street2;
+    }
+
+    /**
+     * Sets the zipcode.
+     * @param zipcode The zipcode to set
+     */
+    public void setZipcode( String zipcode )
+    {
+        _zipcode = zipcode;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,116 +0,0 @@
-/*
- * Created on Feb 22, 2003
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-import java.util.HashSet;
-import java.util.Set;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @hibernate.class
- *         table="T_CATEGORY"
- */
-public class Category
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _categoryId;
-    private String _name;
-    private String _description;
-    private Set    _products = new HashSet(  );
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return String
-     *
-     * @hibernate.id
-     *      generator-class="assigned"
-     *      length="10"
-     */
-    public String getCategoryId(  )
-    {
-        return _categoryId;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="255"
-     */
-    public String getDescription(  )
-    {
-        return _description;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="50"
-     */
-    public String getName(  )
-    {
-        return _name;
-    }
-
-    /**
-     * @return Set
-     *
-     * @hibernate.set
-     *    role="products"
-     *    lazy="true"
-     *    cascade="delete"
-     * @hibernate.collection-key
-     *    column="category_fk"
-     * @hibernate.collection-one-to-many
-     *    class="xpetstore.domain.Product"
-     */
-    public Set getProducts(  )
-    {
-        return _products;
-    }
-
-    /**
-     * Sets the categoryId.
-     * @param categoryId The categoryId to set
-     */
-    public void setCategoryId( String categoryId )
-    {
-        _categoryId = categoryId;
-    }
-
-    /**
-     * Sets the description.
-     * @param description The description to set
-     */
-    public void setDescription( String description )
-    {
-        _description = description;
-    }
-
-    /**
-     * Sets the name.
-     * @param name The name to set
-     */
-    public void setName( String name )
-    {
-        _name = name;
-    }
-
-    /**
-     * Sets the products.
-     * @param products The products to set
-     */
-    public void setProducts( Set products )
-    {
-        _products = products;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Category.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,116 @@
+/*
+ * Created on Feb 22, 2003
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @hibernate.class
+ *         table="T_CATEGORY"
+ */
+public class Category
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _categoryId;
+    private String _name;
+    private String _description;
+    private Set    _products = new HashSet(  );
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return String
+     *
+     * @hibernate.id
+     *      generator-class="assigned"
+     *      length="10"
+     */
+    public String getCategoryId(  )
+    {
+        return _categoryId;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="255"
+     */
+    public String getDescription(  )
+    {
+        return _description;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="50"
+     */
+    public String getName(  )
+    {
+        return _name;
+    }
+
+    /**
+     * @return Set
+     *
+     * @hibernate.set
+     *    role="products"
+     *    lazy="true"
+     *    cascade="delete"
+     * @hibernate.collection-key
+     *    column="category_fk"
+     * @hibernate.collection-one-to-many
+     *    class="xpetstore.domain.Product"
+     */
+    public Set getProducts(  )
+    {
+        return _products;
+    }
+
+    /**
+     * Sets the categoryId.
+     * @param categoryId The categoryId to set
+     */
+    public void setCategoryId( String categoryId )
+    {
+        _categoryId = categoryId;
+    }
+
+    /**
+     * Sets the description.
+     * @param description The description to set
+     */
+    public void setDescription( String description )
+    {
+        _description = description;
+    }
+
+    /**
+     * Sets the name.
+     * @param name The name to set
+     */
+    public void setName( String name )
+    {
+        _name = name;
+    }
+
+    /**
+     * Sets the products.
+     * @param products The products to set
+     */
+    public void setProducts( Set products )
+    {
+        _products = products;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,113 +0,0 @@
-/*
- * Created on Feb 22, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class CreditCard
-    implements Serializable
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String VISA = "Visa";
-    public static final String MASTERCARD = "MasterCard";
-    public static final String AMEX = "American Express";
-
-    //~ Instance fields --------------------------------------------------------
-
-    private String _number = "";
-    private String _type = "";
-    private String _expiryDate = "";
-
-    //~ Constructors -----------------------------------------------------------
-
-    public CreditCard(  )
-    {
-        super(  );
-    }
-
-    public CreditCard( CreditCard cc )
-    {
-        set( cc );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         column="creditCardExpiryDate"
-     *      length="10"
-     */
-    public String getExpiryDate(  )
-    {
-        return _expiryDate;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         column="creditCardNumber"
-     *      length="25"
-     */
-    public String getNumber(  )
-    {
-        return _number;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         column="creditCardType"
-     *      length="25"
-     */
-    public String getType(  )
-    {
-        return _type;
-    }
-
-    public void set( CreditCard cc )
-    {
-        _type       = cc.getType(  );
-        _number     = cc.getNumber(  );
-        _expiryDate = cc.getExpiryDate(  );
-    }
-
-    /**
-     * Sets the expiryDate.
-     * @param expiryDate The expiryDate to set
-     */
-    public void setExpiryDate( String expiryDate )
-    {
-        _expiryDate = expiryDate;
-    }
-
-    /**
-     * Sets the number.
-     * @param number The number to set
-     */
-    public void setNumber( String number )
-    {
-        _number = number;
-    }
-
-    /**
-     * Sets the type.
-     * @param type The type to set
-     */
-    public void setType( String type )
-    {
-        _type = type;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/CreditCard.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,113 @@
+/*
+ * Created on Feb 22, 2003
+ *
+ * To change this generated comment go to
+ * Window>Preferences>Java>Code Generation>Code Template
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class CreditCard
+    implements Serializable
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String VISA = "Visa";
+    public static final String MASTERCARD = "MasterCard";
+    public static final String AMEX = "American Express";
+
+    //~ Instance fields --------------------------------------------------------
+
+    private String _number = "";
+    private String _type = "";
+    private String _expiryDate = "";
+
+    //~ Constructors -----------------------------------------------------------
+
+    public CreditCard(  )
+    {
+        super(  );
+    }
+
+    public CreditCard( CreditCard cc )
+    {
+        set( cc );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         column="creditCardExpiryDate"
+     *      length="10"
+     */
+    public String getExpiryDate(  )
+    {
+        return _expiryDate;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         column="creditCardNumber"
+     *      length="25"
+     */
+    public String getNumber(  )
+    {
+        return _number;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         column="creditCardType"
+     *      length="25"
+     */
+    public String getType(  )
+    {
+        return _type;
+    }
+
+    public void set( CreditCard cc )
+    {
+        _type       = cc.getType(  );
+        _number     = cc.getNumber(  );
+        _expiryDate = cc.getExpiryDate(  );
+    }
+
+    /**
+     * Sets the expiryDate.
+     * @param expiryDate The expiryDate to set
+     */
+    public void setExpiryDate( String expiryDate )
+    {
+        _expiryDate = expiryDate;
+    }
+
+    /**
+     * Sets the number.
+     * @param number The number to set
+     */
+    public void setNumber( String number )
+    {
+        _number = number;
+    }
+
+    /**
+     * Sets the type.
+     * @param type The type to set
+     */
+    public void setType( String type )
+    {
+        _type = type;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,239 +0,0 @@
-/*
- * Created on Feb 22, 2003
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @hibernate.class
- *         table="T_CUSTOMER"
- */
-public class Customer
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Account    _account = new Account(  );
-    private Address    _address = new Address(  );
-    private CreditCard _creditCard = new CreditCard(  );
-    private String     _email = "";
-    private String     _firstname = "";
-    private String     _language = "";
-    private String     _lastname = "";
-    private String     _telephone = "";
-
-    //~ Constructors -----------------------------------------------------------
-
-    public Customer(  ) {}
-
-    public Customer( Account account )
-    {
-        _account = account;
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return Account
-     *
-     * @hibernate.one-to-one
-     *         cascade="all"
-     */
-    public Account getAccount(  )
-    {
-        return _account;
-    }
-
-    /**
-     * @return Address
-     *
-     * @hibernate.component
-     */
-    public Address getAddress(  )
-    {
-        return _address;
-    }
-
-    /**
-     * @return CreditCard
-     *
-     * @hibernate.component
-     */
-    public CreditCard getCreditCard(  )
-    {
-        return _creditCard;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.id
-     *        generator-class="assigned"
-     *         length="10"
-     */
-    public String getUserId(  )
-    {
-        return ( _account != null )
-               ? _account.getUserId(  )
-               : "";
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *         length="255"
-     *         not-null="true"
-     *         unique="true"
-     */
-    public String getEmail(  )
-    {
-        return _email;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="50"
-     */
-    public String getFirstname(  )
-    {
-        return _firstname;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="3"
-     */
-    public String getLanguage(  )
-    {
-        return _language;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="50"
-     */
-    public String getLastname(  )
-    {
-        return _lastname;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="10"
-     */
-    public String getTelephone(  )
-    {
-        return _telephone;
-    }
-
-    public void set( Customer cst )
-    {
-        _account.set( cst.getAccount(  ) );
-        _address.set( cst.getAddress(  ) );
-        _creditCard.set( cst.getCreditCard(  ) );
-        _email     = cst.getEmail(  );
-        _firstname = cst.getFirstname(  );
-        _lastname  = cst.getLastname(  );
-        _language  = cst.getLanguage(  );
-        _telephone = cst.getTelephone(  );
-    }
-
-    /**
-     * Sets the account.
-     * @param account The account to set
-     */
-    public void setAccount( Account account )
-    {
-        _account = account;
-    }
-
-    /**
-     * Sets the address.
-     * @param address The address to set
-     */
-    public void setAddress( Address address )
-    {
-        _address = address;
-    }
-
-    /**
-     * Sets the creditCard.
-     * @param creditCard The creditCard to set
-     */
-    public void setCreditCard( CreditCard creditCard )
-    {
-        _creditCard = creditCard;
-    }
-
-    /**
-     * Sets the userId.
-     * @param userId The userId to set
-     */
-    public void setUserId( String userId )
-    {
-        if ( _account == null )
-        {
-            _account = new Account(  );
-        }
-
-        _account.setUserId( userId );
-    }
-
-    /**
-     * Sets the email.
-     * @param email The email to set
-     */
-    public void setEmail( String email )
-    {
-        _email = email;
-    }
-
-    /**
-     * Sets the firstname.
-     * @param firstname The firstname to set
-     */
-    public void setFirstname( String firstname )
-    {
-        _firstname = firstname;
-    }
-
-    /**
-     * Sets the language.
-     * @param language The language to set
-     */
-    public void setLanguage( String language )
-    {
-        _language = language;
-    }
-
-    /**
-     * Sets the lastname.
-     * @param lastname The lastname to set
-     */
-    public void setLastname( String lastname )
-    {
-        _lastname = lastname;
-    }
-
-    /**
-     * Sets the telephone.
-     * @param telephone The telephone to set
-     */
-    public void setTelephone( String telephone )
-    {
-        _telephone = telephone;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,239 @@
+/*
+ * Created on Feb 22, 2003
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @hibernate.class
+ *         table="T_CUSTOMER"
+ */
+public class Customer
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Account    _account = new Account(  );
+    private Address    _address = new Address(  );
+    private CreditCard _creditCard = new CreditCard(  );
+    private String     _email = "";
+    private String     _firstname = "";
+    private String     _language = "";
+    private String     _lastname = "";
+    private String     _telephone = "";
+
+    //~ Constructors -----------------------------------------------------------
+
+    public Customer(  ) {}
+
+    public Customer( Account account )
+    {
+        _account = account;
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return Account
+     *
+     * @hibernate.one-to-one
+     *         cascade="all"
+     */
+    public Account getAccount(  )
+    {
+        return _account;
+    }
+
+    /**
+     * @return Address
+     *
+     * @hibernate.component
+     */
+    public Address getAddress(  )
+    {
+        return _address;
+    }
+
+    /**
+     * @return CreditCard
+     *
+     * @hibernate.component
+     */
+    public CreditCard getCreditCard(  )
+    {
+        return _creditCard;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.id
+     *        generator-class="assigned"
+     *         length="10"
+     */
+    public String getUserId(  )
+    {
+        return ( _account != null )
+               ? _account.getUserId(  )
+               : "";
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *         length="255"
+     *         not-null="true"
+     *         unique="true"
+     */
+    public String getEmail(  )
+    {
+        return _email;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="50"
+     */
+    public String getFirstname(  )
+    {
+        return _firstname;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="3"
+     */
+    public String getLanguage(  )
+    {
+        return _language;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="50"
+     */
+    public String getLastname(  )
+    {
+        return _lastname;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="10"
+     */
+    public String getTelephone(  )
+    {
+        return _telephone;
+    }
+
+    public void set( Customer cst )
+    {
+        _account.set( cst.getAccount(  ) );
+        _address.set( cst.getAddress(  ) );
+        _creditCard.set( cst.getCreditCard(  ) );
+        _email     = cst.getEmail(  );
+        _firstname = cst.getFirstname(  );
+        _lastname  = cst.getLastname(  );
+        _language  = cst.getLanguage(  );
+        _telephone = cst.getTelephone(  );
+    }
+
+    /**
+     * Sets the account.
+     * @param account The account to set
+     */
+    public void setAccount( Account account )
+    {
+        _account = account;
+    }
+
+    /**
+     * Sets the address.
+     * @param address The address to set
+     */
+    public void setAddress( Address address )
+    {
+        _address = address;
+    }
+
+    /**
+     * Sets the creditCard.
+     * @param creditCard The creditCard to set
+     */
+    public void setCreditCard( CreditCard creditCard )
+    {
+        _creditCard = creditCard;
+    }
+
+    /**
+     * Sets the userId.
+     * @param userId The userId to set
+     */
+    public void setUserId( String userId )
+    {
+        if ( _account == null )
+        {
+            _account = new Account(  );
+        }
+
+        _account.setUserId( userId );
+    }
+
+    /**
+     * Sets the email.
+     * @param email The email to set
+     */
+    public void setEmail( String email )
+    {
+        _email = email;
+    }
+
+    /**
+     * Sets the firstname.
+     * @param firstname The firstname to set
+     */
+    public void setFirstname( String firstname )
+    {
+        _firstname = firstname;
+    }
+
+    /**
+     * Sets the language.
+     * @param language The language to set
+     */
+    public void setLanguage( String language )
+    {
+        _language = language;
+    }
+
+    /**
+     * Sets the lastname.
+     * @param lastname The lastname to set
+     */
+    public void setLastname( String lastname )
+    {
+        _lastname = lastname;
+    }
+
+    /**
+     * Sets the telephone.
+     * @param telephone The telephone to set
+     */
+    public void setTelephone( String telephone )
+    {
+        _telephone = telephone;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,148 +0,0 @@
-/*
- * Created on Feb 22, 2003
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @hibernate.class
- *         table="T_ITEM"
- */
-public class Item
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String  _itemId;
-    private double  _listPrice;
-    private double  _unitCost;
-    private String  _description;
-    private String  _imagePath;
-    private Product _product;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="255"
-     */
-    public String getDescription(  )
-    {
-        return _description;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="255"
-     */
-    public String getImagePath(  )
-    {
-        return _imagePath;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.id
-     *      generator-class="assigned"
-     *      length="10"
-     */
-    public String getItemId(  )
-    {
-        return _itemId;
-    }
-
-    /**
-     * @return double
-     *
-     * @hibernate.property
-     */
-    public double getListPrice(  )
-    {
-        return _listPrice;
-    }
-
-    /**
-     * @return Product
-     *
-     * @hibernate.many-to-one
-     *      cascade="none"
-     *      column="product_fk"
-     */
-    public Product getProduct(  )
-    {
-        return _product;
-    }
-
-    /**
-     * @return double
-     *
-     * @hibernate.property
-     */
-    public double getUnitCost(  )
-    {
-        return _unitCost;
-    }
-
-    /**
-     * Sets the description.
-     * @param description The description to set
-     */
-    public void setDescription( String description )
-    {
-        _description = description;
-    }
-
-    /**
-     * Sets the imagePath.
-     * @param imagePath The imagePath to set
-     */
-    public void setImagePath( String imagePath )
-    {
-        _imagePath = imagePath;
-    }
-
-    /**
-     * Sets the itemId.
-     * @param itemId The itemId to set
-     */
-    public void setItemId( String itemId )
-    {
-        _itemId = itemId;
-    }
-
-    /**
-     * Sets the listPrice.
-     * @param listPrice The listPrice to set
-     */
-    public void setListPrice( double listPrice )
-    {
-        _listPrice = listPrice;
-    }
-
-    /**
-     * Sets the product.
-     * @param product The product to set
-     */
-    public void setProduct( Product product )
-    {
-        _product = product;
-    }
-
-    /**
-     * Sets the unitCost.
-     * @param unitCost The unitCost to set
-     */
-    public void setUnitCost( double unitCost )
-    {
-        _unitCost = unitCost;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Item.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,148 @@
+/*
+ * Created on Feb 22, 2003
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @hibernate.class
+ *         table="T_ITEM"
+ */
+public class Item
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String  _itemId;
+    private double  _listPrice;
+    private double  _unitCost;
+    private String  _description;
+    private String  _imagePath;
+    private Product _product;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="255"
+     */
+    public String getDescription(  )
+    {
+        return _description;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="255"
+     */
+    public String getImagePath(  )
+    {
+        return _imagePath;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.id
+     *      generator-class="assigned"
+     *      length="10"
+     */
+    public String getItemId(  )
+    {
+        return _itemId;
+    }
+
+    /**
+     * @return double
+     *
+     * @hibernate.property
+     */
+    public double getListPrice(  )
+    {
+        return _listPrice;
+    }
+
+    /**
+     * @return Product
+     *
+     * @hibernate.many-to-one
+     *      cascade="none"
+     *      column="product_fk"
+     */
+    public Product getProduct(  )
+    {
+        return _product;
+    }
+
+    /**
+     * @return double
+     *
+     * @hibernate.property
+     */
+    public double getUnitCost(  )
+    {
+        return _unitCost;
+    }
+
+    /**
+     * Sets the description.
+     * @param description The description to set
+     */
+    public void setDescription( String description )
+    {
+        _description = description;
+    }
+
+    /**
+     * Sets the imagePath.
+     * @param imagePath The imagePath to set
+     */
+    public void setImagePath( String imagePath )
+    {
+        _imagePath = imagePath;
+    }
+
+    /**
+     * Sets the itemId.
+     * @param itemId The itemId to set
+     */
+    public void setItemId( String itemId )
+    {
+        _itemId = itemId;
+    }
+
+    /**
+     * Sets the listPrice.
+     * @param listPrice The listPrice to set
+     */
+    public void setListPrice( double listPrice )
+    {
+        _listPrice = listPrice;
+    }
+
+    /**
+     * Sets the product.
+     * @param product The product to set
+     */
+    public void setProduct( Product product )
+    {
+        _product = product;
+    }
+
+    /**
+     * Sets the unitCost.
+     * @param unitCost The unitCost to set
+     */
+    public void setUnitCost( double unitCost )
+    {
+        _unitCost = unitCost;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,219 +0,0 @@
-/*
- * Created on Feb 22, 2003
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @hibernate.class
- *         table="T_ORDER"
- */
-public class Order
-    implements Serializable
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String PENDING = "pending";
-    public static final String DELIVERED = "delivered";
-    public static final String CANCELLED = "cancelled";
-
-    //~ Instance fields --------------------------------------------------------
-
-    private Address    _address;
-    private CreditCard _creditCard;
-    private Customer   _customer;
-    private Date       _orderDate;
-    private long       _orderId;
-    private Set        _orderItems = new HashSet(  );
-    private String     _status = PENDING;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public Order(  )
-    {
-        _customer   = new Customer(  );
-        _address    = new Address(  );
-        _creditCard = new CreditCard(  );
-    }
-
-    public Order( Customer customer )
-    {
-        _customer   = customer;
-        _address    = new Address( customer.getAddress(  ) );
-        _creditCard = new CreditCard( customer.getCreditCard(  ) );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    public void add( Item item,
-                     int  quantity )
-    {
-        _orderItems.add( new OrderItem( item, quantity ) );
-    }
-
-    public double getTotal(  )
-    {
-        double   total = 0;
-        Iterator it = _orderItems.iterator(  );
-
-        while ( it.hasNext(  ) )
-        {
-            total += ( ( OrderItem ) it.next(  ) ).getSubTotal(  );
-        }
-
-        return total;
-    }
-
-    /**
-     * @return Address
-     *
-     * @hibernate.component
-     */
-    public Address getAddress(  )
-    {
-        return _address;
-    }
-
-    /**
-     * @return CreditCard
-     *
-     * @hibernate.component
-     */
-    public CreditCard getCreditCard(  )
-    {
-        return _creditCard;
-    }
-
-    /**
-     * @return Customer
-     *
-     * @hibernate.many-to-one
-     *      column="customer_fk"
-     *      cascade="none"
-     */
-    public Customer getCustomer(  )
-    {
-        return _customer;
-    }
-
-    /**
-     * @return Date
-     *
-     * @hibernate.property
-     */
-    public Date getOrderDate(  )
-    {
-        return _orderDate;
-    }
-
-    /**
-     * @return long
-     *
-     * @hibernate.id
-     *      generator-class="vm.long"
-     */
-    public long getOrderId(  )
-    {
-        return _orderId;
-    }
-
-    /**
-     * @return Set
-     *
-     * @hibernate.set
-     *    role="orderItems"
-     *    lazy="true"
-     *    cascade="all"
-     * @hibernate.collection-key
-     *    column="order_fk"
-     * @hibernate.collection-one-to-many
-     *    class="xpetstore.domain.OrderItem"
-     */
-    public Set getOrderItems(  )
-    {
-        return _orderItems;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="10"
-     */
-    public String getStatus(  )
-    {
-        return _status;
-    }
-
-    /**
-     * Sets the address.
-     * @param address The address to set
-     */
-    public void setAddress( Address address )
-    {
-        _address = address;
-    }
-
-    /**
-     * Sets the creditCard.
-     * @param creditCard The creditCard to set
-     */
-    public void setCreditCard( CreditCard creditCard )
-    {
-        _creditCard = creditCard;
-    }
-
-    /**
-     * Sets the customer.
-     * @param customer The customer to set
-     */
-    public void setCustomer( Customer customer )
-    {
-        _customer = customer;
-    }
-
-    /**
-     * Sets the orderDate.
-     * @param orderDate The orderDate to set
-     */
-    public void setOrderDate( Date orderDate )
-    {
-        _orderDate = orderDate;
-    }
-
-    /**
-     * Sets the orderId.
-     * @param orderId The orderId to set
-     */
-    public void setOrderId( long orderId )
-    {
-        _orderId = orderId;
-    }
-
-    /**
-     * Sets the orderItems.
-     * @param orderItems The orderItems to set
-     */
-    public void setOrderItems( Set orderItems )
-    {
-        _orderItems = orderItems;
-    }
-
-    /**
-     * Sets the status.
-     * @param status The status to set
-     */
-    public void setStatus( String status )
-    {
-        _status = status;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Order.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,219 @@
+/*
+ * Created on Feb 22, 2003
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @hibernate.class
+ *         table="T_ORDER"
+ */
+public class Order
+    implements Serializable
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String PENDING = "pending";
+    public static final String DELIVERED = "delivered";
+    public static final String CANCELLED = "cancelled";
+
+    //~ Instance fields --------------------------------------------------------
+
+    private Address    _address;
+    private CreditCard _creditCard;
+    private Customer   _customer;
+    private Date       _orderDate;
+    private long       _orderId;
+    private Set        _orderItems = new HashSet(  );
+    private String     _status = PENDING;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public Order(  )
+    {
+        _customer   = new Customer(  );
+        _address    = new Address(  );
+        _creditCard = new CreditCard(  );
+    }
+
+    public Order( Customer customer )
+    {
+        _customer   = customer;
+        _address    = new Address( customer.getAddress(  ) );
+        _creditCard = new CreditCard( customer.getCreditCard(  ) );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    public void add( Item item,
+                     int  quantity )
+    {
+        _orderItems.add( new OrderItem( item, quantity ) );
+    }
+
+    public double getTotal(  )
+    {
+        double   total = 0;
+        Iterator it = _orderItems.iterator(  );
+
+        while ( it.hasNext(  ) )
+        {
+            total += ( ( OrderItem ) it.next(  ) ).getSubTotal(  );
+        }
+
+        return total;
+    }
+
+    /**
+     * @return Address
+     *
+     * @hibernate.component
+     */
+    public Address getAddress(  )
+    {
+        return _address;
+    }
+
+    /**
+     * @return CreditCard
+     *
+     * @hibernate.component
+     */
+    public CreditCard getCreditCard(  )
+    {
+        return _creditCard;
+    }
+
+    /**
+     * @return Customer
+     *
+     * @hibernate.many-to-one
+     *      column="customer_fk"
+     *      cascade="none"
+     */
+    public Customer getCustomer(  )
+    {
+        return _customer;
+    }
+
+    /**
+     * @return Date
+     *
+     * @hibernate.property
+     */
+    public Date getOrderDate(  )
+    {
+        return _orderDate;
+    }
+
+    /**
+     * @return long
+     *
+     * @hibernate.id
+     *      generator-class="vm.long"
+     */
+    public long getOrderId(  )
+    {
+        return _orderId;
+    }
+
+    /**
+     * @return Set
+     *
+     * @hibernate.set
+     *    role="orderItems"
+     *    lazy="true"
+     *    cascade="all"
+     * @hibernate.collection-key
+     *    column="order_fk"
+     * @hibernate.collection-one-to-many
+     *    class="xpetstore.domain.OrderItem"
+     */
+    public Set getOrderItems(  )
+    {
+        return _orderItems;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="10"
+     */
+    public String getStatus(  )
+    {
+        return _status;
+    }
+
+    /**
+     * Sets the address.
+     * @param address The address to set
+     */
+    public void setAddress( Address address )
+    {
+        _address = address;
+    }
+
+    /**
+     * Sets the creditCard.
+     * @param creditCard The creditCard to set
+     */
+    public void setCreditCard( CreditCard creditCard )
+    {
+        _creditCard = creditCard;
+    }
+
+    /**
+     * Sets the customer.
+     * @param customer The customer to set
+     */
+    public void setCustomer( Customer customer )
+    {
+        _customer = customer;
+    }
+
+    /**
+     * Sets the orderDate.
+     * @param orderDate The orderDate to set
+     */
+    public void setOrderDate( Date orderDate )
+    {
+        _orderDate = orderDate;
+    }
+
+    /**
+     * Sets the orderId.
+     * @param orderId The orderId to set
+     */
+    public void setOrderId( long orderId )
+    {
+        _orderId = orderId;
+    }
+
+    /**
+     * Sets the orderItems.
+     * @param orderItems The orderItems to set
+     */
+    public void setOrderItems( Set orderItems )
+    {
+        _orderItems = orderItems;
+    }
+
+    /**
+     * Sets the status.
+     * @param status The status to set
+     */
+    public void setStatus( String status )
+    {
+        _status = status;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,122 +0,0 @@
-/*
- * Created on Feb 22, 2003
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @hibernate.class
- *         table="T_ORDER_ITEM"
- */
-public class OrderItem
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Item   _item;
-    private long   _orderItemId;
-    private int    _quantity;
-    private double _unitPrice;
-
-    //~ Constructors -----------------------------------------------------------
-
-    public OrderItem(  ) {}
-
-    public OrderItem( Item item,
-                      int  quantity )
-    {
-        _item      = item;
-        _quantity  = quantity;
-        _unitPrice = item.getListPrice(  );
-    }
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return Item
-     *
-     * @hibernate.many-to-one
-     *      column="item_fk"
-     *      cascade="none"
-     */
-    public Item getItem(  )
-    {
-        return _item;
-    }
-
-    /**
-     * @return long
-     *
-     * @hibernate.id
-     *      generator-class="vm.long"
-     */
-    public long getOrderItemId(  )
-    {
-        return _orderItemId;
-    }
-
-    /**
-     * @return int
-     *
-     * @hibernate.property
-     */
-    public int getQuantity(  )
-    {
-        return _quantity;
-    }
-
-    public double getSubTotal(  )
-    {
-        return _quantity * _unitPrice;
-    }
-
-    /**
-     * @return double
-     *
-     * @hibernate.property
-     */
-    public double getUnitPrice(  )
-    {
-        return _unitPrice;
-    }
-
-    /**
-     * Sets the item.
-     * @param item The item to set
-     */
-    public void setItem( Item item )
-    {
-        _item = item;
-    }
-
-    /**
-     * Sets the orderItemUId.
-     * @param orderItemUId The orderItemUId to set
-     */
-    public void setOrderItemId( long orderItemUId )
-    {
-        _orderItemId = orderItemUId;
-    }
-
-    /**
-     * Sets the quantity.
-     * @param quantity The quantity to set
-     */
-    public void setQuantity( int quantity )
-    {
-        this._quantity = quantity;
-    }
-
-    /**
-     * Sets the unitPrice.
-     * @param unitPrice The unitPrice to set
-     */
-    public void setUnitPrice( double unitPrice )
-    {
-        _unitPrice = unitPrice;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/OrderItem.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,122 @@
+/*
+ * Created on Feb 22, 2003
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @hibernate.class
+ *         table="T_ORDER_ITEM"
+ */
+public class OrderItem
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Item   _item;
+    private long   _orderItemId;
+    private int    _quantity;
+    private double _unitPrice;
+
+    //~ Constructors -----------------------------------------------------------
+
+    public OrderItem(  ) {}
+
+    public OrderItem( Item item,
+                      int  quantity )
+    {
+        _item      = item;
+        _quantity  = quantity;
+        _unitPrice = item.getListPrice(  );
+    }
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return Item
+     *
+     * @hibernate.many-to-one
+     *      column="item_fk"
+     *      cascade="none"
+     */
+    public Item getItem(  )
+    {
+        return _item;
+    }
+
+    /**
+     * @return long
+     *
+     * @hibernate.id
+     *      generator-class="vm.long"
+     */
+    public long getOrderItemId(  )
+    {
+        return _orderItemId;
+    }
+
+    /**
+     * @return int
+     *
+     * @hibernate.property
+     */
+    public int getQuantity(  )
+    {
+        return _quantity;
+    }
+
+    public double getSubTotal(  )
+    {
+        return _quantity * _unitPrice;
+    }
+
+    /**
+     * @return double
+     *
+     * @hibernate.property
+     */
+    public double getUnitPrice(  )
+    {
+        return _unitPrice;
+    }
+
+    /**
+     * Sets the item.
+     * @param item The item to set
+     */
+    public void setItem( Item item )
+    {
+        _item = item;
+    }
+
+    /**
+     * Sets the orderItemUId.
+     * @param orderItemUId The orderItemUId to set
+     */
+    public void setOrderItemId( long orderItemUId )
+    {
+        _orderItemId = orderItemUId;
+    }
+
+    /**
+     * Sets the quantity.
+     * @param quantity The quantity to set
+     */
+    public void setQuantity( int quantity )
+    {
+        this._quantity = quantity;
+    }
+
+    /**
+     * Sets the unitPrice.
+     * @param unitPrice The unitPrice to set
+     */
+    public void setUnitPrice( double unitPrice )
+    {
+        _unitPrice = unitPrice;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,115 +0,0 @@
-/*
- * Created on Feb 22, 2003
- */
-package xpetstore.domain;
-
-import java.io.Serializable;
-
-import java.util.Set;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @hibernate.class
- *         table="T_PRODUCT"
- */
-public class Product
-    implements Serializable
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _productId;
-    private String _name;
-    private String _description;
-    private Set    _items;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="255"
-     */
-    public String getDescription(  )
-    {
-        return _description;
-    }
-
-    /**
-     * @return Set
-     *
-     * @hibernate.set
-     *    role="items"
-     *    lazy="true"
-     *    cascade="delete"
-     * @hibernate.collection-key
-     *    column="product_fk"
-     * @hibernate.collection-one-to-many
-     *    class="xpetstore.domain.Item"
-     */
-    public Set getItems(  )
-    {
-        return _items;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.property
-     *      length="50"
-     */
-    public String getName(  )
-    {
-        return _name;
-    }
-
-    /**
-     * @return String
-     *
-     * @hibernate.id
-     *      generator-class="assigned"
-     *      length="10"
-     */
-    public String getProductId(  )
-    {
-        return _productId;
-    }
-
-    /**
-     * Sets the description.
-     * @param description The description to set
-     */
-    public void setDescription( String description )
-    {
-        _description = description;
-    }
-
-    /**
-     * Sets the items.
-     * @param items The items to set
-     */
-    public void setItems( Set items )
-    {
-        _items = items;
-    }
-
-    /**
-     * Sets the name.
-     * @param name The name to set
-     */
-    public void setName( String name )
-    {
-        _name = name;
-    }
-
-    /**
-     * Sets the productId.
-     * @param productId The productId to set
-     */
-    public void setProductId( String productId )
-    {
-        _productId = productId;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/domain/Product.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,115 @@
+/*
+ * Created on Feb 22, 2003
+ */
+package xpetstore.domain;
+
+import java.io.Serializable;
+
+import java.util.Set;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @hibernate.class
+ *         table="T_PRODUCT"
+ */
+public class Product
+    implements Serializable
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _productId;
+    private String _name;
+    private String _description;
+    private Set    _items;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="255"
+     */
+    public String getDescription(  )
+    {
+        return _description;
+    }
+
+    /**
+     * @return Set
+     *
+     * @hibernate.set
+     *    role="items"
+     *    lazy="true"
+     *    cascade="delete"
+     * @hibernate.collection-key
+     *    column="product_fk"
+     * @hibernate.collection-one-to-many
+     *    class="xpetstore.domain.Item"
+     */
+    public Set getItems(  )
+    {
+        return _items;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.property
+     *      length="50"
+     */
+    public String getName(  )
+    {
+        return _name;
+    }
+
+    /**
+     * @return String
+     *
+     * @hibernate.id
+     *      generator-class="assigned"
+     *      length="10"
+     */
+    public String getProductId(  )
+    {
+        return _productId;
+    }
+
+    /**
+     * Sets the description.
+     * @param description The description to set
+     */
+    public void setDescription( String description )
+    {
+        _description = description;
+    }
+
+    /**
+     * Sets the items.
+     * @param items The items to set
+     */
+    public void setItems( Set items )
+    {
+        _items = items;
+    }
+
+    /**
+     * Sets the name.
+     * @param name The name to set
+     */
+    public void setName( String name )
+    {
+        _name = name;
+    }
+
+    /**
+     * Sets the productId.
+     * @param productId The productId to set
+     */
+    public void setProductId( String productId )
+    {
+        _productId = productId;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-/*
- * Created on 27-Feb-2003
- */
-package xpetstore.util;
-
-import java.util.Date;
-
-import javax.activation.DataHandler;
-
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public class MailUtil
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String MAIL_SESSION = "java:comp/env/mail/xpetstore/MailSession";
-
-    //~ Methods ----------------------------------------------------------------
-
-    public static void send( String to,
-                             String subject,
-                             String body )
-        throws NamingException, 
-                   AddressException, 
-                   MessagingException
-    {
-        InitialContext     ic = new InitialContext(  );
-        Session            session = ( Session ) ic.lookup( MAIL_SESSION );
-        javax.mail.Message msg = new MimeMessage( session );
-
-        msg.setFrom(  );
-        msg.setRecipients( javax.mail.Message.RecipientType.TO, InternetAddress.parse( to, false ) );
-        msg.setSubject( subject );
-
-        msg.setDataHandler( new DataHandler( body, "text/plain" ) );
-        msg.setHeader( "X-Mailer", "JavaMailer" );
-        msg.setSentDate( new Date(  ) );
-
-        Transport.send( msg );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/java/xpetstore/util/MailUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+ * Created on 27-Feb-2003
+ */
+package xpetstore.util;
+
+import java.util.Date;
+
+import javax.activation.DataHandler;
+
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public class MailUtil
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String MAIL_SESSION = "java:comp/env/mail/xpetstore/MailSession";
+
+    //~ Methods ----------------------------------------------------------------
+
+    public static void send( String to,
+                             String subject,
+                             String body )
+        throws NamingException, 
+                   AddressException, 
+                   MessagingException
+    {
+        InitialContext     ic = new InitialContext(  );
+        Session            session = ( Session ) ic.lookup( MAIL_SESSION );
+        javax.mail.Message msg = new MimeMessage( session );
+
+        msg.setFrom(  );
+        msg.setRecipients( javax.mail.Message.RecipientType.TO, InternetAddress.parse( to, false ) );
+        msg.setSubject( subject );
+
+        msg.setDataHandler( new DataHandler( body, "text/plain" ) );
+        msg.setHeader( "X-Mailer", "JavaMailer" );
+        msg.setSentDate( new Date(  ) );
+
+        Transport.send( msg );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/lcp.bat
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/lcp.bat (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/lcp.bat)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-account_information=Account Information
-address=Address
-authentication_failed=Authentication Failed
-birds=Birds
-cart_empty=The Shopping Cart is empty
-cats=Cats
-ccExpiryDate=Expiry Date
-ccExpiryDate_bad_format=The credit card expiry date has the wrong format
-ccExpiryDate_required=The credit card expiry date is required
-ccInfos=Credit Card Information
-ccNumber=Number
-ccNumber_required=The credit card number is required
-ccType=Type
-ccType_required=The credit card type is required
-city=City
-country=Country
-description=Description
-duplicate_account=The user ID you have entered belongs to another customer
-duplicate_email=The email you have entered belongs to another customer
-dogs=Dogs
-email=Email
-email_required=Email is required
-firstname=First name
-fish=Fish
-itemId=Item ID
-home=Home
-keyword=Keyword
-lastname=Last name
-listPrice=List Price
-name=Name
-no_items=No Items
-no_products=No Products
-password=Password
-password_required=Password is required
-password_length=Password must have at least 4 characters
-personal_information=Personal Information
-productId=Product ID
-quantity=Quantity
-reptiles=Reptiles
-state=State
-street1=Street1
-street2=Street2
-subTotal=Sub Total
-telephone=Telephone
-total=Total
-unitCost=Unit Cost
-userId=User ID
-userId_length=User ID must have at least 4 characters
-userId_required=User ID is required
-zipcode=Zip Code
-
-cart.title=xPetStore Shopping Cart
-cart.subtitle=Shopping Cart
-category.title=xPetStore Category
-confirmation.title=xPetstore Order Confirmation
-confirmation.subtitle=Order Confirmation
-confirmation.message=Your order has been proceed.<br>You will receive an email shortly.
-index.title=xPetStore
-item.title=xPetStore Item
-login.title=xPetStore Login
-login.message=Please enter your username and password.
-myaccount.title=xPetStore Account
-myaccount.subtitle=My Account
-order.title=xPetStore Order Form
-order.subtitle=Order Form
-product.title=xPetStore Product
-register.title=xPetstore Registration Form
-register.subtitle=Registration Form
-search.title=xPetStore Search
-search.subtitle=xPetStore Search
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/Resources.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+account_information=Account Information
+address=Address
+authentication_failed=Authentication Failed
+birds=Birds
+cart_empty=The Shopping Cart is empty
+cats=Cats
+ccExpiryDate=Expiry Date
+ccExpiryDate_bad_format=The credit card expiry date has the wrong format
+ccExpiryDate_required=The credit card expiry date is required
+ccInfos=Credit Card Information
+ccNumber=Number
+ccNumber_required=The credit card number is required
+ccType=Type
+ccType_required=The credit card type is required
+city=City
+country=Country
+description=Description
+duplicate_account=The user ID you have entered belongs to another customer
+duplicate_email=The email you have entered belongs to another customer
+dogs=Dogs
+email=Email
+email_required=Email is required
+firstname=First name
+fish=Fish
+itemId=Item ID
+home=Home
+keyword=Keyword
+lastname=Last name
+listPrice=List Price
+name=Name
+no_items=No Items
+no_products=No Products
+password=Password
+password_required=Password is required
+password_length=Password must have at least 4 characters
+personal_information=Personal Information
+productId=Product ID
+quantity=Quantity
+reptiles=Reptiles
+state=State
+street1=Street1
+street2=Street2
+subTotal=Sub Total
+telephone=Telephone
+total=Total
+unitCost=Unit Cost
+userId=User ID
+userId_length=User ID must have at least 4 characters
+userId_required=User ID is required
+zipcode=Zip Code
+
+cart.title=xPetStore Shopping Cart
+cart.subtitle=Shopping Cart
+category.title=xPetStore Category
+confirmation.title=xPetstore Order Confirmation
+confirmation.subtitle=Order Confirmation
+confirmation.message=Your order has been proceed.<br>You will receive an email shortly.
+index.title=xPetStore
+item.title=xPetStore Item
+login.title=xPetStore Login
+login.message=Please enter your username and password.
+myaccount.title=xPetStore Account
+myaccount.subtitle=My Account
+order.title=xPetStore Order Form
+order.subtitle=Order Form
+product.title=xPetStore Product
+register.title=xPetstore Registration Form
+register.subtitle=Registration Form
+search.title=xPetStore Search
+search.subtitle=xPetStore Search
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-# Default WebWork configuration
-# These can be overridden by webwork.properties in your own project
-# You should place webwork.properties in WEB-INF/classes directory.
-
-#### Comma separated list of package prefixes for Java actions.
-# This allows you to eliminate package prefixes when designating
-# actions. Override webwork.action.package with your package prefix
-# i.e. - com.acme.action
-#webwork.action.packages=com.acme.action
-
-#### Factory for actions
-# This will be the factory used to retrieve Actions.
-webwork.action.factory=webwork.action.factory.DefaultActionFactory
-
-# Allow only aliasing?
-webwork.aliasing.only=false
-
-# extension for actions
-webwork.action.extension=action
-
-# maximum number of links a chain may have
-webwork.action.chain.maxlinks=10
-
-#### multipart parser
-webwork.multipart.parser=cos
-#webwork.multipart.parser=pell
-# use javax.servlet.context.tempdir by default
-webwork.multipart.saveDir=
-webwork.multipart.maxSize=2097152
-
-#### Configuration
-# Class WW should use to load configurations
-webwork.configuration=webwork.config.DefaultConfiguration
-
-# *.properties files to load
-# views.properties, webwork.properties, default.properties
-webwork.configuration.properties=views,webwork,webwork/default
-
-#### logger
-# indicate log4j configuration file
-# this may be .properties or .xml
-#webwork.log4j.configfile=webwork/log4j.properties
-webwork.log4j.configfile=webwork/log4j.xml
-
-# name of XML configurations to load
-# webwork.configuration.xml= - indicates none
-webwork.configuration.xml=actions
-
-#### Standard action aliases
-redirect.action=webwork.action.standard.Redirect
-referrer.action=webwork.action.standard.Referrer
-cardpane.action=webwork.action.standard.CardPane
-
-### Standard UI theme
-# Change this to reflect which subdirectory of /template
-# should be used for JSP control tags
-webwork.ui.theme=xhtml
-webwork.ui.templateDir=template
-
-### i18n
-# Change this to change the encoding of the template pages included
-# by the ui taglib.
-# If not enabled, webwork will use the default encoding for your
-# platform as given by System.getProperty("file.encoding").
-# webwork.i18n.encoding=utf-8
-
-
-#### Velocity settings
-# See the Velocity project (http://jakarta.apache.org/velocity/) for
-# more info on what settings are available
-file.resource.loader.path = /
-runtime.log = /velocity.log
-velocimacro.library = webwork.vm
-
-resource.loader = file,class
-class.resource.loader.description = Velocity Classpath Resource Loader
-class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-class.resource.loader.cache = true
-class.resource.loader.modificationCheckInterval = 0
-
-# Set this to your own source directory during development.
-# This allows you to edit the pages while the server is running without loosing
-# the changes when you re-deploy the application.
-file.resource.loader.path = /
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = 1
-

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/resources/webwork.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+# Default WebWork configuration
+# These can be overridden by webwork.properties in your own project
+# You should place webwork.properties in WEB-INF/classes directory.
+
+#### Comma separated list of package prefixes for Java actions.
+# This allows you to eliminate package prefixes when designating
+# actions. Override webwork.action.package with your package prefix
+# i.e. - com.acme.action
+#webwork.action.packages=com.acme.action
+
+#### Factory for actions
+# This will be the factory used to retrieve Actions.
+webwork.action.factory=webwork.action.factory.DefaultActionFactory
+
+# Allow only aliasing?
+webwork.aliasing.only=false
+
+# extension for actions
+webwork.action.extension=action
+
+# maximum number of links a chain may have
+webwork.action.chain.maxlinks=10
+
+#### multipart parser
+webwork.multipart.parser=cos
+#webwork.multipart.parser=pell
+# use javax.servlet.context.tempdir by default
+webwork.multipart.saveDir=
+webwork.multipart.maxSize=2097152
+
+#### Configuration
+# Class WW should use to load configurations
+webwork.configuration=webwork.config.DefaultConfiguration
+
+# *.properties files to load
+# views.properties, webwork.properties, default.properties
+webwork.configuration.properties=views,webwork,webwork/default
+
+#### logger
+# indicate log4j configuration file
+# this may be .properties or .xml
+#webwork.log4j.configfile=webwork/log4j.properties
+webwork.log4j.configfile=webwork/log4j.xml
+
+# name of XML configurations to load
+# webwork.configuration.xml= - indicates none
+webwork.configuration.xml=actions
+
+#### Standard action aliases
+redirect.action=webwork.action.standard.Redirect
+referrer.action=webwork.action.standard.Referrer
+cardpane.action=webwork.action.standard.CardPane
+
+### Standard UI theme
+# Change this to reflect which subdirectory of /template
+# should be used for JSP control tags
+webwork.ui.theme=xhtml
+webwork.ui.templateDir=template
+
+### i18n
+# Change this to change the encoding of the template pages included
+# by the ui taglib.
+# If not enabled, webwork will use the default encoding for your
+# platform as given by System.getProperty("file.encoding").
+# webwork.i18n.encoding=utf-8
+
+
+#### Velocity settings
+# See the Velocity project (http://jakarta.apache.org/velocity/) for
+# more info on what settings are available
+file.resource.loader.path = /
+runtime.log = /velocity.log
+velocimacro.library = webwork.vm
+
+resource.loader = file,class
+class.resource.loader.description = Velocity Classpath Resource Loader
+class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+class.resource.loader.cache = true
+class.resource.loader.modificationCheckInterval = 0
+
+# Set this to your own source directory during development.
+# This allows you to edit the pages while the server is running without loosing
+# the changes when you re-deploy the application.
+file.resource.loader.path = /
+file.resource.loader.cache = true
+file.resource.loader.modificationCheckInterval = 1
+

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql/data.sql
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql/data.sql (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/sql/data.sql)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<decorators defaultdir="/decorators">
-     <decorator name="default" page="default.jsp">
-        <pattern>*</pattern>
-    </decorator>
-</decorators>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/decorators.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<decorators defaultdir="/decorators">
+     <decorator name="default" page="default.jsp">
+        <pattern>*</pattern>
+    </decorator>
+</decorators>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-decorator.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-decorator.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-decorator.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-page.tld
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-page.tld (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh-page.tld)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-<sitemesh>
-
-	<page-parsers>
-		<parser default="true" class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" />
-		<parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
-	</page-parsers>
-
-	<decorator-mappers>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
-			<param name="property.1" value="meta.decorator" />
-			<param name="property.2" value="decorator" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
-			<param name="match.MSIE" value="ie" />
-			<param name="match.Mozilla [" value="ns" />
-			<param name="match.Opera" value="opera" />
-			<param name="match.Lynx" value="lynx" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
-			<param name="decorator" value="printable" />
-			<param name="parameter.name" value="printable" />
-			<param name="parameter.value" value="true" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
-			<param name="decorator" value="robot" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
-			<param name="decorator.parameter" value="decorator" />
-			<param name="parameter.name" value="confirm" />
-			<param name="parameter.value" value="true" />
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper">
-		</mapper>
-
-		<mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
-			<param name="config" value="/WEB-INF/decorators.xml" />
-		</mapper>
-
-	</decorator-mappers>
-
-</sitemesh>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/WEB-INF/sitemesh.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+<sitemesh>
+
+	<page-parsers>
+		<parser default="true" class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" />
+		<parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
+	</page-parsers>
+
+	<decorator-mappers>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
+			<param name="property.1" value="meta.decorator" />
+			<param name="property.2" value="decorator" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
+			<param name="match.MSIE" value="ie" />
+			<param name="match.Mozilla [" value="ns" />
+			<param name="match.Opera" value="opera" />
+			<param name="match.Lynx" value="lynx" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
+			<param name="decorator" value="printable" />
+			<param name="parameter.name" value="printable" />
+			<param name="parameter.value" value="true" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
+			<param name="decorator" value="robot" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
+			<param name="decorator.parameter" value="decorator" />
+			<param name="parameter.name" value="confirm" />
+			<param name="parameter.value" value="true" />
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper">
+		</mapper>
+
+		<mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
+			<param name="config" value="/WEB-INF/decorators.xml" />
+		</mapper>
+
+	</decorator-mappers>
+
+</sitemesh>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css/style.css
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css/style.css (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/css/style.css)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/bird2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/cat2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog3.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog3.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog3.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog4.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog4.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog4.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog5.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog5.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog5.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog6.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog6.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/dog6.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish2.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish2.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish2.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish3.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish3.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish3.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish4.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish4.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/fish4.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/lizard1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/lizard1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/lizard1.jpg)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/snake1.jpg
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/snake1.jpg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/dataimages/snake1.jpg)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_birds.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_birds.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_birds.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_cats.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_cats.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_cats.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_dogs.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_dogs.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_dogs.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_fish.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_fish.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_fish.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_reptiles.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_reptiles.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/banner_reptiles.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/birds_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/birds_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/birds_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-sidebar.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-sidebar.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-sidebar.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-topbar.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-topbar.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/bkg-topbar.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_add_to_cart.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_add_to_cart.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_add_to_cart.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_checkout.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_checkout.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_checkout.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_continue.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_continue.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_continue.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_next.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_next.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_next.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_prev.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_prev.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_prev.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_previous.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_previous.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_previous.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_proceed.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_proceed.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_proceed.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_register_now.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_register_now.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_register_now.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_remove.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_remove.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_remove.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_submit.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_submit.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_submit.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_update_cart.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_update_cart.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/button_update_cart.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cart.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cart.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cart.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cartHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cartHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cartHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cats_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cats_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/cats_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/dogs_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/dogs_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/dogs_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/fish_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/fish_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/fish_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/help.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/help.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/help.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/helpHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/helpHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/helpHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/logo-topbar.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/logo-topbar.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/logo-topbar.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_account.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_account.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_account.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_accountHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_accountHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/my_accountHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/poweredby.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/poweredby.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/poweredby.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/reptiles_icon.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/reptiles_icon.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/reptiles_icon.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/search.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/search.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/search.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/separator.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/separator.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/separator.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sflogo.png
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sflogo.png (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sflogo.png)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-in.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-in.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-in.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-inHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-inHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-inHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-out.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-out.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-out.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-outHL.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-outHL.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sign-outHL.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_birds.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_birds.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_birds.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_cats.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_cats.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_cats.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_dogs.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_dogs.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_dogs.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_fish.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_fish.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_fish.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_reptiles.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_reptiles.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/sm_reptiles.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/splash.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/splash.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/splash.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/struts-power.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/struts-power.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/struts-power.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/velocity-power.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/velocity-power.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/velocity-power.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/webwork-power.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/webwork-power.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/webwork-power.gif)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/xdoclet.gif
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/xdoclet.gif (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/images/xdoclet.gif)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/default.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/default.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/default.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/footer.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/footer.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/footer.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/header.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/header.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/header.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/navigation.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/navigation.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/decorators/navigation.jsp)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/index.jsp
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/index.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/jsp/index.jsp)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/cart.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/cart.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/cart.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/category.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/category.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/category.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/checkout.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/checkout.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/checkout.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/confirmation.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/confirmation.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/confirmation.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/customerEditor.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/customerEditor.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/customerEditor.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/errors.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/errors.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/errors.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/index.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/index.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/index.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/item.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/item.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/item.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/myaccount.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/myaccount.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/myaccount.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/product.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/product.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/product.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/register.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/register.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/register.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/search.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/search.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/search.vm)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/signon.vm
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/signon.vm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/vm/signon.vm)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,149 +0,0 @@
-/*
- * Created on 26-Feb-2003
- */
-package xpetstore.web.filter;
-
-import java.io.IOException;
-
-import java.util.HashMap;
-import java.util.StringTokenizer;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * This filter protects some URI and make sure that only signed-on users
- * can access them
- *
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @web.filter
- *      name="signon"
- *      display-name="xPetstore WebWork Signon Filter"
- *
- * @web.filter-mapping
- *      servlet-name="action"
- *
- * @web.filter-init-param
- *      name="signon.action"
- *         value="signon.action"
- *
- * @web.filter-init-param
- *      name="protected.uri"
- *         value="checkout.action,order.action"
- */
-public class SignOnFilter
-    implements Filter
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    private static final Log __log = LogFactory.getLog( SignOnFilter.class );
-
-    //~ Instance fields --------------------------------------------------------
-
-    private String       _signon;
-    private HashMap      _protectedUris = new HashMap(  );
-    private FilterConfig _config;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
-     */
-    public void init( FilterConfig config )
-        throws ServletException
-    {
-        __log.info( "init()" );
-
-        _config = config;
-
-        /* SignOn action */
-        _signon = config.getInitParameter( "signon.action" );
-        __log.info( "...signon.action=" + _signon );
-
-        /* Protected Uri */
-        String          uri = config.getInitParameter( "protected.uri" );
-        StringTokenizer tok = new StringTokenizer( uri, "," );
-
-        while ( tok.hasMoreTokens(  ) )
-        {
-            String url = tok.nextToken(  );
-            _protectedUris.put( url, url );
-
-            __log.info( "...Adding URI to protect: " + url );
-        }
-    }
-
-    /**
-     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
-     */
-    public void doFilter( ServletRequest  request,
-                          ServletResponse response,
-                          FilterChain     chain )
-        throws IOException, 
-                   ServletException
-    {
-        HttpServletRequest req = ( HttpServletRequest ) request;
-
-        /* Uri */
-        String uri = req.getRequestURI(  );
-
-        if ( uri.startsWith( "/" ) )
-        {
-            uri = uri.substring( 1 );
-        }
-
-        int i = uri.indexOf( "/" );
-
-        if ( i >= 0 )
-        {
-            uri = uri.substring( i + 1 );
-        }
-        else {}
-
-        /* check if signon is required */
-        if ( isProtected( uri ) && !isSignedIn( req ) )
-        {
-            String forward = _signon + "?redirectUri=" + uri;
-            _config.getServletContext(  ).getRequestDispatcher( forward ).forward( request, response );
-        }
-        else
-        {
-            chain.doFilter( request, response );
-        }
-    }
-
-    /**
-     * @see javax.servlet.Filter#destroy()
-     */
-    public void destroy(  )
-    {
-        _protectedUris.clear(  );
-    }
-
-    public boolean isProtected( String uri )
-    {
-        return ( _protectedUris.get( uri ) != null );
-    }
-
-    public boolean isSignedIn( HttpServletRequest request )
-    {
-        HttpSession session = request.getSession( false );
-
-        return ( session == null )
-               ? false
-               : ( session.getAttribute( BaseAction.USERID_KEY ) != null );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/filter/SignOnFilter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,149 @@
+/*
+ * Created on 26-Feb-2003
+ */
+package xpetstore.web.filter;
+
+import java.io.IOException;
+
+import java.util.HashMap;
+import java.util.StringTokenizer;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * This filter protects some URI and make sure that only signed-on users
+ * can access them
+ *
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @web.filter
+ *      name="signon"
+ *      display-name="xPetstore WebWork Signon Filter"
+ *
+ * @web.filter-mapping
+ *      servlet-name="action"
+ *
+ * @web.filter-init-param
+ *      name="signon.action"
+ *         value="signon.action"
+ *
+ * @web.filter-init-param
+ *      name="protected.uri"
+ *         value="checkout.action,order.action"
+ */
+public class SignOnFilter
+    implements Filter
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    private static final Log __log = LogFactory.getLog( SignOnFilter.class );
+
+    //~ Instance fields --------------------------------------------------------
+
+    private String       _signon;
+    private HashMap      _protectedUris = new HashMap(  );
+    private FilterConfig _config;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+     */
+    public void init( FilterConfig config )
+        throws ServletException
+    {
+        __log.info( "init()" );
+
+        _config = config;
+
+        /* SignOn action */
+        _signon = config.getInitParameter( "signon.action" );
+        __log.info( "...signon.action=" + _signon );
+
+        /* Protected Uri */
+        String          uri = config.getInitParameter( "protected.uri" );
+        StringTokenizer tok = new StringTokenizer( uri, "," );
+
+        while ( tok.hasMoreTokens(  ) )
+        {
+            String url = tok.nextToken(  );
+            _protectedUris.put( url, url );
+
+            __log.info( "...Adding URI to protect: " + url );
+        }
+    }
+
+    /**
+     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+     */
+    public void doFilter( ServletRequest  request,
+                          ServletResponse response,
+                          FilterChain     chain )
+        throws IOException, 
+                   ServletException
+    {
+        HttpServletRequest req = ( HttpServletRequest ) request;
+
+        /* Uri */
+        String uri = req.getRequestURI(  );
+
+        if ( uri.startsWith( "/" ) )
+        {
+            uri = uri.substring( 1 );
+        }
+
+        int i = uri.indexOf( "/" );
+
+        if ( i >= 0 )
+        {
+            uri = uri.substring( i + 1 );
+        }
+        else {}
+
+        /* check if signon is required */
+        if ( isProtected( uri ) && !isSignedIn( req ) )
+        {
+            String forward = _signon + "?redirectUri=" + uri;
+            _config.getServletContext(  ).getRequestDispatcher( forward ).forward( request, response );
+        }
+        else
+        {
+            chain.doFilter( request, response );
+        }
+    }
+
+    /**
+     * @see javax.servlet.Filter#destroy()
+     */
+    public void destroy(  )
+    {
+        _protectedUris.clear(  );
+    }
+
+    public boolean isProtected( String uri )
+    {
+        return ( _protectedUris.get( uri ) != null );
+    }
+
+    public boolean isSignedIn( HttpServletRequest request )
+    {
+        HttpSession session = request.getSession( false );
+
+        return ( session == null )
+               ? false
+               : ( session.getAttribute( BaseAction.USERID_KEY ) != null );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,138 +0,0 @@
-/*
- * Created on Feb 23, 2003
- */
-package xpetstore.web.servlet;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.Properties;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-
-import org.apache.log4j.Logger;
-
-import cirrus.hibernate.Datastore;
-import cirrus.hibernate.Hibernate;
-import cirrus.hibernate.HibernateException;
-import cirrus.hibernate.SessionFactory;
-
-import webwork.dispatcher.ServletDispatcher;
-
-import xpetstore.domain.Account;
-import xpetstore.domain.Category;
-import xpetstore.domain.Customer;
-import xpetstore.domain.Item;
-import xpetstore.domain.Order;
-import xpetstore.domain.OrderItem;
-import xpetstore.domain.Product;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @web.servlet
- *      name="action"
- *      display-name="xPetstore WebWork Action Servlet"
- *      load-on-startup="1"
- *
- * @web.servlet-mapping
- *      url-pattern="*.action"
- *
- * @web.resource-ref
- *      name="${jndi.mail.session}"
- *      type="javax.mail.Session"
- *      auth="Container"
- *
- * @jboss.resource-ref
- *      res-ref-name="${jndi.mail.session}"
- *      jndi-name="${jboss.mail.session}"
- *
- * @weblogic.resource-description
- *      res-ref-name="${jndi.mail.session}"
- *      jndi-name="${weblogic.mail.session}"
- */
-public class ActionServlet
-    extends ServletDispatcher
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    private static final Logger __logger = Logger.getLogger( ActionServlet.class );
-    public static final String  SESSION_FACTORY_KEY = "cirrus.hibernate.SessionFactory";
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-     */
-    public void init( ServletConfig config )
-        throws ServletException
-    {
-        super.init( config );
-
-        __logger.info( "Initializing" );
-
-        try
-        {
-            Datastore ds = Hibernate.createDatastore(  );
-
-            /* Classes */
-            load( Account.class, ds );
-            load( Category.class, ds );
-            load( Customer.class, ds );
-            load( Item.class, ds );
-            load( Order.class, ds );
-            load( OrderItem.class, ds );
-            load( Product.class, ds );
-
-            /* Hibernate properties */
-            __logger.info( "...loading: hibernate.properties" );
-
-            InputStream in = getClass(  ).getClassLoader(  ).getResourceAsStream( "hibernate.properties" );
-            Properties  props = new Properties(  );
-            props.load( in );
-
-            /* Session Factory */
-            __logger.info( "...initializing the Hibernate SessionFactory" );
-
-            SessionFactory sessionFactory = ds.buildSessionFactory( props );
-            config.getServletContext(  ).setAttribute( SESSION_FACTORY_KEY, sessionFactory );
-
-            __logger.info( "Initialized" );
-        }
-        catch ( HibernateException h )
-        {
-            throw new ServletException( h );
-        }
-        catch ( IOException io )
-        {
-            throw new ServletException( "Unable to load: hibernate.properties", io );
-        }
-    }
-
-    private void load( Class     type,
-                       Datastore ds )
-        throws ServletException
-    {
-        try
-        {
-            __logger.info( "... loading mapping for: " + type );
-            ds.storeClass( type );
-        }
-        catch ( Exception e )
-        {
-            throw new ServletException( "Unable to load Hibernate mapping:" + type, e );
-        }
-    }
-
-    /**
-     * @see javax.servlet.Servlet#destroy()
-     */
-    public void destroy(  )
-    {
-        getServletContext(  ).removeAttribute( SESSION_FACTORY_KEY );
-
-        super.destroy(  );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/servlet/ActionServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,138 @@
+/*
+ * Created on Feb 23, 2003
+ */
+package xpetstore.web.servlet;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.Properties;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+import org.apache.log4j.Logger;
+
+import cirrus.hibernate.Datastore;
+import cirrus.hibernate.Hibernate;
+import cirrus.hibernate.HibernateException;
+import cirrus.hibernate.SessionFactory;
+
+import webwork.dispatcher.ServletDispatcher;
+
+import xpetstore.domain.Account;
+import xpetstore.domain.Category;
+import xpetstore.domain.Customer;
+import xpetstore.domain.Item;
+import xpetstore.domain.Order;
+import xpetstore.domain.OrderItem;
+import xpetstore.domain.Product;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @web.servlet
+ *      name="action"
+ *      display-name="xPetstore WebWork Action Servlet"
+ *      load-on-startup="1"
+ *
+ * @web.servlet-mapping
+ *      url-pattern="*.action"
+ *
+ * @web.resource-ref
+ *      name="${jndi.mail.session}"
+ *      type="javax.mail.Session"
+ *      auth="Container"
+ *
+ * @jboss.resource-ref
+ *      res-ref-name="${jndi.mail.session}"
+ *      jndi-name="${jboss.mail.session}"
+ *
+ * @weblogic.resource-description
+ *      res-ref-name="${jndi.mail.session}"
+ *      jndi-name="${weblogic.mail.session}"
+ */
+public class ActionServlet
+    extends ServletDispatcher
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    private static final Logger __logger = Logger.getLogger( ActionServlet.class );
+    public static final String  SESSION_FACTORY_KEY = "cirrus.hibernate.SessionFactory";
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+     */
+    public void init( ServletConfig config )
+        throws ServletException
+    {
+        super.init( config );
+
+        __logger.info( "Initializing" );
+
+        try
+        {
+            Datastore ds = Hibernate.createDatastore(  );
+
+            /* Classes */
+            load( Account.class, ds );
+            load( Category.class, ds );
+            load( Customer.class, ds );
+            load( Item.class, ds );
+            load( Order.class, ds );
+            load( OrderItem.class, ds );
+            load( Product.class, ds );
+
+            /* Hibernate properties */
+            __logger.info( "...loading: hibernate.properties" );
+
+            InputStream in = getClass(  ).getClassLoader(  ).getResourceAsStream( "hibernate.properties" );
+            Properties  props = new Properties(  );
+            props.load( in );
+
+            /* Session Factory */
+            __logger.info( "...initializing the Hibernate SessionFactory" );
+
+            SessionFactory sessionFactory = ds.buildSessionFactory( props );
+            config.getServletContext(  ).setAttribute( SESSION_FACTORY_KEY, sessionFactory );
+
+            __logger.info( "Initialized" );
+        }
+        catch ( HibernateException h )
+        {
+            throw new ServletException( h );
+        }
+        catch ( IOException io )
+        {
+            throw new ServletException( "Unable to load: hibernate.properties", io );
+        }
+    }
+
+    private void load( Class     type,
+                       Datastore ds )
+        throws ServletException
+    {
+        try
+        {
+            __logger.info( "... loading mapping for: " + type );
+            ds.storeClass( type );
+        }
+        catch ( Exception e )
+        {
+            throw new ServletException( "Unable to load Hibernate mapping:" + type, e );
+        }
+    }
+
+    /**
+     * @see javax.servlet.Servlet#destroy()
+     */
+    public void destroy(  )
+    {
+        getServletContext(  ).removeAttribute( SESSION_FACTORY_KEY );
+
+        super.destroy(  );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,214 +0,0 @@
-/*
- * Created on Feb 23, 2003
- */
-package xpetstore.web.webwork.action;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import cirrus.hibernate.Session;
-import cirrus.hibernate.SessionFactory;
-
-import webwork.action.ActionSupport;
-import webwork.action.ApplicationAware;
-import webwork.action.LocaleAware;
-import webwork.action.SessionAware;
-
-import xpetstore.domain.Customer;
-
-import xpetstore.web.servlet.ActionServlet;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public abstract class BaseAction
-    extends ActionSupport
-    implements SessionAware,
-                   ApplicationAware,
-                   LocaleAware
-{
-    //~ Static fields/initializers ---------------------------------------------
-
-    public static final String BUNDLE_NAME = "Resources";
-    public static final String CART_KEY = "cart";
-    public static final String USERID_KEY = "userId";
-    public static final String USERNAME_KEY = "username";
-
-    //~ Instance fields --------------------------------------------------------
-
-    protected Map    _application;
-    private Session  _hibernateSession;
-    protected Locale _locale;
-    protected Log    _log = LogFactory.getLog( getClass(  ) );
-    protected String _redirectUri = "";
-    protected Map    _session;
-
-    //~ Methods ----------------------------------------------------------------
-
-    protected void checkLength( String key,
-                                String msg,
-                                String value,
-                                int    length )
-    {
-        if ( ( value == null ) || ( value.length(  ) < length ) )
-        {
-            addError( key, getText( msg ) );
-        }
-    }
-
-    protected void checkNotEmpty( String key,
-                                  String msg,
-                                  String value )
-    {
-        if ( ( value == null ) || ( value.length(  ) == 0 ) )
-        {
-            addError( key, getText( msg ) );
-        }
-    }
-
-    protected void clearSession(  )
-    {
-        _session.remove( USERID_KEY );
-        _session.remove( USERNAME_KEY );
-        _session.remove( CART_KEY );
-    }
-
-    /**
-     * @see webwork.action.Action#execute()
-     */
-    public String execute(  )
-        throws Exception
-    {
-        _log.info( "execute()" );
-        return super.execute(  );
-    }
-
-    /**
-     * Returns the shoppping cart.
-     * The cart is a <code>java.util.Map</code> containing the quantities of
-     * the items of the shopping cart indexed by their <code>itemId</code>
-     *
-     * @return Map
-     */
-    public Map getCart(  )
-    {
-        Map cart = ( Map ) _session.get( CART_KEY );
-
-        if ( cart == null )
-        {
-            cart = new HashMap(  );
-            _session.put( CART_KEY, cart );
-        }
-
-        return cart;
-    }
-
-    public Session getHibernateSession(  )
-        throws Exception
-    {
-        if ( _hibernateSession == null )
-        {
-            SessionFactory factory = ( SessionFactory ) _application.get( ActionServlet.SESSION_FACTORY_KEY );
-            _hibernateSession = factory.openSession(  );
-        }
-
-        if ( !_hibernateSession.isOpen(  ) )
-        {
-            _hibernateSession.reconnect(  );
-        }
-
-        return _hibernateSession;
-    }
-
-    /**
-     * @see webwork.action.ActionSupport#getLocale()
-     */
-    public Locale getLocale(  )
-    {
-        return _locale;
-    }
-
-    /**
-     * @return String
-     */
-    public String getRedirectUri(  )
-    {
-        return _redirectUri;
-    }
-
-    /**
-     * @see webwork.action.ActionSupport#getText(java.lang.String)
-     */
-    public String getText( String key )
-    {
-        try
-        {
-            return getTexts(  ).getString( key );
-        }
-        catch ( MissingResourceException m )
-        {
-            return "???" + key + "???";
-        }
-    }
-
-    /**
-     * @see webwork.action.ActionSupport#getTexts()
-     */
-    public ResourceBundle getTexts(  )
-    {
-        return ResourceBundle.getBundle( BUNDLE_NAME, getLocale(  ) );
-    }
-
-    public String getUserId(  )
-    {
-        return ( String ) _session.get( USERID_KEY );
-    }
-
-    protected void initSession( Customer customer )
-    {
-        _session.put( USERID_KEY, customer.getUserId(  ) );
-        _session.put( USERNAME_KEY, customer.getFirstname(  ) + " " + customer.getLastname(  ) );
-
-        /* TODO set the locale */
-    }
-
-    /**
-     * @see webwork.action.ApplicationAware#setApplication(java.util.Map)
-     */
-    public void setApplication( Map application )
-    {
-        _application = application;
-    }
-
-    /**
-      * @see webwork.action.LocaleAware#setLocale(java.util.Locale)
-     */
-    public void setLocale( Locale locale )
-    {
-        _locale = locale;
-    }
-
-    /**
-     * Sets the nextUri.
-     * @param nextUri The nextUri to set
-     */
-    public void setRedirectUri( String nextUri )
-    {
-        _redirectUri = nextUri;
-    }
-
-    /**
-     * @see webwork.action.SessionAware#setSession(java.util.Map)
-     */
-    public void setSession( Map session )
-    {
-        _session = session;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/BaseAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,214 @@
+/*
+ * Created on Feb 23, 2003
+ */
+package xpetstore.web.webwork.action;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import cirrus.hibernate.Session;
+import cirrus.hibernate.SessionFactory;
+
+import webwork.action.ActionSupport;
+import webwork.action.ApplicationAware;
+import webwork.action.LocaleAware;
+import webwork.action.SessionAware;
+
+import xpetstore.domain.Customer;
+
+import xpetstore.web.servlet.ActionServlet;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public abstract class BaseAction
+    extends ActionSupport
+    implements SessionAware,
+                   ApplicationAware,
+                   LocaleAware
+{
+    //~ Static fields/initializers ---------------------------------------------
+
+    public static final String BUNDLE_NAME = "Resources";
+    public static final String CART_KEY = "cart";
+    public static final String USERID_KEY = "userId";
+    public static final String USERNAME_KEY = "username";
+
+    //~ Instance fields --------------------------------------------------------
+
+    protected Map    _application;
+    private Session  _hibernateSession;
+    protected Locale _locale;
+    protected Log    _log = LogFactory.getLog( getClass(  ) );
+    protected String _redirectUri = "";
+    protected Map    _session;
+
+    //~ Methods ----------------------------------------------------------------
+
+    protected void checkLength( String key,
+                                String msg,
+                                String value,
+                                int    length )
+    {
+        if ( ( value == null ) || ( value.length(  ) < length ) )
+        {
+            addError( key, getText( msg ) );
+        }
+    }
+
+    protected void checkNotEmpty( String key,
+                                  String msg,
+                                  String value )
+    {
+        if ( ( value == null ) || ( value.length(  ) == 0 ) )
+        {
+            addError( key, getText( msg ) );
+        }
+    }
+
+    protected void clearSession(  )
+    {
+        _session.remove( USERID_KEY );
+        _session.remove( USERNAME_KEY );
+        _session.remove( CART_KEY );
+    }
+
+    /**
+     * @see webwork.action.Action#execute()
+     */
+    public String execute(  )
+        throws Exception
+    {
+        _log.info( "execute()" );
+        return super.execute(  );
+    }
+
+    /**
+     * Returns the shoppping cart.
+     * The cart is a <code>java.util.Map</code> containing the quantities of
+     * the items of the shopping cart indexed by their <code>itemId</code>
+     *
+     * @return Map
+     */
+    public Map getCart(  )
+    {
+        Map cart = ( Map ) _session.get( CART_KEY );
+
+        if ( cart == null )
+        {
+            cart = new HashMap(  );
+            _session.put( CART_KEY, cart );
+        }
+
+        return cart;
+    }
+
+    public Session getHibernateSession(  )
+        throws Exception
+    {
+        if ( _hibernateSession == null )
+        {
+            SessionFactory factory = ( SessionFactory ) _application.get( ActionServlet.SESSION_FACTORY_KEY );
+            _hibernateSession = factory.openSession(  );
+        }
+
+        if ( !_hibernateSession.isOpen(  ) )
+        {
+            _hibernateSession.reconnect(  );
+        }
+
+        return _hibernateSession;
+    }
+
+    /**
+     * @see webwork.action.ActionSupport#getLocale()
+     */
+    public Locale getLocale(  )
+    {
+        return _locale;
+    }
+
+    /**
+     * @return String
+     */
+    public String getRedirectUri(  )
+    {
+        return _redirectUri;
+    }
+
+    /**
+     * @see webwork.action.ActionSupport#getText(java.lang.String)
+     */
+    public String getText( String key )
+    {
+        try
+        {
+            return getTexts(  ).getString( key );
+        }
+        catch ( MissingResourceException m )
+        {
+            return "???" + key + "???";
+        }
+    }
+
+    /**
+     * @see webwork.action.ActionSupport#getTexts()
+     */
+    public ResourceBundle getTexts(  )
+    {
+        return ResourceBundle.getBundle( BUNDLE_NAME, getLocale(  ) );
+    }
+
+    public String getUserId(  )
+    {
+        return ( String ) _session.get( USERID_KEY );
+    }
+
+    protected void initSession( Customer customer )
+    {
+        _session.put( USERID_KEY, customer.getUserId(  ) );
+        _session.put( USERNAME_KEY, customer.getFirstname(  ) + " " + customer.getLastname(  ) );
+
+        /* TODO set the locale */
+    }
+
+    /**
+     * @see webwork.action.ApplicationAware#setApplication(java.util.Map)
+     */
+    public void setApplication( Map application )
+    {
+        _application = application;
+    }
+
+    /**
+      * @see webwork.action.LocaleAware#setLocale(java.util.Locale)
+     */
+    public void setLocale( Locale locale )
+    {
+        _locale = locale;
+    }
+
+    /**
+     * Sets the nextUri.
+     * @param nextUri The nextUri to set
+     */
+    public void setRedirectUri( String nextUri )
+    {
+        _redirectUri = nextUri;
+    }
+
+    /**
+     * @see webwork.action.SessionAware#setSession(java.util.Map)
+     */
+    public void setSession( Map session )
+    {
+        _session = session;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-/*
- * Created on 24-Feb-2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package xpetstore.web.webwork.action;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="index"
- *   success="index.vm"
- */
-public class IndexAction
-    extends BaseAction {}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/IndexAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+/*
+ * Created on 24-Feb-2003
+ *
+ * To change this generated comment go to
+ * Window>Preferences>Java>Code Generation>Code Template
+ */
+package xpetstore.web.webwork.action;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="index"
+ *   success="index.vm"
+ */
+public class IndexAction
+    extends BaseAction {}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * Created on 24-Feb-2003
- */
-package xpetstore.web.webwork.action.cart;
-
-import java.util.Map;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="addItem"
- *   success="cart.action"
- */
-public class AddItemAction
-    extends BaseCartAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _itemId;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Map     cart = getCart(  );
-        Integer qty = ( Integer ) cart.get( _itemId );
-
-        if ( qty == null )
-        {
-            cart.put( _itemId, new Integer( 1 ) );
-        }
-        else
-        {
-            cart.put( _itemId, new Integer( 1 + qty.intValue(  ) ) );
-        }
-
-        return SUCCESS;
-    }
-
-    /**
-     * @return String
-     */
-    public String getItemId(  )
-    {
-        return _itemId;
-    }
-
-    /**
-     * Sets the itemId.
-     * @param itemId The itemId to set
-     */
-    public void setItemId( String itemId )
-    {
-        _itemId = itemId;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/AddItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * Created on 24-Feb-2003
+ */
+package xpetstore.web.webwork.action.cart;
+
+import java.util.Map;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="addItem"
+ *   success="cart.action"
+ */
+public class AddItemAction
+    extends BaseCartAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _itemId;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Map     cart = getCart(  );
+        Integer qty = ( Integer ) cart.get( _itemId );
+
+        if ( qty == null )
+        {
+            cart.put( _itemId, new Integer( 1 ) );
+        }
+        else
+        {
+            cart.put( _itemId, new Integer( 1 + qty.intValue(  ) ) );
+        }
+
+        return SUCCESS;
+    }
+
+    /**
+     * @return String
+     */
+    public String getItemId(  )
+    {
+        return _itemId;
+    }
+
+    /**
+     * Sets the itemId.
+     * @param itemId The itemId to set
+     */
+    public void setItemId( String itemId )
+    {
+        _itemId = itemId;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
- * Created on 25-Feb-2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package xpetstore.web.webwork.action.cart;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Item;
-import xpetstore.domain.OrderItem;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public abstract class BaseCartAction
-    extends BaseAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Collection _cartItems;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * Returns all the {@link xpetstore.web.cart.CartItem}s
-     * @return Collection
-     * @throws Exception
-     */
-    public Collection getCartItems(  )
-        throws Exception
-    {
-        Session s = null;
-        Map     cart = getCart(  );
-
-        try
-        {
-            if ( _cartItems == null )
-            {
-                _cartItems = new ArrayList(  );
-
-                if ( cart.size(  ) > 0 )
-                {
-                    s = getHibernateSession(  );
-
-                    Iterator it = cart.keySet(  ).iterator(  );
-
-                    while ( it.hasNext(  ) )
-                    {
-                        String  itemId = ( String ) it.next(  );
-                        Integer quantity = ( Integer ) cart.get( itemId );
-                        Item    item = ( Item ) s.load( Item.class, itemId );
-
-                        _cartItems.add( new OrderItem( item, quantity.intValue(  ) ) );
-                    }
-                }
-            }
-
-            return _cartItems;
-        }
-        catch ( Exception e )
-        {
-            e.printStackTrace(  );
-            throw e;
-        }
-        finally
-        {
-            if ( s != null )
-            {
-                s.close(  );
-            }
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/BaseCartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * Created on 25-Feb-2003
+ *
+ * To change this generated comment go to
+ * Window>Preferences>Java>Code Generation>Code Template
+ */
+package xpetstore.web.webwork.action.cart;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Item;
+import xpetstore.domain.OrderItem;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public abstract class BaseCartAction
+    extends BaseAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Collection _cartItems;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * Returns all the {@link xpetstore.web.cart.CartItem}s
+     * @return Collection
+     * @throws Exception
+     */
+    public Collection getCartItems(  )
+        throws Exception
+    {
+        Session s = null;
+        Map     cart = getCart(  );
+
+        try
+        {
+            if ( _cartItems == null )
+            {
+                _cartItems = new ArrayList(  );
+
+                if ( cart.size(  ) > 0 )
+                {
+                    s = getHibernateSession(  );
+
+                    Iterator it = cart.keySet(  ).iterator(  );
+
+                    while ( it.hasNext(  ) )
+                    {
+                        String  itemId = ( String ) it.next(  );
+                        Integer quantity = ( Integer ) cart.get( itemId );
+                        Item    item = ( Item ) s.load( Item.class, itemId );
+
+                        _cartItems.add( new OrderItem( item, quantity.intValue(  ) ) );
+                    }
+                }
+            }
+
+            return _cartItems;
+        }
+        catch ( Exception e )
+        {
+            e.printStackTrace(  );
+            throw e;
+        }
+        finally
+        {
+            if ( s != null )
+            {
+                s.close(  );
+            }
+        }
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-/*
- * Created on 25-Feb-2003
- */
-package xpetstore.web.webwork.action.cart;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="cart"
- *   success="cart.vm"
- */
-public class CartAction
-    extends BaseCartAction {}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CartAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+/*
+ * Created on 25-Feb-2003
+ */
+package xpetstore.web.webwork.action.cart;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="cart"
+ *   success="cart.vm"
+ */
+public class CartAction
+    extends BaseCartAction {}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * Created on Feb 25, 2003
- */
-package xpetstore.web.webwork.action.cart;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Customer;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="checkout"
- *   success="checkout.vm"
- */
-public class CheckoutAction
-    extends BaseCartAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Customer _customer = new Customer(  );
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Session s = getHibernateSession(  );
-
-        try
-        {
-            _customer = ( Customer ) s.load( Customer.class, getUserId(  ) );
-
-            return SUCCESS;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     * @return Customer
-     */
-    public Customer getCustomer(  )
-    {
-        return _customer;
-    }
-
-    /**
-     * Sets the customer.
-     * @param customer The customer to set
-     */
-    public void setCustomer( Customer customer )
-    {
-        _customer = customer;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/CheckoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * Created on Feb 25, 2003
+ */
+package xpetstore.web.webwork.action.cart;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Customer;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="checkout"
+ *   success="checkout.vm"
+ */
+public class CheckoutAction
+    extends BaseCartAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Customer _customer = new Customer(  );
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Session s = getHibernateSession(  );
+
+        try
+        {
+            _customer = ( Customer ) s.load( Customer.class, getUserId(  ) );
+
+            return SUCCESS;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     * @return Customer
+     */
+    public Customer getCustomer(  )
+    {
+        return _customer;
+    }
+
+    /**
+     * Sets the customer.
+     * @param customer The customer to set
+     */
+    public void setCustomer( Customer customer )
+    {
+        _customer = customer;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * Created on 24-Feb-2003
- */
-package xpetstore.web.webwork.action.cart;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="removeItem"
- *   success="cart.action"
- */
-public class RemoveItemAction
-    extends BaseCartAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _itemId;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        getCart(  ).remove( _itemId );
-
-        return SUCCESS;
-    }
-
-    /**
-     * @return String
-     */
-    public String getItemId(  )
-    {
-        return _itemId;
-    }
-
-    /**
-     * Sets the itemId.
-     * @param itemId The itemId to set
-     */
-    public void setItemId( String itemId )
-    {
-        _itemId = itemId;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/RemoveItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * Created on 24-Feb-2003
+ */
+package xpetstore.web.webwork.action.cart;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="removeItem"
+ *   success="cart.action"
+ */
+public class RemoveItemAction
+    extends BaseCartAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _itemId;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        getCart(  ).remove( _itemId );
+
+        return SUCCESS;
+    }
+
+    /**
+     * @return String
+     */
+    public String getItemId(  )
+    {
+        return _itemId;
+    }
+
+    /**
+     * Sets the itemId.
+     * @param itemId The itemId to set
+     */
+    public void setItemId( String itemId )
+    {
+        _itemId = itemId;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-/*
- * Created on 24-Feb-2003
- */
-package xpetstore.web.webwork.action.cart;
-
-import java.util.Map;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="updateCart"
- *   success="cart.action"
- */
-public class UpdateCardAction
-    extends BaseCartAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _itemId[];
-    private int    _quantity[];
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Map cart = getCart(  );
-
-        for ( int i = 0; i < _quantity.length; i++ )
-        {
-            int qty = _quantity[ i ];
-
-            if ( qty <= 0 )
-            {
-                cart.remove( _itemId[ i ] );
-            }
-            else
-            {
-                cart.put( _itemId[ i ], new Integer( qty ) );
-            }
-        }
-
-        return SUCCESS;
-    }
-
-    /**
-     * @return String[]
-     */
-    public String[] getItemId(  )
-    {
-        return _itemId;
-    }
-
-    /**
-     * @return int[]
-     */
-    public int[] getQuantity(  )
-    {
-        return _quantity;
-    }
-
-    /**
-     * Sets the itemId.
-     * @param itemId The itemId to set
-     */
-    public void setItemId( String itemId[] )
-    {
-        _itemId = itemId;
-    }
-
-    /**
-     * Sets the quantity.
-     * @param quantity The quantity to set
-     */
-    public void setQuantity( int quantity[] )
-    {
-        this._quantity = quantity;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/cart/UpdateCardAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,84 @@
+/*
+ * Created on 24-Feb-2003
+ */
+package xpetstore.web.webwork.action.cart;
+
+import java.util.Map;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="updateCart"
+ *   success="cart.action"
+ */
+public class UpdateCardAction
+    extends BaseCartAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _itemId[];
+    private int    _quantity[];
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Map cart = getCart(  );
+
+        for ( int i = 0; i < _quantity.length; i++ )
+        {
+            int qty = _quantity[ i ];
+
+            if ( qty <= 0 )
+            {
+                cart.remove( _itemId[ i ] );
+            }
+            else
+            {
+                cart.put( _itemId[ i ], new Integer( qty ) );
+            }
+        }
+
+        return SUCCESS;
+    }
+
+    /**
+     * @return String[]
+     */
+    public String[] getItemId(  )
+    {
+        return _itemId;
+    }
+
+    /**
+     * @return int[]
+     */
+    public int[] getQuantity(  )
+    {
+        return _quantity;
+    }
+
+    /**
+     * Sets the itemId.
+     * @param itemId The itemId to set
+     */
+    public void setItemId( String itemId[] )
+    {
+        _itemId = itemId;
+    }
+
+    /**
+     * Sets the quantity.
+     * @param quantity The quantity to set
+     */
+    public void setQuantity( int quantity[] )
+    {
+        this._quantity = quantity;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-/*
- * Created on Feb 23, 2003
- */
-package xpetstore.web.webwork.action.category;
-
-import java.util.Iterator;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Category;
-import xpetstore.domain.Product;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="category"
- *   success="category.vm"
- */
-public class CategoryAction
-    extends BaseAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Category _category = null;
-    private String   _categoryId = "";
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Session s = getHibernateSession(  );
-
-        try
-        {
-            _category = ( Category ) s.load( Category.class, _categoryId );
-
-            /*
-             * Since category.product is lazy loaded,
-             * traverse the collection to load all the product to display
-             */
-            Iterator it = _category.getProducts(  ).iterator(  );
-
-            while ( it.hasNext(  ) )
-            {
-                Product p = ( Product ) it.next(  );
-                p.getName(  );
-            }
-
-            return SUCCESS;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     * @return Category
-     */
-    public Category getCategory(  )
-    {
-        return _category;
-    }
-
-    /**
-     * @return String
-     */
-    public String getCategoryId(  )
-    {
-        return _categoryId;
-    }
-
-    /**
-     * Sets the category.
-     * @param category The category to set
-     */
-    public void setCategory( Category category )
-    {
-        _category = category;
-    }
-
-    /**
-     * Sets the categoryId.
-     * @param categoryId The categoryId to set
-     */
-    public void setCategoryId( String categoryId )
-    {
-        _categoryId = categoryId;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/category/CategoryAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+/*
+ * Created on Feb 23, 2003
+ */
+package xpetstore.web.webwork.action.category;
+
+import java.util.Iterator;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Category;
+import xpetstore.domain.Product;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="category"
+ *   success="category.vm"
+ */
+public class CategoryAction
+    extends BaseAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Category _category = null;
+    private String   _categoryId = "";
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Session s = getHibernateSession(  );
+
+        try
+        {
+            _category = ( Category ) s.load( Category.class, _categoryId );
+
+            /*
+             * Since category.product is lazy loaded,
+             * traverse the collection to load all the product to display
+             */
+            Iterator it = _category.getProducts(  ).iterator(  );
+
+            while ( it.hasNext(  ) )
+            {
+                Product p = ( Product ) it.next(  );
+                p.getName(  );
+            }
+
+            return SUCCESS;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     * @return Category
+     */
+    public Category getCategory(  )
+    {
+        return _category;
+    }
+
+    /**
+     * @return String
+     */
+    public String getCategoryId(  )
+    {
+        return _categoryId;
+    }
+
+    /**
+     * Sets the category.
+     * @param category The category to set
+     */
+    public void setCategory( Category category )
+    {
+        _category = category;
+    }
+
+    /**
+     * Sets the categoryId.
+     * @param categoryId The categoryId to set
+     */
+    public void setCategoryId( String categoryId )
+    {
+        _categoryId = categoryId;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,157 +0,0 @@
-/*
- * Created on Feb 25, 2003
- */
-package xpetstore.web.webwork.action.customer;
-
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletResponse;
-
-import cirrus.hibernate.Hibernate;
-import cirrus.hibernate.ObjectNotFoundException;
-import cirrus.hibernate.Session;
-import cirrus.hibernate.Transaction;
-
-import webwork.action.ServletResponseAware;
-
-import xpetstore.domain.Account;
-import xpetstore.domain.CreditCard;
-import xpetstore.domain.Customer;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- */
-public abstract class BaseSaveCustomerAction
-    extends BaseAction
-    implements ServletResponseAware
-{
-    //~ Instance fields --------------------------------------------------------
-
-    protected Customer          _customer = new Customer(  );
-    private HttpServletResponse _response;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Transaction tx = null;
-        Session     s = getHibernateSession(  );
-        String      customerId = _customer.getUserId(  );
-
-        try
-        {
-            tx = s.beginTransaction(  );
-
-            /* Make sure that the user-id is unique */
-            try
-            {
-                Customer c = ( Customer ) s.load( Customer.class, customerId );
-
-                if ( !c.getUserId(  ).equalsIgnoreCase( _customer.getUserId(  ) ) )
-                {
-                    addError( "customer", getText( "duplicate_account" ) );
-
-                    return ERROR;
-                }
-            }
-            catch ( ObjectNotFoundException o ) {}
-
-            /* Make sure that the email is unique */
-            String     oql = "FROM cst IN CLASS " + Customer.class + " WHERE cst.email=?";
-            Collection col = s.find( oql, _customer.getEmail(  ), Hibernate.STRING );
-
-            if ( col.size(  ) > 0 )
-            {
-                Customer c = ( Customer ) col.iterator(  ).next(  );
-
-                if ( !c.getUserId(  ).equalsIgnoreCase( customerId ) )
-                {
-                    addError( "customer", getText( "duplicate_email" ) );
-
-                    return ERROR;
-                }
-            }
-
-            save( _customer, s );
-            tx.commit(  );
-
-            return SUCCESS;
-        }
-        catch ( Exception e )
-        {
-            _log.error( "Unexpected error", e );
-
-            if ( tx != null )
-            {
-                tx.rollback(  );
-            }
-
-            throw e;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     *
-     * @see webwork.action.ActionSupport#doValidation()
-     */
-    protected void doValidation(  )
-    {
-        System.out.println( getClass(  ).getName(  ) + ".doValidation()" );
-
-        /* Account */
-        Account account = _customer.getAccount(  );
-        checkLength( "customerId", "userId_length", account.getUserId(  ), 4 );
-        checkLength( "password", "password_length", account.getPassword(  ), 4 );
-
-        /* Email */
-        checkNotEmpty( "email", "email_required", _customer.getEmail(  ) );
-
-        /* Credit card */
-        CreditCard cc = _customer.getCreditCard(  );
-        checkNotEmpty( "ccEmail", "ccType_required", cc.getType(  ) );
-        checkNotEmpty( "ccNumber", "ccNumber_required", cc.getNumber(  ) );
-        checkNotEmpty( "ccExpiryDate", "ccExpiryDate_required", cc.getExpiryDate(  ) );
-
-        super.doValidation(  );
-    }
-
-    /**
-     * @return Customer
-     */
-    public Customer getCustomer(  )
-    {
-        return _customer;
-    }
-
-    public abstract void save( Customer customer,
-                               Session  session )
-        throws Exception;
-
-    /**
-     * Sets the customer.
-     * @param customer The customer to set
-     */
-    public void setCustomer( Customer customer )
-    {
-        _customer = customer;
-    }
-
-    /**
-     * @see webwork.action.ServletResponseAware#setServletResponse(javax.servlet.http.HttpServletResponse)
-     */
-    public void setServletResponse( HttpServletResponse response )
-    {
-        _response = response;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/BaseSaveCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,157 @@
+/*
+ * Created on Feb 25, 2003
+ */
+package xpetstore.web.webwork.action.customer;
+
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletResponse;
+
+import cirrus.hibernate.Hibernate;
+import cirrus.hibernate.ObjectNotFoundException;
+import cirrus.hibernate.Session;
+import cirrus.hibernate.Transaction;
+
+import webwork.action.ServletResponseAware;
+
+import xpetstore.domain.Account;
+import xpetstore.domain.CreditCard;
+import xpetstore.domain.Customer;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ */
+public abstract class BaseSaveCustomerAction
+    extends BaseAction
+    implements ServletResponseAware
+{
+    //~ Instance fields --------------------------------------------------------
+
+    protected Customer          _customer = new Customer(  );
+    private HttpServletResponse _response;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Transaction tx = null;
+        Session     s = getHibernateSession(  );
+        String      customerId = _customer.getUserId(  );
+
+        try
+        {
+            tx = s.beginTransaction(  );
+
+            /* Make sure that the user-id is unique */
+            try
+            {
+                Customer c = ( Customer ) s.load( Customer.class, customerId );
+
+                if ( !c.getUserId(  ).equalsIgnoreCase( _customer.getUserId(  ) ) )
+                {
+                    addError( "customer", getText( "duplicate_account" ) );
+
+                    return ERROR;
+                }
+            }
+            catch ( ObjectNotFoundException o ) {}
+
+            /* Make sure that the email is unique */
+            String     oql = "FROM cst IN CLASS " + Customer.class + " WHERE cst.email=?";
+            Collection col = s.find( oql, _customer.getEmail(  ), Hibernate.STRING );
+
+            if ( col.size(  ) > 0 )
+            {
+                Customer c = ( Customer ) col.iterator(  ).next(  );
+
+                if ( !c.getUserId(  ).equalsIgnoreCase( customerId ) )
+                {
+                    addError( "customer", getText( "duplicate_email" ) );
+
+                    return ERROR;
+                }
+            }
+
+            save( _customer, s );
+            tx.commit(  );
+
+            return SUCCESS;
+        }
+        catch ( Exception e )
+        {
+            _log.error( "Unexpected error", e );
+
+            if ( tx != null )
+            {
+                tx.rollback(  );
+            }
+
+            throw e;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     *
+     * @see webwork.action.ActionSupport#doValidation()
+     */
+    protected void doValidation(  )
+    {
+        System.out.println( getClass(  ).getName(  ) + ".doValidation()" );
+
+        /* Account */
+        Account account = _customer.getAccount(  );
+        checkLength( "customerId", "userId_length", account.getUserId(  ), 4 );
+        checkLength( "password", "password_length", account.getPassword(  ), 4 );
+
+        /* Email */
+        checkNotEmpty( "email", "email_required", _customer.getEmail(  ) );
+
+        /* Credit card */
+        CreditCard cc = _customer.getCreditCard(  );
+        checkNotEmpty( "ccEmail", "ccType_required", cc.getType(  ) );
+        checkNotEmpty( "ccNumber", "ccNumber_required", cc.getNumber(  ) );
+        checkNotEmpty( "ccExpiryDate", "ccExpiryDate_required", cc.getExpiryDate(  ) );
+
+        super.doValidation(  );
+    }
+
+    /**
+     * @return Customer
+     */
+    public Customer getCustomer(  )
+    {
+        return _customer;
+    }
+
+    public abstract void save( Customer customer,
+                               Session  session )
+        throws Exception;
+
+    /**
+     * Sets the customer.
+     * @param customer The customer to set
+     */
+    public void setCustomer( Customer customer )
+    {
+        _customer = customer;
+    }
+
+    /**
+     * @see webwork.action.ServletResponseAware#setServletResponse(javax.servlet.http.HttpServletResponse)
+     */
+    public void setServletResponse( HttpServletResponse response )
+    {
+        _response = response;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * Created on Feb 25, 2003
- */
-package xpetstore.web.webwork.action.customer;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Customer;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *      name="createCustomer"
- *      success="signon.action"
- *      error="register.vm"
- */
-public class CreateCustomerAction
-    extends BaseSaveCustomerAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see xpetstore.web.webwork.action.customer.BaseSaveCustomerAction#save(xpetstore.domain.Customer, cirrus.hibernate.Session)
-     */
-    public void save( Customer customer,
-                      Session  session )
-        throws Exception
-    {
-        session.save( customer );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/CreateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * Created on Feb 25, 2003
+ */
+package xpetstore.web.webwork.action.customer;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Customer;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *      name="createCustomer"
+ *      success="signon.action"
+ *      error="register.vm"
+ */
+public class CreateCustomerAction
+    extends BaseSaveCustomerAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see xpetstore.web.webwork.action.customer.BaseSaveCustomerAction#save(xpetstore.domain.Customer, cirrus.hibernate.Session)
+     */
+    public void save( Customer customer,
+                      Session  session )
+        throws Exception
+    {
+        session.save( customer );
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-/*
- * Created on 25-Feb-2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package xpetstore.web.webwork.action.customer;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Customer;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *      name="myaccount"
- *      success="myaccount.vm"
- */
-public class MyAccountAction
-    extends BaseAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Customer _customer = new Customer(  );
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Session s = getHibernateSession(  );
-
-        try
-        {
-            _customer = ( Customer ) s.load( Customer.class, getUserId(  ) );
-
-            return SUCCESS;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     * @return Customer
-     */
-    public Customer getCustomer(  )
-    {
-        return _customer;
-    }
-
-    /**
-     * Sets the customer.
-     * @param customer The customer to set
-     */
-    public void setCustomer( Customer customer )
-    {
-        _customer = customer;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/MyAccountAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+/*
+ * Created on 25-Feb-2003
+ *
+ * To change this generated comment go to
+ * Window>Preferences>Java>Code Generation>Code Template
+ */
+package xpetstore.web.webwork.action.customer;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Customer;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *      name="myaccount"
+ *      success="myaccount.vm"
+ */
+public class MyAccountAction
+    extends BaseAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Customer _customer = new Customer(  );
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Session s = getHibernateSession(  );
+
+        try
+        {
+            _customer = ( Customer ) s.load( Customer.class, getUserId(  ) );
+
+            return SUCCESS;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     * @return Customer
+     */
+    public Customer getCustomer(  )
+    {
+        return _customer;
+    }
+
+    /**
+     * Sets the customer.
+     * @param customer The customer to set
+     */
+    public void setCustomer( Customer customer )
+    {
+        _customer = customer;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * Created on 24-Feb-2003
- */
-package xpetstore.web.webwork.action.customer;
-
-import xpetstore.domain.Customer;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="register"
- *   success="register.vm"
- */
-public class RegisterAction
-    extends BaseAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Customer _customer = new Customer(  );
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @return Customer
-     */
-    public Customer getCustomer(  )
-    {
-        return _customer;
-    }
-
-    /**
-     * Sets the customer.
-     * @param customer The customer to set
-     */
-    public void setCustomer( Customer customer )
-    {
-        _customer = customer;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/RegisterAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * Created on 24-Feb-2003
+ */
+package xpetstore.web.webwork.action.customer;
+
+import xpetstore.domain.Customer;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="register"
+ *   success="register.vm"
+ */
+public class RegisterAction
+    extends BaseAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Customer _customer = new Customer(  );
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @return Customer
+     */
+    public Customer getCustomer(  )
+    {
+        return _customer;
+    }
+
+    /**
+     * Sets the customer.
+     * @param customer The customer to set
+     */
+    public void setCustomer( Customer customer )
+    {
+        _customer = customer;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * Created on 25-Feb-2003
- */
-package xpetstore.web.webwork.action.customer;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Customer;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *      name="updateCustomer"
- *      success="index.action"
- *      error="myaccount.vm"
- */
-public class UpdateCustomerAction
-    extends BaseSaveCustomerAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        String result = super.doExecute(  );
-
-        if ( SUCCESS.equals( result ) )
-        {
-            initSession( _customer );
-        }
-
-        return result;
-    }
-
-    /**
-     * @see xpetstore.web.webwork.action.customer.BaseSaveCustomerAction#save(xpetstore.domain.Customer, cirrus.hibernate.Session)
-     */
-    public void save( Customer customer,
-                      Session  session )
-        throws Exception
-    {
-        Customer cst = ( Customer ) session.load( Customer.class, customer.getUserId(  ) );
-        cst.set( customer );
-        session.update( cst );
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/customer/UpdateCustomerAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * Created on 25-Feb-2003
+ */
+package xpetstore.web.webwork.action.customer;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Customer;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *      name="updateCustomer"
+ *      success="index.action"
+ *      error="myaccount.vm"
+ */
+public class UpdateCustomerAction
+    extends BaseSaveCustomerAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        String result = super.doExecute(  );
+
+        if ( SUCCESS.equals( result ) )
+        {
+            initSession( _customer );
+        }
+
+        return result;
+    }
+
+    /**
+     * @see xpetstore.web.webwork.action.customer.BaseSaveCustomerAction#save(xpetstore.domain.Customer, cirrus.hibernate.Session)
+     */
+    public void save( Customer customer,
+                      Session  session )
+        throws Exception
+    {
+        Customer cst = ( Customer ) session.load( Customer.class, customer.getUserId(  ) );
+        cst.set( customer );
+        session.update( cst );
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
- * Created on 24-Feb-2003
- */
-package xpetstore.web.webwork.action.item;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Item;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="item"
- *   success="item.vm"
- */
-public class ItemAction
-    extends BaseAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String _itemId;
-    private Item   _item;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Session s = getHibernateSession(  );
-
-        try
-        {
-            _item = ( Item ) s.load( Item.class, _itemId );
-
-            return SUCCESS;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     * @return String
-     */
-    public String getItemId(  )
-    {
-        return _itemId;
-    }
-
-    /**
-     * Sets the itemId.
-     * @param itemId The itemId to set
-     */
-    public void setItemId( String itemId )
-    {
-        _itemId = itemId;
-    }
-
-    /**
-     * @return Item
-     */
-    public Item getItem(  )
-    {
-        return _item;
-    }
-
-    /**
-     * Sets the item.
-     * @param item The item to set
-     */
-    public void setItem( Item item )
-    {
-        _item = item;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/item/ItemAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * Created on 24-Feb-2003
+ */
+package xpetstore.web.webwork.action.item;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Item;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="item"
+ *   success="item.vm"
+ */
+public class ItemAction
+    extends BaseAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String _itemId;
+    private Item   _item;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Session s = getHibernateSession(  );
+
+        try
+        {
+            _item = ( Item ) s.load( Item.class, _itemId );
+
+            return SUCCESS;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     * @return String
+     */
+    public String getItemId(  )
+    {
+        return _itemId;
+    }
+
+    /**
+     * Sets the itemId.
+     * @param itemId The itemId to set
+     */
+    public void setItemId( String itemId )
+    {
+        _itemId = itemId;
+    }
+
+    /**
+     * @return Item
+     */
+    public Item getItem(  )
+    {
+        return _item;
+    }
+
+    /**
+     * Sets the item.
+     * @param item The item to set
+     */
+    public void setItem( Item item )
+    {
+        _item = item;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-/*
- * Created on Feb 26, 2003
- */
-package xpetstore.web.webwork.action.order;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import cirrus.hibernate.Session;
-import cirrus.hibernate.Transaction;
-
-import xpetstore.domain.Customer;
-import xpetstore.domain.Item;
-import xpetstore.domain.Order;
-
-import xpetstore.util.MailUtil;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="createOrder"
- *   success="confirmation.vm"
- */
-public class CreateOrderAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Session     s = getHibernateSession(  );
-        Transaction tx = null;
-
-        try
-        {
-            tx = s.beginTransaction(  );
-
-            /* Customer */
-            Customer cst = ( Customer ) s.load( Customer.class, getUserId(  ) );
-
-            /* Order + Items*/
-            Order    order = new Order( cst );
-            Map      cart = getCart(  );
-            Iterator it = cart.keySet(  ).iterator(  );
-
-            while ( it.hasNext(  ) )
-            {
-                String  itemId = ( String ) it.next(  );
-                Item    item = ( Item ) s.load( Item.class, itemId );
-                Integer quantity = ( Integer ) cart.get( itemId );
-                order.add( item, quantity.intValue(  ) );
-            }
-
-            /* Save */
-            s.save( order );
-            tx.commit(  );
-
-            /* Empty the cart */
-            getCart(  ).clear(  );
-
-            /* send the email */
-            String subject = "[xpetstore] Order Confimation";
-            String body = "Your order has been submitted.\nThe order number is: " + order.getOrderId(  );
-
-            try
-            {
-                MailUtil.send( cst.getEmail(  ), subject, body );
-            }
-            catch ( Exception e )
-            {
-                _log.error( "Unexpected error while sending email", e );
-            }
-
-            return SUCCESS;
-        }
-        catch ( Exception e )
-        {
-            _log.error( "Unexpected error", e );
-
-            if ( tx != null )
-            {
-                tx.rollback(  );
-            }
-
-            throw e;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/order/CreateOrderAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,100 @@
+/*
+ * Created on Feb 26, 2003
+ */
+package xpetstore.web.webwork.action.order;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import cirrus.hibernate.Session;
+import cirrus.hibernate.Transaction;
+
+import xpetstore.domain.Customer;
+import xpetstore.domain.Item;
+import xpetstore.domain.Order;
+
+import xpetstore.util.MailUtil;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="createOrder"
+ *   success="confirmation.vm"
+ */
+public class CreateOrderAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Session     s = getHibernateSession(  );
+        Transaction tx = null;
+
+        try
+        {
+            tx = s.beginTransaction(  );
+
+            /* Customer */
+            Customer cst = ( Customer ) s.load( Customer.class, getUserId(  ) );
+
+            /* Order + Items*/
+            Order    order = new Order( cst );
+            Map      cart = getCart(  );
+            Iterator it = cart.keySet(  ).iterator(  );
+
+            while ( it.hasNext(  ) )
+            {
+                String  itemId = ( String ) it.next(  );
+                Item    item = ( Item ) s.load( Item.class, itemId );
+                Integer quantity = ( Integer ) cart.get( itemId );
+                order.add( item, quantity.intValue(  ) );
+            }
+
+            /* Save */
+            s.save( order );
+            tx.commit(  );
+
+            /* Empty the cart */
+            getCart(  ).clear(  );
+
+            /* send the email */
+            String subject = "[xpetstore] Order Confimation";
+            String body = "Your order has been submitted.\nThe order number is: " + order.getOrderId(  );
+
+            try
+            {
+                MailUtil.send( cst.getEmail(  ), subject, body );
+            }
+            catch ( Exception e )
+            {
+                _log.error( "Unexpected error while sending email", e );
+            }
+
+            return SUCCESS;
+        }
+        catch ( Exception e )
+        {
+            _log.error( "Unexpected error", e );
+
+            if ( tx != null )
+            {
+                tx.rollback(  );
+            }
+
+            throw e;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-/*
- * Created on Feb 23, 2003
- */
-package xpetstore.web.webwork.action.product;
-
-import java.util.Iterator;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Item;
-import xpetstore.domain.Product;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="product"
- *   success="product.vm"
- */
-public class ProductAction
-    extends BaseAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private Product _product = null;
-    private String  _productId = "";
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Session s = getHibernateSession(  );
-
-        try
-        {
-            _product = ( Product ) s.load( Product.class, _productId );
-
-            /*
-             * Since product.item is lazy loaded,
-             * traverse the collection to load all the product to display
-             */
-            Iterator it = _product.getItems(  ).iterator(  );
-
-            while ( it.hasNext(  ) )
-            {
-                Item i = ( Item ) it.next(  );
-                i.getDescription(  );
-            }
-
-            return SUCCESS;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     * @return Product
-     */
-    public Product getProduct(  )
-    {
-        return _product;
-    }
-
-    /**
-     * @return String
-     */
-    public String getProductId(  )
-    {
-        return _productId;
-    }
-
-    /**
-     * Sets the product.
-     * @param product The product to set
-     */
-    public void setProduct( Product product )
-    {
-        _product = product;
-    }
-
-    /**
-     * Sets the productId.
-     * @param productId The productId to set
-     */
-    public void setProductId( String productId )
-    {
-        _productId = productId;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/ProductAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+/*
+ * Created on Feb 23, 2003
+ */
+package xpetstore.web.webwork.action.product;
+
+import java.util.Iterator;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Item;
+import xpetstore.domain.Product;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="product"
+ *   success="product.vm"
+ */
+public class ProductAction
+    extends BaseAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private Product _product = null;
+    private String  _productId = "";
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Session s = getHibernateSession(  );
+
+        try
+        {
+            _product = ( Product ) s.load( Product.class, _productId );
+
+            /*
+             * Since product.item is lazy loaded,
+             * traverse the collection to load all the product to display
+             */
+            Iterator it = _product.getItems(  ).iterator(  );
+
+            while ( it.hasNext(  ) )
+            {
+                Item i = ( Item ) it.next(  );
+                i.getDescription(  );
+            }
+
+            return SUCCESS;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     * @return Product
+     */
+    public Product getProduct(  )
+    {
+        return _product;
+    }
+
+    /**
+     * @return String
+     */
+    public String getProductId(  )
+    {
+        return _productId;
+    }
+
+    /**
+     * Sets the product.
+     * @param product The product to set
+     */
+    public void setProduct( Product product )
+    {
+        _product = product;
+    }
+
+    /**
+     * Sets the productId.
+     * @param productId The productId to set
+     */
+    public void setProductId( String productId )
+    {
+        _productId = productId;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
- * Created on Feb 27, 2003
- */
-package xpetstore.web.webwork.action.product;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import cirrus.hibernate.Session;
-
-import xpetstore.domain.Product;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="search"
- *   success="search.vm"
- */
-public class SearchAction
-    extends BaseAction
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String     _keyword = "";
-    private Collection _products = new ArrayList(  );
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        if ( ( _keyword == null ) || ( _keyword.length(  ) == 0 ) )
-        {
-            return SUCCESS;
-        }
-
-        Session s = getHibernateSession(  );
-        try
-        {
-            String oql = "FROM p IN CLASS " + Product.class + " WHERE" + " ( p.productId LIKE '%" + _keyword + "%' ) OR" + " ( p.name LIKE '%" + _keyword + "%' ) OR" + " ( p.description LIKE '%" + _keyword + "%' )";
-            _products = s.find( oql );
-
-            return SUCCESS;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     * @return String
-     */
-    public String getKeyword(  )
-    {
-        return _keyword;
-    }
-
-    /**
-     * @return Collection
-     */
-    public Collection getProducts(  )
-    {
-        return _products;
-    }
-
-    /**
-     * Sets the keyword.
-     * @param keyword The keyword to set
-     */
-    public void setKeyword( String keyword )
-    {
-        _keyword = keyword;
-    }
-
-    /**
-     * Sets the products.
-     * @param products The products to set
-     */
-    public void setProducts( Collection products )
-    {
-        _products = products;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/product/SearchAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * Created on Feb 27, 2003
+ */
+package xpetstore.web.webwork.action.product;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import cirrus.hibernate.Session;
+
+import xpetstore.domain.Product;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="search"
+ *   success="search.vm"
+ */
+public class SearchAction
+    extends BaseAction
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String     _keyword = "";
+    private Collection _products = new ArrayList(  );
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        if ( ( _keyword == null ) || ( _keyword.length(  ) == 0 ) )
+        {
+            return SUCCESS;
+        }
+
+        Session s = getHibernateSession(  );
+        try
+        {
+            String oql = "FROM p IN CLASS " + Product.class + " WHERE" + " ( p.productId LIKE '%" + _keyword + "%' ) OR" + " ( p.name LIKE '%" + _keyword + "%' ) OR" + " ( p.description LIKE '%" + _keyword + "%' )";
+            _products = s.find( oql );
+
+            return SUCCESS;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     * @return String
+     */
+    public String getKeyword(  )
+    {
+        return _keyword;
+    }
+
+    /**
+     * @return Collection
+     */
+    public Collection getProducts(  )
+    {
+        return _products;
+    }
+
+    /**
+     * Sets the keyword.
+     * @param keyword The keyword to set
+     */
+    public void setKeyword( String keyword )
+    {
+        _keyword = keyword;
+    }
+
+    /**
+     * Sets the products.
+     * @param products The products to set
+     */
+    public void setProducts( Collection products )
+    {
+        _products = products;
+    }
+}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-/*
- * Created on 24-Feb-2003
- */
-package xpetstore.web.webwork.action.signon;
-
-import javax.servlet.http.HttpServletResponse;
-
-import cirrus.hibernate.ObjectNotFoundException;
-import cirrus.hibernate.Session;
-
-import webwork.action.ServletResponseAware;
-
-import xpetstore.domain.Customer;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="login"
- *   success="index.action"
- *   error="signon.vm"
- */
-public class LoginAction
-    extends BaseAction
-    implements ServletResponseAware
-{
-    //~ Instance fields --------------------------------------------------------
-
-    private String              _password;
-    private HttpServletResponse _response;
-    private String              _userId;
-
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        Session s = getHibernateSession(  );
-
-        try
-        {
-            Customer c = ( Customer ) s.load( Customer.class, _userId );
-
-            if ( c.getAccount(  ).matchPassword( _password ) )
-            {
-                initSession( c );
-
-                /* Redirect */
-                if ( ( _redirectUri != null ) && ( _redirectUri.length(  ) > 0 ) )
-                {
-                    _response.sendRedirect( _redirectUri );
-                    return NONE;
-                }
-
-                /* Normal flow */
-                return SUCCESS;
-            }
-            else
-            {
-                addError( "login", getText( "authentication_failed" ) );
-                return ERROR;
-            }
-        }
-        catch ( ObjectNotFoundException o )
-        {
-            addError( "login", getText( "authentication_failed" ) );
-
-            return ERROR;
-        }
-        finally
-        {
-            s.close(  );
-        }
-    }
-
-    /**
-     * @return String
-     */
-    public String getPassword(  )
-    {
-        return _password;
-    }
-
-    /**
-     * @return String
-     */
-    public String getUserId(  )
-    {
-        return _userId;
-    }
-
-    /**
-     * Sets the password.
-     * @param password The password to set
-     */
-    public void setPassword( String password )
-    {
-        _password = password;
-    }
-
-    /**
-     * @see webwork.action.ServletRequestAware#setServletRequest(javax.servlet.http.HttpServletRequest)
-     */
-    public void setServletResponse( HttpServletResponse response )
-    {
-        _response = response;
-    }
-
-    /**
-     * Sets the login.
-     * @param login The login to set
-     */
-    public void setUserId( String login )
-    {
-        _userId = login;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LoginAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * Created on 24-Feb-2003
+ */
+package xpetstore.web.webwork.action.signon;
+
+import javax.servlet.http.HttpServletResponse;
+
+import cirrus.hibernate.ObjectNotFoundException;
+import cirrus.hibernate.Session;
+
+import webwork.action.ServletResponseAware;
+
+import xpetstore.domain.Customer;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="login"
+ *   success="index.action"
+ *   error="signon.vm"
+ */
+public class LoginAction
+    extends BaseAction
+    implements ServletResponseAware
+{
+    //~ Instance fields --------------------------------------------------------
+
+    private String              _password;
+    private HttpServletResponse _response;
+    private String              _userId;
+
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        Session s = getHibernateSession(  );
+
+        try
+        {
+            Customer c = ( Customer ) s.load( Customer.class, _userId );
+
+            if ( c.getAccount(  ).matchPassword( _password ) )
+            {
+                initSession( c );
+
+                /* Redirect */
+                if ( ( _redirectUri != null ) && ( _redirectUri.length(  ) > 0 ) )
+                {
+                    _response.sendRedirect( _redirectUri );
+                    return NONE;
+                }
+
+                /* Normal flow */
+                return SUCCESS;
+            }
+            else
+            {
+                addError( "login", getText( "authentication_failed" ) );
+                return ERROR;
+            }
+        }
+        catch ( ObjectNotFoundException o )
+        {
+            addError( "login", getText( "authentication_failed" ) );
+
+            return ERROR;
+        }
+        finally
+        {
+            s.close(  );
+        }
+    }
+
+    /**
+     * @return String
+     */
+    public String getPassword(  )
+    {
+        return _password;
+    }
+
+    /**
+     * @return String
+     */
+    public String getUserId(  )
+    {
+        return _userId;
+    }
+
+    /**
+     * Sets the password.
+     * @param password The password to set
+     */
+    public void setPassword( String password )
+    {
+        _password = password;
+    }
+
+    /**
+     * @see webwork.action.ServletRequestAware#setServletRequest(javax.servlet.http.HttpServletRequest)
+     */
+    public void setServletResponse( HttpServletResponse response )
+    {
+        _response = response;
+    }
+
+    /**
+     * Sets the login.
+     * @param login The login to set
+     */
+    public void setUserId( String login )
+    {
+        _userId = login;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * Created on 24-Feb-2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package xpetstore.web.webwork.action.signon;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="logout"
- *   success="index.action"
- */
-public class LogoutAction
-    extends BaseAction
-{
-    //~ Methods ----------------------------------------------------------------
-
-    /**
-     * @see webwork.action.ActionSupport#doExecute()
-     */
-    protected String doExecute(  )
-        throws Exception
-    {
-        clearSession(  );
-
-        return SUCCESS;
-    }
-}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/LogoutAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * Created on 24-Feb-2003
+ *
+ * To change this generated comment go to
+ * Window>Preferences>Java>Code Generation>Code Template
+ */
+package xpetstore.web.webwork.action.signon;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="logout"
+ *   success="index.action"
+ */
+public class LogoutAction
+    extends BaseAction
+{
+    //~ Methods ----------------------------------------------------------------
+
+    /**
+     * @see webwork.action.ActionSupport#doExecute()
+     */
+    protected String doExecute(  )
+        throws Exception
+    {
+        clearSession(  );
+
+        return SUCCESS;
+    }
+}

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-/*
- * Created on 24-Feb-2003
- */
-package xpetstore.web.webwork.action.signon;
-
-import xpetstore.web.webwork.action.BaseAction;
-
-
-/**
- * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
- *
- * @webwork.action
- *   name="signon"
- *   success="signon.vm"
- */
-public class SignOnAction
-    extends BaseAction {}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/web/xpetstore/web/webwork/action/signon/SignOnAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+/*
+ * Created on 24-Feb-2003
+ */
+package xpetstore.web.webwork.action.signon;
+
+import xpetstore.web.webwork.action.BaseAction;
+
+
+/**
+ * @author <a href="mailto:tchbansi at sourceforge.net">Herve Tchepannou</a>
+ *
+ * @webwork.action
+ *   name="signon"
+ *   success="signon.vm"
+ */
+public class SignOnAction
+    extends BaseAction {}

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion)

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE orion-web-app PUBLIC "-//Evermind//DTD Orion Web Application 2.3//EN" "http://www.orionserver.com/dtds/orion-web.dtd">
-
-<orion-web-app
-	deployment-version="@orion.version@"
->
-	<session-tracking />
-	
-	<resource-ref-mapping 
-		location="@orion.mail.session@" 
-		name="@jndi.mail.session@"
-	/>
-	
-</orion-web-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/orion/WEB-INF/orion-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE orion-web-app PUBLIC "-//Evermind//DTD Orion Web Application 2.3//EN" "http://www.orionserver.com/dtds/orion-web.dtd">
+
+<orion-web-app
+	deployment-version="@orion.version@"
+>
+	<session-tracking />
+	
+	<resource-ref-mapping 
+		location="@orion.mail.session@" 
+		name="@jndi.mail.session@"
+	/>
+	
+</orion-web-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web)

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<!-- Sitemesh -->
-<filter-mapping>
-    <filter-name>sitemesh</filter-name>
-    <url-pattern>/*</url-pattern>
-</filter-mapping>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filter-mappings.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<!-- Sitemesh -->
+<filter-mapping>
+    <filter-name>sitemesh</filter-name>
+    <url-pattern>/*</url-pattern>
+</filter-mapping>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<!-- Sitemesh -->
-<filter>
-	<filter-name>sitemesh</filter-name>
-  	<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-</filter>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/filters.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<!-- Sitemesh -->
+<filter>
+	<filter-name>sitemesh</filter-name>
+  	<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+</filter>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<!-- Velocity -->
-<servlet-mapping>
-    <servlet-name>velocity</servlet-name>
-    <url-pattern>*.vm</url-pattern>
-</servlet-mapping>

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlet-mappings.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<!-- Velocity -->
+<servlet-mapping>
+    <servlet-name>velocity</servlet-name>
+    <url-pattern>*.vm</url-pattern>
+</servlet-mapping>

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<!-- Velocity -->
-<servlet>
-    <servlet-name>velocity</servlet-name>
-    <servlet-class>webwork.view.velocity.WebWorkVelocityServlet</servlet-class>
-</servlet>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/servlets.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<!-- Velocity -->
+<servlet>
+    <servlet-name>velocity</servlet-name>
+    <servlet-class>webwork.view.velocity.WebWorkVelocityServlet</servlet-class>
+</servlet>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-<!-- Welcome files -->
-<welcome-file-list>
-	<welcome-file>index.jsp</welcome-file>
-</welcome-file-list>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/examples/xpetstore/xpetstore-servlet/xdoclet/web/welcomefiles.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+<!-- Welcome files -->
+<welcome-file-list>
+	<welcome-file>index.jsp</welcome-file>
+</welcome-file-list>
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/docs/index.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/index.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/index.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -9,7 +9,7 @@
 <ul>
 <li> <a href="tutorial/installing.html">Installation Guide</a></li>
 <li> <a href="tutorial/index.html">Tutorial</a> Walks you through EJB 3.0 with
-over 30+ real examples that you can build and run.</li>
+over 30 real examples that you can build and run.</li>
 <li> Reference Manual (incomplete): [<a
 href="reference/build/reference/en/pdf/jbossejb3_reference.pdf">PDF</a>] [<a
 href="reference/build/reference/en/html/index.html">Html</a>] [<a
@@ -23,7 +23,7 @@
 implementation.  It will teach you how to run EJB3 Persistence out of the container
 </p>
 <ul>
-<li> <a href="HibernateEntityManager/reference/en/pdf/hibernate_entitymanager.pdf">Hibernate EntityManager PDF Doc</a></li>
+<li> <a href="HibernateEntityManager/reference/en/pdf/hibernate-entitymanager.pdf">Hibernate EntityManager PDF Doc</a></li>
 <li> <a href="HibernateEntityManager/reference/en/html_single/index.html">Hibernate EntityManager HTML Doc</a></li>
 <li> <a href="HibernateEntityManager/api/index.html">Hibernate EntityManager JavaDoc</a></li>
 </ul>
@@ -35,7 +35,7 @@
 specific annotations.
 </p>
 <ul>
-<li> <a href="HibernateAnnotations/reference/en/pdf/hibernate_annotations.pdf">Hibernate Annotations PDF Doc</a></li>
+<li> <a href="HibernateAnnotations/reference/en/pdf/hibernate-annotations.pdf">Hibernate Annotations PDF Doc</a></li>
 <li> <a href="HibernateAnnotations/reference/en/html_single/index.html">Hibernate Annotations HTML Doc</a></li>
 <li> <a href="HibernateAnnotations/api/index.html">Hibernate Annotations JavaDoc</a></li>
 </ul>
@@ -46,8 +46,8 @@
 You'll need Hibernate 3.0 Docs for knowledge on specific hibernate properties that JBoss EJB 3.0 requires.
 </p>
 <ul>
-<li> <a href="Hibernate3/reference/en/pdf/hibernate_reference.pdf">Hibernate 3.x PDF Doc</a></li>
-<li> <a href="Hibernate3/reference/en/html_single/index.html">Hibernate 3.x HTML Doc</a></li>
+<li> <a href="Hibernate3/reference/en/pdf/hibernate_reference.pdf">Hibernate 3.1 PDF Doc</a></li>
+<li> <a href="Hibernate3/reference/en/html_single/index.html">Hibernate 3.1 HTML Doc</a></li>
 </ul>
 </p><p>
 </p>


Property changes on: branches/Branch_4_2/ejb3/docs/reference
___________________________________________________________________
Name: svn:ignore
   + build


Copied: branches/Branch_4_2/ejb3/docs/reference/.cvsignore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/.cvsignore)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/.cvsignore	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/.cvsignore	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+build

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/images (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/images)

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/images/empty.dir
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/images/empty.dir (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/images/empty.dir)
===================================================================
(Binary files differ)

Modified: branches/Branch_4_2/ejb3/docs/reference/reference/en/master.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/master.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/master.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,7 +19,7 @@
    <bookinfo>
       <title>JBoss EJB 3.0</title>
       <subtitle>JBoss EJB 3.0 Reference Documentation</subtitle>
-      <releaseinfo>RC7 - PFD</releaseinfo>
+      <releaseinfo>RC6 - PFD</releaseinfo>
    </bookinfo>
 
    <toc/>

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-<chapter id="references">
-
-   <title>References and Injection XML and Annotations</title>
-
-   <sect1>
-      <title>Intro</title>
-      <para>
-         This section covers how JBoss implements @EJB and @Resource.  Please note that XML always overrides annotations.
-      </para>
-   </sect1>
-   <sect1>
-      <title>EJB references</title>
-      <para>
-         Rules for the @EJB annotation
-         <itemizedlist>
-            <listitem>
-               The @EJB annotation also has a mappedName() attribute.  The specification leaves this a vendor specific metadata, but JBoss recognizes mappedName() as the global JNDI name of the EJB you are referencing.  If you have specified a mappedName(), then all other attributes are ignored and this global JNDI name is used for binding.
-            </listitem>
-            <listitem>
-               If you specify @EJB with no attributes defined:
-               <programlisting>
-                    @EJB ProcessPayment myEjbref;
-               </programlisting>
-               Then the following rules apply:
-               <itemizedlist>
-                 <listitem>The EJB jar of the referencing bean is contained in is search for another EJB with the same interface.  If there are more than one EJB that publishes same business interface, throw an exception, if there is one, use that one.</listitem>
-                 <listitem>Search the EAR for EJBs that publish that interface.  If there are duplicates, throw an exception, otherwise return that one.</listitem>
-                 <listitem>Search globally in JBoss for an EJB of that interface.  Again, if duplicates, throw an exception</listitem>
-               </itemizedlist></listitem>
-          <listitem>@EJB.beanName() corresponds to <![CDATA[<ejb-link>]]>.  If the beanName() is defined, then use the same algorithm as @EJB with no attributes defined except use the beanName() as a key in the search.  An exception to this rule is if you use the ejb-link '#' syntax.  The '#' syntax allows you to put a relative path to a jar in the EAR where the EJB you are referencing lives.  See spec for more details</listitem>
-         </itemizedlist>
-      </para>
-      <para>
-         For XML the same rules apply as annotations exception <![CDATA[<mapped-name>]]> is the ejb-jar.xml equivalent to @EJB.mappedName().
-      </para>
-   </sect1>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/ejbref.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/ejbref.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+<chapter id="references">
+
+   <title>References and Injection XML and Annotations</title>
+
+   <sect1>
+      <title>Intro</title>
+      <para>
+         This section covers how JBoss implements @EJB and @Resource.  Please note that XML always overrides annotations.
+      </para>
+   </sect1>
+   <sect1>
+      <title>EJB references</title>
+      <para>
+         Rules for the @EJB annotation
+         <itemizedlist>
+            <listitem>
+               The @EJB annotation also has a mappedName() attribute.  The specification leaves this a vendor specific metadata, but JBoss recognizes mappedName() as the global JNDI name of the EJB you are referencing.  If you have specified a mappedName(), then all other attributes are ignored and this global JNDI name is used for binding.
+            </listitem>
+            <listitem>
+               If you specify @EJB with no attributes defined:
+               <programlisting>
+                    @EJB ProcessPayment myEjbref;
+               </programlisting>
+               Then the following rules apply:
+               <itemizedlist>
+                 <listitem>The EJB jar of the referencing bean is contained in is search for another EJB with the same interface.  If there are more than one EJB that publishes same business interface, throw an exception, if there is one, use that one.</listitem>
+                 <listitem>Search the EAR for EJBs that publish that interface.  If there are duplicates, throw an exception, otherwise return that one.</listitem>
+                 <listitem>Search globally in JBoss for an EJB of that interface.  Again, if duplicates, throw an exception</listitem>
+               </itemizedlist></listitem>
+          <listitem>@EJB.beanName() corresponds to <![CDATA[<ejb-link>]]>.  If the beanName() is defined, then use the same algorithm as @EJB with no attributes defined except use the beanName() as a key in the search.  An exception to this rule is if you use the ejb-link '#' syntax.  The '#' syntax allows you to put a relative path to a jar in the EAR where the EJB you are referencing lives.  See spec for more details</listitem>
+         </itemizedlist>
+      </para>
+      <para>
+         For XML the same rules apply as annotations exception <![CDATA[<mapped-name>]]> is the ejb-jar.xml equivalent to @EJB.mappedName().
+      </para>
+   </sect1>
+</chapter>
+

Modified: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/entity_configuration.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/entity_configuration.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/entity_configuration.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -269,14 +269,12 @@
       </para>
       <para>
          The value can be one of insert, update, delete, or read.  That is the permission.
-         The "*" character can be used to specify all permissions.
+         The "*" character can be used to specify all.
       </para>
       <para>
          Now the configuration gets a bit more complicated.  You have to interact with the EntityManager within a secured jacc enabled
          EJB (session) or secured jacc enabled WAR.  For jacc enabling a WAR, see this URL http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC.
-         To jacc enable an EJB, you have to use a JBoss specific aspect domain.  An aspect domain is a container configuration
-         template.  There is an aspect domain defined for jacc, either "JACC Stateless Bean" or "JACC Stateful Bean" depending on the type
-         of EJB you are securing.
+         There is an aspect domain defined for this "JACC Stateless Bean" or "JACC Stateful Bean".
          For example:
          <programlisting>
             @javax.ejb.Stateless
@@ -304,10 +302,8 @@
          You must do similar configuration on Tomcat to jacc enable wars and your servlets.
       </para>
       <para>
-         The final thing you must do is to create an jacc-service.xml file that will go in your deploy/ejb3.deployer directory.  This jacc configuration is defined in more detail at
-         http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC.  The jacc-service.xml file must be deployed before your EJB3 Deployer.  Putting this file in the
-         ejb3.deployer directory ensures that this service starts before the EJB3 subsystem.  You could also set up an explicit dependency on the jacc service
-         within the ejb.deployer/META-INF/jboss-service.xml file if you do not like that kind of setup.  The EJB 3.0 distribution comes with a tutorial on entity security.
+         The final thing you must do is to create an jacc-service.xml file that will go in your deploy directory.  This jacc configuration is defined in more detail at
+         http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC.
          <programlisting>
             <![CDATA[
 

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,314 +0,0 @@
-<chapter id="jboss_deployment_descriptor">
-   <title>JBoss EJB 3.0 jboss.xml deployment descriptor</title>
-   <para>
-      Jboss supports several vendor specific extensions EJB 3.0. The extensions are specified either as source code annotations or 
-      through the jboss.xml deployment descriptor. The chapter discusses the tags and options of the EJB 3.0 jboss.xml deployment 
-      descriptor.
-   </para>
-   <sect1>
-      <title>Bean extensions</title>
-      <para>
-         JBoss offers the capability to create additional Service and Consumer/Producer bean types.
-      </para>
-      <sect2> 
-         <title>Service</title>
-         <para>
-            JBoss offers the capability to create services through the <literal>@Service</literal> annotation or through the 
-            <literal>jboss.xml</literal> deployment descriptor. They are singleton beans and are not pooled. Service beans can expose both
-            local and remote interfaces so they can be accessed from java clients. When different clients access the interfaces for Service beans,
-            all clients will be accessing the same instance on the server. Below is an example of a <literal>jboss.xml</literal> deployment 
-            descriptor that specifies a Service. 
-         </para>
-         <para>
-            The implementing class is specified by the <literal>ejb-class</literal> tag. Local and remote interfaces are specified
-            with the <literal>local</literal> and <literal>remote</literal> tags, respectively. JNDI bindings are specified through the
-            <literal>jndi-name</literal> and the <literal>local-jndi-name</literal> tags.
-         </para>
-         <para>
-            A Service bean can also implement a management interface, which wraps the MBean and installs the Service as an MBean on 
-            the MBean server. The management interface is specified by the <literal>management</literal> tag. The management interface
-            can support the standard lifecycle management of JBoss JMX.
-         </para>
-         <para>
-            When deployed, the bean is assigned a JMX ObjectName in the MBean server. The ObjectName can be explicitly set with the
-            <literal>object-name</literal> tag.
-            The default is: <literal>jboss.j2ee:service=EJB3,name=&lt;Fully qualified name of @Service bean&gt;,type=service</literal>.
-         </para>
-         <para>
-            Here is the example remote interface:
-            <programlisting>
-public interface ServiceSixRemote
-{
-   boolean getCalled();
-   void setCalled(boolean called);
-   void remoteMethod();
-}
-            </programlisting>
-         </para>
-         <para>
-            Here is the example local interface:
-            <programlisting>
-public interface ServiceSixLocal
-{
-   boolean getCalled();
-   void setCalled(boolean called);
-   void localMethod();
-}
-            </programlisting>
-         </para>
-         <para>
-            Here is the example management interface:
-            <programlisting>
-public interface ServiceSixManagement
-{
-   String jmxOperation(String s);
-   String[] jmxOperation(String[] s);
-   int getAttribute();
-   void setAttribute(int i);
-   int getSomeAttr();
-   void setSomeAttr(int i);
-   int getOtherAttr();
-   void setOtherAttr(int i);
-   void setWriteOnly(int i);
-   int getReadOnly();
-
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-}
-            </programlisting>
-         </para>
-         <para>
-            Here is the implementing Service bean class:
-            <programlisting>
-public class ServiceSix implements ServiceSixLocal, ServiceSixRemote, ServiceSixManagement
-{
-   boolean called;
-   
-   int localMethodCalls;
-   int remoteMethodCalls;
-   int jmxAttribute;
-   int someJmxAttribute;
-   int otherJmxAttribute;
-   int readWriteOnlyAttribute;
-
-
-   public boolean getCalled()
-   {
-      return called;
-   }
-
-   public void setCalled(boolean called)
-   {
-      this.called = called;
-   }
-
-   public void localMethod()
-   {
-      called = true;
-   }
-
-   public void remoteMethod()
-   {
-      called = true;
-   }
-   
-   public String jmxOperation(String s)
-   {
-      return "x" + s + "x";
-   }
-
-   public String[] jmxOperation(String[] s)
-   {
-      return s;
-   }
-
-   public int getAttribute()
-   {
-      return jmxAttribute;
-   }
-
-   public void setAttribute(int i)
-   {
-      jmxAttribute = i;
-   }
-
-   public int getSomeAttr()
-   {
-      return someJmxAttribute;
-   }
-
-   public void setSomeAttr(int i)
-   {
-      someJmxAttribute = i;
-   }
-
-   public int getOtherAttr()
-   {
-      return otherJmxAttribute;
-   }
-
-   public void setOtherAttr(int i)
-   {
-      otherJmxAttribute = i;
-   }
-
-   public void setWriteOnly(int i)
-   {
-      readWriteOnlyAttribute = i;
-   }
-
-   public int getReadOnly()
-   {
-      return readWriteOnlyAttribute;
-   }
-
-
-   public void create() throws Exception
-   {
-   }
-
-   public void start() throws Exception
-   {
-   }
-
-   public void stop()
-   {
-   }
-
-   public void destroy()
-   {
-   }
-            </programlisting>
-         </para>
-         <para>
-            Here is the example deployment descriptor:
-<programlisting><![CDATA[
-<jboss>
-   <enterprise-beans>
-      <service>
-         <ejb-class>org.jboss.ejb3.test.service.ServiceSix</ejb-class>
-         <local>org.jboss.ejb3.test.service.ServiceSixLocal</local>
-         <remote>org.jboss.ejb3.test.service.ServiceSixRemote</remote>
-         <management>org.jboss.ejb3.test.service.ServiceSixManagement</management>
-         <jndi-name>serviceSix/remote</jndi-name>
-         <local-jndi-name>serviceSix/local</local-jndi-name>
-      </service>
-   </enterprise-beans>
-</jboss>]]></programlisting>
-         </para>
-      </sect2>
-      <sect2>
-         <title>Consumer/Producer</title>
-         <para>
-            JBoss offers the capability to create message producers and consumers through the <literal>@Producer</literal> and <literal>@Consumer</literal>
-            annotations or through the <literal>jboss.xml</literal> deployment descriptor. The Consumer class is specified using the 
-            <literal>consumer</literal> and <literal>ejb-class</literal> tags. The destination and destination type are specified in the 
-            <literal>destination</literal> and <literal>destination-type</literal> tags. The Producer interface is specified by the 
-            <literal>producer</literal> tag. Messages are created and sent to the configured destination when one of the Producer methods is called.
-            A Consumer is configured to listen on a destination and when a message arrives, the current message is set in the implementing Consumer
-            bean based on the <literal>current-message</literal> tag.
-         </para>
-         <para>
-            Here is the example for the remote and Producer interfaces:
-            <programlisting>
-public interface DeploymentDescriptorQueueTestRemote
-{
-   void method1(String msg, int num);
-
-   void method2(String msg, float num);
-}
-            </programlisting>
-         </para>
-         <para>
-            Here is the example for the implementing Consumer/Producer bean class
-            <programlisting>
-public class DeploymentDescriptorQueueTestConsumer implements DeploymentDescriptorQueueTestRemote
-{
-   Message currentMessage;
-
-   private Message setterMessage;
-
-   void setMessage(Message msg)
-   {
-      setterMessage = msg;
-   }
-
-   public void method1(String msg, int num)
-   {
-      TestStatusBean.queueRan = "method1";
-      TestStatusBean.fieldMessage = currentMessage != null;
-      TestStatusBean.setterMessage = setterMessage != null;
-
-      System.out.println("method1(" + msg + ", " + num + ")");
-   }
-
-   public void method2(String msg, float num)
-   {
-      TestStatusBean.queueRan = "method2";
-
-      TestStatusBean.fieldMessage = currentMessage != null;
-      TestStatusBean.setterMessage = setterMessage != null;
-
-      System.out.println("method2(" + msg + ", " + num + ")");
-   }
-}
-            </programlisting>
-         </para>
-         <para>
-            Here is an example code snippet for a Consumer/Producer client. When the <literal>tester.method#</literal> methods are called, the current
-            message is set in the Consumer bean.
-            <programlisting>
- public void testDeploymentDescriptorQueue() throws Exception
-   {
-     
-      DeploymentDescriptorQueueTestRemote tester = (DeploymentDescriptorQueueTestRemote) getInitialContext().lookup(DeploymentDescriptorQueueTestRemote.class.getName());
-      ProducerManager manager = (ProducerManager) ((ProducerObject) tester).getProducerManager();
-      manager.connect();
-      try
-      {
-         tester.method1("testQueue", 5);
-
-         tester.method2("testQueue", 5.5F);
-      }
-      finally
-      {
-         manager.close();
-      }
-   }
-            </programlisting>
-         </para>
-         <para>
-            Here is the example deployment descriptor:
-<programlisting><![CDATA[
-<jboss>
-   <enterprise-beans>
-      <consumer>
-         <ejb-name>DeploymentDescriptorQueueTestConsumer</ejb-name>
-         <ejb-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</ejb-class>
-         <destination>queue/consumertest</destination>
-         <destination-type>javax.jms.Queue</destination-type>
-         <producer>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestRemote</producer>
-         <current-message>
-            <method>
-               <method-name>currentMessage</method-name>
-            </method>
-            <method>
-               <method-name>setMessage</method-name>
-            </method>
-         </current-message>
-         <message-properties>
-            <method>
-               <method-name>method2</method-name>
-            </method>
-            <delivery>NonPersistent</delivery>
-         </message-properties>
-      </consumer>
-   </enterprise-beans>
-</jboss>]]></programlisting>
-         </para>
-      </sect2>
-   </sect1>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_deployment_descriptor.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,314 @@
+<chapter id="jboss_deployment_descriptor">
+   <title>JBoss EJB 3.0 jboss.xml deployment descriptor</title>
+   <para>
+      Jboss supports several vendor specific extensions EJB 3.0. The extensions are specified either as source code annotations or 
+      through the jboss.xml deployment descriptor. The chapter discusses the tags and options of the EJB 3.0 jboss.xml deployment 
+      descriptor.
+   </para>
+   <sect1>
+      <title>Bean extensions</title>
+      <para>
+         JBoss offers the capability to create additional Service and Consumer/Producer bean types.
+      </para>
+      <sect2> 
+         <title>Service</title>
+         <para>
+            JBoss offers the capability to create services through the <literal>@Service</literal> annotation or through the 
+            <literal>jboss.xml</literal> deployment descriptor. They are singleton beans and are not pooled. Service beans can expose both
+            local and remote interfaces so they can be accessed from java clients. When different clients access the interfaces for Service beans,
+            all clients will be accessing the same instance on the server. Below is an example of a <literal>jboss.xml</literal> deployment 
+            descriptor that specifies a Service. 
+         </para>
+         <para>
+            The implementing class is specified by the <literal>ejb-class</literal> tag. Local and remote interfaces are specified
+            with the <literal>local</literal> and <literal>remote</literal> tags, respectively. JNDI bindings are specified through the
+            <literal>jndi-name</literal> and the <literal>local-jndi-name</literal> tags.
+         </para>
+         <para>
+            A Service bean can also implement a management interface, which wraps the MBean and installs the Service as an MBean on 
+            the MBean server. The management interface is specified by the <literal>management</literal> tag. The management interface
+            can support the standard lifecycle management of JBoss JMX.
+         </para>
+         <para>
+            When deployed, the bean is assigned a JMX ObjectName in the MBean server. The ObjectName can be explicitly set with the
+            <literal>object-name</literal> tag.
+            The default is: <literal>jboss.j2ee:service=EJB3,name=&lt;Fully qualified name of @Service bean&gt;,type=service</literal>.
+         </para>
+         <para>
+            Here is the example remote interface:
+            <programlisting>
+public interface ServiceSixRemote
+{
+   boolean getCalled();
+   void setCalled(boolean called);
+   void remoteMethod();
+}
+            </programlisting>
+         </para>
+         <para>
+            Here is the example local interface:
+            <programlisting>
+public interface ServiceSixLocal
+{
+   boolean getCalled();
+   void setCalled(boolean called);
+   void localMethod();
+}
+            </programlisting>
+         </para>
+         <para>
+            Here is the example management interface:
+            <programlisting>
+public interface ServiceSixManagement
+{
+   String jmxOperation(String s);
+   String[] jmxOperation(String[] s);
+   int getAttribute();
+   void setAttribute(int i);
+   int getSomeAttr();
+   void setSomeAttr(int i);
+   int getOtherAttr();
+   void setOtherAttr(int i);
+   void setWriteOnly(int i);
+   int getReadOnly();
+
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+}
+            </programlisting>
+         </para>
+         <para>
+            Here is the implementing Service bean class:
+            <programlisting>
+public class ServiceSix implements ServiceSixLocal, ServiceSixRemote, ServiceSixManagement
+{
+   boolean called;
+   
+   int localMethodCalls;
+   int remoteMethodCalls;
+   int jmxAttribute;
+   int someJmxAttribute;
+   int otherJmxAttribute;
+   int readWriteOnlyAttribute;
+
+
+   public boolean getCalled()
+   {
+      return called;
+   }
+
+   public void setCalled(boolean called)
+   {
+      this.called = called;
+   }
+
+   public void localMethod()
+   {
+      called = true;
+   }
+
+   public void remoteMethod()
+   {
+      called = true;
+   }
+   
+   public String jmxOperation(String s)
+   {
+      return "x" + s + "x";
+   }
+
+   public String[] jmxOperation(String[] s)
+   {
+      return s;
+   }
+
+   public int getAttribute()
+   {
+      return jmxAttribute;
+   }
+
+   public void setAttribute(int i)
+   {
+      jmxAttribute = i;
+   }
+
+   public int getSomeAttr()
+   {
+      return someJmxAttribute;
+   }
+
+   public void setSomeAttr(int i)
+   {
+      someJmxAttribute = i;
+   }
+
+   public int getOtherAttr()
+   {
+      return otherJmxAttribute;
+   }
+
+   public void setOtherAttr(int i)
+   {
+      otherJmxAttribute = i;
+   }
+
+   public void setWriteOnly(int i)
+   {
+      readWriteOnlyAttribute = i;
+   }
+
+   public int getReadOnly()
+   {
+      return readWriteOnlyAttribute;
+   }
+
+
+   public void create() throws Exception
+   {
+   }
+
+   public void start() throws Exception
+   {
+   }
+
+   public void stop()
+   {
+   }
+
+   public void destroy()
+   {
+   }
+            </programlisting>
+         </para>
+         <para>
+            Here is the example deployment descriptor:
+<programlisting><![CDATA[
+<jboss>
+   <enterprise-beans>
+      <service>
+         <ejb-class>org.jboss.ejb3.test.service.ServiceSix</ejb-class>
+         <local>org.jboss.ejb3.test.service.ServiceSixLocal</local>
+         <remote>org.jboss.ejb3.test.service.ServiceSixRemote</remote>
+         <management>org.jboss.ejb3.test.service.ServiceSixManagement</management>
+         <jndi-name>serviceSix/remote</jndi-name>
+         <local-jndi-name>serviceSix/local</local-jndi-name>
+      </service>
+   </enterprise-beans>
+</jboss>]]></programlisting>
+         </para>
+      </sect2>
+      <sect2>
+         <title>Consumer/Producer</title>
+         <para>
+            JBoss offers the capability to create message producers and consumers through the <literal>@Producer</literal> and <literal>@Consumer</literal>
+            annotations or through the <literal>jboss.xml</literal> deployment descriptor. The Consumer class is specified using the 
+            <literal>consumer</literal> and <literal>ejb-class</literal> tags. The destination and destination type are specified in the 
+            <literal>destination</literal> and <literal>destination-type</literal> tags. The Producer interface is specified by the 
+            <literal>producer</literal> tag. Messages are created and sent to the configured destination when one of the Producer methods is called.
+            A Consumer is configured to listen on a destination and when a message arrives, the current message is set in the implementing Consumer
+            bean based on the <literal>current-message</literal> tag.
+         </para>
+         <para>
+            Here is the example for the remote and Producer interfaces:
+            <programlisting>
+public interface DeploymentDescriptorQueueTestRemote
+{
+   void method1(String msg, int num);
+
+   void method2(String msg, float num);
+}
+            </programlisting>
+         </para>
+         <para>
+            Here is the example for the implementing Consumer/Producer bean class
+            <programlisting>
+public class DeploymentDescriptorQueueTestConsumer implements DeploymentDescriptorQueueTestRemote
+{
+   Message currentMessage;
+
+   private Message setterMessage;
+
+   void setMessage(Message msg)
+   {
+      setterMessage = msg;
+   }
+
+   public void method1(String msg, int num)
+   {
+      TestStatusBean.queueRan = "method1";
+      TestStatusBean.fieldMessage = currentMessage != null;
+      TestStatusBean.setterMessage = setterMessage != null;
+
+      System.out.println("method1(" + msg + ", " + num + ")");
+   }
+
+   public void method2(String msg, float num)
+   {
+      TestStatusBean.queueRan = "method2";
+
+      TestStatusBean.fieldMessage = currentMessage != null;
+      TestStatusBean.setterMessage = setterMessage != null;
+
+      System.out.println("method2(" + msg + ", " + num + ")");
+   }
+}
+            </programlisting>
+         </para>
+         <para>
+            Here is an example code snippet for a Consumer/Producer client. When the <literal>tester.method#</literal> methods are called, the current
+            message is set in the Consumer bean.
+            <programlisting>
+ public void testDeploymentDescriptorQueue() throws Exception
+   {
+     
+      DeploymentDescriptorQueueTestRemote tester = (DeploymentDescriptorQueueTestRemote) getInitialContext().lookup(DeploymentDescriptorQueueTestRemote.class.getName());
+      ProducerManager manager = (ProducerManager) ((ProducerObject) tester).getProducerManager();
+      manager.connect();
+      try
+      {
+         tester.method1("testQueue", 5);
+
+         tester.method2("testQueue", 5.5F);
+      }
+      finally
+      {
+         manager.close();
+      }
+   }
+            </programlisting>
+         </para>
+         <para>
+            Here is the example deployment descriptor:
+<programlisting><![CDATA[
+<jboss>
+   <enterprise-beans>
+      <consumer>
+         <ejb-name>DeploymentDescriptorQueueTestConsumer</ejb-name>
+         <ejb-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</ejb-class>
+         <destination>queue/consumertest</destination>
+         <destination-type>javax.jms.Queue</destination-type>
+         <producer>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestRemote</producer>
+         <current-message>
+            <method>
+               <method-name>currentMessage</method-name>
+            </method>
+            <method>
+               <method-name>setMessage</method-name>
+            </method>
+         </current-message>
+         <message-properties>
+            <method>
+               <method-name>method2</method-name>
+            </method>
+            <delivery>NonPersistent</delivery>
+         </message-properties>
+      </consumer>
+   </enterprise-beans>
+</jboss>]]></programlisting>
+         </para>
+      </sect2>
+   </sect1>
+</chapter>
+

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,349 +0,0 @@
-<chapter id="jboss_extensions">
-
-   <title>JBoss EJB 3.0 extensions</title>
-   <para>
-      JBoss provides a few extensions to the EJB 3.0 spec. This chapter describes
-      those features here.
-   </para>
-   <sect1>
-      <title>@Service EJBs</title>
-      <para>
-         An extension offered by JBoss EJB 3.0 is the notion of a <literal>@org.jboss.annotation.ejb.Service</literal> annotated bean. They are 
-         singleton beans and are not pooled, so only one instance of the bean exists in the server. They can have both
-         <literal>@Remote</literal> and <literal>@Local</literal> interfaces so they can be accessed by java clients. When different clients look 
-         up the interfaces for <literal>@Service</literal> beans, all clients will work on the same instance of the bean on the server. When installing 
-         the bean it gets given a  JMX ObjectName in the MBean server it runs on. The default is 
-         <programlisting><![CDATA[jboss.j2ee:service=EJB3,name=<Fully qualified name of @Service bean>,type=service]]></programlisting>
-         You can override this default ObjectName by specifying the <literal>objectName</literal> attribute of the <literal>@Service</literal> annotation.
-      </para>
-      <sect2>
-         <title>@org.jboss.annotation.ejb.Management interface</title>
-         <para>
-            In addition to supporting <literal>@Local</literal> and <literal>@Remote</literal> interfaces, a <literal>@Service</literal> 
-            bean can also implement an interface annotated with <literal>@Management</literal> .
-            This interface will wrap the bean as an MBean and install it in the JBoss MBean Server. The operations and attributes defined in the 
-            <literal>@Management</literal>
-            interfaces become MBean operations and attributes for the installed MBean.. The underlying bean instance is the same as the one accessed via
-            the <literal>@Local</literal> or <literal>@Remote</literal> interfaces.
-         </para>
-      </sect2>
-      <sect2>
-         <title>Lifecycle Management and dependencies</title>
-         <para>
-            Just as for normal MBeans running in JBoss, <literal>@Service</literal> lifecycle management beans support lifecycle management. This 
-            involves
-         <itemizedlist>
-            <listitem>
-               Lifecycle Methods.
-            </listitem>
-            <listitem>
-               Dependencies.
-            </listitem>
-         </itemizedlist>
-         </para>
-            <sect3>
-               <title>Lifecycle Methods</title>
-               <para>
-                  Your <literal>@Management</literal> interface may contain methods with the following signatures
-                  <programlisting>
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-                     </programlisting>
-                     Each of these methods corresponds to when the MBean enters a particular state, so you can handle that. You do not need to include any of 
-                     these methods, and you can pick and choose which ones you want to use. A description of the MBean states these methods correspond to:
-                     <itemizedlist>
-                        <listitem>
-                           <literal>create()</literal> - called by the server when the service is created and all the services it depends upon have been created too. 
-                           At this point the service (and all the services it depends on) is installed in the JMX server, but is not yet fully functional.
-                        </listitem>
-                        <listitem>
-                           <literal>start()</literal> - called by the server when the service is started and all the services it depends upon have been started too. 
-                           At this point the service (and all the services it depends on) is fully functional..
-                        </listitem>
-                        <listitem>
-                           <literal>stop()</literal> - called by the server when the service is stopped. At this point the service (and all the services that depend on it) 
-                           is no longer fully operational.
-                        </listitem>
-                        <listitem>
-                           <literal>destroy()</literal> - called by the server when the service is destroyed and removed from the MBean server. 
-                           At this point the service (and all the services that depend on it) are destroyed.
-                        </listitem>
-                     </itemizedlist>
-               </para>
-            </sect3>
-            <sect3>
-               <title>Dependencies</title>
-               <para>
-               We mentioned dependencies between MBeans in the previous section. You can specify what MBeans you depend on by using the 
-               <literal>org.jboss.annotation.ejb.Depends</literal> annotation. This will also work for "proper" EJBs, i.e. ones annotated with 
-               <literal>@Stateful</literal>, <literal>@Stateless</literal> and <literal>@MessageDriven</literal>.
-               The Depends annotation-type takes an array of the String representation of the JMX ObjectNames of the service we depend on.
-               <programlisting><![CDATA[
-               @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) 
-               @Retention(RetentionPolicy.RUNTIME)
-               public @interface Depends
-               {
-                  String[] value();
-               }]]>
-               </programlisting>               
-               It can either be used on class level, in which case it simply means "I depend on these services". It can also be used on fields or
-               setters in the bean class that take a type of a <literal>@Management</literal> annotated interface. In addition to the meaning of 
-               annotating at class level it will inject the <literal>@Management</literal> interface of the service we depend on.
-               </para>
-            </sect3>
-      </sect2>
-      <sect2>
-         <title>Example</title>
-      </sect2>
-         <para>
-            First we define a <literal>@Management</literal> interface
-              <programlisting>
-package org.jboss.tutorial.service.bean;
-
-import org.jboss.annotation.ejb.Management;
-
- at Management
-public interface ServiceOneManagement
-{
-   void setAttribute(int attribute);
-   int getAttribute();
-   String sayHello();
-
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-}          
-           </programlisting>
-            We also have a Remote interface
-           <programlisting>
-package org.jboss.tutorial.service.bean;
-
-public interface ServiceOneRemote
-{
-   public void setAttribute(int attribute);
-   public int getAttribute();
-}           
-           </programlisting>
-           And fnally we have a @Service annotated bean implementing our interfaces
-           <programlisting>
-package org.jboss.tutorial.service.bean;
-
-import org.test.OtherServiceManagement;
-
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ejb.Depends;
-
-
- at Service (objectName = "jboss:custom=Name")
- at Remote(ServiceOneRemote.class)
- at Depends ({"jboss:service=someService"})
-public class ServiceOne implements ServiceOneRemote, ServiceOneManagement
-{
-   int attribute;
-   
-   @Depends({"jboss.j2ee:service=EJB3,name=org.test.OtherService,type=service"})
-   OtherServiceManagement other;
-
-   public void setAttribute(int attribute)
-   {
-      this.attribute = attribute;
-   }
-
-   public int getAttribute()
-   {
-      return this.attribute;
-   }
-
-   public String sayHello()
-   {
-      return "Hello from service One";
-   }
-
-   // Lifecycle methods
-   public void create() throws Exception
-   {
-      System.out.println("ServiceOne - Creating");
-   }
-
-   public void start() throws Exception
-   {
-      System.out.println("ServiceOne - Starting");
-   }
-
-   public void stop()
-   {
-      System.out.println("ServiceOne - Stopping");
-   }
-
-   public void destroy()
-   {
-      System.out.println("ServiceOne - Destroying");
-   }
-}
-           </programlisting>
-           This bean is accessible from remote clients via the <literal>ServiceOneRemote</literal> interface. The 
-           <literal>ServiceOneManagement</literal> interface defines the operations to be made available via JMX. It specfies 
-           all the lifecycle methods so we will get notified when this bean is created, started, stopped and destroyed. Our bean uses a 
-           custom object name, so it will be installed in the MBean server under the name <literal>jboss:custom=Name</literal>. At bean level
-           we have specified that it depends on a service with the name <literal>jboss:service=someService</literal>, so that service must be 
-           started before our bean can start. Also, we have specified that we depend on another JMX service called 
-           <literal>jboss.j2ee:service=EJB3,name=org.test.OtherService,type=service</literal> and that we want to inject an MBean Proxy 
-           implementing the <literal>org.test.OtherServiceManagement</literal> interface into the <literal>other</literal> field.
-           For a more complete example, take a look at the tutorial.
-         </para> 
-   </sect1>
-   <sect1>
-      <title>Message Driven POJOs</title>
-      <para>
-         Doco not complete yet.  See tutorial for more information.
-      </para>
-   </sect1>
-   <sect1>
-      <title>Asynchronous invocations</title>
-      <para>
-         In JBoss EJB 3.0, you can convert a reference to a local or remote session bean into a reference
-         that will invoke asynchronously on the EJB.  This is called obtaining an asychronous proxy or interface.
-         asynchronous interface. Methods called on the asynchronous proxy will be 
-         executed asynchronously, and the results can be obtained later on.  You obtain an asynchronous proxy
-         by invoking on the
-         <literal>org.jboss.ejb3.asynchronous.Asynch.getAsynchronousProxy</literal> static method.  You pass
-      </para>
-      <programlisting><![CDATA[
-         package org.jboss.ejb3.asycnhronous;
-         
-         public class Asynch
-         {
-             public static <T> T getAsynchronousProxy(T ejbRef) {...}
-
-             public static Future getFutureResult(Object asynchProxy)
-         }
-         ]]>
-      </programlisting>
-      <para>
-         The asynchronous proxy created will implement the same
-         local/remote interfaces as the original proxy. When you invoke on a method
-         of the asynch proxy, the method will be invoked in the background.  If the method
-         has a return value, the value returned by the method will be null or zero depending on the return type.
-         This will not be the true return value of the asynch method so you can just throw this away.
-         To obtain the real result you must obtain  <literal>org.jboss.aspects.asynch.Future</literal> object.
-         This Future object works much the same way a <literal>java.util.concurrent.Future</literal> object does.
-      </para>
-      <para>
-         Let us look at an example. We have the following session bean.
-      </para>
-      <programlisting>
-         package org.acme.test;
-
-         @javax.ejb.Remote
-         public interface Test
-         {
-            int perfomHeavyOperation(int i);
-            String echo(String s);
-         }
-      </programlisting>
-      <programlisting>
-         package org.acme.test;
-         
-         @javax.ejb.Stateless
-         public class TestBean implements Test
-         {
-            public int perfomHeavyOperation(int i)
-            {
-               try
-               {
-                  //Simulate time-consuming operation
-                  Thread.sleep(10000);
-                  return i;
-               }
-               catch(Exception e)
-               {
-                  throw new RuntimeException(e);
-               }
-            }
-            
-            public String echo(String s)
-            {
-               return s;
-            }
-         }
-      </programlisting>
-      <para>
-         As you can see there is nothing special about the session bean, now let's
-         look at the client code. First we look up the remote interface:
-         
-         <programlisting>
-         InitialContext ctx = new InitialContext();
-         Test test = (Echo)ctx.lookup(org.acme.test.Test.getName());
-         </programlisting>
-         
-         We now have a reference to the bean's normal interface. Calls done on this
-         interface will execute synchronously. The following call to 
-         <literal>perfomHeavyOperation()</literal> will block the client thread for
-         10 seconds.
-         
-         <programlisting>
-         int i = test.performHeavyOperation(1);
-         //i will be 1
-         </programlisting>
-         
-         Now to demonstrate the asynchronous functionality, we the asynchronous proxy.
-         
-         <programlisting>
-         Test asynchTest = org.jboss.ejb3.asynchronous.Asynch.getAsynchronousProxy(test);
-         </programlisting>
-         
-         Calls made on the asynchronous interface will return 0 in the case of a simple
-         return type or null in the case of an Object return type. We will see how to
-         obtain the return value further down.
-         
-         <programlisting>
-            int j = asynchTest.performHeavyOperation(123);
-         //j will be 0
-         </programlisting>
-         
-         The call to <literal>perfomHeavyOperation()</literal> returns immediately, and 
-         our client thread is now free to do other stuff while the business method 
-         executes.
-          
-         <programlisting>
-         //You can do other stuff in client's thread
-         </programlisting>
-         
-         Now that we have finished doing things in our thread while the business method
-         has been executing on the server, we obtain the
-         <literal>Future</literal> which will hold the result of our asynchronous 
-         invocation.
-         
-         <programlisting>
-         Future future = org.jboss.ejb3.asynchronous.Asynch.getFutureResult(asynchTest);
-         </programlisting>
-
-         It is important to note that you must call getFutureResult() to obtain the future for the last method call.
-         If you call another method on the asynch proxy, then you will lose the previous Future.
-
-         The asynchronous invocation might not have finished yet (in case the extra 
-         things we did in the client code took &lt; 10 seconds), so we check for this
-         here:
-
-         <programlisting>
-         while (!future.isDone())
-         {
-            Thread.sleep(100);
-         }
-         </programlisting>
-         
-         Now that the asynchronous invocation is done, we can obtain its return value
-         from the <literal>Future</literal> object.
-         <programlisting>
-         int ret = (String)future.get();
-         //ret will be 123
-         </programlisting>
-               
-      </para>      
-   </sect1>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jboss_extensions.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,349 @@
+<chapter id="jboss_extensions">
+
+   <title>JBoss EJB 3.0 extensions</title>
+   <para>
+      JBoss provides a few extensions to the EJB 3.0 spec. This chapter describes
+      those features here.
+   </para>
+   <sect1>
+      <title>@Service EJBs</title>
+      <para>
+         An extension offered by JBoss EJB 3.0 is the notion of a <literal>@org.jboss.annotation.ejb.Service</literal> annotated bean. They are 
+         singleton beans and are not pooled, so only one instance of the bean exists in the server. They can have both
+         <literal>@Remote</literal> and <literal>@Local</literal> interfaces so they can be accessed by java clients. When different clients look 
+         up the interfaces for <literal>@Service</literal> beans, all clients will work on the same instance of the bean on the server. When installing 
+         the bean it gets given a  JMX ObjectName in the MBean server it runs on. The default is 
+         <programlisting><![CDATA[jboss.j2ee:service=EJB3,name=<Fully qualified name of @Service bean>,type=service]]></programlisting>
+         You can override this default ObjectName by specifying the <literal>objectName</literal> attribute of the <literal>@Service</literal> annotation.
+      </para>
+      <sect2>
+         <title>@org.jboss.annotation.ejb.Management interface</title>
+         <para>
+            In addition to supporting <literal>@Local</literal> and <literal>@Remote</literal> interfaces, a <literal>@Service</literal> 
+            bean can also implement an interface annotated with <literal>@Management</literal> .
+            This interface will wrap the bean as an MBean and install it in the JBoss MBean Server. The operations and attributes defined in the 
+            <literal>@Management</literal>
+            interfaces become MBean operations and attributes for the installed MBean.. The underlying bean instance is the same as the one accessed via
+            the <literal>@Local</literal> or <literal>@Remote</literal> interfaces.
+         </para>
+      </sect2>
+      <sect2>
+         <title>Lifecycle Management and dependencies</title>
+         <para>
+            Just as for normal MBeans running in JBoss, <literal>@Service</literal> lifecycle management beans support lifecycle management. This 
+            involves
+         <itemizedlist>
+            <listitem>
+               Lifecycle Methods.
+            </listitem>
+            <listitem>
+               Dependencies.
+            </listitem>
+         </itemizedlist>
+         </para>
+            <sect3>
+               <title>Lifecycle Methods</title>
+               <para>
+                  Your <literal>@Management</literal> interface may contain methods with the following signatures
+                  <programlisting>
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+                     </programlisting>
+                     Each of these methods corresponds to when the MBean enters a particular state, so you can handle that. You do not need to include any of 
+                     these methods, and you can pick and choose which ones you want to use. A description of the MBean states these methods correspond to:
+                     <itemizedlist>
+                        <listitem>
+                           <literal>create()</literal> - called by the server when the service is created and all the services it depends upon have been created too. 
+                           At this point the service (and all the services it depends on) is installed in the JMX server, but is not yet fully functional.
+                        </listitem>
+                        <listitem>
+                           <literal>start()</literal> - called by the server when the service is started and all the services it depends upon have been started too. 
+                           At this point the service (and all the services it depends on) is fully functional..
+                        </listitem>
+                        <listitem>
+                           <literal>stop()</literal> - called by the server when the service is stopped. At this point the service (and all the services that depend on it) 
+                           is no longer fully operational.
+                        </listitem>
+                        <listitem>
+                           <literal>destroy()</literal> - called by the server when the service is destroyed and removed from the MBean server. 
+                           At this point the service (and all the services that depend on it) are destroyed.
+                        </listitem>
+                     </itemizedlist>
+               </para>
+            </sect3>
+            <sect3>
+               <title>Dependencies</title>
+               <para>
+               We mentioned dependencies between MBeans in the previous section. You can specify what MBeans you depend on by using the 
+               <literal>org.jboss.annotation.ejb.Depends</literal> annotation. This will also work for "proper" EJBs, i.e. ones annotated with 
+               <literal>@Stateful</literal>, <literal>@Stateless</literal> and <literal>@MessageDriven</literal>.
+               The Depends annotation-type takes an array of the String representation of the JMX ObjectNames of the service we depend on.
+               <programlisting><![CDATA[
+               @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) 
+               @Retention(RetentionPolicy.RUNTIME)
+               public @interface Depends
+               {
+                  String[] value();
+               }]]>
+               </programlisting>               
+               It can either be used on class level, in which case it simply means "I depend on these services". It can also be used on fields or
+               setters in the bean class that take a type of a <literal>@Management</literal> annotated interface. In addition to the meaning of 
+               annotating at class level it will inject the <literal>@Management</literal> interface of the service we depend on.
+               </para>
+            </sect3>
+      </sect2>
+      <sect2>
+         <title>Example</title>
+      </sect2>
+         <para>
+            First we define a <literal>@Management</literal> interface
+              <programlisting>
+package org.jboss.tutorial.service.bean;
+
+import org.jboss.annotation.ejb.Management;
+
+ at Management
+public interface ServiceOneManagement
+{
+   void setAttribute(int attribute);
+   int getAttribute();
+   String sayHello();
+
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+}          
+           </programlisting>
+            We also have a Remote interface
+           <programlisting>
+package org.jboss.tutorial.service.bean;
+
+public interface ServiceOneRemote
+{
+   public void setAttribute(int attribute);
+   public int getAttribute();
+}           
+           </programlisting>
+           And fnally we have a @Service annotated bean implementing our interfaces
+           <programlisting>
+package org.jboss.tutorial.service.bean;
+
+import org.test.OtherServiceManagement;
+
+import javax.ejb.Remote;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.annotation.ejb.Depends;
+
+
+ at Service (objectName = "jboss:custom=Name")
+ at Remote(ServiceOneRemote.class)
+ at Depends ({"jboss:service=someService"})
+public class ServiceOne implements ServiceOneRemote, ServiceOneManagement
+{
+   int attribute;
+   
+   @Depends({"jboss.j2ee:service=EJB3,name=org.test.OtherService,type=service"})
+   OtherServiceManagement other;
+
+   public void setAttribute(int attribute)
+   {
+      this.attribute = attribute;
+   }
+
+   public int getAttribute()
+   {
+      return this.attribute;
+   }
+
+   public String sayHello()
+   {
+      return "Hello from service One";
+   }
+
+   // Lifecycle methods
+   public void create() throws Exception
+   {
+      System.out.println("ServiceOne - Creating");
+   }
+
+   public void start() throws Exception
+   {
+      System.out.println("ServiceOne - Starting");
+   }
+
+   public void stop()
+   {
+      System.out.println("ServiceOne - Stopping");
+   }
+
+   public void destroy()
+   {
+      System.out.println("ServiceOne - Destroying");
+   }
+}
+           </programlisting>
+           This bean is accessible from remote clients via the <literal>ServiceOneRemote</literal> interface. The 
+           <literal>ServiceOneManagement</literal> interface defines the operations to be made available via JMX. It specfies 
+           all the lifecycle methods so we will get notified when this bean is created, started, stopped and destroyed. Our bean uses a 
+           custom object name, so it will be installed in the MBean server under the name <literal>jboss:custom=Name</literal>. At bean level
+           we have specified that it depends on a service with the name <literal>jboss:service=someService</literal>, so that service must be 
+           started before our bean can start. Also, we have specified that we depend on another JMX service called 
+           <literal>jboss.j2ee:service=EJB3,name=org.test.OtherService,type=service</literal> and that we want to inject an MBean Proxy 
+           implementing the <literal>org.test.OtherServiceManagement</literal> interface into the <literal>other</literal> field.
+           For a more complete example, take a look at the tutorial.
+         </para> 
+   </sect1>
+   <sect1>
+      <title>Message Driven POJOs</title>
+      <para>
+         Doco not complete yet.  See tutorial for more information.
+      </para>
+   </sect1>
+   <sect1>
+      <title>Asynchronous invocations</title>
+      <para>
+         In JBoss EJB 3.0, you can convert a reference to a local or remote session bean into a reference
+         that will invoke asynchronously on the EJB.  This is called obtaining an asychronous proxy or interface.
+         asynchronous interface. Methods called on the asynchronous proxy will be 
+         executed asynchronously, and the results can be obtained later on.  You obtain an asynchronous proxy
+         by invoking on the
+         <literal>org.jboss.ejb3.asynchronous.Asynch.getAsynchronousProxy</literal> static method.  You pass
+      </para>
+      <programlisting><![CDATA[
+         package org.jboss.ejb3.asycnhronous;
+         
+         public class Asynch
+         {
+             public static <T> T getAsynchronousProxy(T ejbRef) {...}
+
+             public static Future getFutureResult(Object asynchProxy)
+         }
+         ]]>
+      </programlisting>
+      <para>
+         The asynchronous proxy created will implement the same
+         local/remote interfaces as the original proxy. When you invoke on a method
+         of the asynch proxy, the method will be invoked in the background.  If the method
+         has a return value, the value returned by the method will be null or zero depending on the return type.
+         This will not be the true return value of the asynch method so you can just throw this away.
+         To obtain the real result you must obtain  <literal>org.jboss.aspects.asynch.Future</literal> object.
+         This Future object works much the same way a <literal>java.util.concurrent.Future</literal> object does.
+      </para>
+      <para>
+         Let us look at an example. We have the following session bean.
+      </para>
+      <programlisting>
+         package org.acme.test;
+
+         @javax.ejb.Remote
+         public interface Test
+         {
+            int perfomHeavyOperation(int i);
+            String echo(String s);
+         }
+      </programlisting>
+      <programlisting>
+         package org.acme.test;
+         
+         @javax.ejb.Stateless
+         public class TestBean implements Test
+         {
+            public int perfomHeavyOperation(int i)
+            {
+               try
+               {
+                  //Simulate time-consuming operation
+                  Thread.sleep(10000);
+                  return i;
+               }
+               catch(Exception e)
+               {
+                  throw new RuntimeException(e);
+               }
+            }
+            
+            public String echo(String s)
+            {
+               return s;
+            }
+         }
+      </programlisting>
+      <para>
+         As you can see there is nothing special about the session bean, now let's
+         look at the client code. First we look up the remote interface:
+         
+         <programlisting>
+         InitialContext ctx = new InitialContext();
+         Test test = (Echo)ctx.lookup(org.acme.test.Test.getName());
+         </programlisting>
+         
+         We now have a reference to the bean's normal interface. Calls done on this
+         interface will execute synchronously. The following call to 
+         <literal>perfomHeavyOperation()</literal> will block the client thread for
+         10 seconds.
+         
+         <programlisting>
+         int i = test.performHeavyOperation(1);
+         //i will be 1
+         </programlisting>
+         
+         Now to demonstrate the asynchronous functionality, we the asynchronous proxy.
+         
+         <programlisting>
+         Test asynchTest = org.jboss.ejb3.asynchronous.Asynch.getAsynchronousProxy(test);
+         </programlisting>
+         
+         Calls made on the asynchronous interface will return 0 in the case of a simple
+         return type or null in the case of an Object return type. We will see how to
+         obtain the return value further down.
+         
+         <programlisting>
+            int j = asynchTest.performHeavyOperation(123);
+         //j will be 0
+         </programlisting>
+         
+         The call to <literal>perfomHeavyOperation()</literal> returns immediately, and 
+         our client thread is now free to do other stuff while the business method 
+         executes.
+          
+         <programlisting>
+         //You can do other stuff in client's thread
+         </programlisting>
+         
+         Now that we have finished doing things in our thread while the business method
+         has been executing on the server, we obtain the
+         <literal>Future</literal> which will hold the result of our asynchronous 
+         invocation.
+         
+         <programlisting>
+         Future future = org.jboss.ejb3.asynchronous.Asynch.getFutureResult(asynchTest);
+         </programlisting>
+
+         It is important to note that you must call getFutureResult() to obtain the future for the last method call.
+         If you call another method on the asynch proxy, then you will lose the previous Future.
+
+         The asynchronous invocation might not have finished yet (in case the extra 
+         things we did in the client code took &lt; 10 seconds), so we check for this
+         here:
+
+         <programlisting>
+         while (!future.isDone())
+         {
+            Thread.sleep(100);
+         }
+         </programlisting>
+         
+         Now that the asynchronous invocation is done, we can obtain its return value
+         from the <literal>Future</literal> object.
+         <programlisting>
+         int ret = (String)future.get();
+         //ret will be 123
+         </programlisting>
+               
+      </para>      
+   </sect1>
+</chapter>
+

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,77 +0,0 @@
-<chapter id="jca_inflow">
-   <title>JBoss EJB 3.0 MDB JCA Inflow</title>
-   <para>
-      This chapter provides two examples on JCA 1.5 resources that allow JMS delivery of messages to EJB 3.0 Message Driven Beans. The first example
-      uses SwiftMQ as the JCA XA resource. The second example illustrates the usage of non-standard (i.e. not javax.jms.MessageListener) messaging 
-      types.
-   </para>
-   <sect1>
-      <title>SwiftMQ JCA XA Resource</title>
-      <para>
-         SwiftMQ provide a JCA 1.5 resource that allows JMS message delivery to an MDB. The EJB 3.0 distribution provides a tutorial on building and
-         deploying this example.  The @org.jboss.annotation.ejb.ResourceAdapter annotation is used to designate the resource adapter you will be using.
-         It takes an attribute that is the base name of the RAR deployment file name.
-      </para>
-      <para>Here is the source listing for the MDB:
-         <programlisting>
- at MessageDriven(name="test/mdb", activationConfig =
-{
- at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
- at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
- at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
- at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
- at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
- at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
- at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
- at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
- at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
-})
- at ResourceAdapter("switfmq.rar")
-public class AnnotatedTestMDBBean
-   implements MessageListener
-{
-   public void onMessage(Message message)
-   {
-      System.out.println(message);
-   }
-}
-         </programlisting>
-      </para>
-   </sect1>
-   <sect1> 
-      <title>Non-Standard Messaging Types</title>
-      <para>
-         JBoss offers the capability use non-standard messaging types for Message Driven Beans. Standard MDBs implement the javax.jms.MessageListener
-         interface. MDBs can alternatively implement a custom messaging interface. The EJB 3.0 distribution test suite provides a complete example
-         for the usage of this bean.
-      </para>
-      <para>
-         Here is the source listing for a non-standard messaging type:
-         <programlisting>
- at MessageDriven(name = "TestMDB", activationConfig =
-{
- at ActivationConfigProperty(propertyName="messagingType", propertyValue="org.jboss.ejb3.test.jca.inflow.TestMessageListener"),      
- at ActivationConfigProperty(propertyName="name", propertyValue="testInflow"),
- at ActivationConfigProperty(propertyName="anInt", propertyValue="5"),
- at ActivationConfigProperty(propertyName="anInteger", propertyValue="55"),
- at ActivationConfigProperty(propertyName="localhost", propertyValue="127.0.0.1"),
- at ActivationConfigProperty(propertyName="props", propertyValue="key1=value1,key2=value2,key3=value3")
-})
- at ResourceAdapter("jcainflow.rar")
- at TransactionAttribute(TransactionAttributeType.REQUIRED)
-public class TestMDBMessageListener implements TestMessageListener
-{
-   private static final Logger log = Logger.getLogger(TestMDBMessageListener.class);
-    
-   public void deliverMessage(TestMessage message)
-   {
-      message.acknowledge();
-      log.info(message.toString());
-   }
-}     
-         </programlisting>
-      </para>
-   </sect1>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/jca_inflow.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/jca_inflow.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,77 @@
+<chapter id="jca_inflow">
+   <title>JBoss EJB 3.0 MDB JCA Inflow</title>
+   <para>
+      This chapter provides two examples on JCA 1.5 resources that allow JMS delivery of messages to EJB 3.0 Message Driven Beans. The first example
+      uses SwiftMQ as the JCA XA resource. The second example illustrates the usage of non-standard (i.e. not javax.jms.MessageListener) messaging 
+      types.
+   </para>
+   <sect1>
+      <title>SwiftMQ JCA XA Resource</title>
+      <para>
+         SwiftMQ provide a JCA 1.5 resource that allows JMS message delivery to an MDB. The EJB 3.0 distribution provides a tutorial on building and
+         deploying this example.  The @org.jboss.annotation.ejb.ResourceAdapter annotation is used to designate the resource adapter you will be using.
+         It takes an attribute that is the base name of the RAR deployment file name.
+      </para>
+      <para>Here is the source listing for the MDB:
+         <programlisting>
+ at MessageDriven(name="test/mdb", activationConfig =
+{
+ at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
+ at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
+ at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
+ at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
+ at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
+ at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
+ at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
+})
+ at ResourceAdapter("switfmq.rar")
+public class AnnotatedTestMDBBean
+   implements MessageListener
+{
+   public void onMessage(Message message)
+   {
+      System.out.println(message);
+   }
+}
+         </programlisting>
+      </para>
+   </sect1>
+   <sect1> 
+      <title>Non-Standard Messaging Types</title>
+      <para>
+         JBoss offers the capability use non-standard messaging types for Message Driven Beans. Standard MDBs implement the javax.jms.MessageListener
+         interface. MDBs can alternatively implement a custom messaging interface. The EJB 3.0 distribution test suite provides a complete example
+         for the usage of this bean.
+      </para>
+      <para>
+         Here is the source listing for a non-standard messaging type:
+         <programlisting>
+ at MessageDriven(name = "TestMDB", activationConfig =
+{
+ at ActivationConfigProperty(propertyName="messagingType", propertyValue="org.jboss.ejb3.test.jca.inflow.TestMessageListener"),      
+ at ActivationConfigProperty(propertyName="name", propertyValue="testInflow"),
+ at ActivationConfigProperty(propertyName="anInt", propertyValue="5"),
+ at ActivationConfigProperty(propertyName="anInteger", propertyValue="55"),
+ at ActivationConfigProperty(propertyName="localhost", propertyValue="127.0.0.1"),
+ at ActivationConfigProperty(propertyName="props", propertyValue="key1=value1,key2=value2,key3=value3")
+})
+ at ResourceAdapter("jcainflow.rar")
+ at TransactionAttribute(TransactionAttributeType.REQUIRED)
+public class TestMDBMessageListener implements TestMessageListener
+{
+   private static final Logger log = Logger.getLogger(TestMDBMessageListener.class);
+    
+   public void deliverMessage(TestMessage message)
+   {
+      message.acknowledge();
+      log.info(message.toString());
+   }
+}     
+         </programlisting>
+      </para>
+   </sect1>
+</chapter>
+

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,262 +0,0 @@
-<chapter id="partial_deployment_descriptors">
-
-   <title>JBoss EJB 3.0 partial deployment descriptors</title>
-   <para>
-      EJB 3.0 allows for partial deployment descriptors to augment or override the behavior of source code annotations. This chapter describes
-      the use of partial deployment descriptors.
-   </para>
-   <sect1>
-      <title>Overview</title>
-      <para>
-	 Beans in EJB 3.0 can be specified via source code annotations and/or a deployment descriptor. The deployment descriptor is used to
-	 augment or override the source code annotations. There are some limitations on which annotations may be overridden, however. The annotations that specify
-         the bean itself (e.g. <literal>@Stateless</literal>, <literal>@Stateful</literal>, <literal>@MessageDriven</literal>, <literal>@Service</literal>,
-         <literal>@Consumer</literal>) cannot be overridden. The EJB 3.0 <literal>ejb.jar.xml</literal> deployment descriptor DTD specifies the majority of tags as optional
-         in order to support annotation augmentation and overrides. The deployment descriptor does not need to specify all of the required information, just that additional
-         information to override or augment the source code annotations.
-      </para>
-   </sect1>
-   <sect1>
-      <title>Examples</title>
-      <para>
-         This section contains examples of complete and partial deployment descriptors for completely specifying or overriding specfic behaviors of EJBs.
-      </para>
-      <sect2>  
-         <title>Complete deployment descriptor</title>
-         <para>
-            The following ejb-jar.xml file contains a complete specification for a series of EJBs, including tags for security, transactions, resource injection, references,
-            callbacks, callback listeners, interceptors, etc.
-<programlisting><![CDATA[
-<ejb-jar> 
-   <description>jBoss test application </description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>Teller</ejb-name>
-         <remote>org.jboss.ejb3.test.bank.Teller</remote>
-         <ejb-class>org.jboss.ejb3.test.bank.TellerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Bank</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.ejb3.test.bank.Bank</remote>
-            <ejb-link>Bank</ejb-link>
-            <injection-target>bank</injection-target>
-         </ejb-ref>
-         <resource-ref>
-             <res-ref-name>java:/TransactionManager</res-ref-name>
-             <res-type>javax.transaction.TransactionManager</res-type>
-             <res-auth>Container</res-auth>
-             <res-sharing-scope>Shareable</res-sharing-scope>
-             <injection-target>setTransactionManager</injection-target>
-         </resource-ref>
-         <resource-ref>
-             <res-ref-name></res-ref-name>
-             <res-type>javax.ejb.TimerService</res-type>
-             <res-auth>Container</res-auth>
-             <res-sharing-scope>Shareable</res-sharing-scope>
-             <injection-target>ts</injection-target>
-         </resource-ref>
-         <security-identity>
-            <run-as>
-               <role-name>bankTeller</role-name>
-            </run-as>
-         </security-identity>
-      </session>
-      <session>
-         <ejb-name>Bank</ejb-name>
-         <remote>org.jboss.ejb3.test.bank.Bank</remote>
-         <ejb-class>org.jboss.ejb3.test.bank.BankBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-         <env-entry>
-            <env-entry-name>id</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value>5678</env-entry-value>
-         </env-entry>
-         <resource-ref>
-            <res-ref-name>java:DefaultDS</res-ref-name>
-            <res-type>javax.sql.DataSource</res-type>
-            <res-auth>Container</res-auth>
-            <res-sharing-scope>Shareable</res-sharing-scope>
-            <injection-target>customerDb</injection-target>
-         </resource-ref>
-         <interceptor>org.jboss.ejb3.test.bank.FirstInterceptor</interceptor>
-         <interceptor>org.jboss.ejb3.test.bank.SecondInterceptor</interceptor> 
-         <callback-listener>org.jboss.ejb3.test.bank.ExternalCallbackListener</callback-listener>
-      </session>
-   </enterprise-beans>
-   <assembly-descriptor>
-      <callback>
-         <annotation>PostConstruct</annotation>
-         <method>
-            <ejb-name>Teller</ejb-name>
-            <method-name>postConstruct</method-name>
-         </method>
-      </callback> 
-      <remove-list>
-         <method>
-            <ejb-name>Bank</ejb-name>
-            <method-name>remove</method-name>
-         </method>
-      </remove-list> 
-      <init-list>
-         <method>
-            <ejb-name>Bank</ejb-name>
-            <method-name>init</method-name>
-         </method>
-      </init-list> 
-      <security-role>
-         <role-name>bankCustomer</role-name>
-      </security-role>
-      <security-role>
-         <role-name>bankTeller</role-name>
-      </security-role>
-      <method-permission>
-         <role-name>bankCustomer</role-name>
-         <method>
-            <ejb-name>Teller</ejb-name>
-            <method-name>greetChecked</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <unchecked/>
-         <method>
-            <ejb-name>Teller</ejb-name>
-            <method-name>greetUnchecked</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>bankTeller</role-name>
-         <method>
-            <ejb-name>Bank</ejb-name>
-            <method-name>getCustomerId</method-name>
-         </method>
-         <method>
-            <ejb-name>Bank</ejb-name>
-            <method-name>storeCustomerId</method-name>
-         </method>
-      </method-permission>
-      <container-transaction>
-         <method>
-            <ejb-name>Teller</ejb-name>
-            <method-name>greetWithNotSupportedTransaction</method-name>
-         </method>
-         <trans-attribute>NotSupported</trans-attribute>
-      </container-transaction>
-      <container-transaction>
-         <method>
-            <ejb-name>Teller</ejb-name>
-            <method-name>greetWithRequiredTransaction</method-name>
-            <method-params>
-               <method-param>java.lang.String</method-param>
-            </method-params>
-         </method>
-         <trans-attribute>Required</trans-attribute>
-      </container-transaction>
-      <container-transaction>
-         <method>
-            <ejb-name>Bank</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <trans-attribute>Required</trans-attribute>
-      </container-transaction>
-      <exclude-list>
-         <method>
-            <ejb-name>Teller</ejb-name>
-            <method-name>excludedMethod</method-name>
-         </method>
-      </exclude-list>
-   </assembly-descriptor>
-</ejb-jar>]]></programlisting>
-         </para>
-      </sect2>
-      <sect2>  
-         <title>Security</title>
-         <para>
-            The following <literal>ejb-jar.xml</literal> file overrides any <literal>@RolesAllowed</literal>, <literal>@PermitAll</literal>, or <literal>@DenyAll</literal>
-            source code annotations for the <literal>bar</literal> method of the <literal>FooB</literal> EJB and adds a <literal>@RolesAllowed</literal> annotation for the 
-            <literal>allowed</literal> role.
-            <programlisting><![CDATA[
-<ejb-jar>
-   <assembly-descriptor>
-      <method-permission>
-         <role-name>allowed</role-name>
-         <method>
-            <ejb-name>FooB</ejb-name>
-            <method-name>bar</method-name>
-         </method>
-     </method-permission>
-   </assembly-descriptor>
-</ejb-jar>
-            ]]></programlisting>
-         </para>
-      </sect2> 
-      <sect2>  
-         <title>Transactions</title>
-         <para>
-            The following <literal>ejb-jar.xml</literal> file overrides any <literal>@TransactionAttribute</literal> annotations for the <literal>bar</literal> method of the
-            <literal>FooA</literal> EJB and adds a <literal>@TransactionAttribute</literal> annotation for <literal>NOT SUPPORTED</literal>.
-            <programlisting><![CDATA[
-<ejb-jar>
-   <assembly-descriptor>
-      <container-transaction>
-         <method>
-            <ejb-name>FooA</ejb-name>
-            <method-name>bar</method-name>
-         </method>
-         <trans-attribute>NotSupported</trans-attribute>
-      </container-transaction>
-   </assembly-descriptor>
-</ejb-jar>                          
-            ]]></programlisting>
-         </para>
-      </sect2>
-      <sect2>  
-         <title>References</title>
-         <para>
-            The following <literal>ejb-jar.xml</literal> file creates a local jndi EJB reference and injects the EJB to the injection target of the <literal>bank</literal>
-            member variable.
-            <programlisting><![CDATA[
-<ejb-jar> 
-   <enterprise-beans>
-      <session>
-         <ejb-name>Teller</ejb-name>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Bank</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.ejb3.test.bank.Bank</remote>
-            <ejb-link>Bank</ejb-link>
-	    <injection-target>bank</injection-target>
-         </ejb-ref>
-      </session>
-   </enterprise-beans>
-</ejb-jar>
-
-            ]]></programlisting>
-         </para>
-      </sect2>
-      <sect2>  
-         <title>Callbacks</title>
-         <para>
-            The following <literal>ejb-jar.xml</literal> file adds a <literal>@PostConstruct</literal> annotation to the <literal>postConstruct</literal> method of the
-            <literal>Teller</literal> EJB.
-            <programlisting><![CDATA[
-<ejb-jar> 
-   <assembly-descriptor>
-      <callback>
-         <annotation>PostConstruct</annotation>
-         <method>
-            <ejb-name>Teller</ejb-name>
-            <method-name>postConstruct</method-name>
-         </method>
-      </callback>
-   </assembly-descriptor>
-</ejb-jar>
-            ]]></programlisting>
-         </para>
-      </sect2>
-   </sect1>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/partial_deployment_descriptors.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,262 @@
+<chapter id="partial_deployment_descriptors">
+
+   <title>JBoss EJB 3.0 partial deployment descriptors</title>
+   <para>
+      EJB 3.0 allows for partial deployment descriptors to augment or override the behavior of source code annotations. This chapter describes
+      the use of partial deployment descriptors.
+   </para>
+   <sect1>
+      <title>Overview</title>
+      <para>
+	 Beans in EJB 3.0 can be specified via source code annotations and/or a deployment descriptor. The deployment descriptor is used to
+	 augment or override the source code annotations. There are some limitations on which annotations may be overridden, however. The annotations that specify
+         the bean itself (e.g. <literal>@Stateless</literal>, <literal>@Stateful</literal>, <literal>@MessageDriven</literal>, <literal>@Service</literal>,
+         <literal>@Consumer</literal>) cannot be overridden. The EJB 3.0 <literal>ejb.jar.xml</literal> deployment descriptor DTD specifies the majority of tags as optional
+         in order to support annotation augmentation and overrides. The deployment descriptor does not need to specify all of the required information, just that additional
+         information to override or augment the source code annotations.
+      </para>
+   </sect1>
+   <sect1>
+      <title>Examples</title>
+      <para>
+         This section contains examples of complete and partial deployment descriptors for completely specifying or overriding specfic behaviors of EJBs.
+      </para>
+      <sect2>  
+         <title>Complete deployment descriptor</title>
+         <para>
+            The following ejb-jar.xml file contains a complete specification for a series of EJBs, including tags for security, transactions, resource injection, references,
+            callbacks, callback listeners, interceptors, etc.
+<programlisting><![CDATA[
+<ejb-jar> 
+   <description>jBoss test application </description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>Teller</ejb-name>
+         <remote>org.jboss.ejb3.test.bank.Teller</remote>
+         <ejb-class>org.jboss.ejb3.test.bank.TellerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <ejb-ref>
+            <ejb-ref-name>ejb/Bank</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <remote>org.jboss.ejb3.test.bank.Bank</remote>
+            <ejb-link>Bank</ejb-link>
+            <injection-target>bank</injection-target>
+         </ejb-ref>
+         <resource-ref>
+             <res-ref-name>java:/TransactionManager</res-ref-name>
+             <res-type>javax.transaction.TransactionManager</res-type>
+             <res-auth>Container</res-auth>
+             <res-sharing-scope>Shareable</res-sharing-scope>
+             <injection-target>setTransactionManager</injection-target>
+         </resource-ref>
+         <resource-ref>
+             <res-ref-name></res-ref-name>
+             <res-type>javax.ejb.TimerService</res-type>
+             <res-auth>Container</res-auth>
+             <res-sharing-scope>Shareable</res-sharing-scope>
+             <injection-target>ts</injection-target>
+         </resource-ref>
+         <security-identity>
+            <run-as>
+               <role-name>bankTeller</role-name>
+            </run-as>
+         </security-identity>
+      </session>
+      <session>
+         <ejb-name>Bank</ejb-name>
+         <remote>org.jboss.ejb3.test.bank.Bank</remote>
+         <ejb-class>org.jboss.ejb3.test.bank.BankBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <env-entry-name>id</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>5678</env-entry-value>
+         </env-entry>
+         <resource-ref>
+            <res-ref-name>java:DefaultDS</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+            <res-sharing-scope>Shareable</res-sharing-scope>
+            <injection-target>customerDb</injection-target>
+         </resource-ref>
+         <interceptor>org.jboss.ejb3.test.bank.FirstInterceptor</interceptor>
+         <interceptor>org.jboss.ejb3.test.bank.SecondInterceptor</interceptor> 
+         <callback-listener>org.jboss.ejb3.test.bank.ExternalCallbackListener</callback-listener>
+      </session>
+   </enterprise-beans>
+   <assembly-descriptor>
+      <callback>
+         <annotation>PostConstruct</annotation>
+         <method>
+            <ejb-name>Teller</ejb-name>
+            <method-name>postConstruct</method-name>
+         </method>
+      </callback> 
+      <remove-list>
+         <method>
+            <ejb-name>Bank</ejb-name>
+            <method-name>remove</method-name>
+         </method>
+      </remove-list> 
+      <init-list>
+         <method>
+            <ejb-name>Bank</ejb-name>
+            <method-name>init</method-name>
+         </method>
+      </init-list> 
+      <security-role>
+         <role-name>bankCustomer</role-name>
+      </security-role>
+      <security-role>
+         <role-name>bankTeller</role-name>
+      </security-role>
+      <method-permission>
+         <role-name>bankCustomer</role-name>
+         <method>
+            <ejb-name>Teller</ejb-name>
+            <method-name>greetChecked</method-name>
+         </method>
+      </method-permission>
+      <method-permission>
+         <unchecked/>
+         <method>
+            <ejb-name>Teller</ejb-name>
+            <method-name>greetUnchecked</method-name>
+         </method>
+      </method-permission>
+      <method-permission>
+         <role-name>bankTeller</role-name>
+         <method>
+            <ejb-name>Bank</ejb-name>
+            <method-name>getCustomerId</method-name>
+         </method>
+         <method>
+            <ejb-name>Bank</ejb-name>
+            <method-name>storeCustomerId</method-name>
+         </method>
+      </method-permission>
+      <container-transaction>
+         <method>
+            <ejb-name>Teller</ejb-name>
+            <method-name>greetWithNotSupportedTransaction</method-name>
+         </method>
+         <trans-attribute>NotSupported</trans-attribute>
+      </container-transaction>
+      <container-transaction>
+         <method>
+            <ejb-name>Teller</ejb-name>
+            <method-name>greetWithRequiredTransaction</method-name>
+            <method-params>
+               <method-param>java.lang.String</method-param>
+            </method-params>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+      <container-transaction>
+         <method>
+            <ejb-name>Bank</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+      <exclude-list>
+         <method>
+            <ejb-name>Teller</ejb-name>
+            <method-name>excludedMethod</method-name>
+         </method>
+      </exclude-list>
+   </assembly-descriptor>
+</ejb-jar>]]></programlisting>
+         </para>
+      </sect2>
+      <sect2>  
+         <title>Security</title>
+         <para>
+            The following <literal>ejb-jar.xml</literal> file overrides any <literal>@RolesAllowed</literal>, <literal>@PermitAll</literal>, or <literal>@DenyAll</literal>
+            source code annotations for the <literal>bar</literal> method of the <literal>FooB</literal> EJB and adds a <literal>@RolesAllowed</literal> annotation for the 
+            <literal>allowed</literal> role.
+            <programlisting><![CDATA[
+<ejb-jar>
+   <assembly-descriptor>
+      <method-permission>
+         <role-name>allowed</role-name>
+         <method>
+            <ejb-name>FooB</ejb-name>
+            <method-name>bar</method-name>
+         </method>
+     </method-permission>
+   </assembly-descriptor>
+</ejb-jar>
+            ]]></programlisting>
+         </para>
+      </sect2> 
+      <sect2>  
+         <title>Transactions</title>
+         <para>
+            The following <literal>ejb-jar.xml</literal> file overrides any <literal>@TransactionAttribute</literal> annotations for the <literal>bar</literal> method of the
+            <literal>FooA</literal> EJB and adds a <literal>@TransactionAttribute</literal> annotation for <literal>NOT SUPPORTED</literal>.
+            <programlisting><![CDATA[
+<ejb-jar>
+   <assembly-descriptor>
+      <container-transaction>
+         <method>
+            <ejb-name>FooA</ejb-name>
+            <method-name>bar</method-name>
+         </method>
+         <trans-attribute>NotSupported</trans-attribute>
+      </container-transaction>
+   </assembly-descriptor>
+</ejb-jar>                          
+            ]]></programlisting>
+         </para>
+      </sect2>
+      <sect2>  
+         <title>References</title>
+         <para>
+            The following <literal>ejb-jar.xml</literal> file creates a local jndi EJB reference and injects the EJB to the injection target of the <literal>bank</literal>
+            member variable.
+            <programlisting><![CDATA[
+<ejb-jar> 
+   <enterprise-beans>
+      <session>
+         <ejb-name>Teller</ejb-name>
+         <ejb-ref>
+            <ejb-ref-name>ejb/Bank</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <remote>org.jboss.ejb3.test.bank.Bank</remote>
+            <ejb-link>Bank</ejb-link>
+	    <injection-target>bank</injection-target>
+         </ejb-ref>
+      </session>
+   </enterprise-beans>
+</ejb-jar>
+
+            ]]></programlisting>
+         </para>
+      </sect2>
+      <sect2>  
+         <title>Callbacks</title>
+         <para>
+            The following <literal>ejb-jar.xml</literal> file adds a <literal>@PostConstruct</literal> annotation to the <literal>postConstruct</literal> method of the
+            <literal>Teller</literal> EJB.
+            <programlisting><![CDATA[
+<ejb-jar> 
+   <assembly-descriptor>
+      <callback>
+         <annotation>PostConstruct</annotation>
+         <method>
+            <ejb-name>Teller</ejb-name>
+            <method-name>postConstruct</method-name>
+         </method>
+      </callback>
+   </assembly-descriptor>
+</ejb-jar>
+            ]]></programlisting>
+         </para>
+      </sect2>
+   </sect1>
+</chapter>
+

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/references.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/references.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/references.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/references.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+<chapter id="references">
+
+   <title>References and Injection XML and Annotations</title>
+
+   <sect1>
+      <title>Intro</title>
+      <para>
+         This section covers how JBoss implements @EJB and @Resource.  Please note that XML always overrides annotations.
+      </para>
+   </sect1>
+   <sect1>
+      <title>EJB references</title>
+      <para>
+         Rules for the @EJB annotation
+         <itemizedlist>
+            <listitem>
+               The @EJB annotation also has a mappedName() attribute.  The specification leaves this a vendor specific metadata, but JBoss recognizes mappedName() as the global JNDI name of the EJB you are referencing.  If you have specified a mappedName(), then all other attributes are ignored and this global JNDI name is used for binding.
+            </listitem>
+            <listitem>
+               If you specify @EJB with no attributes defined:
+               <programlisting>
+                    @EJB ProcessPayment myEjbref;
+               </programlisting>
+               Then the following rules apply:
+               <itemizedlist>
+                 <listitem>The EJB jar of the referencing bean is contained in is search for another EJB with the same interface.  If there are more than one EJB that publishes same business interface, throw an exception, if there is one, use that one.</listitem>
+                 <listitem>Search the EAR for EJBs that publish that interface.  If there are duplicates, throw an exception, otherwise return that one.</listitem>
+                 <listitem>Search globally in JBoss for an EJB of that interface.  Again, if duplicates, throw an exception</listitem>
+               </itemizedlist></listitem>
+          <listitem>@EJB.beanName() corresponds to <![CDATA[<ejb-link>]]>.  If the beanName() is defined, then use the same algorithm as @EJB with no attributes defined except use the beanName() as a key in the search.  An exception to this rule is if you use the ejb-link '#' syntax.  The '#' syntax allows you to put a relative path to a jar in the EAR where the EJB you are referencing lives.  See spec for more details</listitem>
+         </itemizedlist>
+      </para>
+      <para>
+         For XML the same rules apply as annotations exception <![CDATA[<mapped-name>]]> is the ejb-jar.xml equivalent to @EJB.mappedName().
+      </para>
+   </sect1>
+</chapter>
+

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<chapter id="resource-references">
-
-   <title>@Resource Annotation</title>
-
-   <para>
-      The @Resource annotation can be used to inject env-entries, EJBContext, JMS destinations and connection factories, and datasources.  For datasources and JMS destinations and connection factories, JBoss uses the <literal>@Resource.mappedName()</literal> attribute.  This attribute corresponds to the global JNDI name of the referenced resource.  For example, here's how you would use the @Resource annotation to inject a reference to the default datasource:
-<programlisting>
- at Resource(mappedName="java:/DefaultDS") DataSource ds;
-</programlisting>
-   </para>
-   <para>
-      Here's one for a JMS connection factory:
-<programlisting>
- at Resource(mappedName="java:/ConnectionFactory") ConnectionFactory factory;
-</programlisting>
-   </para>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/resource.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/resource.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<chapter id="resource-references">
+
+   <title>@Resource Annotation</title>
+
+   <para>
+      The @Resource annotation can be used to inject env-entries, EJBContext, JMS destinations and connection factories, and datasources.  For datasources and JMS destinations and connection factories, JBoss uses the <literal>@Resource.mappedName()</literal> attribute.  This attribute corresponds to the global JNDI name of the referenced resource.  For example, here's how you would use the @Resource annotation to inject a reference to the default datasource:
+<programlisting>
+ at Resource(mappedName="java:/DefaultDS") DataSource ds;
+</programlisting>
+   </para>
+   <para>
+      Here's one for a JMS connection factory:
+<programlisting>
+ at Resource(mappedName="java:/ConnectionFactory") ConnectionFactory factory;
+</programlisting>
+   </para>
+</chapter>
+

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,141 +0,0 @@
-<chapter id="session-bean-config">
-
-   <title>Session EJB and MDB Configuration</title>
-
-   <sect1>
-      <title>Pooling</title>
-      <para>
-         Both Stateless Session beans and Message Driven Beans have an instance pool.  The basic configuration of JBoss uses a thread local pool
-         to avoid Java synchronization (org.jboss.ejb3.ThreadLocalPool).  These EJB types can be configured to use an alternative pooling mechanism.  For example,
-         JBoss has a strict pool size implementation that will only allow a fixed number of concurrent requests to run at one time.  If there are more requests running
-         than the pool's strict size, those requests will block until an instance becomes available.  This is configured via the
-         @org.jboss.annotation.ejb.PoolClass annotation.
-         <programlisting>
-            @Retention(RetentionPolicy.RUNTIME)
-            @Target({ElementType.TYPE})
-            public @interface PoolClass
-            {
-               Class value();
-               int maxSize() default 30;
-               long timeout()default Long.MAX_VALUE;
-            }
-         </programlisting>
-         </para>
-      <para>
-         The value() parameter defines the pool implementation class you want to plug in.  maxSize() defines the size of the pool while timeout() is a time in
-         milliseconds you want to block when waiting for an instance to be ready.  This annotation can be applied to a stateless or message driven bean class.
-         Here's an example of using it.
-         <programlisting>
-            @Stateless
-            @PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=5, timeout=10000)
-            @Remote(StrictlyPooledSession.class)
-            public class StrictlyPooledSessionBean implements StrictlyPooledSession
-            {
-             ...
-            }
-         </programlisting>
-       </para>
-       <para>
-          There is no nice way of applying the same configuration through XML.  To do it through XML you must define a new aspect domain (an EJB container configuration template)
-          and define an annotation override within that domain and then apply the domain through jboss.xml.  Here's an example:
-       </para>
-      <para>
-         First create the aspect domain.  Create a file called mydomain-aop.xml and put this in the top level directory of your EJB jar.  Might seem a little cryptic
-         but what this is doing is declaring an annotation that will be created by the EJB container.  Our EJB3 implementation is based on JBoss AOP.  See the
-         JBoss AOP documentation for more info on annotation overrides.
-         <programlisting><![CDATA[
-<aop>
-   <domain name="Strictly Pooled Stateless Bean" extends="Stateless Bean" inheritBindings="true">
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-          @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=5, timeout=10000)
-      </annotation>
-   </domain>
-   <domain name="Strictly Pooled Message Driven Bean" extends="Message Driven Bean" inheritBindings="true">
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-          @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=5, timeout=10000)
-      </annotation>
-   </domain>
-</aop>
-
-]]>
-         </programlisting>
-      </para>
-      <para>
-         There is no nice way of applying the same configuration through XML.  To do it through XML you must define a new aspect domain (an EJB container configuration template)
-         and define an annotation override within that domain and then apply the domain through jboss.xml.  Here's an example:
-      </para>
-     <para>
-        The next thing you have to do is apply the aspect domain to your EJB within a jboss.xml file in the META-INF directory.
-        <programlisting><![CDATA[
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>MySessionBean</ejb-name>
-         <aop-domain-name>Strictly Pooled Stateless Bean</aop-domain-name>
-      </session>
-   </enterprise-beans>
-</jboss>
-  ]]>
-        </programlisting>
-     </para>
-   </sect1>
-   <sect1>
-      <title>The Stateful Session Bean Cache</title>
-      <para>
-         Stateful beans are stored in a cache.  This cache is responsible for passivated stateful sessions when
-         the cache becomes too full or a bean is too old.  You may want to set things like the max size of this cache, and when
-         beans should become idle.  Configuration is different depending on whether you are clustered or not.
-      </para>
-      <sect2>
-         <title>Non-Clustered</title>
-         <para>
-            For non clustered stateful beans, the @org.jboss.annotation.ejb.cache.simple.CacheConfig annotation is
-            responsible for configuring the cache.
-            <programlisting>
-               public @interface CacheConfig
-               {
-                  int maxSize() default 100000;
-
-                  long idleTimeoutSeconds() default 300;
-               }
-            </programlisting>
-  If you want an XML version, you must do a similar pattern as shown in the pooling
-            section above.  You must create an aspect domain through XML and apply that domain through XML.
-         </para>
-      </sect2>
-      <sect2>
-         <title>Clustered</title>
-         <para>
-            For non clustered stateful beans, the @org.jboss.annotation.ejb.cache.tree.CacheConfig annotation is
-            responsible for configuring the cache.
-            <programlisting>
-               public @interface CacheConfig
-               {
-                  String name() default "jboss.cache:service=EJB3SFSBClusteredCache";
-
-                  int maxSize() default 10000;
-
-                  long idleTimeoutSeconds() default 300;
-               }
-            </programlisting>
-            The name() attribute specificies the kernel name of the clustered cache you are using.  Usually you won't change this value.
-            If you want an XML version, you must do a similar pattern as shown in the pooling
-            section above.  You must create an aspect domain through XML and apply that domain through XML.
-         </para>
-      </sect2>
-      <sect2>
-         <title>No Passivation</title>
-         <para>
-            Sometimes it is useful to turn off passivation entirely.  This can be done by plugging in the caching implementation
-            using the @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class) annotation.
-         </para>
-      </sect2>
-   </sect1>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/session.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/session.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,141 @@
+<chapter id="session-bean-config">
+
+   <title>Session EJB and MDB Configuration</title>
+
+   <sect1>
+      <title>Pooling</title>
+      <para>
+         Both Stateless Session beans and Message Driven Beans have an instance pool.  The basic configuration of JBoss uses a thread local pool
+         to avoid Java synchronization (org.jboss.ejb3.ThreadLocalPool).  These EJB types can be configured to use an alternative pooling mechanism.  For example,
+         JBoss has a strict pool size implementation that will only allow a fixed number of concurrent requests to run at one time.  If there are more requests running
+         than the pool's strict size, those requests will block until an instance becomes available.  This is configured via the
+         @org.jboss.annotation.ejb.PoolClass annotation.
+         <programlisting>
+            @Retention(RetentionPolicy.RUNTIME)
+            @Target({ElementType.TYPE})
+            public @interface PoolClass
+            {
+               Class value();
+               int maxSize() default 30;
+               long timeout()default Long.MAX_VALUE;
+            }
+         </programlisting>
+         </para>
+      <para>
+         The value() parameter defines the pool implementation class you want to plug in.  maxSize() defines the size of the pool while timeout() is a time in
+         milliseconds you want to block when waiting for an instance to be ready.  This annotation can be applied to a stateless or message driven bean class.
+         Here's an example of using it.
+         <programlisting>
+            @Stateless
+            @PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=5, timeout=10000)
+            @Remote(StrictlyPooledSession.class)
+            public class StrictlyPooledSessionBean implements StrictlyPooledSession
+            {
+             ...
+            }
+         </programlisting>
+       </para>
+       <para>
+          There is no nice way of applying the same configuration through XML.  To do it through XML you must define a new aspect domain (an EJB container configuration template)
+          and define an annotation override within that domain and then apply the domain through jboss.xml.  Here's an example:
+       </para>
+      <para>
+         First create the aspect domain.  Create a file called mydomain-aop.xml and put this in the top level directory of your EJB jar.  Might seem a little cryptic
+         but what this is doing is declaring an annotation that will be created by the EJB container.  Our EJB3 implementation is based on JBoss AOP.  See the
+         JBoss AOP documentation for more info on annotation overrides.
+         <programlisting><![CDATA[
+<aop>
+   <domain name="Strictly Pooled Stateless Bean" extends="Stateless Bean" inheritBindings="true">
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+          @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=5, timeout=10000)
+      </annotation>
+   </domain>
+   <domain name="Strictly Pooled Message Driven Bean" extends="Message Driven Bean" inheritBindings="true">
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+          @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=5, timeout=10000)
+      </annotation>
+   </domain>
+</aop>
+
+]]>
+         </programlisting>
+      </para>
+      <para>
+         There is no nice way of applying the same configuration through XML.  To do it through XML you must define a new aspect domain (an EJB container configuration template)
+         and define an annotation override within that domain and then apply the domain through jboss.xml.  Here's an example:
+      </para>
+     <para>
+        The next thing you have to do is apply the aspect domain to your EJB within a jboss.xml file in the META-INF directory.
+        <programlisting><![CDATA[
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>MySessionBean</ejb-name>
+         <aop-domain-name>Strictly Pooled Stateless Bean</aop-domain-name>
+      </session>
+   </enterprise-beans>
+</jboss>
+  ]]>
+        </programlisting>
+     </para>
+   </sect1>
+   <sect1>
+      <title>The Stateful Session Bean Cache</title>
+      <para>
+         Stateful beans are stored in a cache.  This cache is responsible for passivated stateful sessions when
+         the cache becomes too full or a bean is too old.  You may want to set things like the max size of this cache, and when
+         beans should become idle.  Configuration is different depending on whether you are clustered or not.
+      </para>
+      <sect2>
+         <title>Non-Clustered</title>
+         <para>
+            For non clustered stateful beans, the @org.jboss.annotation.ejb.cache.simple.CacheConfig annotation is
+            responsible for configuring the cache.
+            <programlisting>
+               public @interface CacheConfig
+               {
+                  int maxSize() default 100000;
+
+                  long idleTimeoutSeconds() default 300;
+               }
+            </programlisting>
+  If you want an XML version, you must do a similar pattern as shown in the pooling
+            section above.  You must create an aspect domain through XML and apply that domain through XML.
+         </para>
+      </sect2>
+      <sect2>
+         <title>Clustered</title>
+         <para>
+            For non clustered stateful beans, the @org.jboss.annotation.ejb.cache.tree.CacheConfig annotation is
+            responsible for configuring the cache.
+            <programlisting>
+               public @interface CacheConfig
+               {
+                  String name() default "jboss.cache:service=EJB3SFSBClusteredCache";
+
+                  int maxSize() default 10000;
+
+                  long idleTimeoutSeconds() default 300;
+               }
+            </programlisting>
+            The name() attribute specificies the kernel name of the clustered cache you are using.  Usually you won't change this value.
+            If you want an XML version, you must do a similar pattern as shown in the pooling
+            section above.  You must create an aspect domain through XML and apply that domain through XML.
+         </para>
+      </sect2>
+      <sect2>
+         <title>No Passivation</title>
+         <para>
+            Sometimes it is useful to turn off passivation entirely.  This can be done by plugging in the caching implementation
+            using the @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class) annotation.
+         </para>
+      </sect2>
+   </sect1>
+</chapter>
+

Deleted: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,176 +0,0 @@
-<chapter id="transport">
-   <title>Transports</title>
-   <para>
-      This chapter explains how remote clients communicate with the EJB 3 container and describes how to set up alternate transports.
-      types. The transport used by JBoss EJB 3 is based on JBoss Remoting, see the JBoss Remoting documentation for more in-depth examples.
-   </para>
-   <sect1>
-      <title>Default transport</title>
-      <para>
-         By default JBoss EJB 3 uses a socket based invoker layer on port 3878. This is set up in
-         <literal><![CDATA[$JBOSS_HOME/server/<your-conf>/deploy/ejb3.deployer/META-INF/jboss-service.xml]]></literal>
-      </para>
-      <para>This is the out-of-the-box setup:</para>
-         <programlisting><![CDATA[
-   <mbean code="org.jboss.remoting.transport.Connector"
-          xmbean-dd="org/jboss/remoting/transport/Connector.xml"
-          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
-      <depends>jboss.aop:service=AspectDeployer</depends>
-      <attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute>
-      <attribute name="Configuration">
-         <handlers>
-            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
-         </handlers>
-      </attribute>
-   </mbean>]]>
-         </programlisting>
-      <para>
-         The URL given by the <literal>InvokerLocator</literal> atribute tells JBoss Remoting which protocol to use, and which IP address and
-         port to listen on. In this case we are using <literal>0.0.0.0</literal> as the IP address, meaning we listen on all NIC's. The
-         <literal>socket://</literal> protocol means we listen on a plain socket, and the port we use is <literal>3873</literal>
-      </para>
-      <para>
-         The <literal>Configuration</literal> attribute specifies that requests coming in via this socket should be handed over to the
-         <literal>AOP</literal> subsystem, implemented by <literal>org.jboss.aspects.remoting.AOPRemotingInvocationHandler</literal>
-         which is the entry point to the EJB 3 container.
-      </para>
-   </sect1>
-   <sect1>
-      <title>Securing the transport</title>
-      <para>
-         In some cases you may wish to use SSL as the protocol. In order to do this you first need to generate a keystore.
-      </para>
-      <sect2>
-         <title>Generating the keystore and truststore</title>
-         <para>
-            For SSL to work we need to create a public/private key pair, which will be stored in a keystore. Generate this using the <literal>genkey</literal> command that comes with the JDK.
-         </para>
-         <programlisting>
-   $cd $JBOSS_HOME/server/default/conf/
-   $ keytool -genkey -alias ejb3-ssl -keypass opensource -keystore localhost.keystore
-   Enter keystore password:  opensource
-   What is your first and last name?
-     [Unknown]:
-   What is the name of your organizational unit?
-     [Unknown]:
-   What is the name of your organization?
-     [Unknown]:
-   What is the name of your City or Locality?
-     [Unknown]:
-   What is the name of your State or Province?
-     [Unknown]:
-   What is the two-letter country code for this unit?
-     [Unknown]:
-   Is CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown correct?
-     [no]:  yes
-         </programlisting>
-         <para>
-            <literal>alias</literal> is the name ("ejb2-ssl") of the key pair within the keystore. <literal>keypass</literal> is the password ("opensource") for the keystore, and
-            <literal>keystore</literal> specifies the location ("localhost.keystore") of the keystore to create/add to.
-         </para>
-         <para>
-            Since we have not signed our certificate through any certification authoritiy, we also need to create a truststore for the client, explicitly saying that we trust the certificate
-            we just created. The first step is to export the certificate using the JDK keytool:
-         </para>
-         <programlisting><![CDATA[
-   $ keytool -export -alias ejb3-ssl -file mycert.cer -keystore localhost.keystore
-   Enter keystore password:  opensource
-   Certificate stored in file <mycert.cer>
-
-         ]]></programlisting>
-         <para>
-            Then we need to create the truststore if it does not exist and import the certificate into the trueststore:
-         </para>
-         <programlisting><![CDATA[
-   $ keytool -import -alias ejb3-ssl -file mycert.cer -keystore localhost.truststore
-   Enter keystore password:  opensource
-   Owner: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
-   Issuer: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
-   Serial number: 43bff927
-   Valid from: Sat Jan 07 18:23:51 CET 2006 until: Fri Apr 07 19:23:51 CEST 2006
-   Certificate fingerprints:
-            MD5:  CF:DC:71:A8:F4:EA:8F:5A:E9:94:E3:E6:5B:A9:C8:F3
-            SHA1: 0E:AD:F3:D6:41:5E:F6:84:9A:D1:54:3D:DE:A9:B2:01:28:F6:7C:26
-   Trust this certificate? [no]:  yes
-   Certificate was added to keystore ]]>
-</programlisting>
-      </sect2>
-      <sect2>
-         <title>Setting up the SSL transport</title>
-         <para>
-         The simplest way to define an SSL transport is to define a new Remoting connector using the <literal>sslsocket</literal> protocol
-         as follows. This transport will listen on port 3843:
-         </para>
-         <programlisting><![CDATA[
-   <mbean code="org.jboss.remoting.transport.Connector"
-      xmbean-dd="org/jboss/remoting/transport/Connector.xml"
-      name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
-      <depends>jboss.aop:service=AspectDeployer</depends>
-      <attribute name="InvokerLocator">sslsocket://0.0.0.0:3843</attribute>
-      <attribute name="Configuration">
-         <handlers>
-            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
-         </handlers>
-      </attribute>
-   </mbean>]]>
-         </programlisting>
-         <para>
-         We need to tell JBoss Remoting where to find the keystore to be used for SSl and its password. This is done using the
-         <literal>javax.net.ssl.keyStore</literal> and <literal>javax.net.ssl.keyStorePassword=opensource</literal> system properties when starting JBoss, as the
-         following example shows:
-         </para>
-         <programlisting>
-    $cd $JBOSS_HOME/bin
-    $ run -Djavax.net.ssl.keyStore=../server/default/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource
-         </programlisting>
-      </sect2>
-      <sect2>
-         <title>Configuring your beans to use the SSL transport</title>
-         <para>
-            By default all the beans will use the default connector on <literal>socket://0.0.0.0:3873</literal>. By using the <literal>@org.jboss.annotation.ejb.RemoteBinding</literal>
-            annotation we can have the bean invokable via SSL.
-         </para>
-         <programlisting>
-   @RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843", jndiBinding="StatefulSSL"),
-   @Remote(BusinessInterface.class)
-   public class StatefulBean implements BusinessInterface
-   {
-      ...
-   }
-
-         </programlisting>
-         <para>
-            This bean will be bound under the JNDI name <literal>StatefulSSL</literal> and the proxy implementing the remote interface returned to the client will communicate with the server via SSL.
-         </para>
-         <para>
-            You can also enable different types of communication for your beans
-         </para>
-         <programlisting>
-   @RemoteBindings({
-      @RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843", jndiBinding="StatefulSSL"),
-      @RemoteBinding(jndiBinding="StatefulNormal")
-   })
-   @Remote(BusinessInterface.class)
-   public class StatefulBean implements BusinessInterface
-   {
-      ...
-   }
-         </programlisting>
-         <para>
-            Now if you look up <literal>StatefulNormal</literal> the returned proxy implementing the remote interface will communicate with the server via the normal unencrypted socket protocol, and if we
-           look up <literal>StatefulSSL</literal> the returned proxy  implementing the remote interface will communicate with the server via SSL.
-         </para>
-      </sect2>
-      <sect2>
-         <title>Setting up the client to use the truststore</title>
-         <para>
-            If not using a certificate signed by a certificate authorization authority, you need to point the client to the truststore using the <literal>javax.net.ssl.trustStore</literal>
-            system property and specify the password using the <literal>javax.net.ssl.trustStorePassword</literal> system property:
-         </para>
-         <programlisting>
-            java -Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource com.acme.RunClient
-         </programlisting>
-      </sect2>
-   </sect1>
-</chapter>
-

Copied: branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/reference/reference/en/modules/transport.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/reference/reference/en/modules/transport.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,176 @@
+<chapter id="transport">
+   <title>Transports</title>
+   <para>
+      This chapter explains how remote clients communicate with the EJB 3 container and describes how to set up alternate transports.
+      types. The transport used by JBoss EJB 3 is based on JBoss Remoting, see the JBoss Remoting documentation for more in-depth examples.
+   </para>
+   <sect1>
+      <title>Default transport</title>
+      <para>
+         By default JBoss EJB 3 uses a socket based invoker layer on port 3878. This is set up in
+         <literal><![CDATA[$JBOSS_HOME/server/<your-conf>/deploy/ejb3.deployer/META-INF/jboss-service.xml]]></literal>
+      </para>
+      <para>This is the out-of-the-box setup:</para>
+         <programlisting><![CDATA[
+   <mbean code="org.jboss.remoting.transport.Connector"
+          xmbean-dd="org/jboss/remoting/transport/Connector.xml"
+          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
+      <depends>jboss.aop:service=AspectDeployer</depends>
+      <attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute>
+      <attribute name="Configuration">
+         <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+         </handlers>
+      </attribute>
+   </mbean>]]>
+         </programlisting>
+      <para>
+         The URL given by the <literal>InvokerLocator</literal> atribute tells JBoss Remoting which protocol to use, and which IP address and
+         port to listen on. In this case we are using <literal>0.0.0.0</literal> as the IP address, meaning we listen on all NIC's. The
+         <literal>socket://</literal> protocol means we listen on a plain socket, and the port we use is <literal>3873</literal>
+      </para>
+      <para>
+         The <literal>Configuration</literal> attribute specifies that requests coming in via this socket should be handed over to the
+         <literal>AOP</literal> subsystem, implemented by <literal>org.jboss.aspects.remoting.AOPRemotingInvocationHandler</literal>
+         which is the entry point to the EJB 3 container.
+      </para>
+   </sect1>
+   <sect1>
+      <title>Securing the transport</title>
+      <para>
+         In some cases you may wish to use SSL as the protocol. In order to do this you first need to generate a keystore.
+      </para>
+      <sect2>
+         <title>Generating the keystore and truststore</title>
+         <para>
+            For SSL to work we need to create a public/private key pair, which will be stored in a keystore. Generate this using the <literal>genkey</literal> command that comes with the JDK.
+         </para>
+         <programlisting>
+   $cd $JBOSS_HOME/server/default/conf/
+   $ keytool -genkey -alias ejb3-ssl -keypass opensource -keystore localhost.keystore
+   Enter keystore password:  opensource
+   What is your first and last name?
+     [Unknown]:
+   What is the name of your organizational unit?
+     [Unknown]:
+   What is the name of your organization?
+     [Unknown]:
+   What is the name of your City or Locality?
+     [Unknown]:
+   What is the name of your State or Province?
+     [Unknown]:
+   What is the two-letter country code for this unit?
+     [Unknown]:
+   Is CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown correct?
+     [no]:  yes
+         </programlisting>
+         <para>
+            <literal>alias</literal> is the name ("ejb2-ssl") of the key pair within the keystore. <literal>keypass</literal> is the password ("opensource") for the keystore, and
+            <literal>keystore</literal> specifies the location ("localhost.keystore") of the keystore to create/add to.
+         </para>
+         <para>
+            Since we have not signed our certificate through any certification authoritiy, we also need to create a truststore for the client, explicitly saying that we trust the certificate
+            we just created. The first step is to export the certificate using the JDK keytool:
+         </para>
+         <programlisting><![CDATA[
+   $ keytool -export -alias ejb3-ssl -file mycert.cer -keystore localhost.keystore
+   Enter keystore password:  opensource
+   Certificate stored in file <mycert.cer>
+
+         ]]></programlisting>
+         <para>
+            Then we need to create the truststore if it does not exist and import the certificate into the trueststore:
+         </para>
+         <programlisting><![CDATA[
+   $ keytool -import -alias ejb3-ssl -file mycert.cer -keystore localhost.truststore
+   Enter keystore password:  opensource
+   Owner: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
+   Issuer: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
+   Serial number: 43bff927
+   Valid from: Sat Jan 07 18:23:51 CET 2006 until: Fri Apr 07 19:23:51 CEST 2006
+   Certificate fingerprints:
+            MD5:  CF:DC:71:A8:F4:EA:8F:5A:E9:94:E3:E6:5B:A9:C8:F3
+            SHA1: 0E:AD:F3:D6:41:5E:F6:84:9A:D1:54:3D:DE:A9:B2:01:28:F6:7C:26
+   Trust this certificate? [no]:  yes
+   Certificate was added to keystore ]]>
+</programlisting>
+      </sect2>
+      <sect2>
+         <title>Setting up the SSL transport</title>
+         <para>
+         The simplest way to define an SSL transport is to define a new Remoting connector using the <literal>sslsocket</literal> protocol
+         as follows. This transport will listen on port 3843:
+         </para>
+         <programlisting><![CDATA[
+   <mbean code="org.jboss.remoting.transport.Connector"
+      xmbean-dd="org/jboss/remoting/transport/Connector.xml"
+      name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
+      <depends>jboss.aop:service=AspectDeployer</depends>
+      <attribute name="InvokerLocator">sslsocket://0.0.0.0:3843</attribute>
+      <attribute name="Configuration">
+         <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+         </handlers>
+      </attribute>
+   </mbean>]]>
+         </programlisting>
+         <para>
+         We need to tell JBoss Remoting where to find the keystore to be used for SSl and its password. This is done using the
+         <literal>javax.net.ssl.keyStore</literal> and <literal>javax.net.ssl.keyStorePassword=opensource</literal> system properties when starting JBoss, as the
+         following example shows:
+         </para>
+         <programlisting>
+    $cd $JBOSS_HOME/bin
+    $ run -Djavax.net.ssl.keyStore=../server/default/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource
+         </programlisting>
+      </sect2>
+      <sect2>
+         <title>Configuring your beans to use the SSL transport</title>
+         <para>
+            By default all the beans will use the default connector on <literal>socket://0.0.0.0:3873</literal>. By using the <literal>@org.jboss.annotation.ejb.RemoteBinding</literal>
+            annotation we can have the bean invokable via SSL.
+         </para>
+         <programlisting>
+   @RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843", jndiBinding="StatefulSSL"),
+   @Remote(BusinessInterface.class)
+   public class StatefulBean implements BusinessInterface
+   {
+      ...
+   }
+
+         </programlisting>
+         <para>
+            This bean will be bound under the JNDI name <literal>StatefulSSL</literal> and the proxy implementing the remote interface returned to the client will communicate with the server via SSL.
+         </para>
+         <para>
+            You can also enable different types of communication for your beans
+         </para>
+         <programlisting>
+   @RemoteBindings({
+      @RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843", jndiBinding="StatefulSSL"),
+      @RemoteBinding(jndiBinding="StatefulNormal")
+   })
+   @Remote(BusinessInterface.class)
+   public class StatefulBean implements BusinessInterface
+   {
+      ...
+   }
+         </programlisting>
+         <para>
+            Now if you look up <literal>StatefulNormal</literal> the returned proxy implementing the remote interface will communicate with the server via the normal unencrypted socket protocol, and if we
+           look up <literal>StatefulSSL</literal> the returned proxy  implementing the remote interface will communicate with the server via SSL.
+         </para>
+      </sect2>
+      <sect2>
+         <title>Setting up the client to use the truststore</title>
+         <para>
+            If not using a certificate signed by a certificate authorization authority, you need to point the client to the truststore using the <literal>javax.net.ssl.trustStore</literal>
+            system property and specify the password using the <literal>javax.net.ssl.trustStorePassword</literal> system property:
+         </para>
+         <programlisting>
+            java -Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource com.acme.RunClient
+         </programlisting>
+      </sect2>
+   </sect1>
+</chapter>
+

Modified: branches/Branch_4_2/ejb3/docs/tutorial/asynch/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/asynch/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/asynch/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,10 +6,10 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/> 
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
    <property name="jboss.home" value="${env.JBOSS_HOME}"/>
-   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/asynch/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/asynch/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/blob/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/blob/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/blob/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/blob/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/blob/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/blob/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/blob/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,10 +6,10 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
    <property name="jboss.home" value="${env.JBOSS_HOME}"/>
-   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/blob/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/blob/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-]>
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project default="main" name="JBoss/EJB3 Tutorials">
-
-	<target name="main">
-		<antcall target="asynch" inheritRefs="true"/>
-		<antcall target="blob" inheritRefs="true"/>
-		<antcall target="callbacks" inheritRefs="true"/>
-		<antcall target="clusteredentity" inheritRefs="true"/>
-		<!--antcall target="clustering" inheritRefs="true"/-->
-		<antcall target="composite" inheritRefs="true"/>
-		<antcall target="consumer" inheritRefs="true"/>
-		<antcall target="consumer_deployment_descriptor" inheritRefs="true"/>
-		<antcall target="dependency" inheritRefs="true"/>
-		<antcall target="dependent" inheritRefs="true"/>
-		<antcall target="ear" inheritRefs="true"/>
-		<antcall target="ejb21_client_adaptors" inheritRefs="true"/>
-		<antcall target="entity" inheritRefs="true"/>
-		<antcall target="extended_pc" inheritRefs="true"/>
-		<antcall target="injection" inheritRefs="true"/>
-		<antcall target="interceptor" inheritRefs="true"/>
-		<antcall target="jboss_deployment_descriptor" inheritRefs="true"/>
-		<!--antcall target="jca/inflow/swiftmq" inheritRefs="true"/-->
-		<antcall target="jndibinding" inheritRefs="true"/>
-		<antcall target="joininheritance" inheritRefs="true"/>
-		<antcall target="mdb" inheritRefs="true"/>
-		<antcall target="jndibinding" inheritRefs="true"/>
-		<antcall target="merge" inheritRefs="true"/>
-		<antcall target="packaging" inheritRefs="true"/>
-		<antcall target="relationships" inheritRefs="true"/>
-		<antcall target="secondary" inheritRefs="true"/>
-		<antcall target="security" inheritRefs="true"/>
-		<antcall target="service" inheritRefs="true"/>
-		<antcall target="service_deployment_descriptor" inheritRefs="true"/>
-		<antcall target="singleinheritance" inheritRefs="true"/>
-		<antcall target="stateful" inheritRefs="true"/>
-		<antcall target="stateful_deployment_descriptor" inheritRefs="true"/>
-		<antcall target="stateless" inheritRefs="true"/>
-		<antcall target="stateless_deployment_descriptor" inheritRefs="true"/>
-		<antcall target="tableperinheritance" inheritRefs="true"/>
-		<antcall target="timer" inheritRefs="true"/>
-	</target>
-
-	<target name="asynch"> 
-		<echo message="---------------- Running asynch ------------"/>     
-		<ant dir="asynch" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="asynch" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="asynch" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="blob">       
-		<echo message="---------------- Running blob ------------"/>
-		<ant dir="blob" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="blob" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="blob" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="callbacks">     
-		<echo message="---------------- Running callbacks ------------"/>  
-		<ant dir="callbacks" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="callbacks" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="callbacks" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="clusteredentity">  
-		<echo message="---------------- Running clusteredentity ------------"/>     
-		<ant dir="clusteredentity" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="clusteredentity" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="clusteredentity" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="clustering">     
-		<echo message="---------------- Running clustering ------------"/>  
-		<ant dir="clustering" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="clustering" antfile="build.xml" target="run.stateless"/>
-		<ant dir="clustering" antfile="build.xml" target="run.stateful"/>
-		<sleep seconds="4"/>
-		<ant dir="clustering" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="composite">   
-		<echo message="---------------- Running composite ------------"/>    
-		<ant dir="composite" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="composite" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="composite" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="consumer">   
-		<echo message="---------------- Running consumer ------------"/>    
-		<ant dir="consumer" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="consumer" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="consumer" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="consumer_deployment_descriptor">   
-		<echo message="---------------- Running consumer_deployment_descriptor ------------"/>    
-		<ant dir="consumer_deployment_descriptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="consumer_deployment_descriptor" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="consumer_deployment_descriptor" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="dependency">       
-		<echo message="---------------- Running dependency ------------"/>
-		<ant dir="dependency" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="dependency" antfile="build.xml" target="run"/>
-		<ant dir="dependency" antfile="build.xml" target="deploy-dependency"/>
-		<sleep seconds="4"/>
-		<ant dir="dependency" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="dependent">    
-		<echo message="---------------- Running dependent ------------"/>   
-		<ant dir="dependent" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="dependent" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="dependent" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="ear">      
-		<echo message="---------------- Running ear ------------"/> 
-		<ant dir="ear" antfile="build.xml"/>
-		<sleep seconds="4"/>
-		<ant dir="ear" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="ejb21_client_adaptors"> 
-		<echo message="---------------- Running ejb21_client_adaptors ------------"/>      
-		<ant dir="ejb21_client_adaptors" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="ejb21_client_adaptors" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="ejb21_client_adaptors" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="entity">       
-		<echo message="---------------- Running entity ------------"/>
-		<ant dir="entity" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="entity" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="entity" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="extended_pc">       
-		<echo message="---------------- Running extended_pc ------------"/>
-		<ant dir="extended_pc" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="extended_pc" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="extended_pc" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="injection">       
-		<echo message="---------------- Running injection ------------"/>
-		<ant dir="injection" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="injection" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="injection" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="interceptor">   
-		<echo message="---------------- Running interceptor ------------"/>    
-		<ant dir="interceptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="interceptor" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="interceptor" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="jboss_deployment_descriptor"> 
-		<echo message="---------------- Running jboss_deployment_descriptor ------------"/>      
-		<ant dir="jboss_deployment_descriptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="jboss_deployment_descriptor" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="jboss_deployment_descriptor" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="jca/inflow/swiftmq">    
-		<echo message="---------------- Running jca/inflow/swiftmq ------------"/>   
-		<ant dir="jca/inflow/swiftmq" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="jca/inflow/swiftmq" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="jca/inflow/swiftmq" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="jndibinding">  
-		<echo message="---------------- Running jndibinding ------------"/>     
-		<ant dir="jndibinding" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="jndibinding" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="jndibinding" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="joininheritance">    
-		<echo message="---------------- Running joininheritance ------------"/>   
-		<ant dir="joininheritance" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="joininheritance" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="joininheritance" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="mdb">      
-		<echo message="---------------- Running mdb ------------"/> 
-		<ant dir="mdb" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="mdb" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="mdb" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="mdb_deployment_descriptor"> 
-		<echo message="---------------- Running mdb_deployment_descriptor ------------"/>      
-		<ant dir="mdb_deployment_descriptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="mdb_deployment_descriptor" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="mdb_deployment_descriptor" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="merge">       
-		<echo message="---------------- Running merge ------------"/>
-		<ant dir="merge" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="merge" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="merge" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="packaging">   
-		<echo message="---------------- Running packaging ------------"/>    
-		<ant dir="packaging" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="packaging" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="packaging" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="relationships">  
-		<echo message="---------------- Running relationships ------------"/>     
-		<ant dir="relationships" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="relationships" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="relationships" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="secondary">   
-		<echo message="---------------- Running secondary ------------"/>    
-		<ant dir="secondary" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="secondary" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="secondary" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="security"> 
-		<echo message="---------------- Running security ------------"/>      
-		<ant dir="security" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="security" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="security" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="service"> 
-		<echo message="---------------- Running service ------------"/>      
-		<ant dir="service" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="service" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="service" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="service_deployment_descriptor">   
-		<echo message="---------------- Running service_deployment_descriptor ------------"/>    
-		<ant dir="service_deployment_descriptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="service_deployment_descriptor" antfile="build.xml" target="run"/>	
-		<sleep seconds="4"/>
-		<ant dir="service_deployment_descriptor" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="singleinheritance">  
-		<echo message="---------------- Running singleinheritance ------------"/>     
-		<ant dir="singleinheritance" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="singleinheritance" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="singleinheritance" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="stateful">    
-		<echo message="---------------- Running stateful ------------"/>   
-		<ant dir="stateful" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="stateful" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="stateful" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="stateful_deployment_descriptor"> 
-		<echo message="---------------- Running stateful_deployment_descriptor ------------"/>      
-		<ant dir="stateful_deployment_descriptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="stateful_deployment_descriptor" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="stateful_deployment_descriptor" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="stateless">       
-		<echo message="---------------- Running stateless ------------"/>
-		<ant dir="stateless" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="stateless" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="stateless" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="stateless_deployment_descriptor">     
-		<echo message="---------------- Running stateless_deployment_descriptor ------------"/>  
-		<ant dir="stateless_deployment_descriptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="stateless_deployment_descriptor" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="stateless_deployment_descriptor" antfile="build.xml" target="clean"/>
-	</target>
-	
-	<target name="tableperinheritance">       
-		<echo message="---------------- Running tableperinheritance ------------"/>
-		<ant dir="tableperinheritance" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="tableperinheritance" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="tableperinheritance" antfile="build.xml" target="clean"/>
-	</target>
-
-	<target name="timer">    
-		<echo message="---------------- Running timer ------------"/>   
-		<ant dir="timer" antfile="build.xml"/>
-		<sleep seconds="5"/>
-		<ant dir="timer" antfile="build.xml" target="run"/>
-		<sleep seconds="4"/>
-		<ant dir="timer" antfile="build.xml" target="clean"/>
-	</target>
-
-</project>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+]>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project default="main" name="JBoss/EJB3 Tutorials">
+
+	<target name="main">
+		<antcall target="asynch" inheritRefs="true"/>
+		<antcall target="blob" inheritRefs="true"/>
+		<antcall target="callbacks" inheritRefs="true"/>
+		<antcall target="clusteredentity" inheritRefs="true"/>
+		<!--antcall target="clustering" inheritRefs="true"/-->
+		<antcall target="composite" inheritRefs="true"/>
+		<antcall target="consumer" inheritRefs="true"/>
+		<antcall target="consumer_deployment_descriptor" inheritRefs="true"/>
+		<antcall target="dependency" inheritRefs="true"/>
+		<antcall target="dependent" inheritRefs="true"/>
+		<antcall target="ear" inheritRefs="true"/>
+		<antcall target="ejb21_client_adaptors" inheritRefs="true"/>
+		<antcall target="entity" inheritRefs="true"/>
+		<antcall target="extended_pc" inheritRefs="true"/>
+		<antcall target="injection" inheritRefs="true"/>
+		<antcall target="interceptor" inheritRefs="true"/>
+		<antcall target="jboss_deployment_descriptor" inheritRefs="true"/>
+		<!--antcall target="jca/inflow/swiftmq" inheritRefs="true"/-->
+		<antcall target="jndibinding" inheritRefs="true"/>
+		<antcall target="joininheritance" inheritRefs="true"/>
+		<antcall target="mdb" inheritRefs="true"/>
+		<antcall target="jndibinding" inheritRefs="true"/>
+		<antcall target="merge" inheritRefs="true"/>
+		<antcall target="packaging" inheritRefs="true"/>
+		<antcall target="relationships" inheritRefs="true"/>
+		<antcall target="secondary" inheritRefs="true"/>
+		<antcall target="security" inheritRefs="true"/>
+		<antcall target="service" inheritRefs="true"/>
+		<antcall target="service_deployment_descriptor" inheritRefs="true"/>
+		<antcall target="singleinheritance" inheritRefs="true"/>
+		<antcall target="stateful" inheritRefs="true"/>
+		<antcall target="stateful_deployment_descriptor" inheritRefs="true"/>
+		<antcall target="stateless" inheritRefs="true"/>
+		<antcall target="stateless_deployment_descriptor" inheritRefs="true"/>
+		<antcall target="tableperinheritance" inheritRefs="true"/>
+		<antcall target="timer" inheritRefs="true"/>
+	</target>
+
+	<target name="asynch"> 
+		<echo message="---------------- Running asynch ------------"/>     
+		<ant dir="asynch" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="asynch" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="asynch" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="blob">       
+		<echo message="---------------- Running blob ------------"/>
+		<ant dir="blob" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="blob" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="blob" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="callbacks">     
+		<echo message="---------------- Running callbacks ------------"/>  
+		<ant dir="callbacks" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="callbacks" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="callbacks" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="clusteredentity">  
+		<echo message="---------------- Running clusteredentity ------------"/>     
+		<ant dir="clusteredentity" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="clusteredentity" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="clusteredentity" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="clustering">     
+		<echo message="---------------- Running clustering ------------"/>  
+		<ant dir="clustering" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="clustering" antfile="build.xml" target="run.stateless"/>
+		<ant dir="clustering" antfile="build.xml" target="run.stateful"/>
+		<sleep seconds="4"/>
+		<ant dir="clustering" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="composite">   
+		<echo message="---------------- Running composite ------------"/>    
+		<ant dir="composite" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="composite" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="composite" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="consumer">   
+		<echo message="---------------- Running consumer ------------"/>    
+		<ant dir="consumer" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="consumer" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="consumer" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="consumer_deployment_descriptor">   
+		<echo message="---------------- Running consumer_deployment_descriptor ------------"/>    
+		<ant dir="consumer_deployment_descriptor" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="consumer_deployment_descriptor" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="consumer_deployment_descriptor" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="dependency">       
+		<echo message="---------------- Running dependency ------------"/>
+		<ant dir="dependency" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="dependency" antfile="build.xml" target="run"/>
+		<ant dir="dependency" antfile="build.xml" target="deploy-dependency"/>
+		<sleep seconds="4"/>
+		<ant dir="dependency" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="dependent">    
+		<echo message="---------------- Running dependent ------------"/>   
+		<ant dir="dependent" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="dependent" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="dependent" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="ear">      
+		<echo message="---------------- Running ear ------------"/> 
+		<ant dir="ear" antfile="build.xml"/>
+		<sleep seconds="4"/>
+		<ant dir="ear" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="ejb21_client_adaptors"> 
+		<echo message="---------------- Running ejb21_client_adaptors ------------"/>      
+		<ant dir="ejb21_client_adaptors" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="ejb21_client_adaptors" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="ejb21_client_adaptors" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="entity">       
+		<echo message="---------------- Running entity ------------"/>
+		<ant dir="entity" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="entity" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="entity" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="extended_pc">       
+		<echo message="---------------- Running extended_pc ------------"/>
+		<ant dir="extended_pc" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="extended_pc" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="extended_pc" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="injection">       
+		<echo message="---------------- Running injection ------------"/>
+		<ant dir="injection" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="injection" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="injection" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="interceptor">   
+		<echo message="---------------- Running interceptor ------------"/>    
+		<ant dir="interceptor" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="interceptor" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="interceptor" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="jboss_deployment_descriptor"> 
+		<echo message="---------------- Running jboss_deployment_descriptor ------------"/>      
+		<ant dir="jboss_deployment_descriptor" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="jboss_deployment_descriptor" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="jboss_deployment_descriptor" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="jca/inflow/swiftmq">    
+		<echo message="---------------- Running jca/inflow/swiftmq ------------"/>   
+		<ant dir="jca/inflow/swiftmq" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="jca/inflow/swiftmq" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="jca/inflow/swiftmq" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="jndibinding">  
+		<echo message="---------------- Running jndibinding ------------"/>     
+		<ant dir="jndibinding" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="jndibinding" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="jndibinding" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="joininheritance">    
+		<echo message="---------------- Running joininheritance ------------"/>   
+		<ant dir="joininheritance" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="joininheritance" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="joininheritance" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="mdb">      
+		<echo message="---------------- Running mdb ------------"/> 
+		<ant dir="mdb" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="mdb" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="mdb" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="mdb_deployment_descriptor"> 
+		<echo message="---------------- Running mdb_deployment_descriptor ------------"/>      
+		<ant dir="mdb_deployment_descriptor" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="mdb_deployment_descriptor" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="mdb_deployment_descriptor" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="merge">       
+		<echo message="---------------- Running merge ------------"/>
+		<ant dir="merge" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="merge" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="merge" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="packaging">   
+		<echo message="---------------- Running packaging ------------"/>    
+		<ant dir="packaging" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="packaging" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="packaging" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="relationships">  
+		<echo message="---------------- Running relationships ------------"/>     
+		<ant dir="relationships" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="relationships" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="relationships" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="secondary">   
+		<echo message="---------------- Running secondary ------------"/>    
+		<ant dir="secondary" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="secondary" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="secondary" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="security"> 
+		<echo message="---------------- Running security ------------"/>      
+		<ant dir="security" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="security" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="security" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="service"> 
+		<echo message="---------------- Running service ------------"/>      
+		<ant dir="service" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="service" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="service" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="service_deployment_descriptor">   
+		<echo message="---------------- Running service_deployment_descriptor ------------"/>    
+		<ant dir="service_deployment_descriptor" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="service_deployment_descriptor" antfile="build.xml" target="run"/>	
+		<sleep seconds="4"/>
+		<ant dir="service_deployment_descriptor" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="singleinheritance">  
+		<echo message="---------------- Running singleinheritance ------------"/>     
+		<ant dir="singleinheritance" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="singleinheritance" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="singleinheritance" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="stateful">    
+		<echo message="---------------- Running stateful ------------"/>   
+		<ant dir="stateful" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="stateful" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="stateful" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="stateful_deployment_descriptor"> 
+		<echo message="---------------- Running stateful_deployment_descriptor ------------"/>      
+		<ant dir="stateful_deployment_descriptor" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="stateful_deployment_descriptor" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="stateful_deployment_descriptor" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="stateless">       
+		<echo message="---------------- Running stateless ------------"/>
+		<ant dir="stateless" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="stateless" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="stateless" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="stateless_deployment_descriptor">     
+		<echo message="---------------- Running stateless_deployment_descriptor ------------"/>  
+		<ant dir="stateless_deployment_descriptor" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="stateless_deployment_descriptor" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="stateless_deployment_descriptor" antfile="build.xml" target="clean"/>
+	</target>
+	
+	<target name="tableperinheritance">       
+		<echo message="---------------- Running tableperinheritance ------------"/>
+		<ant dir="tableperinheritance" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="tableperinheritance" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="tableperinheritance" antfile="build.xml" target="clean"/>
+	</target>
+
+	<target name="timer">    
+		<echo message="---------------- Running timer ------------"/>   
+		<ant dir="timer" antfile="build.xml"/>
+		<sleep seconds="5"/>
+		<ant dir="timer" antfile="build.xml" target="run"/>
+		<sleep seconds="4"/>
+		<ant dir="timer" antfile="build.xml" target="clean"/>
+	</target>
+
+</project>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/callbacks/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/callbacks/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/callbacks/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -57,7 +57,7 @@
    public List findByLastName(String last)
    {
       System.out.println("-- CustomerDAOBean.findByLastName(id)");
-      return manager.createQuery("select c from Customer c where c.last = :last").setParameter("last", last).getResultList();
+      return manager.createQuery("from Customer c where c.last = :last").setParameter("last", last).getResultList();
    }
 
    public void merge(Customer c)
@@ -72,7 +72,7 @@
       for (Iterator it = l.iterator() ; it.hasNext() ; )
       {
          Customer c = (Customer)it.next();
-         manager.remove(manager.find(Customer.class, c.getId()));
+         manager.remove(c);
       }
    }
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.tutorial.callback.bean;
-
-import javax.interceptor.InvocationContext;
-import javax.annotation.PostConstruct;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class LifecycleInterceptor
-{
-   @PostConstruct
-   public void postConstruct(InvocationContext ctx)
-   {
-      try
-      {
-         System.out.println("LifecycleInterceptor postConstruct");
-         ctx.proceed();
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/LifecycleInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.tutorial.callback.bean;
+
+import javax.interceptor.InvocationContext;
+import javax.annotation.PostConstruct;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class LifecycleInterceptor
+{
+   @PostConstruct
+   public void postConstruct(InvocationContext ctx)
+   {
+      try
+      {
+         System.out.println("LifecycleInterceptor postConstruct");
+         ctx.proceed();
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.properties
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.properties	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-hibernate.connection.release_mode=after_statement
-hibernate.transaction.flush_before_completion=false
-hibernate.transaction.auto_close_session=false
-hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-#hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-hibernate.connection.datasource=java:/DefaultDS
-hibernate.dialect=org.hibernate.dialect.HSQLDialect
-javax.persistence.provider=org.hibernate.ejb.HibernatePersistence

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-	  <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
-         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+	  <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
+         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,10 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
-   <property name="jboss.server.config" value="all"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/clusteredentity/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clusteredentity/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/clustering/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clustering/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clustering/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,10 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
-   <property name="jboss.server.config" value="all"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/clustering/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/clustering/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/composite/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/composite/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/composite/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/composite/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/composite/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/composite/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/composite/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/composite/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/composite/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/consumer/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,220 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Message Driven POJOs</h2>
-
-</p><p>
-We are prototyping some possible extensions to MDBs to see if we can make things a little easier for development.  The idea is to give a message consumer (an MDB) a typed interface that message producers can send messages through.  Both the publisher and subscriber would be typed interfaces.
-</p><p>
-<h3>The model</h3>
-
-Message Driven POJOs will have the same model as Stateless/Stateful beans.  There is a bean class tagged as @Consumer that must implement one or more @Producer interfaces.  Just as a stateless bean is tagged as @Stateless and implements one or more @Remote or @Local interfaces.
-</p><p>
-It might be best to look at a full example.  One is available in our <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/">testsuite</a>
-</p><p>
-<pre>
-package org.jboss.annotation.ejb;
-
- at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
-public @interface Consumer
-{
-   String name() default "";
-
-   TransactionManagementType transactionManagement() default TransactionManagementType.CONTAINER;
-
-   ActivationConfigProperty[] activationConfig() default {};
-}
-</pre>
-</p><p>
- at Consumer looks exactly like @MessageDriven of the EJB3 specification and is configured as such.  Place @Consumer on a bean class.  That bean class implements interfaces tagged as @Producer.
-</p><p>
-<pre>
-package org.jboss.annotation.Producer;
-
- at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
-public @interface Producer
-{
-   String connectionFactory() default "";
-   boolean transacted() default false;
-   int acknowledgeMode() default 1; // autoacknowledge
-}
-</pre>
-</p><p>
-For each @Producer interface the @Consumer implements, there will be a proxy that implements that @Producer registered in JNDI under the FQN of that @Producer interface.
-</p><p>
-<h3>Simple example</h3>
-
-</p><p>
-Let's do a simple example.  First define the consumer:
-</p><p>
-<pre>
-import org.jboss.ejb3.mdb.Consumer;
-
- at Consumer(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
-        })
-public class QueueTestConsumer implements QueueTestRemote
-{
-   public void method1(String msg, int num)
-   {
-      System.out.println("method1(" + msg + ", " + num + ")");
-   }
-}
-</pre>
-</p><p>
-QueueTestConsumer is our bean class and defines the methods that can receive JMS messages.  You see that it implements one interface, QueueTestRemote.  
-</p><p>
-<pre>
-import org.jboss.annotation.ejb.Producer;
-
- at Producer
-public interface QueueTestRemote 
-{
-   public void method1(String msg, int num);
-}
-</pre>
-</p><p>
-This interface will be used by clients(JMS Publishers) to send messages to the consumer via JMS.  Let's now take a look at the client (really the producer of the actual messages).
-</p><p>
-<pre>
-import org.jboss.ejb3.mdb.ProducerObject;
-import org.jboss.ejb3.mdb.ProducerManager;
-
-public static void main(String[] args) throws Exception
-{
-   InitialContext ctx = new InitialContext();
-   QueueTestRemote tester = (QueueTestRemote)ctx.lookup(QueueTestRemote.class.getName());
-
-   ProducerObject po = (ProducerObject)tester;
-   ProducerManager manager = po.getProducerManager();
-
-   manager.connect(); // internally create a JMS connection
-   try
-   {
-      tester.method1("hello world", 55);
-   }
-   finally
-   {
-      manager.close(); // clean up the JMS connection
-   }
-}
-</pre>
-</p><p>
-When the @Consumer is deployed by the EJB3 container, it looks for all of its @Producer interfaces and registers each one of them in JNDI under their FQN class name.  The client code above looks up the QueueTestRemote interface in JNDI.  Each producer implements the <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerObject.java?rev=1.1&view=markup">ProducerObject</a> .  The client typecasts the QueueTesterRemote to the ProducerObject.  It then gets a <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerManager.java?rev=1.1&view=markup">ProducerManager</a> that manages the JMS connection for this proxy.  To start being able to send messages to the Queue, the client calls <tt>connect()</tt> on the manager.  It then can successfully call methods on the <tt>tester</tt>.  When it calls <tt>method1()</tt> this method call is converted into a JMS message and published to the Queue of th!
 e Consumer.  The consumer will receive the message and invoke its <tt>method1</tt> method.
-</p><p>
-<h3>@Producer default values</h3>
-
-The proxy registered in JNDI will know how to contact the JMS Queue/Topic to publish messages.  You can specify explicitly through the <i>connnectionFactory</i> attribute of the annotation what the JMS ConnectionFactory JNDI name is, or you can rely on defaults.
-</p><p>
-</p><p>
-The default value is "ConnectionFactory" for the ConnectionFactory JNDI name.
-</p><p>
-If you additionally tag the producer as @ProducerLocal instead of @Producer, then "java:/ConnectionFactory" will be used.
-</p><p>
-<h3>@ProducerLocal</h3>
-
-If you tag a producer as @ProducerLocal, the proxy will lookup the connection factory via the default InitialContext when connect() is called.   Otherwise, the ConnectFactory reference will be embedded directly within the proxy.
-</p><p>
-<h3>@MessageProperties</h3>
-
-</p><p>
-The methods defined in a Producer are turned into JMS messages.  The default message properties are a Time To Live of 0, a Priority of 4, and a delivery mode of PERSISTENT.  You can override these default values in a couple of ways.
-</p><p>
-<ul>
-<li> First you can use the @MessageProperties anntotation and tag the Producer class directly to override the values:</li>
-</ul>
-</p><p>
-<pre>
- at Producer
- at MessageProperties(delivery=DeliveryMode.NON_PERSISTENT, timeToLive=1000, priority=1)
-public interface QueueTestRemote 
-{
-   public void method1(String msg, int num);
-}
-</pre>
-</p><p>
-In this configuration, all method calls on QueueTestRemote will use the JMS message properties defined with the @MessageProperties annotation on the interface.
-</p><p>
-<ul>
-<li> Second, you can specify @MessageProperties on a per method basis.</li>
-</ul>
-<pre>
- at Producer
-public interface QueueTestRemote 
-{
-   public void method1(String msg, int num);
-
-   @MessageProperties(delivery=DeliveryMode.NON_PERSISTENT, timeToLive=1000, priority=1)
-   public void method2(String msg, int num);
-}
-</pre>
-</p><p>
-So, in the above example, <tt>method1()</tt> uses the default message properties, and <tt>method2()</tt> overrides the defaults via the @MessageProperties annotation attached to it.
-</p><p>
-<h3> Obtaining the current message</h3>
-
-Sometimes you may need to access the real JMS message.  Maybe you need to obtain the replyTo destination or set an acknowledgement or something.  You can
-obtain it by using the <tt>@org.jboss.annotation.ejb.CurrentMessage</tt> annotation.
-</p><p>
-<pre>
-
-   @CurrentMessage private javax.jms.Message currentMessage;
-
-</pre>
-</p><p>
-This annotation will inject the current JMS message into your Consumer bean before your target method is invoked.
-</p><p>
-<h3>A Full Example</h3>
-
-A full example can be found in our <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/">testsuite</a>.  The QueueTestConsumer defines 3 Producers.  One is for remote invocations on the Queue <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestRemote.java?rev=1.1&view=markup">QueueTestRemote.java</a>, another is for local invocations on the queue <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestLocal.java?rev=1.1&view=markup">QueueTestLocal.java</a>, yet another is for using the JCA adapter to send messages transactionally through CMT <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestXA.java?rev=1.1&view=markup">QueueTestXA.java</a>
-</p><p>
-The <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java?rev=1.1&view=markup">test client</a> sends messages through the QueueTestRemote interface.  It interacts with a <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/TestStatusBean.java?rev=1.1&view=markup">stateless bean</a> to test the local and XA producers.
-</p><p>
-</p><p>
-<h3>FEEDBACK NEEDED</h3>
-
-Please provide feedback to this proposed feature on our <a href="http://www.jboss.org/index.html?module=bb&op=viewtopic&t=60294">forum</a>.  We would really like feedback on this feature.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-</pre>
-</p><p>
-Look in the console window to determine that the message was sent.
-</p><p>
-<pre>
-12:25:59,734 INFO  [Ejb3Module] found EJB3 consumer bean: org.jboss.tutorial.consumer.bean.ExampleConsumerBean
-12:25:59,734 INFO  [Ejb3Module] found EJB3 stateless session bean: org.jboss.tutorial.consumer.bean.TesterBean
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerRemote
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerLocal
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerXA
-12:25:59,812 INFO  [ProxyDeployer] no declared remote bindings
-12:25:59,812 INFO  [ProxyDeployer] there is remote interfaces
-12:25:59,812 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.consumer.bean.Tester
-12:25:59,828 INFO  [EJB3Deployer] Deployed: file[the deployment]
-12:26:09,000 INFO  [STDOUT] method1(Remote method1 called, 1)
-12:26:09,015 INFO  [STDOUT] method2: Remote method2 called
-12:26:09,015 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,015 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,109 INFO  [STDOUT] method1(testLocal, 1)
-12:26:09,125 INFO  [STDOUT] method2: testLocal2
-12:26:09,125 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,125 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,125 INFO  [STDOUT] end TESTXA **
-12:26:09,140 INFO  [STDOUT] method2: testXA2
-12:26:09,140 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,140 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,140 INFO  [STDOUT] method1(testXA, 1)
-</pre>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer/consumer.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer/consumer.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,220 @@
+<html>
+<body>
+<p>
+<h2>Message Driven POJOs</h2>
+
+</p><p>
+We are prototyping some possible extensions to MDBs to see if we can make things a little easier for development.  The idea is to give a message consumer (an MDB) a typed interface that message producers can send messages through.  Both the publisher and subscriber would be typed interfaces.
+</p><p>
+<h3>The model</h3>
+
+Message Driven POJOs will have the same model as Stateless/Stateful beans.  There is a bean class tagged as @Consumer that must implement one or more @Producer interfaces.  Just as a stateless bean is tagged as @Stateless and implements one or more @Remote or @Local interfaces.
+</p><p>
+It might be best to look at a full example.  One is available in our <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/">testsuite</a>
+</p><p>
+<pre>
+package org.jboss.annotation.ejb;
+
+ at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+public @interface Consumer
+{
+   String name() default "";
+
+   TransactionManagementType transactionManagement() default TransactionManagementType.CONTAINER;
+
+   ActivationConfigProperty[] activationConfig() default {};
+}
+</pre>
+</p><p>
+ at Consumer looks exactly like @MessageDriven of the EJB3 specification and is configured as such.  Place @Consumer on a bean class.  That bean class implements interfaces tagged as @Producer.
+</p><p>
+<pre>
+package org.jboss.annotation.Producer;
+
+ at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+public @interface Producer
+{
+   String connectionFactory() default "";
+   boolean transacted() default false;
+   int acknowledgeMode() default 1; // autoacknowledge
+}
+</pre>
+</p><p>
+For each @Producer interface the @Consumer implements, there will be a proxy that implements that @Producer registered in JNDI under the FQN of that @Producer interface.
+</p><p>
+<h3>Simple example</h3>
+
+</p><p>
+Let's do a simple example.  First define the consumer:
+</p><p>
+<pre>
+import org.jboss.ejb3.mdb.Consumer;
+
+ at Consumer(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
+        })
+public class QueueTestConsumer implements QueueTestRemote
+{
+   public void method1(String msg, int num)
+   {
+      System.out.println("method1(" + msg + ", " + num + ")");
+   }
+}
+</pre>
+</p><p>
+QueueTestConsumer is our bean class and defines the methods that can receive JMS messages.  You see that it implements one interface, QueueTestRemote.  
+</p><p>
+<pre>
+import org.jboss.annotation.ejb.Producer;
+
+ at Producer
+public interface QueueTestRemote 
+{
+   public void method1(String msg, int num);
+}
+</pre>
+</p><p>
+This interface will be used by clients(JMS Publishers) to send messages to the consumer via JMS.  Let's now take a look at the client (really the producer of the actual messages).
+</p><p>
+<pre>
+import org.jboss.ejb3.mdb.ProducerObject;
+import org.jboss.ejb3.mdb.ProducerManager;
+
+public static void main(String[] args) throws Exception
+{
+   InitialContext ctx = new InitialContext();
+   QueueTestRemote tester = (QueueTestRemote)ctx.lookup(QueueTestRemote.class.getName());
+
+   ProducerObject po = (ProducerObject)tester;
+   ProducerManager manager = po.getProducerManager();
+
+   manager.connect(); // internally create a JMS connection
+   try
+   {
+      tester.method1("hello world", 55);
+   }
+   finally
+   {
+      manager.close(); // clean up the JMS connection
+   }
+}
+</pre>
+</p><p>
+When the @Consumer is deployed by the EJB3 container, it looks for all of its @Producer interfaces and registers each one of them in JNDI under their FQN class name.  The client code above looks up the QueueTestRemote interface in JNDI.  Each producer implements the <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerObject.java?rev=1.1&view=markup">ProducerObject</a> .  The client typecasts the QueueTesterRemote to the ProducerObject.  It then gets a <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerManager.java?rev=1.1&view=markup">ProducerManager</a> that manages the JMS connection for this proxy.  To start being able to send messages to the Queue, the client calls <tt>connect()</tt> on the manager.  It then can successfully call methods on the <tt>tester</tt>.  When it calls <tt>method1()</tt> this method call is converted into a JMS message and published to the Queue of th!
 e Consumer.  The consumer will receive the message and invoke its <tt>method1</tt> method.
+</p><p>
+<h3>@Producer default values</h3>
+
+The proxy registered in JNDI will know how to contact the JMS Queue/Topic to publish messages.  You can specify explicitly through the <i>connnectionFactory</i> attribute of the annotation what the JMS ConnectionFactory JNDI name is, or you can rely on defaults.
+</p><p>
+</p><p>
+The default value is "ConnectionFactory" for the ConnectionFactory JNDI name.
+</p><p>
+If you additionally tag the producer as @ProducerLocal instead of @Producer, then "java:/ConnectionFactory" will be used.
+</p><p>
+<h3>@ProducerLocal</h3>
+
+If you tag a producer as @ProducerLocal, the proxy will lookup the connection factory via the default InitialContext when connect() is called.   Otherwise, the ConnectFactory reference will be embedded directly within the proxy.
+</p><p>
+<h3>@MessageProperties</h3>
+
+</p><p>
+The methods defined in a Producer are turned into JMS messages.  The default message properties are a Time To Live of 0, a Priority of 4, and a delivery mode of PERSISTENT.  You can override these default values in a couple of ways.
+</p><p>
+<ul>
+<li> First you can use the @MessageProperties anntotation and tag the Producer class directly to override the values:</li>
+</ul>
+</p><p>
+<pre>
+ at Producer
+ at MessageProperties(delivery=DeliveryMode.NON_PERSISTENT, timeToLive=1000, priority=1)
+public interface QueueTestRemote 
+{
+   public void method1(String msg, int num);
+}
+</pre>
+</p><p>
+In this configuration, all method calls on QueueTestRemote will use the JMS message properties defined with the @MessageProperties annotation on the interface.
+</p><p>
+<ul>
+<li> Second, you can specify @MessageProperties on a per method basis.</li>
+</ul>
+<pre>
+ at Producer
+public interface QueueTestRemote 
+{
+   public void method1(String msg, int num);
+
+   @MessageProperties(delivery=DeliveryMode.NON_PERSISTENT, timeToLive=1000, priority=1)
+   public void method2(String msg, int num);
+}
+</pre>
+</p><p>
+So, in the above example, <tt>method1()</tt> uses the default message properties, and <tt>method2()</tt> overrides the defaults via the @MessageProperties annotation attached to it.
+</p><p>
+<h3> Obtaining the current message</h3>
+
+Sometimes you may need to access the real JMS message.  Maybe you need to obtain the replyTo destination or set an acknowledgement or something.  You can
+obtain it by using the <tt>@org.jboss.annotation.ejb.CurrentMessage</tt> annotation.
+</p><p>
+<pre>
+
+   @CurrentMessage private javax.jms.Message currentMessage;
+
+</pre>
+</p><p>
+This annotation will inject the current JMS message into your Consumer bean before your target method is invoked.
+</p><p>
+<h3>A Full Example</h3>
+
+A full example can be found in our <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/">testsuite</a>.  The QueueTestConsumer defines 3 Producers.  One is for remote invocations on the Queue <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestRemote.java?rev=1.1&view=markup">QueueTestRemote.java</a>, another is for local invocations on the queue <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestLocal.java?rev=1.1&view=markup">QueueTestLocal.java</a>, yet another is for using the JCA adapter to send messages transactionally through CMT <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestXA.java?rev=1.1&view=markup">QueueTestXA.java</a>
+</p><p>
+The <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java?rev=1.1&view=markup">test client</a> sends messages through the QueueTestRemote interface.  It interacts with a <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/consumer/TestStatusBean.java?rev=1.1&view=markup">stateless bean</a> to test the local and XA producers.
+</p><p>
+</p><p>
+<h3>FEEDBACK NEEDED</h3>
+
+Please provide feedback to this proposed feature on our <a href="http://www.jboss.org/index.html?module=bb&op=viewtopic&t=60294">forum</a>.  We would really like feedback on this feature.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+</pre>
+</p><p>
+Look in the console window to determine that the message was sent.
+</p><p>
+<pre>
+12:25:59,734 INFO  [Ejb3Module] found EJB3 consumer bean: org.jboss.tutorial.consumer.bean.ExampleConsumerBean
+12:25:59,734 INFO  [Ejb3Module] found EJB3 stateless session bean: org.jboss.tutorial.consumer.bean.TesterBean
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerRemote
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerLocal
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerXA
+12:25:59,812 INFO  [ProxyDeployer] no declared remote bindings
+12:25:59,812 INFO  [ProxyDeployer] there is remote interfaces
+12:25:59,812 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.consumer.bean.Tester
+12:25:59,828 INFO  [EJB3Deployer] Deployed: file[the deployment]
+12:26:09,000 INFO  [STDOUT] method1(Remote method1 called, 1)
+12:26:09,015 INFO  [STDOUT] method2: Remote method2 called
+12:26:09,015 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,015 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,109 INFO  [STDOUT] method1(testLocal, 1)
+12:26:09,125 INFO  [STDOUT] method2: testLocal2
+12:26:09,125 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,125 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,125 INFO  [STDOUT] end TESTXA **
+12:26:09,140 INFO  [STDOUT] method2: testXA2
+12:26:09,140 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,140 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,140 INFO  [STDOUT] method1(testXA, 1)
+</pre>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-	<enterprise-beans>
-		<consumer>
-        	<ejb-name>ExampleConsumer</ejb-name>
-         	<ejb-class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleConsumerBean</ejb-class>
-         	<message-destination>queue/tutorial/example</message-destination>
-	   		<message-destination-type>javax.jms.Queue</message-destination-type>
-         	<producer>
-            	<class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerRemote</class>
-         	</producer>
-         	<local-producer>
-            	<class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerXA</class>
-            	<connection-factory>java:/JmsXA</connection-factory>
-         	</local-producer>
-         	<local-producer>
-				<class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerLocal</class>
-         	</local-producer>
-         	<current-message>
-				<method>
-               		<method-name>currentMessage</method-name>
-            	</method>
-         	</current-message>
-         	<message-properties>
-				<method>
-		   			<method-name>method2</method-name>
-	      		</method>
-				<delivery>NonPersistent</delivery>
-         	</message-properties>
-       	</consumer>
-	</enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+	<enterprise-beans>
+		<consumer>
+        	<ejb-name>ExampleConsumer</ejb-name>
+         	<ejb-class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleConsumerBean</ejb-class>
+         	<message-destination>queue/tutorial/example</message-destination>
+	   		<message-destination-type>javax.jms.Queue</message-destination-type>
+         	<producer>
+            	<class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerRemote</class>
+         	</producer>
+         	<local-producer>
+            	<class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerXA</class>
+            	<connection-factory>java:/JmsXA</connection-factory>
+         	</local-producer>
+         	<local-producer>
+				<class>org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerLocal</class>
+         	</local-producer>
+         	<current-message>
+				<method>
+               		<method-name>currentMessage</method-name>
+            	</method>
+         	</current-message>
+         	<message-properties>
+				<method>
+		   			<method-name>method2</method-name>
+	      		</method>
+				<delivery>NonPersistent</delivery>
+         	</message-properties>
+       	</consumer>
+	</enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-      <copy file="queue-example-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-      <sleep seconds="5"/>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <java classname="org.jboss.tutorial.consumer_deployment_descriptor.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/queue-example-service.xml"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
+      <copy file="queue-example-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+      <sleep seconds="5"/>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <java classname="org.jboss.tutorial.consumer_deployment_descriptor.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/queue-example-service.xml"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Message Driven POJOs via the deployment descriptor</h2>
-
-</p><p>
-We are prototyping some possible extensions to MDBs to see if we can make things a little easier for development.  The idea is to give a message consumer (an MDB) a typed interface that message producers can send messages through.  Both the publisher and subscriber would be typed interfaces.
-</p><p>
-<h3>The model</h3>
-
-Message Driven POJOs will have the same model as Session beans.  A Consumer can be configured via a combination of annotations and via the
-jboss.xml deployment descriptor. This tutorial describes configuration via a deployment descriptor. Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>.
-There is a bean class tagged as <tt>consumer</tt> that must implement one or more Producer interfaces.  Note the <tt>producer</tt> and <tt>local-producer</tt> tags.
-Just as a session bean is tagged as <tt>session</tt> and implements one or more <tt>remote</tt> or <tt>local</tt> interfaces.
-</p><p>
-It might be best to look at a full example.
-</p><p>
-For each <tt>producer</tt> interface the Consumer implements, there will be a proxy that implements that Producer interface registered in JNDI under the FQN of
- that Producer interface.
-</p><p>
-<h3>Simple example</h3>
-
-</p><p>
-Let's do a simple example.  First define the consumer. Take a look at <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java">ExampleConsumerBean.java</a>.
-This is our bean class and defines the methods than can receive JMS messages. The bean class implements three interfaces which are configured as Producers in <tt>jboss.xml</tt>. These interfaces
-will be used by clients (JMS publishers) to send messages to the Consumer via JMS.Note that <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java">ExampleProducerXA.java</a>
-is tagged with <tt>connection-factory</tt> to indicate the jndi name of the XA transaction factory.
-</p><p>
-<h3>The client</h3>
-
-</p><p>
-Let's now take a look at the client (really the producer of the actual messages) <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java">Client.java</a>
-</p><p>
-When the Consumer is deployed by the EJB3 container, it looks for all of its Producer interfaces and registers each one of them in JNDI under their FQN class name.  The client code above looks
-up the <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java">ExampleProducerRemote.java</a> interface in JNDI and accesses the local interfaces (
-<a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java">ExampleProducerLocal.java</a>,
-<a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java">ExampleProducerXA.java</a>) through the Stateless Session bean 
-<a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java"">TesterBean.java</a>.
-Each producer implements the <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerObject.java?rev=1.1&view=markup">ProducerObject</a>.
-The client typecasts the <tt>ExampleProducerRemote</tt> to the ProducerObject.
-It then gets a <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerManager.java?rev=1.1&view=markup">ProducerManager</a> that manages the
-JMS connection for this proxy.  To start being able to send messages to the Queue, the client calls <tt>connect()</tt> on the manager.
-It then can successfully call methods on the remote Producer.  When it calls <tt>method1()</tt> this method call is converted into a JMS message and published to the Queue of the Consumer.
-The consumer will receive the message and invoke its <tt>method1</tt> method.
-</p><p>
-<h3>Producer default values</h3>
-
-</p><p>
-The proxy registered in JNDI will know how to contact the JMS Queue/Topic to publish messages.  You can specify explicitly through the <tt>connnection-factory</tt> tag what the JMS
-ConnectionFactory JNDI name is, or you can rely on defaults.
-</p><p>
-The default value is "ConnectionFactory" for the ConnectionFactory JNDI name.
-</p><p>
-If you additionally tag the producer as <tt>local-producer</tt> instead of <tt>producer</tt>, then "java:/ConnectionFactory" will be used.
-</p><p>
-<h3>local-producer</h3>
-
-</p><p>
-If you tag a producer as <tt>local-producer</tt>, the proxy will lookup the connection factory via the default InitialContext when connect() is called.   Otherwise, the ConnectFactory
-reference will be embedded directly within the proxy.
-</p><p>
-<h3>message-properties</h3>
-
-</p><p>
-The methods defined in a Producer are turned into JMS messages.  The default message properties are a Time To Live of 0, a Priority of 4, and a delivery mode of PERSISTENT.  You can override
-these default values using the <tt>message-properties</tt> tag. This tag can be specified per method or wildcarded for all methods in the Producer interface.
-</p><p>
-So, in the above example, <tt>method1()</tt> uses the default message properties, and <tt>method2()</tt> overrides the defaults via the <tt>message-properties</tt> tag.
-</p><p>
-<h3>Obtaining the current message</h3>
-
-</p><p>
-Sometimes you may need to access the real JMS message.  Maybe you need to obtain the replyTo destination or set an acknowledgement or something.  You can
-obtain it by using the <tt>current-message</tt> tag.
-</p><p>
-This tag will inject the current JMS message into your Consumer bean before your target method is invoked.
-</p><p>
-<h3>FEEDBACK NEEDED</h3>
-
-</p><p>
-Please provide feedback to this proposed feature on our <a href="http://www.jboss.org/index.html?module=bb&op=viewtopic&t=60294">forum</a>.  We would really like feedback on this feature.
-</p><p>
-<h3>Building and Running</h3>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-</pre>
-</p><p>
-Look in the console window to determine that the message was sent.
-</p><p>
-<pre>
-12:25:59,734 INFO  [Ejb3Module] found EJB3 consumer bean: org.jboss.tutorial.consumer.bean.ExampleConsumerBean
-12:25:59,734 INFO  [Ejb3Module] found EJB3 stateless session bean: org.jboss.tutorial.consumer.bean.TesterBean
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerRemote
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerLocal
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerXA
-12:25:59,812 INFO  [ProxyDeployer] no declared remote bindings
-12:25:59,812 INFO  [ProxyDeployer] there is remote interfaces
-12:25:59,812 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.consumer.bean.Tester
-12:25:59,828 INFO  [EJB3Deployer] Deployed: file[the deployment]
-12:26:09,000 INFO  [STDOUT] method1(Remote method1 called, 1)
-12:26:09,015 INFO  [STDOUT] method2: Remote method2 called
-12:26:09,015 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,015 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,109 INFO  [STDOUT] method1(testLocal, 1)
-12:26:09,125 INFO  [STDOUT] method2: testLocal2
-12:26:09,125 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,125 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,125 INFO  [STDOUT] end TESTXA **
-12:26:09,140 INFO  [STDOUT] method2: testXA2
-12:26:09,140 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,140 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,140 INFO  [STDOUT] method1(testXA, 1)
-</pre>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+<html>
+<body>
+<p>
+<h2>Message Driven POJOs via the deployment descriptor</h2>
+
+</p><p>
+We are prototyping some possible extensions to MDBs to see if we can make things a little easier for development.  The idea is to give a message consumer (an MDB) a typed interface that message producers can send messages through.  Both the publisher and subscriber would be typed interfaces.
+</p><p>
+<h3>The model</h3>
+
+Message Driven POJOs will have the same model as Session beans.  A Consumer can be configured via a combination of annotations and via the
+jboss.xml deployment descriptor. This tutorial describes configuration via a deployment descriptor. Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>.
+There is a bean class tagged as <tt>consumer</tt> that must implement one or more Producer interfaces.  Note the <tt>producer</tt> and <tt>local-producer</tt> tags.
+Just as a session bean is tagged as <tt>session</tt> and implements one or more <tt>remote</tt> or <tt>local</tt> interfaces.
+</p><p>
+It might be best to look at a full example.
+</p><p>
+For each <tt>producer</tt> interface the Consumer implements, there will be a proxy that implements that Producer interface registered in JNDI under the FQN of
+ that Producer interface.
+</p><p>
+<h3>Simple example</h3>
+
+</p><p>
+Let's do a simple example.  First define the consumer. Take a look at <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java">ExampleConsumerBean.java</a>.
+This is our bean class and defines the methods than can receive JMS messages. The bean class implements three interfaces which are configured as Producers in <tt>jboss.xml</tt>. These interfaces
+will be used by clients (JMS publishers) to send messages to the Consumer via JMS.Note that <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java">ExampleProducerXA.java</a>
+is tagged with <tt>connection-factory</tt> to indicate the jndi name of the XA transaction factory.
+</p><p>
+<h3>The client</h3>
+
+</p><p>
+Let's now take a look at the client (really the producer of the actual messages) <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java">Client.java</a>
+</p><p>
+When the Consumer is deployed by the EJB3 container, it looks for all of its Producer interfaces and registers each one of them in JNDI under their FQN class name.  The client code above looks
+up the <a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java">ExampleProducerRemote.java</a> interface in JNDI and accesses the local interfaces (
+<a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java">ExampleProducerLocal.java</a>,
+<a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java">ExampleProducerXA.java</a>) through the Stateless Session bean 
+<a href="src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java"">TesterBean.java</a>.
+Each producer implements the <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerObject.java?rev=1.1&view=markup">ProducerObject</a>.
+The client typecasts the <tt>ExampleProducerRemote</tt> to the ProducerObject.
+It then gets a <a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerManager.java?rev=1.1&view=markup">ProducerManager</a> that manages the
+JMS connection for this proxy.  To start being able to send messages to the Queue, the client calls <tt>connect()</tt> on the manager.
+It then can successfully call methods on the remote Producer.  When it calls <tt>method1()</tt> this method call is converted into a JMS message and published to the Queue of the Consumer.
+The consumer will receive the message and invoke its <tt>method1</tt> method.
+</p><p>
+<h3>Producer default values</h3>
+
+</p><p>
+The proxy registered in JNDI will know how to contact the JMS Queue/Topic to publish messages.  You can specify explicitly through the <tt>connnection-factory</tt> tag what the JMS
+ConnectionFactory JNDI name is, or you can rely on defaults.
+</p><p>
+The default value is "ConnectionFactory" for the ConnectionFactory JNDI name.
+</p><p>
+If you additionally tag the producer as <tt>local-producer</tt> instead of <tt>producer</tt>, then "java:/ConnectionFactory" will be used.
+</p><p>
+<h3>local-producer</h3>
+
+</p><p>
+If you tag a producer as <tt>local-producer</tt>, the proxy will lookup the connection factory via the default InitialContext when connect() is called.   Otherwise, the ConnectFactory
+reference will be embedded directly within the proxy.
+</p><p>
+<h3>message-properties</h3>
+
+</p><p>
+The methods defined in a Producer are turned into JMS messages.  The default message properties are a Time To Live of 0, a Priority of 4, and a delivery mode of PERSISTENT.  You can override
+these default values using the <tt>message-properties</tt> tag. This tag can be specified per method or wildcarded for all methods in the Producer interface.
+</p><p>
+So, in the above example, <tt>method1()</tt> uses the default message properties, and <tt>method2()</tt> overrides the defaults via the <tt>message-properties</tt> tag.
+</p><p>
+<h3>Obtaining the current message</h3>
+
+</p><p>
+Sometimes you may need to access the real JMS message.  Maybe you need to obtain the replyTo destination or set an acknowledgement or something.  You can
+obtain it by using the <tt>current-message</tt> tag.
+</p><p>
+This tag will inject the current JMS message into your Consumer bean before your target method is invoked.
+</p><p>
+<h3>FEEDBACK NEEDED</h3>
+
+</p><p>
+Please provide feedback to this proposed feature on our <a href="http://www.jboss.org/index.html?module=bb&op=viewtopic&t=60294">forum</a>.  We would really like feedback on this feature.
+</p><p>
+<h3>Building and Running</h3>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+</pre>
+</p><p>
+Look in the console window to determine that the message was sent.
+</p><p>
+<pre>
+12:25:59,734 INFO  [Ejb3Module] found EJB3 consumer bean: org.jboss.tutorial.consumer.bean.ExampleConsumerBean
+12:25:59,734 INFO  [Ejb3Module] found EJB3 stateless session bean: org.jboss.tutorial.consumer.bean.TesterBean
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerRemote
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerLocal
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerXA
+12:25:59,812 INFO  [ProxyDeployer] no declared remote bindings
+12:25:59,812 INFO  [ProxyDeployer] there is remote interfaces
+12:25:59,812 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.consumer.bean.Tester
+12:25:59,828 INFO  [EJB3Deployer] Deployed: file[the deployment]
+12:26:09,000 INFO  [STDOUT] method1(Remote method1 called, 1)
+12:26:09,015 INFO  [STDOUT] method2: Remote method2 called
+12:26:09,015 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,015 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,109 INFO  [STDOUT] method1(testLocal, 1)
+12:26:09,125 INFO  [STDOUT] method2: testLocal2
+12:26:09,125 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,125 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,125 INFO  [STDOUT] end TESTXA **
+12:26:09,140 INFO  [STDOUT] method2: testXA2
+12:26:09,140 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,140 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,140 INFO  [STDOUT] method1(testXA, 1)
+</pre>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,107 +0,0 @@
-!!!Message Driven POJOs via the deployment descriptor
-
-We are prototyping some possible extensions to MDBs to see if we can make things a little easier for development.  The idea is to give a message consumer (an MDB) a typed interface that message producers can send messages through.  Both the publisher and subscriber would be typed interfaces.
-
-!!The model
-Message Driven POJOs will have the same model as Session beans.  A Consumer can be configured via a combination of annotations and via the
-jboss.xml deployment descriptor. This tutorial describes configuration via a deployment descriptor. Take a look at [jboss.xml|META-INF/jboss.xml].
-There is a bean class tagged as {{consumer}} that must implement one or more Producer interfaces.  Note the {{producer}} and {{local-producer}} tags.
-Just as a session bean is tagged as {{session}} and implements one or more {{remote}} or {{local}} interfaces.
-
-It might be best to look at a full example.
-
-For each {{producer}} interface the Consumer implements, there will be a proxy that implements that Producer interface registered in JNDI under the FQN of
- that Producer interface.
-
-!!Simple example
-
-Let's do a simple example.  First define the consumer. Take a look at [ExampleConsumerBean.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java].
-This is our bean class and defines the methods than can receive JMS messages. The bean class implements three interfaces which are configured as Producers in {{jboss.xml}}. These interfaces
-will be used by clients (JMS publishers) to send messages to the Consumer via JMS.Note that [ExampleProducerXA.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java]
-is tagged with {{connection-factory}} to indicate the jndi name of the XA transaction factory.
-
-!!The client
-
-Let's now take a look at the client (really the producer of the actual messages) [Client.java|src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java]
-
-When the Consumer is deployed by the EJB3 container, it looks for all of its Producer interfaces and registers each one of them in JNDI under their FQN class name.  The client code above looks
-up the [ExampleProducerRemote.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java] interface in JNDI and accesses the local interfaces (
-[ExampleProducerLocal.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java],
-[ExampleProducerXA.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java]) through the Stateless Session bean 
-[TesterBean.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java"].
-Each producer implements the [ProducerObject|http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerObject.java?rev=1.1&view=markup].
-The client typecasts the {{ExampleProducerRemote}} to the ProducerObject.
-It then gets a [ProducerManager|http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerManager.java?rev=1.1&view=markup] that manages the
-JMS connection for this proxy.  To start being able to send messages to the Queue, the client calls {{connect()}} on the manager.
-It then can successfully call methods on the remote Producer.  When it calls {{method1()}} this method call is converted into a JMS message and published to the Queue of the Consumer.
-The consumer will receive the message and invoke its {{method1}} method.
-
-!!Producer default values
-
-The proxy registered in JNDI will know how to contact the JMS Queue/Topic to publish messages.  You can specify explicitly through the {{connnection-factory}} tag what the JMS
-ConnectionFactory JNDI name is, or you can rely on defaults.
-
-The default value is "ConnectionFactory" for the ConnectionFactory JNDI name.
-
-If you additionally tag the producer as {{local-producer}} instead of {{producer}}, then "java:/ConnectionFactory" will be used.
-
-!!local-producer
-
-If you tag a producer as {{local-producer}}, the proxy will lookup the connection factory via the default InitialContext when connect() is called.   Otherwise, the ConnectFactory
-reference will be embedded directly within the proxy.
-
-!!message-properties
-
-The methods defined in a Producer are turned into JMS messages.  The default message properties are a Time To Live of 0, a Priority of 4, and a delivery mode of PERSISTENT.  You can override
-these default values using the {{message-properties}} tag. This tag can be specified per method or wildcarded for all methods in the Producer interface.
-
-So, in the above example, {{method1()}} uses the default message properties, and {{method2()}} overrides the defaults via the {{message-properties}} tag.
-
-!!Obtaining the current message
-
-Sometimes you may need to access the real JMS message.  Maybe you need to obtain the replyTo destination or set an acknowledgement or something.  You can
-obtain it by using the {{current-message}} tag.
-
-This tag will inject the current JMS message into your Consumer bean before your target method is invoked.
-
-!!FEEDBACK NEEDED
-
-Please provide feedback to this proposed feature on our [forum|http://www.jboss.org/index.html?module=bb&op=viewtopic&t=60294].  We would really like feedback on this feature.
-
-!!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-}}}
-
-Look in the console window to determine that the message was sent.
-
-{{{
-12:25:59,734 INFO  [Ejb3Module] found EJB3 consumer bean: org.jboss.tutorial.consumer.bean.ExampleConsumerBean
-12:25:59,734 INFO  [Ejb3Module] found EJB3 stateless session bean: org.jboss.tutorial.consumer.bean.TesterBean
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerRemote
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerLocal
-12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerXA
-12:25:59,812 INFO  [ProxyDeployer] no declared remote bindings
-12:25:59,812 INFO  [ProxyDeployer] there is remote interfaces
-12:25:59,812 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.consumer.bean.Tester
-12:25:59,828 INFO  [EJB3Deployer] Deployed: file[the deployment]
-12:26:09,000 INFO  [STDOUT] method1(Remote method1 called, 1)
-12:26:09,015 INFO  [STDOUT] method2: Remote method2 called
-12:26:09,015 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,015 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,109 INFO  [STDOUT] method1(testLocal, 1)
-12:26:09,125 INFO  [STDOUT] method2: testLocal2
-12:26:09,125 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,125 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,125 INFO  [STDOUT] end TESTXA **
-12:26:09,140 INFO  [STDOUT] method2: testXA2
-12:26:09,140 INFO  [STDOUT] method2 key/val: great:ejb3
-12:26:09,140 INFO  [STDOUT] method2 key/val: hello:world
-12:26:09,140 INFO  [STDOUT] method1(testXA, 1)
-}}}
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/consumer.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,107 @@
+!!!Message Driven POJOs via the deployment descriptor
+
+We are prototyping some possible extensions to MDBs to see if we can make things a little easier for development.  The idea is to give a message consumer (an MDB) a typed interface that message producers can send messages through.  Both the publisher and subscriber would be typed interfaces.
+
+!!The model
+Message Driven POJOs will have the same model as Session beans.  A Consumer can be configured via a combination of annotations and via the
+jboss.xml deployment descriptor. This tutorial describes configuration via a deployment descriptor. Take a look at [jboss.xml|META-INF/jboss.xml].
+There is a bean class tagged as {{consumer}} that must implement one or more Producer interfaces.  Note the {{producer}} and {{local-producer}} tags.
+Just as a session bean is tagged as {{session}} and implements one or more {{remote}} or {{local}} interfaces.
+
+It might be best to look at a full example.
+
+For each {{producer}} interface the Consumer implements, there will be a proxy that implements that Producer interface registered in JNDI under the FQN of
+ that Producer interface.
+
+!!Simple example
+
+Let's do a simple example.  First define the consumer. Take a look at [ExampleConsumerBean.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java].
+This is our bean class and defines the methods than can receive JMS messages. The bean class implements three interfaces which are configured as Producers in {{jboss.xml}}. These interfaces
+will be used by clients (JMS publishers) to send messages to the Consumer via JMS.Note that [ExampleProducerXA.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java]
+is tagged with {{connection-factory}} to indicate the jndi name of the XA transaction factory.
+
+!!The client
+
+Let's now take a look at the client (really the producer of the actual messages) [Client.java|src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java]
+
+When the Consumer is deployed by the EJB3 container, it looks for all of its Producer interfaces and registers each one of them in JNDI under their FQN class name.  The client code above looks
+up the [ExampleProducerRemote.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java] interface in JNDI and accesses the local interfaces (
+[ExampleProducerLocal.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java],
+[ExampleProducerXA.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java]) through the Stateless Session bean 
+[TesterBean.java|src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java"].
+Each producer implements the [ProducerObject|http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerObject.java?rev=1.1&view=markup].
+The client typecasts the {{ExampleProducerRemote}} to the ProducerObject.
+It then gets a [ProducerManager|http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/ProducerManager.java?rev=1.1&view=markup] that manages the
+JMS connection for this proxy.  To start being able to send messages to the Queue, the client calls {{connect()}} on the manager.
+It then can successfully call methods on the remote Producer.  When it calls {{method1()}} this method call is converted into a JMS message and published to the Queue of the Consumer.
+The consumer will receive the message and invoke its {{method1}} method.
+
+!!Producer default values
+
+The proxy registered in JNDI will know how to contact the JMS Queue/Topic to publish messages.  You can specify explicitly through the {{connnection-factory}} tag what the JMS
+ConnectionFactory JNDI name is, or you can rely on defaults.
+
+The default value is "ConnectionFactory" for the ConnectionFactory JNDI name.
+
+If you additionally tag the producer as {{local-producer}} instead of {{producer}}, then "java:/ConnectionFactory" will be used.
+
+!!local-producer
+
+If you tag a producer as {{local-producer}}, the proxy will lookup the connection factory via the default InitialContext when connect() is called.   Otherwise, the ConnectFactory
+reference will be embedded directly within the proxy.
+
+!!message-properties
+
+The methods defined in a Producer are turned into JMS messages.  The default message properties are a Time To Live of 0, a Priority of 4, and a delivery mode of PERSISTENT.  You can override
+these default values using the {{message-properties}} tag. This tag can be specified per method or wildcarded for all methods in the Producer interface.
+
+So, in the above example, {{method1()}} uses the default message properties, and {{method2()}} overrides the defaults via the {{message-properties}} tag.
+
+!!Obtaining the current message
+
+Sometimes you may need to access the real JMS message.  Maybe you need to obtain the replyTo destination or set an acknowledgement or something.  You can
+obtain it by using the {{current-message}} tag.
+
+This tag will inject the current JMS message into your Consumer bean before your target method is invoked.
+
+!!FEEDBACK NEEDED
+
+Please provide feedback to this proposed feature on our [forum|http://www.jboss.org/index.html?module=bb&op=viewtopic&t=60294].  We would really like feedback on this feature.
+
+!!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+}}}
+
+Look in the console window to determine that the message was sent.
+
+{{{
+12:25:59,734 INFO  [Ejb3Module] found EJB3 consumer bean: org.jboss.tutorial.consumer.bean.ExampleConsumerBean
+12:25:59,734 INFO  [Ejb3Module] found EJB3 stateless session bean: org.jboss.tutorial.consumer.bean.TesterBean
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerRemote
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerLocal
+12:25:59,796 INFO  [ConsumerContainer] Producer: org.jboss.tutorial.consumer.bean.ExampleProducerXA
+12:25:59,812 INFO  [ProxyDeployer] no declared remote bindings
+12:25:59,812 INFO  [ProxyDeployer] there is remote interfaces
+12:25:59,812 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.consumer.bean.Tester
+12:25:59,828 INFO  [EJB3Deployer] Deployed: file[the deployment]
+12:26:09,000 INFO  [STDOUT] method1(Remote method1 called, 1)
+12:26:09,015 INFO  [STDOUT] method2: Remote method2 called
+12:26:09,015 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,015 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,109 INFO  [STDOUT] method1(testLocal, 1)
+12:26:09,125 INFO  [STDOUT] method2: testLocal2
+12:26:09,125 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,125 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,125 INFO  [STDOUT] end TESTXA **
+12:26:09,140 INFO  [STDOUT] method2: testXA2
+12:26:09,140 INFO  [STDOUT] method2 key/val: great:ejb3
+12:26:09,140 INFO  [STDOUT] method2 key/val: hello:world
+12:26:09,140 INFO  [STDOUT] method1(testXA, 1)
+}}}
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=tutorial">
-      <attribute name="JNDIName">queue/tutorial/example</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/queue-example-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=tutorial">
+      <attribute name="JNDIName">queue/tutorial/example</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+
+</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.bean;
-
-import java.util.Map;
-import javax.ejb.ActivationConfigProperty;
-import javax.jms.Message;
-import org.jboss.annotation.ejb.Consumer;
-import org.jboss.annotation.ejb.CurrentMessage;
-
-public class ExampleConsumerBean implements ExampleProducerRemote, ExampleProducerLocal, ExampleProducerXA
-{
-   // you can have container inject the current JMS message so that you can manipulate it, like for instance
-   // to get a reply-to destination.
-   private Message currentMessage;
-
-   public void method1(String msg, int val)
-   {
-      System.out.println("method1(" + msg + ", " + val + ")");
-   }
-   public void method2(String msg, Map<String, String> map)
-   {
-      System.out.println("method2: " + msg);
-      for (String key : map.keySet())
-      {
-         System.out.println("method2 key/val: " + key + ":" + map.get(key));
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleConsumerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.bean;
+
+import java.util.Map;
+import javax.ejb.ActivationConfigProperty;
+import javax.jms.Message;
+import org.jboss.annotation.ejb.Consumer;
+import org.jboss.annotation.ejb.CurrentMessage;
+
+public class ExampleConsumerBean implements ExampleProducerRemote, ExampleProducerLocal, ExampleProducerXA
+{
+   // you can have container inject the current JMS message so that you can manipulate it, like for instance
+   // to get a reply-to destination.
+   private Message currentMessage;
+
+   public void method1(String msg, int val)
+   {
+      System.out.println("method1(" + msg + ", " + val + ")");
+   }
+   public void method2(String msg, Map<String, String> map)
+   {
+      System.out.println("method2: " + msg);
+      for (String key : map.keySet())
+      {
+         System.out.println("method2 key/val: " + key + ":" + map.get(key));
+      }
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.bean;
-
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.MessageProperties;
-
-import java.util.Map;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public interface ExampleProducer
-{
-   void method1(String msg, int val);
-
-   void method2(String msg, Map<String, String> map);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.bean;
+
+import org.jboss.annotation.ejb.MessageProperties;
+import org.jboss.annotation.ejb.DeliveryMode;
+import org.jboss.annotation.ejb.DeliveryMode;
+import org.jboss.annotation.ejb.MessageProperties;
+
+import java.util.Map;
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public interface ExampleProducer
+{
+   void method1(String msg, int val);
+
+   void method2(String msg, Map<String, String> map);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.bean;
-
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.Local;
-import org.jboss.annotation.ejb.Producer;
-
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public interface ExampleProducerLocal extends ExampleProducer
-{
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.bean;
+
+import org.jboss.annotation.ejb.Producer;
+import org.jboss.annotation.ejb.Local;
+import org.jboss.annotation.ejb.Producer;
+
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public interface ExampleProducerLocal extends ExampleProducer
+{
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.bean;
-
-import org.jboss.annotation.ejb.Producer;
-
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public interface ExampleProducerRemote extends ExampleProducer
-{
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.bean;
+
+import org.jboss.annotation.ejb.Producer;
+
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public interface ExampleProducerRemote extends ExampleProducer
+{
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.bean;
-
-import java.util.Map;
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.Local;
-
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public interface ExampleProducerXA extends ExampleProducer
-{
-   void method2(String msg, Map<String, String> map);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/ExampleProducerXA.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.bean;
+
+import java.util.Map;
+import org.jboss.annotation.ejb.DeliveryMode;
+import org.jboss.annotation.ejb.MessageProperties;
+import org.jboss.annotation.ejb.Producer;
+import org.jboss.annotation.ejb.Local;
+
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public interface ExampleProducerXA extends ExampleProducer
+{
+   void method2(String msg, Map<String, String> map);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.bean;
-
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Tester
-{
-   void testXA() throws Exception;
-
-   void testLocal() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/Tester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.bean;
+
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Tester
+{
+   void testXA() throws Exception;
+
+   void testLocal() throws Exception;
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.bean;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.jboss.annotation.JndiInject;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import org.jboss.ejb3.mdb.ProducerManager;
-import org.jboss.ejb3.mdb.ProducerObject;
-
-/**
- * Show injecting in producers
- * Show how to interact with local producers
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(Tester.class)
-public class TesterBean implements Tester
-{
-   private ExampleProducerXA xa;
-   private ProducerManager xaManager;
-
-   @JndiInject(jndiName="org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerXA")
-   public void setXa(ExampleProducerXA xa)
-   {
-      this.xa = xa;
-      this.xaManager = ((ProducerObject)xa).getProducerManager();
-   }
-
-   private ExampleProducer local;
-   private ProducerManager localManager;
-
-   @JndiInject(jndiName="org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerLocal")
-   public void setLocal(ExampleProducer local)
-   {
-      this.local = local;
-      this.localManager = ((ProducerObject)local).getProducerManager();
-   }
-
-   @TransactionAttribute(TransactionAttributeType.REQUIRED)
-   public void testXA() throws Exception
-   {
-
-      xaManager.connect();
-      xa.method1("testXA", 1);
-      Map<String, String> map = new HashMap<String, String>();
-      map.put("hello", "world");
-      map.put("great", "ejb3");
-      xa.method2("testXA2", map);
-      System.out.println("end TESTXA **");
-      xaManager.close();
-   }
-
-   public void testLocal() throws Exception
-   {
-
-      localManager.connect();
-      local.method1("testLocal", 1);
-      Map<String, String> map = new HashMap<String, String>();
-      map.put("hello", "world");
-      map.put("great", "ejb3");
-      local.method2("testLocal2", map);
-      localManager.close();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/bean/TesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.bean;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.jboss.annotation.JndiInject;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import org.jboss.ejb3.mdb.ProducerManager;
+import org.jboss.ejb3.mdb.ProducerObject;
+
+/**
+ * Show injecting in producers
+ * Show how to interact with local producers
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(Tester.class)
+public class TesterBean implements Tester
+{
+   private ExampleProducerXA xa;
+   private ProducerManager xaManager;
+
+   @JndiInject(jndiName="org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerXA")
+   public void setXa(ExampleProducerXA xa)
+   {
+      this.xa = xa;
+      this.xaManager = ((ProducerObject)xa).getProducerManager();
+   }
+
+   private ExampleProducer local;
+   private ProducerManager localManager;
+
+   @JndiInject(jndiName="org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerLocal")
+   public void setLocal(ExampleProducer local)
+   {
+      this.local = local;
+      this.localManager = ((ProducerObject)local).getProducerManager();
+   }
+
+   @TransactionAttribute(TransactionAttributeType.REQUIRED)
+   public void testXA() throws Exception
+   {
+
+      xaManager.connect();
+      xa.method1("testXA", 1);
+      Map<String, String> map = new HashMap<String, String>();
+      map.put("hello", "world");
+      map.put("great", "ejb3");
+      xa.method2("testXA2", map);
+      System.out.println("end TESTXA **");
+      xaManager.close();
+   }
+
+   public void testLocal() throws Exception
+   {
+
+      localManager.connect();
+      local.method1("testLocal", 1);
+      Map<String, String> map = new HashMap<String, String>();
+      map.put("hello", "world");
+      map.put("great", "ejb3");
+      local.method2("testLocal2", map);
+      localManager.close();
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.consumer_deployment_descriptor.client;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.mdb.ProducerManager;
-import org.jboss.ejb3.mdb.ProducerObject;
-import org.jboss.ejb3.mdb.ProducerConfig;
-import org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerRemote;
-import org.jboss.tutorial.consumer_deployment_descriptor.bean.Tester;
-
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      ExampleProducerRemote remote = (ExampleProducerRemote) ctx.lookup(ExampleProducerRemote.class.getName());
-
-      // you can typecast the returned proxy to obtain a ProducerManager interface that allows you to manage
-      // interaction with JMS.
-      ProducerManager manager = ((ProducerObject) remote).getProducerManager();
-
-
-      // connect
-      manager.connect();
-
-      try
-      {
-         // Call method1
-         remote.method1("Remote method1 called", 1);
-
-         // Call method2
-         Map<String, String> map = new HashMap<String, String>();
-         map.put("hello", "world");
-         map.put("great", "ejb3");
-
-         remote.method2("Remote method2 called", map);
-      }
-      finally
-      {
-         // instead of typecasting, you can use a helper class that does everything for you.
-         ProducerConfig.close(remote);
-      }
-
-
-      // Try out local producers by interfacing with Session bean
-      Tester tester = (Tester) ctx.lookup("TesterBean/remote");
-      tester.testLocal();
-      tester.testXA();
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/consumer_deployment_descriptor/src/org/jboss/tutorial/consumer_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.consumer_deployment_descriptor.client;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.mdb.ProducerManager;
+import org.jboss.ejb3.mdb.ProducerObject;
+import org.jboss.ejb3.mdb.ProducerConfig;
+import org.jboss.tutorial.consumer_deployment_descriptor.bean.ExampleProducerRemote;
+import org.jboss.tutorial.consumer_deployment_descriptor.bean.Tester;
+
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      ExampleProducerRemote remote = (ExampleProducerRemote) ctx.lookup(ExampleProducerRemote.class.getName());
+
+      // you can typecast the returned proxy to obtain a ProducerManager interface that allows you to manage
+      // interaction with JMS.
+      ProducerManager manager = ((ProducerObject) remote).getProducerManager();
+
+
+      // connect
+      manager.connect();
+
+      try
+      {
+         // Call method1
+         remote.method1("Remote method1 called", 1);
+
+         // Call method2
+         Map<String, String> map = new HashMap<String, String>();
+         map.put("hello", "world");
+         map.put("great", "ejb3");
+
+         remote.method2("Remote method2 called", map);
+      }
+      finally
+      {
+         // instead of typecasting, you can use a helper class that does everything for you.
+         ProducerConfig.close(remote);
+      }
+
+
+      // Try out local producers by interfacing with Session bean
+      Tester tester = (Tester) ctx.lookup("TesterBean/remote");
+      tester.testLocal();
+      tester.testXA();
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.tutorial.dependency.bean.DependedOn" name="jboss.test:service=DependedOn"/>
-</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.tutorial.dependency.bean.DependedOn" name="jboss.test:service=DependedOn"/>
+</server>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>HasXmlMBeanDependencyBean</ejb-name>
-         <depends>jboss.test:service=DependedOn</depends>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>HasXmlMBeanDependencyBean</ejb-name>
+         <depends>jboss.test:service=DependedOn</depends>
+      </session>
+   </enterprise-beans>
+</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOn.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOn.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOn.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOnMBean.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOnMBean.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/DependedOnMBean.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.class)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client/Client.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client/Client.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/classes/org/jboss/tutorial/dependency/client/Client.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/tutorial.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.sar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build/tutorial.sar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build/tutorial.sar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
-   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.sar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/DependedOn*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/HasXml*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.dependency.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <target name="deploy-dependency">
-      <copy file="build/tutorial.sar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-	<delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.sar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.sar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/DependedOn*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/jboss-service.xml"/>
+         </fileset>
+      </jar>
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/HasXml*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/jboss.xml"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.dependency.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <target name="deploy-dependency">
+      <copy file="build/tutorial.sar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+	<delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.sar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/dependency.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Dependency</h2>
-
-Dependencies of an EJB on a service or services, including other EJBs, may be specified through the &lt;depends&gt; tag of the jboss.xml deployment descriptor. The &lt;depends&gt;
-tag is analagous to the Depends annotation. The dependencies control the deployment of EJBs such that an EJB will not deploy until all of it's dependencies have successfully
-deployed. 
-</p><p>
-<h4>jboss-service.xml</h4>
-
-Take a look at <a href="META-INF/jboss-service.xml">jboss-service.xml</a>. This service deployment descriptor starts a service based on
-<a href="src/org/jboss/tutorial/dependency/bean/DependedOn.java">DependedOn.java</a>.
-</p><p>
-<h4>jboss.xml</h4>
-
-Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>. This deployment descriptor indicates that the <tt>HasXmlMBeanDependencyBean</tt> is dependent on the
-<tt>jboss.test:service=DependedOn</tt> started by <tt>jboss-service.xml</tt>. The <tt>HasXmlMBeanDependencyBean</tt> will not deploy until the <tt>jboss.test:service=DependedOn</tt> 
-service has successfully started.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.
-The run ant task will deploy just the <tt>HasXmlMBeanDependencyBean</tt> EJB. You will see deployment dependency log entries in the JBoss console and the following client
-exception as the bean has not been deployed due to the unfullfilled dependency.
-</p><p>
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-run:
-     [java] Caught unsatisfied dependency exception javax.naming.NameNotFoundException: HasXmlMBeanDependencyBean not bound
-</pre>
-</p><p>
-<pre>
-13:17:53,921 ERROR [URLDeploymentScanner] Incomplete Deployment listing:
-
---- MBeans waiting for other MBeans ---
-ObjectName: jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
-  State: NOTYETINSTALLED
-  I Depend On:
-    jboss.test:service=DependedOn
-
---- MBEANS THAT ARE THE ROOT CAUSE OF THE PROBLEM ---
-ObjectName: jboss.test:service=DependedOn
-  State: NOTYETINSTALLED
-  Depends On Me:
-    jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
-</pre>
-</p><p>
-Next, deploy the <tt>jboss.test:service=DependedOn</tt> and run again
-<pre>
-$ ant deploy-dependency
-
-deploy-dependency:
-     [copy] Copying 1 file to C:\eclipse\workspace\jboss-head\build\output\jboss
--5.0.0alpha\server\all\deploy
-
-$ant run
-
-run:
-     [java] Lookup and bean access succeeded
-</pre>
-</p><p>
-</p><p>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/dependency.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+<html>
+<body>
+<p>
+<h2>Dependency</h2>
+
+Dependencies of an EJB on a service or services, including other EJBs, may be specified through the &lt;depends&gt; tag of the jboss.xml deployment descriptor. The &lt;depends&gt;
+tag is analagous to the Depends annotation. The dependencies control the deployment of EJBs such that an EJB will not deploy until all of it's dependencies have successfully
+deployed. 
+</p><p>
+<h4>jboss-service.xml</h4>
+
+Take a look at <a href="META-INF/jboss-service.xml">jboss-service.xml</a>. This service deployment descriptor starts a service based on
+<a href="src/org/jboss/tutorial/dependency/bean/DependedOn.java">DependedOn.java</a>.
+</p><p>
+<h4>jboss.xml</h4>
+
+Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>. This deployment descriptor indicates that the <tt>HasXmlMBeanDependencyBean</tt> is dependent on the
+<tt>jboss.test:service=DependedOn</tt> started by <tt>jboss-service.xml</tt>. The <tt>HasXmlMBeanDependencyBean</tt> will not deploy until the <tt>jboss.test:service=DependedOn</tt> 
+service has successfully started.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.
+The run ant task will deploy just the <tt>HasXmlMBeanDependencyBean</tt> EJB. You will see deployment dependency log entries in the JBoss console and the following client
+exception as the bean has not been deployed due to the unfullfilled dependency.
+</p><p>
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+run:
+     [java] Caught unsatisfied dependency exception javax.naming.NameNotFoundException: HasXmlMBeanDependencyBean not bound
+</pre>
+</p><p>
+<pre>
+13:17:53,921 ERROR [URLDeploymentScanner] Incomplete Deployment listing:
+
+--- MBeans waiting for other MBeans ---
+ObjectName: jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
+  State: NOTYETINSTALLED
+  I Depend On:
+    jboss.test:service=DependedOn
+
+--- MBEANS THAT ARE THE ROOT CAUSE OF THE PROBLEM ---
+ObjectName: jboss.test:service=DependedOn
+  State: NOTYETINSTALLED
+  Depends On Me:
+    jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
+</pre>
+</p><p>
+Next, deploy the <tt>jboss.test:service=DependedOn</tt> and run again
+<pre>
+$ ant deploy-dependency
+
+deploy-dependency:
+     [copy] Copying 1 file to C:\eclipse\workspace\jboss-head\build\output\jboss
+-5.0.0alpha\server\all\deploy
+
+$ant run
+
+run:
+     [java] Lookup and bean access succeeded
+</pre>
+</p><p>
+</p><p>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/dependency.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-!!!Dependency
-Dependencies of an EJB on a service or services, including other EJBs, may be specified through the <depends> tag of the jboss.xml deployment descriptor. The <depends>
-tag is analagous to the Depends annotation. The dependencies control the deployment of EJBs such that an EJB will not deploy until all of it's dependencies have successfully
-deployed. 
-
-!jboss-service.xml
-Take a look at [jboss-service.xml|META-INF/jboss-service.xml]. This service deployment descriptor starts a service based on
-[DependedOn.java|src/org/jboss/tutorial/dependency/bean/DependedOn.java].
-
-!jboss.xml
-Take a look at [jboss.xml|META-INF/jboss.xml]. This deployment descriptor indicates that the {{HasXmlMBeanDependencyBean}} is dependent on the
-{{jboss.test:service=DependedOn}} started by {{jboss-service.xml}}. The {{HasXmlMBeanDependencyBean}} will not deploy until the {{jboss.test:service=DependedOn}} 
-service has successfully started.
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.
-The run ant task will deploy just the {{HasXmlMBeanDependencyBean}} EJB. You will see deployment dependency log entries in the JBoss console and the following client
-exception as the bean has not been deployed due to the unfullfilled dependency.
-
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-run:
-     [java] Caught unsatisfied dependency exception javax.naming.NameNotFoundException: HasXmlMBeanDependencyBean not bound
-}}}
-
-{{{
-13:17:53,921 ERROR [URLDeploymentScanner] Incomplete Deployment listing:
-
---- MBeans waiting for other MBeans ---
-ObjectName: jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
-  State: NOTYETINSTALLED
-  I Depend On:
-    jboss.test:service=DependedOn
-
---- MBEANS THAT ARE THE ROOT CAUSE OF THE PROBLEM ---
-ObjectName: jboss.test:service=DependedOn
-  State: NOTYETINSTALLED
-  Depends On Me:
-    jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
-}}}
-
-Next, deploy the {{jboss.test:service=DependedOn}} and run again
-{{{
-$ ant deploy-dependency
-
-deploy-dependency:
-     [copy] Copying 1 file to C:\eclipse\workspace\jboss-head\build\output\jboss
--5.0.0alpha\server\all\deploy
-
-$ant run
-
-run:
-     [java] Lookup and bean access succeeded
-}}}
-
-
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/dependency.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/dependency.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+!!!Dependency
+Dependencies of an EJB on a service or services, including other EJBs, may be specified through the <depends> tag of the jboss.xml deployment descriptor. The <depends>
+tag is analagous to the Depends annotation. The dependencies control the deployment of EJBs such that an EJB will not deploy until all of it's dependencies have successfully
+deployed. 
+
+!jboss-service.xml
+Take a look at [jboss-service.xml|META-INF/jboss-service.xml]. This service deployment descriptor starts a service based on
+[DependedOn.java|src/org/jboss/tutorial/dependency/bean/DependedOn.java].
+
+!jboss.xml
+Take a look at [jboss.xml|META-INF/jboss.xml]. This deployment descriptor indicates that the {{HasXmlMBeanDependencyBean}} is dependent on the
+{{jboss.test:service=DependedOn}} started by {{jboss-service.xml}}. The {{HasXmlMBeanDependencyBean}} will not deploy until the {{jboss.test:service=DependedOn}} 
+service has successfully started.
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.
+The run ant task will deploy just the {{HasXmlMBeanDependencyBean}} EJB. You will see deployment dependency log entries in the JBoss console and the following client
+exception as the bean has not been deployed due to the unfullfilled dependency.
+
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+run:
+     [java] Caught unsatisfied dependency exception javax.naming.NameNotFoundException: HasXmlMBeanDependencyBean not bound
+}}}
+
+{{{
+13:17:53,921 ERROR [URLDeploymentScanner] Incomplete Deployment listing:
+
+--- MBeans waiting for other MBeans ---
+ObjectName: jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
+  State: NOTYETINSTALLED
+  I Depend On:
+    jboss.test:service=DependedOn
+
+--- MBEANS THAT ARE THE ROOT CAUSE OF THE PROBLEM ---
+ObjectName: jboss.test:service=DependedOn
+  State: NOTYETINSTALLED
+  Depends On Me:
+    jboss.j2ee:service=EJB3,jar=tutorial.jar,name=HasXmlMBeanDependencyBean
+}}}
+
+Next, deploy the {{jboss.test:service=DependedOn}} and run again
+{{{
+$ ant deploy-dependency
+
+deploy-dependency:
+     [copy] Copying 1 file to C:\eclipse\workspace\jboss-head\build\output\jboss
+-5.0.0alpha\server\all\deploy
+
+$ant run
+
+run:
+     [java] Lookup and bean access succeeded
+}}}
+
+
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.dependency.bean;
-
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class DependedOn extends ServiceMBeanSupport implements DependedOnMBean
-{
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOn.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dependency.bean;
+
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class DependedOn extends ServiceMBeanSupport implements DependedOnMBean
+{
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.dependency.bean;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface DependedOnMBean extends ServiceMBean
-{
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/DependedOnMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dependency.bean;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface DependedOnMBean extends ServiceMBean
+{
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.dependency.bean;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface HasXmlMBeanDependency
-{
-   void noop();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dependency.bean;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface HasXmlMBeanDependency
+{
+   void noop();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.dependency.bean;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class HasXmlMBeanDependencyBean implements HasXmlMBeanDependency
-{
-   public void noop()
-   {
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/bean/HasXmlMBeanDependencyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dependency.bean;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class HasXmlMBeanDependencyBean implements HasXmlMBeanDependency
+{
+   public void noop()
+   {
+
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.dependency.client;
-
-import javax.naming.InitialContext;
-
-import org.jboss.tutorial.dependency.bean.HasXmlMBeanDependency;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-        
-      try
-      {
-         HasXmlMBeanDependency dependency = (HasXmlMBeanDependency)jndiContext.lookup("HasXmlMBeanDependencyBean/remote");
-         dependency.noop();
-         System.out.println("Lookup and bean access succeeded");
-      }
-      catch (Exception e)
-      {
-         System.out.println("Caught unsatisfied dependency exception " + e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependency/src/org/jboss/tutorial/dependency/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.dependency.client;
+
+import javax.naming.InitialContext;
+
+import org.jboss.tutorial.dependency.bean.HasXmlMBeanDependency;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+        
+      try
+      {
+         HasXmlMBeanDependency dependency = (HasXmlMBeanDependency)jndiContext.lookup("HasXmlMBeanDependencyBean/remote");
+         dependency.noop();
+         System.out.println("Lookup and bean access succeeded");
+      }
+      catch (Exception e)
+      {
+         System.out.println("Caught unsatisfied dependency exception " + e);
+      }
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependent/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependent/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependent/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependent/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/dependent/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependent/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependent/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/dependent/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependent/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -49,7 +49,7 @@
 
    public List findByLastName(String name)
    {
-      return manager.createQuery("select c from Customer c where c.name.last = :name").setParameter("name", name).getResultList();
+      return manager.createQuery("from Customer c where c.name.last = :name").setParameter("name", name).getResultList();
    }
 
    public void merge(Customer c)

Modified: branches/Branch_4_2/ejb3/docs/tutorial/ear/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ear/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ear/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,7 +6,7 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
    <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
    <property name="build.dir" value="${basedir}/build"/>
@@ -22,12 +22,9 @@
       <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
          <include name="**/*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deployers/ejb3.deployer">
          <include name="*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
       <pathelement location="${build.classes.dir}"/>
    </path>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ear/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ear/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-<?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">
-   <description>jBoss test application</description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>DeploymentDescriptorSession1</ejb-name>
-         <home>org.jboss.tutorial.ejb21_client_adaptors.bean.Session1RemoteHome</home>
-         <remote>org.jboss.tutorial.ejb21_client_adaptors.bean.Session1Remote</remote>
-         <ejb-class>org.jboss.tutorial.ejb21_client_adaptors.bean.DeploymentDescriptorSession1Bean</ejb-class>
-         <session-type>Stateful</session-type>
-	   <init-method>
-            <create-method>
-               <method-name>ejbCreate</method-name>
-            </create-method>
-            <bean-method>
-               <method-name>ejbCreate</method-name>
-            </bean-method>
-         </init-method>
-         <transaction-type>Container</transaction-type>
-         <ejb-local-ref>
-            <ejb-ref-name>session2</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local>org.jboss.tutorial.ejb21_client_adaptors.bean.Session2LocalHome</local>
-            <ejb-link>DeploymentDescriptorSession2</ejb-link>
-         </ejb-local-ref>
-      </session>
-      <session>
-         <ejb-name>DeploymentDescriptorSession2</ejb-name>
-         <local-home>org.jboss.tutorial.ejb21_client_adaptors.bean.Session2LocalHome</local-home>
-         <local>org.jboss.tutorial.ejb21_client_adaptors.bean.Session2Local</local>
-         <ejb-class>org.jboss.tutorial.ejb21_client_adaptors.bean.DeploymentDescriptorSession2Bean</ejb-class>
-         <session-type>Stateful</session-type>
-         <init-method>
-            <create-method>
-               <method-name>ejbCreate</method-name>
-            </create-method>
-            <bean-method>
-               <method-name>ejbCreate</method-name>
-            </bean-method>
-         </init-method>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+<?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">
+   <description>jBoss test application</description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>DeploymentDescriptorSession1</ejb-name>
+         <home>org.jboss.tutorial.ejb21_client_adaptors.bean.Session1RemoteHome</home>
+         <remote>org.jboss.tutorial.ejb21_client_adaptors.bean.Session1Remote</remote>
+         <ejb-class>org.jboss.tutorial.ejb21_client_adaptors.bean.DeploymentDescriptorSession1Bean</ejb-class>
+         <session-type>Stateful</session-type>
+	   <init-method>
+            <create-method>
+               <method-name>ejbCreate</method-name>
+            </create-method>
+            <bean-method>
+               <method-name>ejbCreate</method-name>
+            </bean-method>
+         </init-method>
+         <transaction-type>Container</transaction-type>
+         <ejb-local-ref>
+            <ejb-ref-name>session2</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <local>org.jboss.tutorial.ejb21_client_adaptors.bean.Session2LocalHome</local>
+            <ejb-link>DeploymentDescriptorSession2</ejb-link>
+         </ejb-local-ref>
+      </session>
+      <session>
+         <ejb-name>DeploymentDescriptorSession2</ejb-name>
+         <local-home>org.jboss.tutorial.ejb21_client_adaptors.bean.Session2LocalHome</local-home>
+         <local>org.jboss.tutorial.ejb21_client_adaptors.bean.Session2Local</local>
+         <ejb-class>org.jboss.tutorial.ejb21_client_adaptors.bean.DeploymentDescriptorSession2Bean</ejb-class>
+         <session-type>Stateful</session-type>
+         <init-method>
+            <create-method>
+               <method-name>ejbCreate</method-name>
+            </create-method>
+            <bean-method>
+               <method-name>ejbCreate</method-name>
+            </bean-method>
+         </init-method>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>DeploymentDescriptorSession1</ejb-name>
-         <jndi-name>DeploymentDescriptorSession1Remote</jndi-name>
-      </session>
-      <session>
-         <ejb-name>DeploymentDescriptorSession2</ejb-name>
-         <local-jndi-name>DeploymentDescriptorSession2Local</local-jndi-name>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>DeploymentDescriptorSession1</ejb-name>
+         <jndi-name>DeploymentDescriptorSession1Remote</jndi-name>
+      </session>
+      <session>
+         <ejb-name>DeploymentDescriptorSession2</ejb-name>
+         <local-jndi-name>DeploymentDescriptorSession2Local</local-jndi-name>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property file="../local.properties"/>  <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.ejb21_client_adaptors.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.ejb21_client_adaptors.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-<html>
-<body>
-<p>
-<h2>EJB 2.1 Client Adaptors</h2>
-
-EJB 3.0 is backward compatible to EJB 2.x clients and supports the use of local and remote home interfaces as well as 
-initialization methods (e.g. ejbCreate()). This capability is configured through annotations and/or through deployment 
-descriptors. Take a look at <a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java">Session1Bean.java</a>. Note
-that the class is annotated with <tt>@RemoteHome</tt> and the ejbCreate() method is annotated with <tt>@Init</tt>. The former 
-annotation indicates that the bean provides a EJB 2.1 style home interface. The latter annotation indicates that when the create()
-method is invoked from the home interface, the bean is initialized via the ejbCreate method. Note that the initializion method name
-is not restricted to ejbCreate().
-</p><p>
-<a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session2Bean.java">Session2Bean.java</a> illustrates the use of a
-local home interface.
-</p><p>
-Similiarly, <a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession1Bean.java">DeploymentDescriptorSession1Bean.java</a> and 
-<a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession2Bean.java">DeploymentDescriptorSession2Bean.java</a>
-mimic the behavior of the first two beans, but use deployment descriptors to indicate the home interface(s) and initialization method(s).
-</p><p>
-Take a look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a>. Note the "home" and "local-home" tags that indicate the respective home interfaces.
-Also, note the "init-list" tag that indicates the initialization method(s) executed when beans are created via the home interface(s).
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-run:
-     [java] Session1 init value is initialized
-     [java] Session2 init value is initialized
-     [java] DeploymentDescriptor Session1 init value is initialized
-     [java] DeploymentDescriptor Session2 init value is initialized
-</pre>
-</p><p>
-The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
-</p><p>
-<h4>Jar structure</h4>
-
-EJB 3.0 beans must be packaged in a JAR file with the suffix <tt>.jar</tt>.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
-</p><p>
-</p><p>
-</p><p>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+<html>
+<body>
+<p>
+<h2>EJB 2.1 Client Adaptors</h2>
+
+EJB 3.0 is backward compatible to EJB 2.x clients and supports the use of local and remote home interfaces as well as 
+initialization methods (e.g. ejbCreate()). This capability is configured through annotations and/or through deployment 
+descriptors. Take a look at <a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java">Session1Bean.java</a>. Note
+that the class is annotated with <tt>@RemoteHome</tt> and the ejbCreate() method is annotated with <tt>@Init</tt>. The former 
+annotation indicates that the bean provides a EJB 2.1 style home interface. The latter annotation indicates that when the create()
+method is invoked from the home interface, the bean is initialized via the ejbCreate method. Note that the initializion method name
+is not restricted to ejbCreate().
+</p><p>
+<a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session2Bean.java">Session2Bean.java</a> illustrates the use of a
+local home interface.
+</p><p>
+Similiarly, <a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession1Bean.java">DeploymentDescriptorSession1Bean.java</a> and 
+<a href="src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession2Bean.java">DeploymentDescriptorSession2Bean.java</a>
+mimic the behavior of the first two beans, but use deployment descriptors to indicate the home interface(s) and initialization method(s).
+</p><p>
+Take a look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a>. Note the "home" and "local-home" tags that indicate the respective home interfaces.
+Also, note the "init-list" tag that indicates the initialization method(s) executed when beans are created via the home interface(s).
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+run:
+     [java] Session1 init value is initialized
+     [java] Session2 init value is initialized
+     [java] DeploymentDescriptor Session1 init value is initialized
+     [java] DeploymentDescriptor Session2 init value is initialized
+</pre>
+</p><p>
+The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
+</p><p>
+<h4>Jar structure</h4>
+
+EJB 3.0 beans must be packaged in a JAR file with the suffix <tt>.jar</tt>.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
+</p><p>
+</p><p>
+</p><p>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-!!!EJB 2.1 Client Adaptors
-EJB 3.0 is backward compatible to EJB 2.x clients and supports the use of local and remote home interfaces as well as 
-initialization methods (e.g. ejbCreate()). This capability is configured through annotations and/or through deployment 
-descriptors. Take a look at [Session1Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java]. Note
-that the class is annotated with {{@RemoteHome}} and the ejbCreate() method is annotated with {{@Init}}. The former 
-annotation indicates that the bean provides a EJB 2.1 style home interface. The latter annotation indicates that when the create()
-method is invoked from the home interface, the bean is initialized via the ejbCreate method. Note that the initializion method name
-is not restricted to ejbCreate().
-
-[Session2Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session2Bean.java] illustrates the use of a
-local home interface.
-
-Similiarly, [DeploymentDescriptorSession1Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession1Bean.java] and 
-[DeploymentDescriptorSession2Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession2Bean.java]
-mimic the behavior of the first two beans, but use deployment descriptors to indicate the home interface(s) and initialization method(s).
-
-Take a look at [ejb-jar.xml|META-INF/ejb-jar.xml]. Note the "home" and "local-home" tags that indicate the respective home interfaces.
-Also, note the "init-list" tag that indicates the initialization method(s) executed when beans are created via the home interface(s).
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-run:
-     [java] Session1 init value is initialized
-     [java] Session2 init value is initialized
-     [java] DeploymentDescriptor Session1 init value is initialized
-     [java] DeploymentDescriptor Session2 init value is initialized
-}}}
-
-The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
-
-!Jar structure
-EJB 3.0 beans must be packaged in a JAR file with the suffix {{.jar}}.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
-
-
-
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/ejb21_client_adaptors.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+!!!EJB 2.1 Client Adaptors
+EJB 3.0 is backward compatible to EJB 2.x clients and supports the use of local and remote home interfaces as well as 
+initialization methods (e.g. ejbCreate()). This capability is configured through annotations and/or through deployment 
+descriptors. Take a look at [Session1Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java]. Note
+that the class is annotated with {{@RemoteHome}} and the ejbCreate() method is annotated with {{@Init}}. The former 
+annotation indicates that the bean provides a EJB 2.1 style home interface. The latter annotation indicates that when the create()
+method is invoked from the home interface, the bean is initialized via the ejbCreate method. Note that the initializion method name
+is not restricted to ejbCreate().
+
+[Session2Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session2Bean.java] illustrates the use of a
+local home interface.
+
+Similiarly, [DeploymentDescriptorSession1Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession1Bean.java] and 
+[DeploymentDescriptorSession2Bean.java|src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession2Bean.java]
+mimic the behavior of the first two beans, but use deployment descriptors to indicate the home interface(s) and initialization method(s).
+
+Take a look at [ejb-jar.xml|META-INF/ejb-jar.xml]. Note the "home" and "local-home" tags that indicate the respective home interfaces.
+Also, note the "init-list" tag that indicates the initialization method(s) executed when beans are created via the home interface(s).
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+run:
+     [java] Session1 init value is initialized
+     [java] Session2 init value is initialized
+     [java] DeploymentDescriptor Session1 init value is initialized
+     [java] DeploymentDescriptor Session2 init value is initialized
+}}}
+
+The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
+
+!Jar structure
+EJB 3.0 beans must be packaged in a JAR file with the suffix {{.jar}}.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
+
+
+
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -24,7 +24,10 @@
 import javax.naming.*;
 import javax.ejb.EJB;
 import javax.ejb.EJBs;
-import javax.ejb.*;
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.ejb.Init;
+import javax.ejb.RemoteHome;
 
 import org.jboss.annotation.ejb.RemoteBinding;
 import org.jboss.ejb3.Container;

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Stateless Beans and XML</h2>
-
-This tutorial teaches XML and stateless beans.
-</p>
-</body>
-</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.wiki
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.wiki	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ejb21_client_adaptors/stateless.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-!!!Stateless Beans and XML
-This tutorial teaches XML and stateless beans.

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/entity/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,10 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+   <property name="jboss.server.config" value="default"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 
@@ -22,12 +23,9 @@
       <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
          <include name="**/*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deployers/ejb3.deployer">
          <include name="*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
       <pathelement location="${build.classes.dir}"/>
    </path>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="hibernate.jacc.allowed.org.jboss.tutorial.entity.security.bean.AllEntity" value="insert,update,delete,read"/>
-         <property name="hibernate.jacc.allowed.org.jboss.tutorial.entity.security.bean.StarEntity" value="*"/>
-         <property name="hibernate.jacc.allowed.org.jboss.tutorial.entity.security.bean.SomeEntity" value="insert,delete"/>
-
-         <property name="hibernate.jacc.enabled" value="true"/>
-      </properties>
-   </persistence-unit>
-</persistence>
-
-
-
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="hibernate.jacc.allowed.org.jboss.tutorial.entity.security.bean.AllEntity" value="insert,update,delete,read"/>
+         <property name="hibernate.jacc.allowed.org.jboss.tutorial.entity.security.bean.StarEntity" value="*"/>
+         <property name="hibernate.jacc.allowed.org.jboss.tutorial.entity.security.bean.SomeEntity" value="insert,delete"/>
+
+         <property name="hibernate.jacc.enabled" value="true"/>
+      </properties>
+   </persistence-unit>
+</persistence>
+
+
+
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property file="../local.properties"/>  <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-      <copy file="jacc-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer"/>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <java classname="org.jboss.tutorial.entity.security.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer/jacc-service.xml"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property file="../local.properties"/>  <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="users.properties"/>
+            <include name="roles.properties"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+      <copy file="jacc-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer"/>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <java classname="org.jboss.tutorial.entity.security.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer/jacc-service.xml"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/entity-security.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,147 +0,0 @@
-<html>
-<body>
-<p>
-<h2> Entity Bean Security</h2>
-
-There is no spec defined way of security EJB 3.0 entity beans.  JBoss does provide a solution but it is only
-available within the JBoss Application Server.  You can secure access to the CRUD operations of your entity, but not
-method invocations on the entity.  Basically, what you are securing is when the Entitymanager does persist(), remove(),
-etc. operations on an entity.
-</p><p>
-<h3> Step 1: Specify Permissions in persistence.xml</h3>
-
-</p><p>
-To secure an entity you must add additional property information within persistence.xml.  here's an example:
-<pre>
-            &lt;?xml version="1.0" encoding="UTF-8"?&gt;
-            &lt;persistence&gt;
-               &lt;persistence-unit name="tempdb"&gt;
-                  &lt;jta-data-source&gt;java:/DefaultDS&lt;/jta-data-source&gt;
-                  &lt;properties&gt;
-                      &lt;property name="hibernate.hbm2ddl.auto" value="create-drop"/&gt;
-                     &lt;property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.AllEntity" value="insert,update,delete,read"/&gt;
-                     &lt;property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.StarEntity" value="*"/&gt;
-                     &lt;property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.SomeEntity" value="insert,delete"/&gt;
-
-                     &lt;property name="hibernate.jacc.enabled" value="true"/&gt;
-                  &lt;/properties&gt;
-               &lt;/persistence-unit&gt;
-            &lt;/persistence&gt;
-</pre>
-The Entity class you are securing as well as the roles allowed and the permissions allowed for that role are stored in property information within persistence.xml
-properties.  The property name has the role and the entity class within it.  It is "hiberante.jacc." + role + FQN of entity class.
-</p><p>
-The value can be one of insert, update, delete, or read.  That is the permission. The "*" character can be used to specify all permissions.  So,
-in the above example, for the <tt>org.jboss.ejb3.test.jacc.AllEntity</tt> entity, the role "allowed" has permission to insert,update, delete, and read.
-</p><p>
-<h3> Step 2: Enable JACC Security</h3>
-
-Now the configuration gets a bit more complicated.  You have to interact with the EntityManager within a secured jacc enabled
-EJB (session) or secured jacc enabled WAR.  For jacc enabling a WAR, see our <a href="URL http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC">JACC Wiki</a>.
-To jacc enable an EJB, you have to use a JBoss specific aspect domain.  An aspect domain is a container configuration template.
-There is an aspect domain defined for jacc, either "JACC Stateless Bean" or "JACC Stateful Bean" depending on the type of EJB you are securing.
-</p><p>
-For example:
-<pre>
-            @javax.ejb.Stateless
-            @SecurityDomain ("other")
-            @AspectDomain("JACC Stateless Bean")
-            public class StatelessBean implements Stateless
-            {
-               @PersistenceContext
-               EntityManager em;
-
-               @PermitAll
-               public int unchecked(int i)
-               {
-                  System.out.println("stateless unchecked");
-                  return i;
-               }
-
-               @RolesAllowed ("allowed")
-               public int checked(int i)
-               {
-                  System.out.println("stateless checked");
-                  return i;
-               }
-</pre>
-You must do similar configuration on Tomcat to jacc enable wars and your servlets.
-</p><p>
-</p><p>
-<h3> Step 3: Enable JACC Security Serverwide</h3>
-
-</p><p>
-The final thing you must do is to create an jacc-service.xml file that will go in your deploy/ejb3.deployer directory.  This jacc configuration is defined in more detail at  <a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC">JACC Wiki Page</a>.  The jacc-service.xml file must be deployed before your EJB3 Deployer.  Putting this file in the <tt>deploy/ejb3.deployer</tt> directory ensures that this service starts before the EJB3 subsystem.  You could also set up an explicit dependency on the jacc service within the <tt>ejb.deployer/META-INF/jboss-service.xml</tt> file if you do not like that kind of setup.
-<pre>
-&lt;server&gt;
-   &lt;mbean code="org.jboss.security.jacc.DelegatingPolicy"
-      name="jboss.security:service=JaccPolicyProvider"
-      xmbean-dd=""&gt;
-      &lt;xmbean&gt;
-         &lt;attribute access="read-only" getMethod="getPolicyProxy"&gt;
-            &lt;description&gt;The java.security.Policy implementation&lt;/description&gt;
-            &lt;name&gt;PolicyProxy&lt;/name&gt;
-            &lt;type&gt;java.security.Policy&lt;/type&gt;
-         &lt;/attribute&gt;
-         &lt;attribute access="read-write" getMethod="getExternalPermissionTypes"
-                    setMethod="setExternalPermissionTypes"&gt;
-            &lt;description&gt;The types of non-javax.security.jacc permissions that
-               should be validated against this policy&lt;/description&gt;
-            &lt;name&gt;ExternalPermissionTypes&lt;/name&gt;
-            &lt;type&gt;[Ljava.lang.Class;&lt;/type&gt;
-         &lt;/attribute&gt;
-         &lt;operation&gt;
-            &lt;name&gt;listContextPolicies&lt;/name&gt;
-            &lt;return-type&gt;java.lang.String&lt;/return-type&gt;
-         &lt;/operation&gt;
-      &lt;/xmbean&gt;
-      &lt;!-- Not used, just here to test that custom permissions don't break the
-      current behavior of javax.security.jacc.* permissions.
-      --&gt;
-      &lt;attribute name="ExternalPermissionTypes"&gt;org.jboss.security.srp.SRPPermission&lt;/attribute&gt;
-   &lt;/mbean&gt;
-   &lt;mbean code="org.jboss.security.jacc.SecurityService"
-      name="jboss.security:service=JaccSecurityService"
-      xmbean-dd=""&gt;
-      &lt;xmbean&gt;
-         &lt;descriptors&gt;
-            &lt;injection id="MBeanServerType" setMethod="setMBeanServer" /&gt;
-            &lt;injection id="ObjectNameType" setMethod="setObjectName" /&gt;
-         &lt;/descriptors&gt;
-         &lt;attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName"&gt;
-            &lt;description&gt;The policy provider MBean name&lt;/description&gt;
-            &lt;name&gt;PolicyName&lt;/name&gt;
-            &lt;type&gt;javax.management.ObjectName&lt;/type&gt;
-         &lt;/attribute&gt;
-         &lt;attribute access="read-write" getMethod="getPolicyAttributeName"
-            setMethod="setPolicyAttributeName"&gt;
-            &lt;description&gt;The Policy attribute name on the PolicyName MBean&lt;/description&gt;
-            &lt;name&gt;PolicyAttributeName&lt;/name&gt;
-            &lt;type&gt;java.lang.String&lt;/type&gt;
-         &lt;/attribute&gt;
-         &lt;operation&gt;
-            &lt;name&gt;start&lt;/name&gt;
-         &lt;/operation&gt;
-         &lt;operation&gt;
-            &lt;name&gt;stop&lt;/name&gt;
-         &lt;/operation&gt;
-      &lt;/xmbean&gt;
-      &lt;attribute name="PolicyName"&gt;jboss.security:service=JaccPolicyProvider&lt;/attribute&gt;
-      &lt;attribute name="PolicyAttributeName"&gt;PolicyProxy&lt;/attribute&gt;
-   &lt;/mbean&gt;
-&lt;/server&gt;
-</pre>
-</p><p>
-<h3> Run the tutorial</h3>
-
-</p><p>
-To run the tutorial you must first shut down JBoss.  This is because the JACC service needs to be started at boot time.
-</p><p>
-<pre>
-$ ant
--- start up jboss app server
-$ ant run
-</pre>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/entity-security.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,147 @@
+<html>
+<body>
+<p>
+<h2> Entity Bean Security</h2>
+
+There is no spec defined way of security EJB 3.0 entity beans.  JBoss does provide a solution but it is only
+available within the JBoss Application Server.  You can secure access to the CRUD operations of your entity, but not
+method invocations on the entity.  Basically, what you are securing is when the Entitymanager does persist(), remove(),
+etc. operations on an entity.
+</p><p>
+<h3> Step 1: Specify Permissions in persistence.xml</h3>
+
+</p><p>
+To secure an entity you must add additional property information within persistence.xml.  here's an example:
+<pre>
+            &lt;?xml version="1.0" encoding="UTF-8"?&gt;
+            &lt;persistence&gt;
+               &lt;persistence-unit name="tempdb"&gt;
+                  &lt;jta-data-source&gt;java:/DefaultDS&lt;/jta-data-source&gt;
+                  &lt;properties&gt;
+                      &lt;property name="hibernate.hbm2ddl.auto" value="create-drop"/&gt;
+                     &lt;property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.AllEntity" value="insert,update,delete,read"/&gt;
+                     &lt;property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.StarEntity" value="*"/&gt;
+                     &lt;property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.SomeEntity" value="insert,delete"/&gt;
+
+                     &lt;property name="hibernate.jacc.enabled" value="true"/&gt;
+                  &lt;/properties&gt;
+               &lt;/persistence-unit&gt;
+            &lt;/persistence&gt;
+</pre>
+The Entity class you are securing as well as the roles allowed and the permissions allowed for that role are stored in property information within persistence.xml
+properties.  The property name has the role and the entity class within it.  It is "hiberante.jacc." + role + FQN of entity class.
+</p><p>
+The value can be one of insert, update, delete, or read.  That is the permission. The "*" character can be used to specify all permissions.  So,
+in the above example, for the <tt>org.jboss.ejb3.test.jacc.AllEntity</tt> entity, the role "allowed" has permission to insert,update, delete, and read.
+</p><p>
+<h3> Step 2: Enable JACC Security</h3>
+
+Now the configuration gets a bit more complicated.  You have to interact with the EntityManager within a secured jacc enabled
+EJB (session) or secured jacc enabled WAR.  For jacc enabling a WAR, see our <a href="URL http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC">JACC Wiki</a>.
+To jacc enable an EJB, you have to use a JBoss specific aspect domain.  An aspect domain is a container configuration template.
+There is an aspect domain defined for jacc, either "JACC Stateless Bean" or "JACC Stateful Bean" depending on the type of EJB you are securing.
+</p><p>
+For example:
+<pre>
+            @javax.ejb.Stateless
+            @SecurityDomain ("other")
+            @AspectDomain("JACC Stateless Bean")
+            public class StatelessBean implements Stateless
+            {
+               @PersistenceContext
+               EntityManager em;
+
+               @PermitAll
+               public int unchecked(int i)
+               {
+                  System.out.println("stateless unchecked");
+                  return i;
+               }
+
+               @RolesAllowed ("allowed")
+               public int checked(int i)
+               {
+                  System.out.println("stateless checked");
+                  return i;
+               }
+</pre>
+You must do similar configuration on Tomcat to jacc enable wars and your servlets.
+</p><p>
+</p><p>
+<h3> Step 3: Enable JACC Security Serverwide</h3>
+
+</p><p>
+The final thing you must do is to create an jacc-service.xml file that will go in your deploy/ejb3.deployer directory.  This jacc configuration is defined in more detail at  <a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC">JACC Wiki Page</a>.  The jacc-service.xml file must be deployed before your EJB3 Deployer.  Putting this file in the <tt>deploy/ejb3.deployer</tt> directory ensures that this service starts before the EJB3 subsystem.  You could also set up an explicit dependency on the jacc service within the <tt>ejb.deployer/META-INF/jboss-service.xml</tt> file if you do not like that kind of setup.
+<pre>
+&lt;server&gt;
+   &lt;mbean code="org.jboss.security.jacc.DelegatingPolicy"
+      name="jboss.security:service=JaccPolicyProvider"
+      xmbean-dd=""&gt;
+      &lt;xmbean&gt;
+         &lt;attribute access="read-only" getMethod="getPolicyProxy"&gt;
+            &lt;description&gt;The java.security.Policy implementation&lt;/description&gt;
+            &lt;name&gt;PolicyProxy&lt;/name&gt;
+            &lt;type&gt;java.security.Policy&lt;/type&gt;
+         &lt;/attribute&gt;
+         &lt;attribute access="read-write" getMethod="getExternalPermissionTypes"
+                    setMethod="setExternalPermissionTypes"&gt;
+            &lt;description&gt;The types of non-javax.security.jacc permissions that
+               should be validated against this policy&lt;/description&gt;
+            &lt;name&gt;ExternalPermissionTypes&lt;/name&gt;
+            &lt;type&gt;[Ljava.lang.Class;&lt;/type&gt;
+         &lt;/attribute&gt;
+         &lt;operation&gt;
+            &lt;name&gt;listContextPolicies&lt;/name&gt;
+            &lt;return-type&gt;java.lang.String&lt;/return-type&gt;
+         &lt;/operation&gt;
+      &lt;/xmbean&gt;
+      &lt;!-- Not used, just here to test that custom permissions don't break the
+      current behavior of javax.security.jacc.* permissions.
+      --&gt;
+      &lt;attribute name="ExternalPermissionTypes"&gt;org.jboss.security.srp.SRPPermission&lt;/attribute&gt;
+   &lt;/mbean&gt;
+   &lt;mbean code="org.jboss.security.jacc.SecurityService"
+      name="jboss.security:service=JaccSecurityService"
+      xmbean-dd=""&gt;
+      &lt;xmbean&gt;
+         &lt;descriptors&gt;
+            &lt;injection id="MBeanServerType" setMethod="setMBeanServer" /&gt;
+            &lt;injection id="ObjectNameType" setMethod="setObjectName" /&gt;
+         &lt;/descriptors&gt;
+         &lt;attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName"&gt;
+            &lt;description&gt;The policy provider MBean name&lt;/description&gt;
+            &lt;name&gt;PolicyName&lt;/name&gt;
+            &lt;type&gt;javax.management.ObjectName&lt;/type&gt;
+         &lt;/attribute&gt;
+         &lt;attribute access="read-write" getMethod="getPolicyAttributeName"
+            setMethod="setPolicyAttributeName"&gt;
+            &lt;description&gt;The Policy attribute name on the PolicyName MBean&lt;/description&gt;
+            &lt;name&gt;PolicyAttributeName&lt;/name&gt;
+            &lt;type&gt;java.lang.String&lt;/type&gt;
+         &lt;/attribute&gt;
+         &lt;operation&gt;
+            &lt;name&gt;start&lt;/name&gt;
+         &lt;/operation&gt;
+         &lt;operation&gt;
+            &lt;name&gt;stop&lt;/name&gt;
+         &lt;/operation&gt;
+      &lt;/xmbean&gt;
+      &lt;attribute name="PolicyName"&gt;jboss.security:service=JaccPolicyProvider&lt;/attribute&gt;
+      &lt;attribute name="PolicyAttributeName"&gt;PolicyProxy&lt;/attribute&gt;
+   &lt;/mbean&gt;
+&lt;/server&gt;
+</pre>
+</p><p>
+<h3> Run the tutorial</h3>
+
+</p><p>
+To run the tutorial you must first shut down JBoss.  This is because the JACC service needs to be started at boot time.
+</p><p>
+<pre>
+$ ant
+-- start up jboss app server
+$ ant run
+</pre>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/entity-security.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,136 +0,0 @@
-!!! Entity Bean Security
-There is no spec defined way of security EJB 3.0 entity beans.  JBoss does provide a solution but it is only
-available within the JBoss Application Server.  You can secure access to the CRUD operations of your entity, but not
-method invocations on the entity.  Basically, what you are securing is when the Entitymanager does persist(), remove(),
-etc. operations on an entity.
-
-!! Step 1: Specify Permissions in persistence.xml
-
-To secure an entity you must add additional property information within persistence.xml.  here's an example:
-{{{
-            <?xml version="1.0" encoding="UTF-8"?>
-            <persistence>
-               <persistence-unit name="tempdb">
-                  <jta-data-source>java:/DefaultDS</jta-data-source>
-                  <properties>
-                      <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-                     <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.AllEntity" value="insert,update,delete,read"/>
-                     <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.StarEntity" value="*"/>
-                     <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.SomeEntity" value="insert,delete"/>
-
-                     <property name="hibernate.jacc.enabled" value="true"/>
-                  </properties>
-               </persistence-unit>
-            </persistence>
-}}}
-The Entity class you are securing as well as the roles allowed and the permissions allowed for that role are stored in property information within persistence.xml
-properties.  The property name has the role and the entity class within it.  It is "hiberante.jacc." + role + FQN of entity class.
-
-The value can be one of insert, update, delete, or read.  That is the permission. The "*" character can be used to specify all permissions.  So,
-in the above example, for the {{org.jboss.ejb3.test.jacc.AllEntity}} entity, the role "allowed" has permission to insert,update, delete, and read.
-
-!! Step 2: Enable JACC Security
-Now the configuration gets a bit more complicated.  You have to interact with the EntityManager within a secured jacc enabled
-EJB (session) or secured jacc enabled WAR.  For jacc enabling a WAR, see our [JACC Wiki|URL http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC].
-To jacc enable an EJB, you have to use a JBoss specific aspect domain.  An aspect domain is a container configuration template.
-There is an aspect domain defined for jacc, either "JACC Stateless Bean" or "JACC Stateful Bean" depending on the type of EJB you are securing.
-
-For example:
-{{{
-            @javax.ejb.Stateless
-            @SecurityDomain ("other")
-            @AspectDomain("JACC Stateless Bean")
-            public class StatelessBean implements Stateless
-            {
-               @PersistenceContext
-               EntityManager em;
-
-               @PermitAll
-               public int unchecked(int i)
-               {
-                  System.out.println("stateless unchecked");
-                  return i;
-               }
-
-               @RolesAllowed ("allowed")
-               public int checked(int i)
-               {
-                  System.out.println("stateless checked");
-                  return i;
-               }
-}}}
-You must do similar configuration on Tomcat to jacc enable wars and your servlets.
-
-
-!! Step 3: Enable JACC Security Serverwide
-
-The final thing you must do is to create an jacc-service.xml file that will go in your deploy/ejb3.deployer directory.  This jacc configuration is defined in more detail at  [JACC Wiki Page|http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC].  The jacc-service.xml file must be deployed before your EJB3 Deployer.  Putting this file in the {{deploy/ejb3.deployer}} directory ensures that this service starts before the EJB3 subsystem.  You could also set up an explicit dependency on the jacc service within the {{ejb.deployer/META-INF/jboss-service.xml}} file if you do not like that kind of setup.
-{{{
-<server>
-   <mbean code="org.jboss.security.jacc.DelegatingPolicy"
-      name="jboss.security:service=JaccPolicyProvider"
-      xmbean-dd="">
-      <xmbean>
-         <attribute access="read-only" getMethod="getPolicyProxy">
-            <description>The java.security.Policy implementation</description>
-            <name>PolicyProxy</name>
-            <type>java.security.Policy</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getExternalPermissionTypes"
-                    setMethod="setExternalPermissionTypes">
-            <description>The types of non-javax.security.jacc permissions that
-               should be validated against this policy</description>
-            <name>ExternalPermissionTypes</name>
-            <type>[Ljava.lang.Class;</type>
-         </attribute>
-         <operation>
-            <name>listContextPolicies</name>
-            <return-type>java.lang.String</return-type>
-         </operation>
-      </xmbean>
-      <!-- Not used, just here to test that custom permissions don't break the
-      current behavior of javax.security.jacc.* permissions.
-      -->
-      <attribute name="ExternalPermissionTypes">org.jboss.security.srp.SRPPermission</attribute>
-   </mbean>
-   <mbean code="org.jboss.security.jacc.SecurityService"
-      name="jboss.security:service=JaccSecurityService"
-      xmbean-dd="">
-      <xmbean>
-         <descriptors>
-            <injection id="MBeanServerType" setMethod="setMBeanServer" />
-            <injection id="ObjectNameType" setMethod="setObjectName" />
-         </descriptors>
-         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
-            <description>The policy provider MBean name</description>
-            <name>PolicyName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getPolicyAttributeName"
-            setMethod="setPolicyAttributeName">
-            <description>The Policy attribute name on the PolicyName MBean</description>
-            <name>PolicyAttributeName</name>
-            <type>java.lang.String</type>
-         </attribute>
-         <operation>
-            <name>start</name>
-         </operation>
-         <operation>
-            <name>stop</name>
-         </operation>
-      </xmbean>
-      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
-      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
-   </mbean>
-</server>
-}}}
-
-!! Run the tutorial
-
-To run the tutorial you must first shut down JBoss.  This is because the JACC service needs to be started at boot time.
-
-{{{
-$ ant
--- start up jboss app server
-$ ant run
-}}}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/entity-security.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/entity-security.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,136 @@
+!!! Entity Bean Security
+There is no spec defined way of security EJB 3.0 entity beans.  JBoss does provide a solution but it is only
+available within the JBoss Application Server.  You can secure access to the CRUD operations of your entity, but not
+method invocations on the entity.  Basically, what you are securing is when the Entitymanager does persist(), remove(),
+etc. operations on an entity.
+
+!! Step 1: Specify Permissions in persistence.xml
+
+To secure an entity you must add additional property information within persistence.xml.  here's an example:
+{{{
+            <?xml version="1.0" encoding="UTF-8"?>
+            <persistence>
+               <persistence-unit name="tempdb">
+                  <jta-data-source>java:/DefaultDS</jta-data-source>
+                  <properties>
+                      <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+                     <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.AllEntity" value="insert,update,delete,read"/>
+                     <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.StarEntity" value="*"/>
+                     <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.SomeEntity" value="insert,delete"/>
+
+                     <property name="hibernate.jacc.enabled" value="true"/>
+                  </properties>
+               </persistence-unit>
+            </persistence>
+}}}
+The Entity class you are securing as well as the roles allowed and the permissions allowed for that role are stored in property information within persistence.xml
+properties.  The property name has the role and the entity class within it.  It is "hiberante.jacc." + role + FQN of entity class.
+
+The value can be one of insert, update, delete, or read.  That is the permission. The "*" character can be used to specify all permissions.  So,
+in the above example, for the {{org.jboss.ejb3.test.jacc.AllEntity}} entity, the role "allowed" has permission to insert,update, delete, and read.
+
+!! Step 2: Enable JACC Security
+Now the configuration gets a bit more complicated.  You have to interact with the EntityManager within a secured jacc enabled
+EJB (session) or secured jacc enabled WAR.  For jacc enabling a WAR, see our [JACC Wiki|URL http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC].
+To jacc enable an EJB, you have to use a JBoss specific aspect domain.  An aspect domain is a container configuration template.
+There is an aspect domain defined for jacc, either "JACC Stateless Bean" or "JACC Stateful Bean" depending on the type of EJB you are securing.
+
+For example:
+{{{
+            @javax.ejb.Stateless
+            @SecurityDomain ("other")
+            @AspectDomain("JACC Stateless Bean")
+            public class StatelessBean implements Stateless
+            {
+               @PersistenceContext
+               EntityManager em;
+
+               @PermitAll
+               public int unchecked(int i)
+               {
+                  System.out.println("stateless unchecked");
+                  return i;
+               }
+
+               @RolesAllowed ("allowed")
+               public int checked(int i)
+               {
+                  System.out.println("stateless checked");
+                  return i;
+               }
+}}}
+You must do similar configuration on Tomcat to jacc enable wars and your servlets.
+
+
+!! Step 3: Enable JACC Security Serverwide
+
+The final thing you must do is to create an jacc-service.xml file that will go in your deploy/ejb3.deployer directory.  This jacc configuration is defined in more detail at  [JACC Wiki Page|http://wiki.jboss.org/wiki/Wiki.jsp?page=JACC].  The jacc-service.xml file must be deployed before your EJB3 Deployer.  Putting this file in the {{deploy/ejb3.deployer}} directory ensures that this service starts before the EJB3 subsystem.  You could also set up an explicit dependency on the jacc service within the {{ejb.deployer/META-INF/jboss-service.xml}} file if you do not like that kind of setup.
+{{{
+<server>
+   <mbean code="org.jboss.security.jacc.DelegatingPolicy"
+      name="jboss.security:service=JaccPolicyProvider"
+      xmbean-dd="">
+      <xmbean>
+         <attribute access="read-only" getMethod="getPolicyProxy">
+            <description>The java.security.Policy implementation</description>
+            <name>PolicyProxy</name>
+            <type>java.security.Policy</type>
+         </attribute>
+         <attribute access="read-write" getMethod="getExternalPermissionTypes"
+                    setMethod="setExternalPermissionTypes">
+            <description>The types of non-javax.security.jacc permissions that
+               should be validated against this policy</description>
+            <name>ExternalPermissionTypes</name>
+            <type>[Ljava.lang.Class;</type>
+         </attribute>
+         <operation>
+            <name>listContextPolicies</name>
+            <return-type>java.lang.String</return-type>
+         </operation>
+      </xmbean>
+      <!-- Not used, just here to test that custom permissions don't break the
+      current behavior of javax.security.jacc.* permissions.
+      -->
+      <attribute name="ExternalPermissionTypes">org.jboss.security.srp.SRPPermission</attribute>
+   </mbean>
+   <mbean code="org.jboss.security.jacc.SecurityService"
+      name="jboss.security:service=JaccSecurityService"
+      xmbean-dd="">
+      <xmbean>
+         <descriptors>
+            <injection id="MBeanServerType" setMethod="setMBeanServer" />
+            <injection id="ObjectNameType" setMethod="setObjectName" />
+         </descriptors>
+         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
+            <description>The policy provider MBean name</description>
+            <name>PolicyName</name>
+            <type>javax.management.ObjectName</type>
+         </attribute>
+         <attribute access="read-write" getMethod="getPolicyAttributeName"
+            setMethod="setPolicyAttributeName">
+            <description>The Policy attribute name on the PolicyName MBean</description>
+            <name>PolicyAttributeName</name>
+            <type>java.lang.String</type>
+         </attribute>
+         <operation>
+            <name>start</name>
+         </operation>
+         <operation>
+            <name>stop</name>
+         </operation>
+      </xmbean>
+      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
+      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
+   </mbean>
+</server>
+}}}
+
+!! Run the tutorial
+
+To run the tutorial you must first shut down JBoss.  This is because the JACC service needs to be started at boot time.
+
+{{{
+$ ant
+-- start up jboss app server
+$ ant run
+}}}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jacc-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/jacc-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jacc-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-
-<server>
-   <mbean code="org.jboss.security.jacc.DelegatingPolicy"
-      name="jboss.security:service=JaccPolicyProvider"
-      xmbean-dd="">
-      <xmbean>
-         <attribute access="read-only" getMethod="getPolicyProxy">
-            <description>The java.security.Policy implementation</description>
-            <name>PolicyProxy</name>
-            <type>java.security.Policy</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getExternalPermissionTypes"
-                    setMethod="setExternalPermissionTypes">
-            <description>The types of non-javax.security.jacc permissions that
-               should be validated against this policy</description>
-            <name>ExternalPermissionTypes</name>
-            <type>[Ljava.lang.Class;</type>
-         </attribute>
-         <operation>
-            <name>listContextPolicies</name>
-            <return-type>java.lang.String</return-type>
-         </operation>
-      </xmbean>
-      <!-- Not used, just here to test that custom permissions don't break the
-      current behavior of javax.security.jacc.* permissions.
-      -->
-      <attribute name="ExternalPermissionTypes">org.jboss.security.srp.SRPPermission</attribute>
-   </mbean>
-   <mbean code="org.jboss.security.jacc.SecurityService"
-      name="jboss.security:service=JaccSecurityService"
-      xmbean-dd="">
-      <xmbean>
-         <descriptors>
-            <injection id="MBeanServerType" setMethod="setMBeanServer" />
-            <injection id="ObjectNameType" setMethod="setObjectName" />
-         </descriptors>
-         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
-            <description>The policy provider MBean name</description>
-            <name>PolicyName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getPolicyAttributeName"
-            setMethod="setPolicyAttributeName">
-            <description>The Policy attribute name on the PolicyName MBean</description>
-            <name>PolicyAttributeName</name>
-            <type>java.lang.String</type>
-         </attribute>
-         <operation>
-            <name>start</name>
-         </operation>
-         <operation>
-            <name>stop</name>
-         </operation>
-      </xmbean>
-      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
-      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
-   </mbean>
-</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jacc-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/jacc-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jacc-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jacc-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+
+<server>
+   <mbean code="org.jboss.security.jacc.DelegatingPolicy"
+      name="jboss.security:service=JaccPolicyProvider"
+      xmbean-dd="">
+      <xmbean>
+         <attribute access="read-only" getMethod="getPolicyProxy">
+            <description>The java.security.Policy implementation</description>
+            <name>PolicyProxy</name>
+            <type>java.security.Policy</type>
+         </attribute>
+         <attribute access="read-write" getMethod="getExternalPermissionTypes"
+                    setMethod="setExternalPermissionTypes">
+            <description>The types of non-javax.security.jacc permissions that
+               should be validated against this policy</description>
+            <name>ExternalPermissionTypes</name>
+            <type>[Ljava.lang.Class;</type>
+         </attribute>
+         <operation>
+            <name>listContextPolicies</name>
+            <return-type>java.lang.String</return-type>
+         </operation>
+      </xmbean>
+      <!-- Not used, just here to test that custom permissions don't break the
+      current behavior of javax.security.jacc.* permissions.
+      -->
+      <attribute name="ExternalPermissionTypes">org.jboss.security.srp.SRPPermission</attribute>
+   </mbean>
+   <mbean code="org.jboss.security.jacc.SecurityService"
+      name="jboss.security:service=JaccSecurityService"
+      xmbean-dd="">
+      <xmbean>
+         <descriptors>
+            <injection id="MBeanServerType" setMethod="setMBeanServer" />
+            <injection id="ObjectNameType" setMethod="setObjectName" />
+         </descriptors>
+         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
+            <description>The policy provider MBean name</description>
+            <name>PolicyName</name>
+            <type>javax.management.ObjectName</type>
+         </attribute>
+         <attribute access="read-write" getMethod="getPolicyAttributeName"
+            setMethod="setPolicyAttributeName">
+            <description>The Policy attribute name on the PolicyName MBean</description>
+            <name>PolicyAttributeName</name>
+            <type>java.lang.String</type>
+         </attribute>
+         <operation>
+            <name>start</name>
+         </operation>
+         <operation>
+            <name>stop</name>
+         </operation>
+      </xmbean>
+      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
+      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
+   </mbean>
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-rolefail=willfail
-somebody=allowed

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+rolefail=willfail
+somebody=allowed

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-package org.jboss.tutorial.entity.security.bean;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
- at Entity
-public class AllEntity implements Serializable
-{
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int id;
-   
-   public String val;
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/AllEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+package org.jboss.tutorial.entity.security.bean;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+ at Entity
+public class AllEntity implements Serializable
+{
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int id;
+   
+   public String val;
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-package org.jboss.tutorial.entity.security.bean;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
- at Entity
-public class SomeEntity implements Serializable
-{
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int id;
-   
-   public String val;
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/SomeEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+package org.jboss.tutorial.entity.security.bean;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+ at Entity
+public class SomeEntity implements Serializable
+{
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int id;
+   
+   public String val;
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-package org.jboss.tutorial.entity.security.bean;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
- at Entity
-public class StarEntity  implements Serializable
-{
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int id;
-   
-   public String val;
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StarEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+package org.jboss.tutorial.entity.security.bean;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+ at Entity
+public class StarEntity  implements Serializable
+{
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int id;
+   
+   public String val;
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-package org.jboss.tutorial.entity.security.bean;
-
-import org.jboss.tutorial.entity.security.bean.AllEntity;
-import org.jboss.tutorial.entity.security.bean.SomeEntity;
-import org.jboss.tutorial.entity.security.bean.StarEntity;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface Stateless
-{
-   int unchecked(int i);
-
-   int checked(int i);
-
-   AllEntity insertAllEntity();
-
-   AllEntity readAllEntity(int key);
-
-   void updateAllEntity(AllEntity e);
-
-   void deleteAllEntity(AllEntity e);
-
-   StarEntity insertStarEntity();
-
-   StarEntity readStarEntity(int key);
-
-   void updateStarEntity(StarEntity e);
-
-   void deleteStarEntity(StarEntity e);
-
-   SomeEntity insertSomeEntity();
-
-   SomeEntity readSomeEntity(int key);
-
-   void updateSomeEntity(SomeEntity e);
-
-   void deleteSomeEntity(SomeEntity e);
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+package org.jboss.tutorial.entity.security.bean;
+
+import org.jboss.tutorial.entity.security.bean.AllEntity;
+import org.jboss.tutorial.entity.security.bean.SomeEntity;
+import org.jboss.tutorial.entity.security.bean.StarEntity;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface Stateless
+{
+   int unchecked(int i);
+
+   int checked(int i);
+
+   AllEntity insertAllEntity();
+
+   AllEntity readAllEntity(int key);
+
+   void updateAllEntity(AllEntity e);
+
+   void deleteAllEntity(AllEntity e);
+
+   StarEntity insertStarEntity();
+
+   StarEntity readStarEntity(int key);
+
+   void updateStarEntity(StarEntity e);
+
+   void deleteStarEntity(StarEntity e);
+
+   SomeEntity insertSomeEntity();
+
+   SomeEntity readSomeEntity(int key);
+
+   void updateSomeEntity(SomeEntity e);
+
+   void deleteSomeEntity(SomeEntity e);
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,128 +0,0 @@
-package org.jboss.tutorial.entity.security.bean;
-
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Remote;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.ejb.AspectDomain;
-import org.jboss.tutorial.entity.security.bean.AllEntity;
-import org.jboss.tutorial.entity.security.bean.SomeEntity;
-import org.jboss.tutorial.entity.security.bean.StarEntity;
-import org.jboss.tutorial.entity.security.bean.Stateless;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at javax.ejb.Stateless
- at Remote (Stateless.class)
- at SecurityDomain ("other")
- at AspectDomain("JACC Stateless Bean")
-public class StatelessBean implements Stateless
-{
-   @PersistenceContext
-   EntityManager em;
-
-   @PermitAll
-   public int unchecked(int i)
-   {
-      System.out.println("stateless unchecked");
-      return i;
-   }
-
-   @RolesAllowed ("allowed")
-   public int checked(int i)
-   {
-      System.out.println("stateless checked");
-      return i;
-   }
-
-   @PermitAll
-   public AllEntity insertAllEntity()
-   {
-      AllEntity e = new AllEntity();
-      e.val = "x";
-      em.persist(e);
-      return e;
-   }
-
-   @PermitAll
-   public AllEntity readAllEntity(int key)
-   {
-      AllEntity e = em.find(AllEntity.class, key);
-      return e;
-   }
-
-   @PermitAll
-   public void updateAllEntity(AllEntity e)
-   {
-      em.merge(e);
-   }
-
-   @PermitAll
-   public void deleteAllEntity(AllEntity e)
-   {
-      em.remove(e);
-   }
-
-   @PermitAll
-   public StarEntity insertStarEntity()
-   {
-      StarEntity e = new StarEntity();
-      e.val = "x";
-      em.persist(e);
-      return e;
-   }
-
-   @PermitAll
-   public StarEntity readStarEntity(int key)
-   {
-      StarEntity e = em.find(StarEntity.class, key);
-      return e;
-   }
-
-   @PermitAll
-   public void updateStarEntity(StarEntity e)
-   {
-      em.merge(e);
-   }
-
-   @PermitAll
-   public void deleteStarEntity(StarEntity e)
-   {
-      em.remove(e);
-   }
-
-
-   @PermitAll
-   public SomeEntity insertSomeEntity()
-   {
-      SomeEntity e = new SomeEntity();
-      e.val = "x";
-      em.persist(e);
-      return e;
-   }
-
-   @PermitAll
-   public SomeEntity readSomeEntity(int key)
-   {
-      SomeEntity e = em.find(SomeEntity.class, key);
-      return e;
-   }
-
-   @PermitAll
-   public void updateSomeEntity(SomeEntity e)
-   {
-      em.merge(e);
-   }
-
-   @PermitAll
-   public void deleteSomeEntity(SomeEntity e)
-   {
-      em.remove(e);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/bean/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,128 @@
+package org.jboss.tutorial.entity.security.bean;
+
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.PermitAll;
+import javax.ejb.Remote;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.annotation.ejb.AspectDomain;
+import org.jboss.tutorial.entity.security.bean.AllEntity;
+import org.jboss.tutorial.entity.security.bean.SomeEntity;
+import org.jboss.tutorial.entity.security.bean.StarEntity;
+import org.jboss.tutorial.entity.security.bean.Stateless;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at javax.ejb.Stateless
+ at Remote (Stateless.class)
+ at SecurityDomain ("other")
+ at AspectDomain("JACC Stateless Bean")
+public class StatelessBean implements Stateless
+{
+   @PersistenceContext
+   EntityManager em;
+
+   @PermitAll
+   public int unchecked(int i)
+   {
+      System.out.println("stateless unchecked");
+      return i;
+   }
+
+   @RolesAllowed ("allowed")
+   public int checked(int i)
+   {
+      System.out.println("stateless checked");
+      return i;
+   }
+
+   @PermitAll
+   public AllEntity insertAllEntity()
+   {
+      AllEntity e = new AllEntity();
+      e.val = "x";
+      em.persist(e);
+      return e;
+   }
+
+   @PermitAll
+   public AllEntity readAllEntity(int key)
+   {
+      AllEntity e = em.find(AllEntity.class, key);
+      return e;
+   }
+
+   @PermitAll
+   public void updateAllEntity(AllEntity e)
+   {
+      em.merge(e);
+   }
+
+   @PermitAll
+   public void deleteAllEntity(AllEntity e)
+   {
+      em.remove(e);
+   }
+
+   @PermitAll
+   public StarEntity insertStarEntity()
+   {
+      StarEntity e = new StarEntity();
+      e.val = "x";
+      em.persist(e);
+      return e;
+   }
+
+   @PermitAll
+   public StarEntity readStarEntity(int key)
+   {
+      StarEntity e = em.find(StarEntity.class, key);
+      return e;
+   }
+
+   @PermitAll
+   public void updateStarEntity(StarEntity e)
+   {
+      em.merge(e);
+   }
+
+   @PermitAll
+   public void deleteStarEntity(StarEntity e)
+   {
+      em.remove(e);
+   }
+
+
+   @PermitAll
+   public SomeEntity insertSomeEntity()
+   {
+      SomeEntity e = new SomeEntity();
+      e.val = "x";
+      em.persist(e);
+      return e;
+   }
+
+   @PermitAll
+   public SomeEntity readSomeEntity(int key)
+   {
+      SomeEntity e = em.find(SomeEntity.class, key);
+      return e;
+   }
+
+   @PermitAll
+   public void updateSomeEntity(SomeEntity e)
+   {
+      em.merge(e);
+   }
+
+   @PermitAll
+   public void deleteSomeEntity(SomeEntity e)
+   {
+      em.remove(e);
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,286 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.entity.security.client;
-
-import org.jboss.tutorial.entity.security.bean.AllEntity;
-import org.jboss.tutorial.entity.security.bean.SomeEntity;
-import org.jboss.tutorial.entity.security.bean.StarEntity;
-import org.jboss.tutorial.entity.security.bean.Stateless;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class Client
-{
-
-   public static void main(String[] args) throws Exception
-   {
-      testAllEntity();
-      testSomeEntity();
-      testStarEntity();
-   }
-
-   public static InitialContext getInitialContext(String username, String password) throws Exception
-   {
-      Properties env = new Properties();
-      env.setProperty(Context.SECURITY_PRINCIPAL, username);
-      env.setProperty(Context.SECURITY_CREDENTIALS, password);
-      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
-      return new InitialContext(env);
-
-   }
-
-   public static void testAllEntity()throws Exception
-   {
-      InitialContext ctx = getInitialContext("somebody", "password");
-      Stateless stateless = (Stateless)ctx.lookup("StatelessBean/remote");
-
-      System.out.println("Good role");
-      System.out.println("Inserting...");
-      AllEntity e = stateless.insertAllEntity();
-      System.out.println("Reading...");
-      e = stateless.readAllEntity(e.id);
-      e.val += "y";
-      System.out.println("Updating...");
-      stateless.updateAllEntity(e);
-      System.out.println("Deleting...");
-      stateless.deleteAllEntity(e);
-      System.out.println("Inserting...");
-      e = stateless.insertAllEntity();
-
-      System.out.println("Bad role");
-      getInitialContext("rolefail", "password");
-
-      AllEntity ae2 = null;
-      try
-      {
-         System.out.println("Inserting...");
-         ae2 = stateless.insertAllEntity();
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         System.out.println("Reading...");
-         ae2 = stateless.readAllEntity(e.id);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         e.val += "y";
-         stateless.updateAllEntity(e);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         stateless.deleteAllEntity(e);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         e = stateless.insertAllEntity();
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-   }
-
-
-   public static void testStarEntity()throws Exception
-   {
-      InitialContext ctx = getInitialContext("somebody", "password");
-      Stateless stateless = (Stateless)ctx.lookup("StatelessBean/remote");
-
-      System.out.println("Good role");
-      System.out.println("Inserting...");
-      StarEntity e = stateless.insertStarEntity();
-      System.out.println("Reading...");
-      e = stateless.readStarEntity(e.id);
-      e.val += "y";
-      System.out.println("Updating...");
-      stateless.updateStarEntity(e);
-      System.out.println("Deleting...");
-      stateless.deleteStarEntity(e);
-      System.out.println("Inserting...");
-      e = stateless.insertStarEntity();
-
-      System.out.println("Bad role");
-      getInitialContext("rolefail", "password");
-
-      StarEntity ae2 = null;
-      try
-      {
-         System.out.println("Inserting...");
-         ae2 = stateless.insertStarEntity();
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         System.out.println("Reading...");
-         ae2 = stateless.readStarEntity(e.id);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         e.val += "y";
-         stateless.updateStarEntity(e);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         stateless.deleteStarEntity(e);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         e = stateless.insertStarEntity();
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-   }
-
-   public static void testSomeEntity()throws Exception
-   {
-      InitialContext ctx = getInitialContext("somebody", "password");
-      Stateless stateless = (Stateless)ctx.lookup("StatelessBean/remote");
-
-      System.out.println("Good role");
-      System.out.println("Inserting...");
-      SomeEntity e = stateless.insertSomeEntity();
-
-      try
-      {
-         System.out.println("Reading...");
-         e = stateless.readSomeEntity(e.id);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         e.val += "y";
-         System.out.println("Updating...");
-         stateless.updateSomeEntity(e);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-
-      System.out.println("Deleting...");
-      stateless.deleteSomeEntity(e);
-      System.out.println("Inserting...");
-      e = stateless.insertSomeEntity();
-
-      System.out.println("Bad role");
-      getInitialContext("rolefail", "password");
-
-      SomeEntity ae2 = null;
-      try
-      {
-         System.out.println("Inserting...");
-         ae2 = stateless.insertSomeEntity();
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         stateless.deleteSomeEntity(e);
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-
-      try
-      {
-         e = stateless.insertSomeEntity();
-         throw new RuntimeException("security exception should have been thrown!");
-      }
-      catch(Exception ex)
-      {
-         System.out.println("Expected failure: " + ex.getMessage());
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/src/org/jboss/tutorial/entity/security/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,286 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.entity.security.client;
+
+import org.jboss.tutorial.entity.security.bean.AllEntity;
+import org.jboss.tutorial.entity.security.bean.SomeEntity;
+import org.jboss.tutorial.entity.security.bean.StarEntity;
+import org.jboss.tutorial.entity.security.bean.Stateless;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Properties;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class Client
+{
+
+   public static void main(String[] args) throws Exception
+   {
+      testAllEntity();
+      testSomeEntity();
+      testStarEntity();
+   }
+
+   public static InitialContext getInitialContext(String username, String password) throws Exception
+   {
+      Properties env = new Properties();
+      env.setProperty(Context.SECURITY_PRINCIPAL, username);
+      env.setProperty(Context.SECURITY_CREDENTIALS, password);
+      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      return new InitialContext(env);
+
+   }
+
+   public static void testAllEntity()throws Exception
+   {
+      InitialContext ctx = getInitialContext("somebody", "password");
+      Stateless stateless = (Stateless)ctx.lookup("StatelessBean/remote");
+
+      System.out.println("Good role");
+      System.out.println("Inserting...");
+      AllEntity e = stateless.insertAllEntity();
+      System.out.println("Reading...");
+      e = stateless.readAllEntity(e.id);
+      e.val += "y";
+      System.out.println("Updating...");
+      stateless.updateAllEntity(e);
+      System.out.println("Deleting...");
+      stateless.deleteAllEntity(e);
+      System.out.println("Inserting...");
+      e = stateless.insertAllEntity();
+
+      System.out.println("Bad role");
+      getInitialContext("rolefail", "password");
+
+      AllEntity ae2 = null;
+      try
+      {
+         System.out.println("Inserting...");
+         ae2 = stateless.insertAllEntity();
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         System.out.println("Reading...");
+         ae2 = stateless.readAllEntity(e.id);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         e.val += "y";
+         stateless.updateAllEntity(e);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         stateless.deleteAllEntity(e);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         e = stateless.insertAllEntity();
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+   }
+
+
+   public static void testStarEntity()throws Exception
+   {
+      InitialContext ctx = getInitialContext("somebody", "password");
+      Stateless stateless = (Stateless)ctx.lookup("StatelessBean/remote");
+
+      System.out.println("Good role");
+      System.out.println("Inserting...");
+      StarEntity e = stateless.insertStarEntity();
+      System.out.println("Reading...");
+      e = stateless.readStarEntity(e.id);
+      e.val += "y";
+      System.out.println("Updating...");
+      stateless.updateStarEntity(e);
+      System.out.println("Deleting...");
+      stateless.deleteStarEntity(e);
+      System.out.println("Inserting...");
+      e = stateless.insertStarEntity();
+
+      System.out.println("Bad role");
+      getInitialContext("rolefail", "password");
+
+      StarEntity ae2 = null;
+      try
+      {
+         System.out.println("Inserting...");
+         ae2 = stateless.insertStarEntity();
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         System.out.println("Reading...");
+         ae2 = stateless.readStarEntity(e.id);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         e.val += "y";
+         stateless.updateStarEntity(e);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         stateless.deleteStarEntity(e);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         e = stateless.insertStarEntity();
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+   }
+
+   public static void testSomeEntity()throws Exception
+   {
+      InitialContext ctx = getInitialContext("somebody", "password");
+      Stateless stateless = (Stateless)ctx.lookup("StatelessBean/remote");
+
+      System.out.println("Good role");
+      System.out.println("Inserting...");
+      SomeEntity e = stateless.insertSomeEntity();
+
+      try
+      {
+         System.out.println("Reading...");
+         e = stateless.readSomeEntity(e.id);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         e.val += "y";
+         System.out.println("Updating...");
+         stateless.updateSomeEntity(e);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+
+      System.out.println("Deleting...");
+      stateless.deleteSomeEntity(e);
+      System.out.println("Inserting...");
+      e = stateless.insertSomeEntity();
+
+      System.out.println("Bad role");
+      getInitialContext("rolefail", "password");
+
+      SomeEntity ae2 = null;
+      try
+      {
+         System.out.println("Inserting...");
+         ae2 = stateless.insertSomeEntity();
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         stateless.deleteSomeEntity(e);
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+
+      try
+      {
+         e = stateless.insertSomeEntity();
+         throw new RuntimeException("security exception should have been thrown!");
+      }
+      catch(Exception ex)
+      {
+         System.out.println("Expected failure: " + ex.getMessage());
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-somebody=password
-rolefail=password

Copied: branches/Branch_4_2/ejb3/docs/tutorial/entity-security/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/entity-security/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/entity-security/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/entity-security/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+somebody=password
+rolefail=password

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <java classname="org.jboss.tutorial.extended.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <java classname="org.jboss.tutorial.extended.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/extended.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,131 +0,0 @@
-<html>
-<body>
-<p>
-<h2> Extended Persistence Contexts</h2>
-
-</p><p>
-Usually, an EntityManager in JBoss EJB 3.0 lives and dies within a JTA transaction. Once the transaction is finished,
-all persistent objects are detached from the EntityManager and are no longer managed.
-Any local caching the EntityManager instance had done is lost. JBoss EJB 3.0 allows you to define long-living EntityManagers
-that live beyond the scope of a JTA transaction. This is called an Extended Persistence Context.
-</p><p>
-When you specify that an injected EntityManager is an extended persistence context, all object instances remain managed.
-Extended persistence contexts can only be used within Stateful session beans.  Take a look at <a href="src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java">ShoppingCartBean</a>.
-</p><p>
-<pre>
- at Stateful
- at Remote(ShoppingCart.class)
-public class ShoppingCartBean implements ShoppingCart
-{
-   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
-
-   @EJB StatelessLocal stateless;
-
-   private Customer customer;
-
-   public long createCustomer()
-   {
-      customer = new Customer();
-      customer.setName("William");
-      em.persist(customer);
-      return customer.getId();
-   }
-
-   public void update()
-   {
-      customer.setName("Bill");
-   }
-...
-}
-</pre>
-</p><p>
-To inject an extended persistence context, you use the <tt>type()</tt> attribute and set it to <tt>EXTENDED</tt>.  If you look at
-the <tt>createCustomer()</tt> method you notice that it is persisting a <tt>Customer</tt> object and storing a reference to that
-create object within a member variable of the stateful bean.  When the update() method is called, you see that the customer's
-state is modified.  Since the entity manager used is EXTENDED, the customer member variable remains managed by the entity
-manager and the modified state will be synchronized with the database.
-</p><p>
-<h4>Converations</h4>
-
-</p><p>
-An even more interesting use case is when you combine extended persistence contexts with non-transactional methods. 
-If you interact with an extended persistence context outside of a transaction, the inserts, updates, and deletes
-will be queued until you access the persistence context within a transaction.   This means that any persist(), merge(), or remove() method you call will not
-actually result in a JDBC execution and thus an update of the database until you manually call EntityManager.flush().
-</p><p>
-Why is this useful? Consider the usecase of a Setup Wizard on a website.  The Wizard has seven steps, seven web pages to enter
-stuff in.  It is extremely unwise to have a JTA transaction that spans multiple http requests, yet you do not want to commit
-anything to the database until all steps are complete.  Your code can interact with the EntityManager as it wants and you
-do not have to worry about updates or writing a lot of gluecode in your application to do all the entity manager's work in the
-final step of the wizard.  Efficient and highly performant. Because the managed persistent objects remain attached to the persistent context,
-all optmistic versioning checks can also be maintained within the application transaction. here's an example on how to do this.
-</p><p>
-<pre>
- at Stateful
- at Remote(ShoppingCart.class)
-public class ShoppingCartBean implements ShoppingCart
-{
-   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
-
-   @EJB StatelessLocal stateless;
-
-   private Customer customer;
-
-   public long createCustomer()
-   {
-      customer = new Customer();
-      customer.setName("William");
-      em.persist(customer);
-      return customer.getId();
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never()
-   {
-      customer.setName("Bob");
-   }
-
-
-
-   @Remove
-   public void checkout()
-   {
-   }
-}
-</pre>
-</p><p>
-Calling the never() method will update the managed customer object reference, but will not result in a database update until
-checkout() is called.  The spec requires that any time you invoke a transactional method of a stateful bean, 
-that the EntityManager join the transaction.  Therefore, our never() update will be committed at the end of the checkout() method.
-</p><p>
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-Buildfile: build.xml
-
-prepare:
-
-compile:
-
-ejbjar:
-
-run:
-     [java] Created customer: William
-     [java] Customer's name should still be William as pc was not yet flushed:  Customer.getName() == William
-     [java] Now that the pc has been flushed name should be 'Bob': Customer.getName() == Bob
-     [java] Created customer: William
-     [java] ShoppingCartBean.customer should stay managed because we're in an extended PC: Customer.getName() == Bill
-     [java] Extended persistence contexts are propagated to nested EJB calls: Customer.getName() == Bill Jr.
-
-</pre>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/extended.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,131 @@
+<html>
+<body>
+<p>
+<h2> Extended Persistence Contexts</h2>
+
+</p><p>
+Usually, an EntityManager in JBoss EJB 3.0 lives and dies within a JTA transaction. Once the transaction is finished,
+all persistent objects are detached from the EntityManager and are no longer managed.
+Any local caching the EntityManager instance had done is lost. JBoss EJB 3.0 allows you to define long-living EntityManagers
+that live beyond the scope of a JTA transaction. This is called an Extended Persistence Context.
+</p><p>
+When you specify that an injected EntityManager is an extended persistence context, all object instances remain managed.
+Extended persistence contexts can only be used within Stateful session beans.  Take a look at <a href="src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java">ShoppingCartBean</a>.
+</p><p>
+<pre>
+ at Stateful
+ at Remote(ShoppingCart.class)
+public class ShoppingCartBean implements ShoppingCart
+{
+   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
+
+   @EJB StatelessLocal stateless;
+
+   private Customer customer;
+
+   public long createCustomer()
+   {
+      customer = new Customer();
+      customer.setName("William");
+      em.persist(customer);
+      return customer.getId();
+   }
+
+   public void update()
+   {
+      customer.setName("Bill");
+   }
+...
+}
+</pre>
+</p><p>
+To inject an extended persistence context, you use the <tt>type()</tt> attribute and set it to <tt>EXTENDED</tt>.  If you look at
+the <tt>createCustomer()</tt> method you notice that it is persisting a <tt>Customer</tt> object and storing a reference to that
+create object within a member variable of the stateful bean.  When the update() method is called, you see that the customer's
+state is modified.  Since the entity manager used is EXTENDED, the customer member variable remains managed by the entity
+manager and the modified state will be synchronized with the database.
+</p><p>
+<h4>Converations</h4>
+
+</p><p>
+An even more interesting use case is when you combine extended persistence contexts with non-transactional methods. 
+If you interact with an extended persistence context outside of a transaction, the inserts, updates, and deletes
+will be queued until you access the persistence context within a transaction.   This means that any persist(), merge(), or remove() method you call will not
+actually result in a JDBC execution and thus an update of the database until you manually call EntityManager.flush().
+</p><p>
+Why is this useful? Consider the usecase of a Setup Wizard on a website.  The Wizard has seven steps, seven web pages to enter
+stuff in.  It is extremely unwise to have a JTA transaction that spans multiple http requests, yet you do not want to commit
+anything to the database until all steps are complete.  Your code can interact with the EntityManager as it wants and you
+do not have to worry about updates or writing a lot of gluecode in your application to do all the entity manager's work in the
+final step of the wizard.  Efficient and highly performant. Because the managed persistent objects remain attached to the persistent context,
+all optmistic versioning checks can also be maintained within the application transaction. here's an example on how to do this.
+</p><p>
+<pre>
+ at Stateful
+ at Remote(ShoppingCart.class)
+public class ShoppingCartBean implements ShoppingCart
+{
+   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
+
+   @EJB StatelessLocal stateless;
+
+   private Customer customer;
+
+   public long createCustomer()
+   {
+      customer = new Customer();
+      customer.setName("William");
+      em.persist(customer);
+      return customer.getId();
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never()
+   {
+      customer.setName("Bob");
+   }
+
+
+
+   @Remove
+   public void checkout()
+   {
+   }
+}
+</pre>
+</p><p>
+Calling the never() method will update the managed customer object reference, but will not result in a database update until
+checkout() is called.  The spec requires that any time you invoke a transactional method of a stateful bean, 
+that the EntityManager join the transaction.  Therefore, our never() update will be committed at the end of the checkout() method.
+</p><p>
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+Buildfile: build.xml
+
+prepare:
+
+compile:
+
+ejbjar:
+
+run:
+     [java] Created customer: William
+     [java] Customer's name should still be William as pc was not yet flushed:  Customer.getName() == William
+     [java] Now that the pc has been flushed name should be 'Bob': Customer.getName() == Bob
+     [java] Created customer: William
+     [java] ShoppingCartBean.customer should stay managed because we're in an extended PC: Customer.getName() == Bill
+     [java] Extended persistence contexts are propagated to nested EJB calls: Customer.getName() == Bill Jr.
+
+</pre>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/extended.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,122 +0,0 @@
-!!! Extended Persistence Contexts
-
-Usually, an EntityManager in JBoss EJB 3.0 lives and dies within a JTA transaction. Once the transaction is finished,
-all persistent objects are detached from the EntityManager and are no longer managed.
-Any local caching the EntityManager instance had done is lost. JBoss EJB 3.0 allows you to define long-living EntityManagers
-that live beyond the scope of a JTA transaction. This is called an Extended Persistence Context.
-
-When you specify that an injected EntityManager is an extended persistence context, all object instances remain managed.
-Extended persistence contexts can only be used within Stateful session beans.  Take a look at [ShoppingCartBean|src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java].
-
-{{{
- at Stateful
- at Remote(ShoppingCart.class)
-public class ShoppingCartBean implements ShoppingCart
-{
-   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
-
-   @EJB StatelessLocal stateless;
-
-   private Customer customer;
-
-   public long createCustomer()
-   {
-      customer = new Customer();
-      customer.setName("William");
-      em.persist(customer);
-      return customer.getId();
-   }
-
-   public void update()
-   {
-      customer.setName("Bill");
-   }
-...
-}
-}}}
-
-To inject an extended persistence context, you use the {{type()}} attribute and set it to {{EXTENDED}}.  If you look at
-the {{createCustomer()}} method you notice that it is persisting a {{Customer}} object and storing a reference to that
-create object within a member variable of the stateful bean.  When the update() method is called, you see that the customer's
-state is modified.  Since the entity manager used is EXTENDED, the customer member variable remains managed by the entity
-manager and the modified state will be synchronized with the database.
-
-!Converations
-
-An even more interesting use case is when you combine extended persistence contexts with non-transactional methods. 
-If you interact with an extended persistence context outside of a transaction, the inserts, updates, and deletes
-will be queued until you access the persistence context within a transaction.   This means that any persist(), merge(), or remove() method you call will not
-actually result in a JDBC execution and thus an update of the database until you manually call EntityManager.flush().
-
-Why is this useful? Consider the usecase of a Setup Wizard on a website.  The Wizard has seven steps, seven web pages to enter
-stuff in.  It is extremely unwise to have a JTA transaction that spans multiple http requests, yet you do not want to commit
-anything to the database until all steps are complete.  Your code can interact with the EntityManager as it wants and you
-do not have to worry about updates or writing a lot of gluecode in your application to do all the entity manager's work in the
-final step of the wizard.  Efficient and highly performant. Because the managed persistent objects remain attached to the persistent context,
-all optmistic versioning checks can also be maintained within the application transaction. here's an example on how to do this.
-
-{{{
- at Stateful
- at Remote(ShoppingCart.class)
-public class ShoppingCartBean implements ShoppingCart
-{
-   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
-
-   @EJB StatelessLocal stateless;
-
-   private Customer customer;
-
-   public long createCustomer()
-   {
-      customer = new Customer();
-      customer.setName("William");
-      em.persist(customer);
-      return customer.getId();
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never()
-   {
-      customer.setName("Bob");
-   }
-
-
-
-   @Remove
-   public void checkout()
-   {
-   }
-}
-}}}
-
-Calling the never() method will update the managed customer object reference, but will not result in a database update until
-checkout() is called.  The spec requires that any time you invoke a transactional method of a stateful bean, 
-that the EntityManager join the transaction.  Therefore, our never() update will be committed at the end of the checkout() method.
-
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-Buildfile: build.xml
-
-prepare:
-
-compile:
-
-ejbjar:
-
-run:
-     [java] Created customer: William
-     [java] Customer's name should still be William as pc was not yet flushed:  Customer.getName() == William
-     [java] Now that the pc has been flushed name should be 'Bob': Customer.getName() == Bob
-     [java] Created customer: William
-     [java] ShoppingCartBean.customer should stay managed because we're in an extended PC: Customer.getName() == Bill
-     [java] Extended persistence contexts are propagated to nested EJB calls: Customer.getName() == Bill Jr.
-
-}}}
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/extended.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/extended.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,122 @@
+!!! Extended Persistence Contexts
+
+Usually, an EntityManager in JBoss EJB 3.0 lives and dies within a JTA transaction. Once the transaction is finished,
+all persistent objects are detached from the EntityManager and are no longer managed.
+Any local caching the EntityManager instance had done is lost. JBoss EJB 3.0 allows you to define long-living EntityManagers
+that live beyond the scope of a JTA transaction. This is called an Extended Persistence Context.
+
+When you specify that an injected EntityManager is an extended persistence context, all object instances remain managed.
+Extended persistence contexts can only be used within Stateful session beans.  Take a look at [ShoppingCartBean|src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java].
+
+{{{
+ at Stateful
+ at Remote(ShoppingCart.class)
+public class ShoppingCartBean implements ShoppingCart
+{
+   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
+
+   @EJB StatelessLocal stateless;
+
+   private Customer customer;
+
+   public long createCustomer()
+   {
+      customer = new Customer();
+      customer.setName("William");
+      em.persist(customer);
+      return customer.getId();
+   }
+
+   public void update()
+   {
+      customer.setName("Bill");
+   }
+...
+}
+}}}
+
+To inject an extended persistence context, you use the {{type()}} attribute and set it to {{EXTENDED}}.  If you look at
+the {{createCustomer()}} method you notice that it is persisting a {{Customer}} object and storing a reference to that
+create object within a member variable of the stateful bean.  When the update() method is called, you see that the customer's
+state is modified.  Since the entity manager used is EXTENDED, the customer member variable remains managed by the entity
+manager and the modified state will be synchronized with the database.
+
+!Converations
+
+An even more interesting use case is when you combine extended persistence contexts with non-transactional methods. 
+If you interact with an extended persistence context outside of a transaction, the inserts, updates, and deletes
+will be queued until you access the persistence context within a transaction.   This means that any persist(), merge(), or remove() method you call will not
+actually result in a JDBC execution and thus an update of the database until you manually call EntityManager.flush().
+
+Why is this useful? Consider the usecase of a Setup Wizard on a website.  The Wizard has seven steps, seven web pages to enter
+stuff in.  It is extremely unwise to have a JTA transaction that spans multiple http requests, yet you do not want to commit
+anything to the database until all steps are complete.  Your code can interact with the EntityManager as it wants and you
+do not have to worry about updates or writing a lot of gluecode in your application to do all the entity manager's work in the
+final step of the wizard.  Efficient and highly performant. Because the managed persistent objects remain attached to the persistent context,
+all optmistic versioning checks can also be maintained within the application transaction. here's an example on how to do this.
+
+{{{
+ at Stateful
+ at Remote(ShoppingCart.class)
+public class ShoppingCartBean implements ShoppingCart
+{
+   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
+
+   @EJB StatelessLocal stateless;
+
+   private Customer customer;
+
+   public long createCustomer()
+   {
+      customer = new Customer();
+      customer.setName("William");
+      em.persist(customer);
+      return customer.getId();
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never()
+   {
+      customer.setName("Bob");
+   }
+
+
+
+   @Remove
+   public void checkout()
+   {
+   }
+}
+}}}
+
+Calling the never() method will update the managed customer object reference, but will not result in a database update until
+checkout() is called.  The spec requires that any time you invoke a transactional method of a stateful bean, 
+that the EntityManager join the transaction.  Therefore, our never() update will be committed at the end of the checkout() method.
+
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+Buildfile: build.xml
+
+prepare:
+
+compile:
+
+ejbjar:
+
+run:
+     [java] Created customer: William
+     [java] Customer's name should still be William as pc was not yet flushed:  Customer.getName() == William
+     [java] Now that the pc has been flushed name should be 'Bob': Customer.getName() == Bob
+     [java] Created customer: William
+     [java] ShoppingCartBean.customer should stay managed because we're in an extended PC: Customer.getName() == Bill
+     [java] Extended persistence contexts are propagated to nested EJB calls: Customer.getName() == Bill Jr.
+
+}}}
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-//$Id$
-package org.jboss.tutorial.extended.bean;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Company customer
- *
- * @author Emmanuel Bernard
- */
- at Entity
-public class Customer implements java.io.Serializable
-{
-   long id;
-   String name;
-
-   public
-   Customer()
-   {
-   }
-
-   @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
-   public
-   long getId()
-   {
-      return id;
-   }
-
-   public
-   String getName()
-   {
-      return name;
-   }
-
-   public
-   void setId(long long1)
-   {
-      id = long1;
-   }
-
-   public
-   void setName(String string)
-   {
-      name = string;
-   }
-
-}
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+//$Id$
+package org.jboss.tutorial.extended.bean;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Company customer
+ *
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class Customer implements java.io.Serializable
+{
+   long id;
+   String name;
+
+   public
+   Customer()
+   {
+   }
+
+   @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
+   public
+   long getId()
+   {
+      return id;
+   }
+
+   public
+   String getName()
+   {
+      return name;
+   }
+
+   public
+   void setId(long long1)
+   {
+      id = long1;
+   }
+
+   public
+   void setName(String string)
+   {
+      name = string;
+   }
+
+}
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.extended.bean;
-
-import javax.ejb.Remove;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public interface ShoppingCart
-{
-   long createCustomer();
-
-   void update();
-
-   Customer find(long id);
-
-   @Remove void checkout();
-
-   void update2();
-
-   void update3();
-
-   void never();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.extended.bean;
+
+import javax.ejb.Remove;
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public interface ShoppingCart
+{
+   long createCustomer();
+
+   void update();
+
+   Customer find(long id);
+
+   @Remove void checkout();
+
+   void update2();
+
+   void update3();
+
+   void never();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,86 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.extended.bean;
-
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.*;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
- at Stateful
- at Remote(ShoppingCart.class)
-public class ShoppingCartBean implements ShoppingCart
-{
-   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
-
-   @EJB StatelessLocal stateless;
-
-   private Customer customer;
-
-   public long createCustomer()
-   {
-      customer = new Customer();
-      customer.setName("William");
-      em.persist(customer);
-      return customer.getId();
-   }
-
-   public void update()
-   {
-      customer.setName("Bill");
-   }
-   public void update2()
-   {
-      customer.setName("Billy");
-   }
-
-   public void update3()
-   {
-      stateless.update(customer);
-   }
-
-   public Customer find(long id)
-   {
-      return em.find(Customer.class, id);
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never()
-   {
-      customer.setName("Bob");
-   }
-
-   
-
-   @Remove
-   public void checkout()
-   {
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.extended.bean;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.*;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+ at Stateful
+ at Remote(ShoppingCart.class)
+public class ShoppingCartBean implements ShoppingCart
+{
+   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
+
+   @EJB StatelessLocal stateless;
+
+   private Customer customer;
+
+   public long createCustomer()
+   {
+      customer = new Customer();
+      customer.setName("William");
+      em.persist(customer);
+      return customer.getId();
+   }
+
+   public void update()
+   {
+      customer.setName("Bill");
+   }
+   public void update2()
+   {
+      customer.setName("Billy");
+   }
+
+   public void update3()
+   {
+      stateless.update(customer);
+   }
+
+   public Customer find(long id)
+   {
+      return em.find(Customer.class, id);
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never()
+   {
+      customer.setName("Bob");
+   }
+
+   
+
+   @Remove
+   public void checkout()
+   {
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.extended.bean;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public interface StatelessLocal
-{
-   void update(Customer c);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.extended.bean;
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public interface StatelessLocal
+{
+   void update(Customer c);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.extended.bean;
-
-
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public interface StatelessRemote
-{
-   Customer find(long id);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.extended.bean;
+
+
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public interface StatelessRemote
+{
+   Customer find(long id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.extended.bean;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
- at Stateless
- at Remote(StatelessRemote.class)
- at Local(StatelessLocal.class)
-public class StatelessSessionBean implements StatelessLocal, StatelessRemote
-{
-   @PersistenceContext EntityManager em;
-
-   public void update(Customer c)
-   {
-      c.setName("Bill Jr.");
-   }
-
-   public Customer find(long id)
-   {
-      System.out.println("*** Stateless find");
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/bean/StatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.extended.bean;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+ at Local(StatelessLocal.class)
+public class StatelessSessionBean implements StatelessLocal, StatelessRemote
+{
+   @PersistenceContext EntityManager em;
+
+   public void update(Customer c)
+   {
+      c.setName("Bill Jr.");
+   }
+
+   public Customer find(long id)
+   {
+      System.out.println("*** Stateless find");
+      return em.find(Customer.class, id);
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.extended.client;
-
-import javax.naming.InitialContext;
-import org.jboss.tutorial.extended.bean.Customer;
-import org.jboss.tutorial.extended.bean.ShoppingCart;
-import org.jboss.tutorial.extended.bean.StatelessRemote;
-
-//import java.rmi.*;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class Client
-{
-   public static InitialContext getInitialContext()  throws Exception
-   {
-      return new InitialContext();
-   }
-
-   public static void testLongLivedSession() throws Exception
-   {
-      ShoppingCart test = (ShoppingCart) getInitialContext().lookup("ShoppingCartBean/remote");
-      StatelessRemote remote = (StatelessRemote) getInitialContext().lookup("StatelessSessionBean/remote");
-      Customer c;
-
-      long id = test.createCustomer();
-      c = remote.find(id);
-      System.out.println("Created customer: " + c.getName());
-
-      test.update();
-      c = remote.find(id);
-      System.out.println("ShoppingCartBean.customer should stay managed because we're in an extended PC: Customer.getName() == " + c.getName());
-
-      test.update3();
-      c = remote.find(id);
-      System.out.println("Extended persistence contexts are propagated to nested EJB calls: Customer.getName() == " + c.getName());
-      test.checkout();
-   }
-
-   public static void testWithFlushMode() throws Exception
-   {
-      ShoppingCart cart = (ShoppingCart) getInitialContext().lookup("ShoppingCartBean/remote");
-      StatelessRemote dao = (StatelessRemote) getInitialContext().lookup("StatelessSessionBean/remote");
-      Customer c;
-      long id;
-
-
-      id = cart.createCustomer();
-      c = dao.find(id);
-      System.out.println("Created customer: " + c.getName());
-
-      cart.never();
-      c = dao.find(id);
-      System.out.println("Customer's name should still be William as pc was not yet flushed:  Customer.getName() == " + c.getName());
-
-      cart.checkout();
-      c = dao.find(id);
-      System.out.println("Now that the pc has been flushed name should be 'Bob': Customer.getName() == " + c.getName());
-
-   }
-
-   public static void main(String[] args) throws Exception
-   {
-      testWithFlushMode();
-      testLongLivedSession();
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/extended_pc/src/org/jboss/tutorial/extended/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.extended.client;
+
+import javax.naming.InitialContext;
+import org.jboss.tutorial.extended.bean.Customer;
+import org.jboss.tutorial.extended.bean.ShoppingCart;
+import org.jboss.tutorial.extended.bean.StatelessRemote;
+
+//import java.rmi.*;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class Client
+{
+   public static InitialContext getInitialContext()  throws Exception
+   {
+      return new InitialContext();
+   }
+
+   public static void testLongLivedSession() throws Exception
+   {
+      ShoppingCart test = (ShoppingCart) getInitialContext().lookup("ShoppingCartBean/remote");
+      StatelessRemote remote = (StatelessRemote) getInitialContext().lookup("StatelessSessionBean/remote");
+      Customer c;
+
+      long id = test.createCustomer();
+      c = remote.find(id);
+      System.out.println("Created customer: " + c.getName());
+
+      test.update();
+      c = remote.find(id);
+      System.out.println("ShoppingCartBean.customer should stay managed because we're in an extended PC: Customer.getName() == " + c.getName());
+
+      test.update3();
+      c = remote.find(id);
+      System.out.println("Extended persistence contexts are propagated to nested EJB calls: Customer.getName() == " + c.getName());
+      test.checkout();
+   }
+
+   public static void testWithFlushMode() throws Exception
+   {
+      ShoppingCart cart = (ShoppingCart) getInitialContext().lookup("ShoppingCartBean/remote");
+      StatelessRemote dao = (StatelessRemote) getInitialContext().lookup("StatelessSessionBean/remote");
+      Customer c;
+      long id;
+
+
+      id = cart.createCustomer();
+      c = dao.find(id);
+      System.out.println("Created customer: " + c.getName());
+
+      cart.never();
+      c = dao.find(id);
+      System.out.println("Customer's name should still be William as pc was not yet flushed:  Customer.getName() == " + c.getName());
+
+      cart.checkout();
+      c = dao.find(id);
+      System.out.println("Now that the pc has been flushed name should be 'Bob': Customer.getName() == " + c.getName());
+
+   }
+
+   public static void main(String[] args) throws Exception
+   {
+      testWithFlushMode();
+      testLongLivedSession();
+   }
+}

Modified: branches/Branch_4_2/ejb3/docs/tutorial/injection/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/injection/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/injection/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/injection/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/injection/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/installing.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/installing.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/installing.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +1,49 @@
 <html>
 <body>
 <p>
-<h2>Installing EJB 3.0 RC7 with JBoss 4.0.4.GA installer</h2>
+<h2>Installing EJB 3.0 RC4 - PFD</h2>
 <p>
-The EJB 3.0 RC7 implementation is only usable with JBoss 4.0.4.GA.  The EJB 3.0 implementation that comes packaged with the JBoss 4.0.4.GA installer is the same as the standalone EJB 3.0 RC7 distribution with one exception.  The standalone distribution has been patched to fix the <a href="http://jira.jboss.com/jira/browse/EJBTHREE-573">EJBTHREE-573</a> JIRA bug.  Also the JBoss Remoting jar has been patched to fix the SSL problems in the 4.0.4.GA release.  If you don't need these fixes, then installing with the installer is fine.
+EJB 3.0 RC4 has been tested with JBoss 4.0.3SP1 and JBoss 4.0.4RC1.  JBoss 4.0.3SP1 comes with an <b>older version</b> so don't use its graphical installer.
+If you are using JBoss 4.0.4RC1 application server, you can use its graphical installer to enable EJB3 RC4.
 </p>
 <hr>
-<h2>Installing into JBoss AS 4.0.4.GA</h2>
+<h2>Installing into JBoss 4.0.3SP1</h2>
 <p>
+Note, the ejb 3.0 implementation that comes with the JBoss AS 4.0.3SP1 installers is old, you should
+download the latest EJB3 impl and follow these directions.
+</p>
 <ol>
-<li> Download <a
-href="http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=16942">JBoss
-4.0.4.GA</a>.</li>
+<li> Download <a href="http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=132063">EJB 3.0 RC4 - PFD</a>.</li>
+<li> Unzip this file.</li>
 
-<li> Download <a href="http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=132063">EJB 3.0 RC7</a>.</li>
-<li> Unzip both of these downloads</li>
-
 <li> Copy <tt>ejb3.deployer</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>ejb3-clustered-sfsbcache-service.xml</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>ejb3-entity-cache-service.xml</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>ejb3-interceptors-aop.xml</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>jboss-aop-jdk50.deployer</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
-<li> Copy <tt>quartz-ra.rar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/deploy</tt></li>
 <li> Copy <tt>jboss-remoting.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>hibernate-annotations.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>hibernate-entitymanager.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>ejb3-persistence.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>quartz-all-1.5.2.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
-<li> Copy <tt>jboss-ejb3-client.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/client</tt></li>
-<li> Copy <tt>jboss-annotations-ejb3.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/client</tt></li>
-<li> Copy <tt>hibernate-client.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/client</tt></li>
+<li> Copy <tt>jboss-serialization.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
+<li> Copy <tt>jboss-j2ee.jar</tt> from the <tt>lib/</tt> directory of the distribution to <tt>jboss-4.0.x/server/all/lib</tt></li>
+<li> Remove <tt>ejb3-persistence.jar</tt> from <tt>jboss-4.0.x/server/all/lib</tt></li>
+<li> Remove <tt>hibernate3.jar</tt> from <tt>jboss-4.0.x/server/all/lib</tt></li>
+<li> Remove <tt>hibernate-annotations.jar</tt> from <tt>jboss-4.0.x/server/all/lib</tt></li>
+<li> Remove <tt>hibernate-entitymanager.jar</tt> from <tt>jboss-4.0.x/server/all/lib</tt></li>
 <li> Remove <tt>jboss-aop.deployer/</tt> from <tt>jboss-4.0.x/server/all/deploy</tt></li>
-
 <li> Start jboss up with the <tt>all</tt> configuration <tt>run.sh -c all</tt></li>
 </ol>
+<p>
+<i> If you do not want to run with the all configuration, the skip the steps of copying the 
+<tt>ejb3-clustered-sfsbcache-service.xml</tt> and the <tt>ejb3-entity-cache-service.xml</tt></i>
 </p>
+<p>
+Because you patched 4.0.3SP1, the client jars in the jboss-4.0.3SP1/client directory will be invalid.
+Build your client classpath from:
+<ol>
+<li>jboss-4.0.3SP1/lib</li>
+<li>jboss-4.0.3SP1/server/all/lib</li>
+<li>jboss-4.0.3SP1/server/all/deploy/ejb3.deployer</li>
+<li>jboss-4.0.3SP1/server/all/deploy/jboss-aop-jdk50.deployer</li>
+</ol>
+</p>
 </body>
 </html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-<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.tutorial.interceptor.bean.AccountsCancelInterceptor</interceptor-class>
-         <around-invoke>
-            <method-name>sendCancelMessage</method-name>
-         </around-invoke>
-         <resource-ref>
-         	<res-ref-name>jms/ConnFactory</res-ref-name>
-            <res-type>javax.jms.QueueConnectionFactory</res-type>
-            <res-auth>Container</res-auth>
-            <mapped-name>java:/ConnectionFactory</mapped-name>
-            <injection-target>
-               <injection-target-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</injection-target-class>
-               <injection-target-name>cf</injection-target-name>
-            </injection-target>
-         </resource-ref>
-         <resource-env-ref>
-         	<resource-env-ref-name>accountsQueue</resource-env-ref-name>
-            <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-            <mapped-name>queue/tutorial/accounts</mapped-name>
-            <injection-target>
-               <injection-target-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</injection-target-class>
-               <injection-target-name>queue</injection-target-name>
-            </injection-target>
-         </resource-env-ref>
-      </interceptor>   
-	</interceptors>
-	<assembly-descriptor>
-	   <!-- Default interceptor that will apply to all methods for all beans in deployment -->
-	   <interceptor-binding>
-         <ejb-name>*</ejb-name>
-         <interceptor-class>org.jboss.tutorial.interceptor.bean.DefaultInterceptor</interceptor-class>
-      </interceptor-binding>
-	  <!-- Class interceptor that will apply to all methods for EmailSystemBean -->
-	   <interceptor-binding>
-         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
-         <interceptor-class>org.jboss.tutorial.interceptor.bean.OtherInterceptor</interceptor-class>
-      </interceptor-binding>
-	   <!-- Method interceptor will apply to sendBookingCancellationMessage for EmailSystemBean -->
-	   <interceptor-binding>
-         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
-         <interceptor-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</interceptor-class>
-         <method>
-           <method-name>sendBookingCancellationMessage</method-name>
-         </method>
-      </interceptor-binding>
-	   <interceptor-binding>
-         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
-         <exclude-default-interceptors>true</exclude-default-interceptors>
-         <exclude-class-interceptors>true</exclude-class-interceptors>
-         <method>
-           <method-name>noop2</method-name>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
-         <interceptor-order>
-            <interceptor-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</interceptor-class>
-            <interceptor-class>org.jboss.tutorial.interceptor.bean.DefaultInterceptor</interceptor-class>
-            <interceptor-class>org.jboss.tutorial.interceptor.bean.OtherInterceptor</interceptor-class>
-            <interceptor-class>org.jboss.tutorial.interceptor.bean.TracingInterceptor</interceptor-class>
-         </interceptor-order>
-         <method>
-           <method-name>sendBookingCancellationMessage</method-name>
-         </method>
-      </interceptor-binding>
-	</assembly-descriptor>
-</ejb-jar>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+<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.tutorial.interceptor.bean.AccountsCancelInterceptor</interceptor-class>
+         <around-invoke>
+            <method-name>sendCancelMessage</method-name>
+         </around-invoke>
+         <resource-ref>
+         	<res-ref-name>jms/ConnFactory</res-ref-name>
+            <res-type>javax.jms.QueueConnectionFactory</res-type>
+            <res-auth>Container</res-auth>
+            <mapped-name>java:/ConnectionFactory</mapped-name>
+            <injection-target>
+               <injection-target-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</injection-target-class>
+               <injection-target-name>cf</injection-target-name>
+            </injection-target>
+         </resource-ref>
+         <resource-env-ref>
+         	<resource-env-ref-name>accountsQueue</resource-env-ref-name>
+            <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+            <mapped-name>queue/tutorial/accounts</mapped-name>
+            <injection-target>
+               <injection-target-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</injection-target-class>
+               <injection-target-name>queue</injection-target-name>
+            </injection-target>
+         </resource-env-ref>
+      </interceptor>   
+	</interceptors>
+	<assembly-descriptor>
+	   <!-- Default interceptor that will apply to all methods for all beans in deployment -->
+	   <interceptor-binding>
+         <ejb-name>*</ejb-name>
+         <interceptor-class>org.jboss.tutorial.interceptor.bean.DefaultInterceptor</interceptor-class>
+      </interceptor-binding>
+	  <!-- Class interceptor that will apply to all methods for EmailSystemBean -->
+	   <interceptor-binding>
+         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
+         <interceptor-class>org.jboss.tutorial.interceptor.bean.OtherInterceptor</interceptor-class>
+      </interceptor-binding>
+	   <!-- Method interceptor will apply to sendBookingCancellationMessage for EmailSystemBean -->
+	   <interceptor-binding>
+         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
+         <interceptor-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</interceptor-class>
+         <method>
+           <method-name>sendBookingCancellationMessage</method-name>
+         </method>
+      </interceptor-binding>
+	   <interceptor-binding>
+         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
+         <exclude-default-interceptors>true</exclude-default-interceptors>
+         <exclude-class-interceptors>true</exclude-class-interceptors>
+         <method>
+           <method-name>noop2</method-name>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>org.jboss.tutorial.interceptor.bean.EmailSystemBean</ejb-name>
+         <interceptor-order>
+            <interceptor-class>org.jboss.tutorial.interceptor.bean.AccountsCancelInterceptor</interceptor-class>
+            <interceptor-class>org.jboss.tutorial.interceptor.bean.DefaultInterceptor</interceptor-class>
+            <interceptor-class>org.jboss.tutorial.interceptor.bean.OtherInterceptor</interceptor-class>
+            <interceptor-class>org.jboss.tutorial.interceptor.bean.TracingInterceptor</interceptor-class>
+         </interceptor-order>
+         <method>
+           <method-name>sendBookingCancellationMessage</method-name>
+         </method>
+      </interceptor-binding>
+	</assembly-descriptor>
+</ejb-jar>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,10 +6,10 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
    <property name="jboss.home" value="${env.JBOSS_HOME}"/>   
-   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.tutorial.interceptor.bean;
-
-import javax.interceptor.InvocationContext;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AccountsCancelInterceptor extends AccountsInterceptor
-{
-   QueueConnectionFactory cf;
-   
-   Queue queue;
-   
-   QueueConnection conn;
-
-   public Object sendCancelMessage(InvocationContext ctx) throws Exception
-   {
-      QueueSession session = null;
-      try
-      {
-         System.out.println("*** AccountsCancelInterceptor intercepting " + ctx.getMethod().getName());
-         System.out.println("*** AccountsConfirmInterceptor - notifying accounts dept");
-         session = getConnection().createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-         Message msg = session.createTextMessage("Cancelling order " + ctx.getParameters()[0]);
-         QueueSender sender = session.createSender(queue);
-         sender.send(msg);
-         
-         return ctx.proceed();
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-      finally
-      {
-         try{session.close();}catch(Exception e) {}
-         System.out.println("*** AccountsCancelInterceptor exiting");
-      }
-   }
-   
-   QueueConnection getConnection() throws JMSException
-   {
-      if (conn == null)
-      {
-         synchronized(cf)
-         {
-            if (conn == null)
-            {
-               conn = cf.createQueueConnection();
-            }
-         }
-      }
-      
-      return conn;
-   }   
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsCancelInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.tutorial.interceptor.bean;
+
+import javax.interceptor.InvocationContext;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AccountsCancelInterceptor extends AccountsInterceptor
+{
+   QueueConnectionFactory cf;
+   
+   Queue queue;
+   
+   QueueConnection conn;
+
+   public Object sendCancelMessage(InvocationContext ctx) throws Exception
+   {
+      QueueSession session = null;
+      try
+      {
+         System.out.println("*** AccountsCancelInterceptor intercepting " + ctx.getMethod().getName());
+         System.out.println("*** AccountsConfirmInterceptor - notifying accounts dept");
+         session = getConnection().createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+         Message msg = session.createTextMessage("Cancelling order " + ctx.getParameters()[0]);
+         QueueSender sender = session.createSender(queue);
+         sender.send(msg);
+         
+         return ctx.proceed();
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+      finally
+      {
+         try{session.close();}catch(Exception e) {}
+         System.out.println("*** AccountsCancelInterceptor exiting");
+      }
+   }
+   
+   QueueConnection getConnection() throws JMSException
+   {
+      if (conn == null)
+      {
+         synchronized(cf)
+         {
+            if (conn == null)
+            {
+               conn = cf.createQueueConnection();
+            }
+         }
+      }
+      
+      return conn;
+   }   
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,121 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.tutorial.interceptor.bean;
-
-import java.util.Date;
-
-import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AccountsConfirmInterceptor extends AccountsInterceptor
-{
-   @Resource(mappedName="java:ConnectionFactory")
-   QueueConnectionFactory cf;
-
-   @Resource(mappedName="queue/tutorial/accounts")
-   Queue queue;
-
-   @PersistenceContext
-   EntityManager em;
-
-   QueueConnection conn;
-
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      //overrides AccountsInterceptor.intercept() so that will not be invoked
-      return null;
-   }
-
-
-   @AroundInvoke
-   public Object sendConfirmMessage(InvocationContext ctx) throws Exception
-   {
-      QueueSession session = null;
-      try
-      {
-         System.out.println("*** AccountsConfirmInterceptor intercepting");
-
-         long orderId = (Long)ctx.getParameters()[0];
-
-         if (em.find(Confirmation.class, orderId) == null)
-         {
-            System.out.println("*** AccountsConfirmInterceptor - recording confirmation");
-            Confirmation confirmation = new Confirmation(orderId, new Date());
-            em.persist(confirmation);
-         }
-         else
-         {
-            System.out.println("*** AccountsConfirmInterceptor - order has already been confirmed aborting");
-            return null;
-         }
-
-         System.out.println("*** AccountsConfirmInterceptor - notifying accounts dept " + ctx.getMethod().getName());
-         session = getConnection().createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-         Message msg = session.createTextMessage("Confirming order " + orderId);
-         QueueSender sender = session.createSender(queue);
-         sender.send(msg);
-
-         return ctx.proceed();
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-      finally
-      {
-         try{session.close();}catch(Exception e) {}
-         System.out.println("*** AccountsConfirmInterceptor exiting");
-      }
-   }
-
-   QueueConnection getConnection() throws JMSException
-   {
-      if (conn == null)
-      {
-         synchronized(cf)
-         {
-            if (conn == null)
-            {
-               conn = cf.createQueueConnection();
-            }
-         }
-      }
-
-      return conn;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,121 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.tutorial.interceptor.bean;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AccountsConfirmInterceptor extends AccountsInterceptor
+{
+   @Resource(mappedName="java:ConnectionFactory")
+   QueueConnectionFactory cf;
+
+   @Resource(mappedName="queue/tutorial/accounts")
+   Queue queue;
+
+   @PersistenceContext
+   EntityManager em;
+
+   QueueConnection conn;
+
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      //overrides AccountsInterceptor.intercept() so that will not be invoked
+      return null;
+   }
+
+
+   @AroundInvoke
+   public Object sendConfirmMessage(InvocationContext ctx) throws Exception
+   {
+      QueueSession session = null;
+      try
+      {
+         System.out.println("*** AccountsConfirmInterceptor intercepting");
+
+         long orderId = (Long)ctx.getParameters()[0];
+
+         if (em.find(Confirmation.class, orderId) == null)
+         {
+            System.out.println("*** AccountsConfirmInterceptor - recording confirmation");
+            Confirmation confirmation = new Confirmation(orderId, new Date());
+            em.persist(confirmation);
+         }
+         else
+         {
+            System.out.println("*** AccountsConfirmInterceptor - order has already been confirmed aborting");
+            return null;
+         }
+
+         System.out.println("*** AccountsConfirmInterceptor - notifying accounts dept " + ctx.getMethod().getName());
+         session = getConnection().createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+         Message msg = session.createTextMessage("Confirming order " + orderId);
+         QueueSender sender = session.createSender(queue);
+         sender.send(msg);
+
+         return ctx.proceed();
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+      finally
+      {
+         try{session.close();}catch(Exception e) {}
+         System.out.println("*** AccountsConfirmInterceptor exiting");
+      }
+   }
+
+   QueueConnection getConnection() throws JMSException
+   {
+      if (conn == null)
+      {
+         synchronized(cf)
+         {
+            if (conn == null)
+            {
+               conn = cf.createQueueConnection();
+            }
+         }
+      }
+
+      return conn;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.tutorial.interceptor.bean;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AccountsInterceptor
-{
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("*** AccountsInterceptor intercepting " + ctx.getMethod().getName());
-      try
-      {
-         return ctx.proceed();
-      }
-      finally
-      {
-         System.out.println("*** AccountsInterceptor exiting");
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.tutorial.interceptor.bean;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AccountsInterceptor
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("*** AccountsInterceptor intercepting " + ctx.getMethod().getName());
+      try
+      {
+         return ctx.proceed();
+      }
+      finally
+      {
+         System.out.println("*** AccountsInterceptor exiting");
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.tutorial.interceptor.bean;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-import javax.jms.MessageListener;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-{
- at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="destination", propertyValue="queue/tutorial/accounts")
-})
-public class AccountsMDB implements MessageListener
-{
-   public void onMessage(Message recvMsg)
-   {
-      try
-      {
-         System.out.println(
-               "\n----------------\n" +
-               "AccountsMDB - Got message " + ((TextMessage)recvMsg).getText() + "\n" +
-               "----------------");
-         //Do necessary bookkeeping
-      }
-      catch (JMSException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.tutorial.interceptor.bean;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+{
+ at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ at ActivationConfigProperty(propertyName="destination", propertyValue="queue/tutorial/accounts")
+})
+public class AccountsMDB implements MessageListener
+{
+   public void onMessage(Message recvMsg)
+   {
+      try
+      {
+         System.out.println(
+               "\n----------------\n" + 
+               "AccountsMDB - Got message " + ((TextMessage)recvMsg).getText() + "\n" +
+               "----------------");
+         //Do necessary bookkeeping
+      }
+      catch (JMSException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}

Modified: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/Confirmation.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/Confirmation.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/Confirmation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.tutorial.interceptor.bean;
 
 import java.util.Date;

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.tutorial.interceptor.bean;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class DefaultInterceptor
-{
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("*** DefaultInterceptor intercepting " + ctx.getMethod().getName());
-      try
-      {
-         return ctx.proceed();
-      }
-      finally
-      {
-         System.out.println("*** DefaultInterceptor exiting");
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/DefaultInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.tutorial.interceptor.bean;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class DefaultInterceptor
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("*** DefaultInterceptor intercepting " + ctx.getMethod().getName());
+      try
+      {
+         return ctx.proceed();
+      }
+      finally
+      {
+         System.out.println("*** DefaultInterceptor exiting");
+      }
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>Tutorial</display-name>
-
-   <module>
-      <ejb>tutorial.jar</ejb>
-   </module>
-</application>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>Tutorial</display-name>
+
+   <module>
+      <ejb>tutorial.jar</ejb>
+   </module>
+</application>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-<?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">
-   <description>JBoss Stateful Session Bean Tutorial</description>
-   <display-name>JBoss Stateful Session Bean Tutorial</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>ShoppingCart</ejb-name>
-         <remote>org.jboss.tutorial.jboss_deployment_descriptor.bean.ShoppingCart</remote>
-         <ejb-class>org.jboss.tutorial.jboss_deployment_descriptor.bean.ShoppingCartBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <remove-method>
-            <bean-method>
-               <method-name>checkout</method-name>
-            </bean-method>
-            <retain-if-exception>false</retain-if-exception>
-         </remove-method>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-   <assembly-descriptor>
-        <method-permission>
-            <role-name>shopper</role-name>
-            <method>
-                <ejb-name>ShoppingCart</ejb-name>
-                <method-name>buy</method-name>
-            </method>
-        </method-permission>
-        <method-permission>
-            <role-name>clerk</role-name>
-            <method>
-                <ejb-name>ShoppingCart</ejb-name>
-                <method-name>priceCheck</method-name>
-            </method>
-        </method-permission>
-
-   </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+<?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">
+   <description>JBoss Stateful Session Bean Tutorial</description>
+   <display-name>JBoss Stateful Session Bean Tutorial</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>ShoppingCart</ejb-name>
+         <remote>org.jboss.tutorial.jboss_deployment_descriptor.bean.ShoppingCart</remote>
+         <ejb-class>org.jboss.tutorial.jboss_deployment_descriptor.bean.ShoppingCartBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <remove-method>
+            <bean-method>
+               <method-name>checkout</method-name>
+            </bean-method>
+            <retain-if-exception>false</retain-if-exception>
+         </remove-method>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+   <assembly-descriptor>
+        <method-permission>
+            <role-name>shopper</role-name>
+            <method>
+                <ejb-name>ShoppingCart</ejb-name>
+                <method-name>buy</method-name>
+            </method>
+        </method-permission>
+        <method-permission>
+            <role-name>clerk</role-name>
+            <method>
+                <ejb-name>ShoppingCart</ejb-name>
+                <method-name>priceCheck</method-name>
+            </method>
+        </method-permission>
+
+   </assembly-descriptor>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,27 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-<policy>
-
-    <application-policy name = "tutorial-test">
-       <authentication>
-          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
-             flag = "required">
-             <module-option name="usersProperties">security/users1.properties</module-option>
-             <module-option name="rolesProperties">security/roles1.properties</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-   <application-policy name = "tutorial-default">
-      <authentication>
-         <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
-            flag = "required">
-            <module-option name="usersProperties">security/users2.properties</module-option>
-            <module-option name="rolesProperties">security/roles2.properties</module-option>
-         </login-module>
-      </authentication>
-   </application-policy>
-
-</policy>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jaas-test-config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+<policy>
+
+    <application-policy name = "tutorial-test">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">security/users1.properties</module-option>
+             <module-option name="rolesProperties">security/roles1.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+   <application-policy name = "tutorial-default">
+      <authentication>
+         <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+            flag = "required">
+            <module-option name="usersProperties">security/users2.properties</module-option>
+            <module-option name="rolesProperties">security/roles2.properties</module-option>
+         </login-module>
+      </authentication>
+   </application-policy>
+
+</policy>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-   <!-- The custom JAAS login configuration service that installs 
-       a Configuration capable of dynamically updating the
-       config settings
-   -->
-   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
-         name="jboss.tutorial:service=DynamicLoginConfig">
-      <attribute name="AuthConfig">META-INF/jaas-test-config.xml</attribute>
-      <depends optional-attribute-name="LoginConfigService">
-         jboss.security:service=XMLLoginConfig
-      </depends>
-      <depends optional-attribute-name="SecurityManagerService">
-         jboss.security:service=JaasSecurityManager
-      </depends>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+   <!-- The custom JAAS login configuration service that installs 
+       a Configuration capable of dynamically updating the
+       config settings
+   -->
+   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+         name="jboss.tutorial:service=DynamicLoginConfig">
+      <attribute name="AuthConfig">META-INF/jaas-test-config.xml</attribute>
+      <depends optional-attribute-name="LoginConfigService">
+         jboss.security:service=XMLLoginConfig
+      </depends>
+      <depends optional-attribute-name="SecurityManagerService">
+         jboss.security:service=JaasSecurityManager
+      </depends>
+   </mbean>
+
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-    <security-domain>tutorial-default</security-domain>
-	<enterprise-beans>
-    	<session>
-         	<ejb-name>ShoppingCart</ejb-name>
-         	<jndi-name>ShoppingCart</jndi-name>
-         	<clustered>true</clustered>
-	        <cluster-config>
-            	<partition-name>DefaultPartition</partition-name>
-            	<load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</load-balance-policy>
-         	</cluster-config>
-    	   	<security-domain>tutorial-test</security-domain>
-      	</session>
-        <session>
-         	<ejb-name>StatelessTest</ejb-name>
-         	<jndi-name>StatelessTest</jndi-name>
-      	</session>
-   	</enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+    <security-domain>tutorial-default</security-domain>
+	<enterprise-beans>
+    	<session>
+         	<ejb-name>ShoppingCart</ejb-name>
+         	<jndi-name>ShoppingCart</jndi-name>
+         	<clustered>true</clustered>
+	        <cluster-config>
+            	<partition-name>DefaultPartition</partition-name>
+            	<load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</load-balance-policy>
+         	</cluster-config>
+    	   	<security-domain>tutorial-test</security-domain>
+      	</session>
+        <session>
+         	<ejb-name>StatelessTest</ejb-name>
+         	<jndi-name>StatelessTest</jndi-name>
+      	</session>
+   	</enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.sar">
-         <fileset dir=".">
-            <include name="META-INF/jaas-test-config.xml"/>
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-         <fileset dir="build">
-    		<include name="*.sar"/>
-         </fileset>
-      </jar>
-      <jar jarfile="build/tutorial.ear">
-         <fileset dir="build">
-            <include name="tutorial.sar"/>
-            <include name="tutorial.jar"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/application.xml"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="security/*.properties"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.ear" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.jboss_deployment_descriptor.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.ear"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.sar">
+         <fileset dir=".">
+            <include name="META-INF/jaas-test-config.xml"/>
+            <include name="META-INF/jboss-service.xml"/>
+         </fileset>
+      </jar>
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/ejb-jar.xml"/>
+            <include name="META-INF/jboss.xml"/>
+         </fileset>
+         <fileset dir="build">
+    		<include name="*.sar"/>
+         </fileset>
+      </jar>
+      <jar jarfile="build/tutorial.ear">
+         <fileset dir="build">
+            <include name="tutorial.sar"/>
+            <include name="tutorial.jar"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/application.xml"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="security/*.properties"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.ear" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.jboss_deployment_descriptor.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.ear"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Jboss.xml Deployment Descriptor</h2>
-
-The EJB 3.0 specification supports the usage of deployment descriptors to describe ejb metadata or override most metadata described via annotations. The Jboss.xml deployment descriptor describes JBoss specific metadata, including
-remote and local JNDI names, cluster configuration, a security domain, additional references, security principal, and container configuration. Annotations which define the ejb (e.g. <tt>@Stateful</tt>, <tt>@RemoteInterface</tt>) cannot be
-ovveridden.
-</p><p>
-<h4>JBoss.xml</h4>
-
-Take a look at <a href="META-INF/jboss.xml">JBoss.xml</a>.
-</p><p>
-The <tt>jndi-name</tt> element defines the remote JNDI binding for the <tt>ShoppingCart</tt> stateful session bean. This JNDI binding overrides the default binding or a binding specified through the <tt>@RemoteBinding</tt> annotation.
-Similiarly, the <tt>local-jndi-name</tt> element specifies the local JNDI binding.
-&lt;/p&gt;&lt;p&gt;
-The <tt>clustered</tt> element indicates that the ejb is clustered, with <tt>partition-name</tt> and <tt>load-balance-policy</tt> specifying the cluster name and load balance policy, respectively. The latter elements will 
-override the parameters specified in the <tt>@Clustered</tt> annotation. In this example, you will see that the <tt>ShoppingCart</tt> ejb is clustered. If you build and run this example (see below) with the default server
-configuration, the deployment will fail, as the default server configuration does not support clustering.
-&lt;/p&gt;&lt;p&gt;
-The <tt>security-domain</tt> element specifies a security domain for the ejb, overriding any security domain set through the <tt>@SecurityDomain</tt> annotation. In this example, you will see that a security domain is set through the 
-jboss.xml deployment descriptor and unless a Principal and Credential (i.e. user/password) is set in the client, requests to the ejb will fail with a javax.ejb.EJBAccessException.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-run:
-     [java] Attempting to buy 1 memory stick with no user/password
-     [java] Attempting to buy 1 memory stick with incorrect password
-     [java] Caught javax.ejb.EJBAccessException as expected
-     [java] Setting user/password
-     [java] bill is a shopper, so is allowed to buy
-     [java] Buying 1 memory stick
-     [java] Buying another memory stick
-     [java] Buying a laptop
-     [java] Print cart:
-     [java] 3     Memory stick
-     [java] 1     Laptop
-     [java] bill is not a clerk, so is not allowed to price check
-     [java] Caught SecurityException as expected
-     [java] Checkout
-     [java] Should throw an object not found exception by invoking on cart after @Remove method
-     [java] Exception in thread "main" javax.ejb.EJBNoSuchObjectException: Could not find Stateful bean: a1616c-oseo5o-eabsujnb-1-eabtkmic-7</pre>
-}}}
-</p><p>
-</p><p>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+<html>
+<body>
+<p>
+<h2>Jboss.xml Deployment Descriptor</h2>
+
+The EJB 3.0 specification supports the usage of deployment descriptors to describe ejb metadata or override most metadata described via annotations. The Jboss.xml deployment descriptor describes JBoss specific metadata, including
+remote and local JNDI names, cluster configuration, a security domain, additional references, security principal, and container configuration. Annotations which define the ejb (e.g. <tt>@Stateful</tt>, <tt>@RemoteInterface</tt>) cannot be
+ovveridden.
+</p><p>
+<h4>JBoss.xml</h4>
+
+Take a look at <a href="META-INF/jboss.xml">JBoss.xml</a>.
+</p><p>
+The <tt>jndi-name</tt> element defines the remote JNDI binding for the <tt>ShoppingCart</tt> stateful session bean. This JNDI binding overrides the default binding or a binding specified through the <tt>@RemoteBinding</tt> annotation.
+Similiarly, the <tt>local-jndi-name</tt> element specifies the local JNDI binding.
+&lt;/p&gt;&lt;p&gt;
+The <tt>clustered</tt> element indicates that the ejb is clustered, with <tt>partition-name</tt> and <tt>load-balance-policy</tt> specifying the cluster name and load balance policy, respectively. The latter elements will 
+override the parameters specified in the <tt>@Clustered</tt> annotation. In this example, you will see that the <tt>ShoppingCart</tt> ejb is clustered. If you build and run this example (see below) with the default server
+configuration, the deployment will fail, as the default server configuration does not support clustering.
+&lt;/p&gt;&lt;p&gt;
+The <tt>security-domain</tt> element specifies a security domain for the ejb, overriding any security domain set through the <tt>@SecurityDomain</tt> annotation. In this example, you will see that a security domain is set through the 
+jboss.xml deployment descriptor and unless a Principal and Credential (i.e. user/password) is set in the client, requests to the ejb will fail with a javax.ejb.EJBAccessException.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+run:
+     [java] Attempting to buy 1 memory stick with no user/password
+     [java] Attempting to buy 1 memory stick with incorrect password
+     [java] Caught javax.ejb.EJBAccessException as expected
+     [java] Setting user/password
+     [java] bill is a shopper, so is allowed to buy
+     [java] Buying 1 memory stick
+     [java] Buying another memory stick
+     [java] Buying a laptop
+     [java] Print cart:
+     [java] 3     Memory stick
+     [java] 1     Laptop
+     [java] bill is not a clerk, so is not allowed to price check
+     [java] Caught SecurityException as expected
+     [java] Checkout
+     [java] Should throw an object not found exception by invoking on cart after @Remove method
+     [java] Exception in thread "main" javax.ejb.EJBNoSuchObjectException: Could not find Stateful bean: a1616c-oseo5o-eabsujnb-1-eabtkmic-7</pre>
+}}}
+</p><p>
+</p><p>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-!!!Jboss.xml Deployment Descriptor
-The EJB 3.0 specification supports the usage of deployment descriptors to describe ejb metadata or override most metadata described via annotations. The Jboss.xml deployment descriptor describes JBoss specific metadata, including
-remote and local JNDI names, cluster configuration, a security domain, additional references, security principal, and container configuration. Annotations which define the ejb (e.g. {{@Stateful}}, {{@RemoteInterface}}) cannot be
-ovveridden.
-
-!JBoss.xml
-Take a look at [JBoss.xml|META-INF/jboss.xml].
-
-The {{jndi-name}} element defines the remote JNDI binding for the {{ShoppingCart}} stateful session bean. This JNDI binding overrides the default binding or a binding specified through the {{@RemoteBinding}} annotation.
-Similiarly, the {{local-jndi-name}} element specifies the local JNDI binding.
-</p><p>
-The {{clustered}} element indicates that the ejb is clustered, with {{partition-name}} and {{load-balance-policy}} specifying the cluster name and load balance policy, respectively. The latter elements will 
-override the parameters specified in the {{@Clustered}} annotation. In this example, you will see that the {{ShoppingCart}} ejb is clustered. If you build and run this example (see below) with the default server
-configuration, the deployment will fail, as the default server configuration does not support clustering.
-</p><p>
-The {{security-domain}} element specifies a security domain for the ejb, overriding any security domain set through the {{@SecurityDomain}} annotation. In this example, you will see that a security domain is set through the 
-jboss.xml deployment descriptor and unless a Principal and Credential (i.e. user/password) is set in the client, requests to the ejb will fail with a javax.ejb.EJBAccessException.
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-run:
-     [java] Attempting to buy 1 memory stick with no user/password
-     [java] Attempting to buy 1 memory stick with incorrect password
-     [java] Caught javax.ejb.EJBAccessException as expected
-     [java] Setting user/password
-     [java] bill is a shopper, so is allowed to buy
-     [java] Buying 1 memory stick
-     [java] Buying another memory stick
-     [java] Buying a laptop
-     [java] Print cart:
-     [java] 3     Memory stick
-     [java] 1     Laptop
-     [java] bill is not a clerk, so is not allowed to price check
-     [java] Caught SecurityException as expected
-     [java] Checkout
-     [java] Should throw an object not found exception by invoking on cart after @Remove method
-     [java] Exception in thread "main" javax.ejb.EJBNoSuchObjectException: Could not find Stateful bean: a1616c-oseo5o-eabsujnb-1-eabtkmic-7}}}
-}}}
-
-
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jboss_dd.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+!!!Jboss.xml Deployment Descriptor
+The EJB 3.0 specification supports the usage of deployment descriptors to describe ejb metadata or override most metadata described via annotations. The Jboss.xml deployment descriptor describes JBoss specific metadata, including
+remote and local JNDI names, cluster configuration, a security domain, additional references, security principal, and container configuration. Annotations which define the ejb (e.g. {{@Stateful}}, {{@RemoteInterface}}) cannot be
+ovveridden.
+
+!JBoss.xml
+Take a look at [JBoss.xml|META-INF/jboss.xml].
+
+The {{jndi-name}} element defines the remote JNDI binding for the {{ShoppingCart}} stateful session bean. This JNDI binding overrides the default binding or a binding specified through the {{@RemoteBinding}} annotation.
+Similiarly, the {{local-jndi-name}} element specifies the local JNDI binding.
+</p><p>
+The {{clustered}} element indicates that the ejb is clustered, with {{partition-name}} and {{load-balance-policy}} specifying the cluster name and load balance policy, respectively. The latter elements will 
+override the parameters specified in the {{@Clustered}} annotation. In this example, you will see that the {{ShoppingCart}} ejb is clustered. If you build and run this example (see below) with the default server
+configuration, the deployment will fail, as the default server configuration does not support clustering.
+</p><p>
+The {{security-domain}} element specifies a security domain for the ejb, overriding any security domain set through the {{@SecurityDomain}} annotation. In this example, you will see that a security domain is set through the 
+jboss.xml deployment descriptor and unless a Principal and Credential (i.e. user/password) is set in the client, requests to the ejb will fail with a javax.ejb.EJBAccessException.
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+run:
+     [java] Attempting to buy 1 memory stick with no user/password
+     [java] Attempting to buy 1 memory stick with incorrect password
+     [java] Caught javax.ejb.EJBAccessException as expected
+     [java] Setting user/password
+     [java] bill is a shopper, so is allowed to buy
+     [java] Buying 1 memory stick
+     [java] Buying another memory stick
+     [java] Buying a laptop
+     [java] Print cart:
+     [java] 3     Memory stick
+     [java] 1     Laptop
+     [java] bill is not a clerk, so is not allowed to price check
+     [java] Caught SecurityException as expected
+     [java] Checkout
+     [java] Should throw an object not found exception by invoking on cart after @Remove method
+     [java] Exception in thread "main" javax.ejb.EJBNoSuchObjectException: Could not find Stateful bean: a1616c-oseo5o-eabsujnb-1-eabtkmic-7}}}
+}}}
+
+
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-bill=shopper

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles1.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+bill=shopper

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-bill2=shopper

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/roles2.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+bill2=shopper

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-bill=password
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users1.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+bill=password
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-bill2=password2
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/security/users2.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+bill2=password2
+

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.jboss_deployment_descriptor.bean;
-
-import java.util.HashMap;
-import javax.ejb.Remove;
-
-public interface ShoppingCart
-{
-   void buy(String product, int quantity);
-   
-   void priceCheck(String product);
-
-   HashMap<String, Integer> getCartContents();
-
-   void checkout();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_deployment_descriptor.bean;
+
+import java.util.HashMap;
+import javax.ejb.Remove;
+
+public interface ShoppingCart
+{
+   void buy(String product, int quantity);
+   
+   void priceCheck(String product);
+
+   HashMap<String, Integer> getCartContents();
+
+   void checkout();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.jboss_deployment_descriptor.bean;
-
-import java.io.Serializable;
-import java.util.HashMap;
-
-public class ShoppingCartBean implements ShoppingCart, Serializable
-{
-   private HashMap<String, Integer> cart = new HashMap<String, Integer>();
-
-   public void buy(String product, int quantity)
-   {
-      if (cart.containsKey(product))
-      {
-         int currq = cart.get(product);
-         currq += quantity;
-         cart.put(product, currq);
-      }
-      else
-      {
-         cart.put(product, quantity);
-      }
-   }
-   
-   public void priceCheck(String product)
-   {
-      // dummy
-   }
-
-   public HashMap<String, Integer> getCartContents()
-   {
-      return cart;
-   }
-
-   public void checkout()
-   {
-      System.out.println("To be implemented");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_deployment_descriptor.bean;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+public class ShoppingCartBean implements ShoppingCart, Serializable
+{
+   private HashMap<String, Integer> cart = new HashMap<String, Integer>();
+
+   public void buy(String product, int quantity)
+   {
+      if (cart.containsKey(product))
+      {
+         int currq = cart.get(product);
+         currq += quantity;
+         cart.put(product, currq);
+      }
+      else
+      {
+         cart.put(product, quantity);
+      }
+   }
+   
+   public void priceCheck(String product)
+   {
+      // dummy
+   }
+
+   public HashMap<String, Integer> getCartContents()
+   {
+      return cart;
+   }
+
+   public void checkout()
+   {
+      System.out.println("To be implemented");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,27 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.jboss_deployment_descriptor.bean;
-
-public interface StatelessTest
-{
-   void testSecurity();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_deployment_descriptor.bean;
+
+public interface StatelessTest
+{
+   void testSecurity();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.jboss_deployment_descriptor.bean;
-
-import javax.annotation.security.RunAs;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
- at Stateless(name="StatelessTest")
- at Remote(StatelessTest.class)
- at RunAs("shopper")
-public class StatelessTestBean
-   implements StatelessTest
-{
-   public void testSecurity()
-   {
-      System.out.println("Successfully accessed SLSB in tutorial-default security domain");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/bean/StatelessTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_deployment_descriptor.bean;
+
+import javax.annotation.security.RunAs;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+ at Stateless(name="StatelessTest")
+ at Remote(StatelessTest.class)
+ at RunAs("shopper")
+public class StatelessTestBean
+   implements StatelessTest
+{
+   public void testSecurity()
+   {
+      System.out.println("Successfully accessed SLSB in tutorial-default security domain");
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,139 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.jboss_deployment_descriptor.client;
-
-import java.util.HashMap;
-import java.util.Properties;
-import javax.ejb.NoSuchEJBException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import org.jboss.tutorial.jboss_deployment_descriptor.bean.ShoppingCart;
-
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.SecurityAssociation;
-
-import org.jboss.tutorial.jboss_deployment_descriptor.bean.StatelessTest;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      testShoppingCart();
-      testStateless();
-   }
-   
-   private static void testShoppingCart() throws Exception
-   {
-      // Establish the proxy with an incorrect security identity
-      Properties env = new Properties();
-      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
-      env.setProperty(Context.SECURITY_PRINCIPAL, "bill");
-      env.setProperty(Context.SECURITY_CREDENTIALS, "invalidpassword");
-      InitialContext ctx = new InitialContext(env);
-      ShoppingCart cart = (ShoppingCart) ctx.lookup("ShoppingCart");
-
-
-      System.out.println("Attempting to buy 1 memory stick with incorrect password");
-      try
-      {
-         cart.buy("Memory stick", 1);
-      }
-      catch (javax.ejb.EJBAccessException e)
-      {
-         System.out.println("Caught javax.ejb.EJBAccessException as expected");
-      }
-
-      System.out.println("Setting user/password");
-      env.setProperty(Context.SECURITY_CREDENTIALS, "password");
-
-      ctx = new InitialContext(env);
-
-      System.out.println("bill is a shopper, so is allowed to buy");
-      System.out.println("Buying 1 memory stick");
-      cart.buy("Memory stick", 1);
-      System.out.println("Buying another memory stick");
-      cart.buy("Memory stick", 1);
-
-      System.out.println("Buying a laptop");
-      cart.buy("Laptop", 1);
-
-      System.out.println("Print cart:");
-      HashMap<String, Integer> fullCart = cart.getCartContents();
-      for (String product : fullCart.keySet())
-      {
-         System.out.println(fullCart.get(product) + "     " + product);
-      }
-
-      System.out.println("bill is not a clerk, so is not allowed to price check");
-      try
-      {
-         cart.priceCheck("Laptop");
-      }
-      catch (javax.ejb.EJBAccessException  ex)
-      {
-         System.out.println("Caught SecurityException as expected");
-      }
-
-      System.out.println("Checkout");
-      cart.checkout();
-
-      System.out.println("Should throw an object not found exception by invoking on cart after @Remove method");
-      try
-      {
-         cart.getCartContents();
-      }
-      catch (NoSuchEJBException e)
-      {
-         System.out.println("Successfully caught no such object exception.");
-      }
-   }
-   
-   private static void testStateless() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      StatelessTest stateless = (StatelessTest)jndiContext.lookup("StatelessTest");
-      
-      SecurityAssociation.setPrincipal(new SimplePrincipal("bill2"));
-      SecurityAssociation.setCredential("invalidpassword".toCharArray());
-      
-      try
-      {
-         stateless.testSecurity();
-      }
-      catch (javax.ejb.EJBAccessException e)
-      {
-         System.out.println("Caught javax.ejb.EJBAccessException as expected");
-      }
-      
-      SecurityAssociation.setCredential("password2".toCharArray());
-      
-      stateless.testSecurity();
-      
-      System.out.println("Successfully accessed SLSB in tutorial-test security domain");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_deployment_descriptor.client;
+
+import java.util.HashMap;
+import java.util.Properties;
+import javax.ejb.NoSuchEJBException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import org.jboss.tutorial.jboss_deployment_descriptor.bean.ShoppingCart;
+
+import org.jboss.security.SimplePrincipal;
+import org.jboss.security.SecurityAssociation;
+
+import org.jboss.tutorial.jboss_deployment_descriptor.bean.StatelessTest;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      testShoppingCart();
+      testStateless();
+   }
+   
+   private static void testShoppingCart() throws Exception
+   {
+      // Establish the proxy with an incorrect security identity
+      Properties env = new Properties();
+      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      env.setProperty(Context.SECURITY_PRINCIPAL, "bill");
+      env.setProperty(Context.SECURITY_CREDENTIALS, "invalidpassword");
+      InitialContext ctx = new InitialContext(env);
+      ShoppingCart cart = (ShoppingCart) ctx.lookup("ShoppingCart");
+
+
+      System.out.println("Attempting to buy 1 memory stick with incorrect password");
+      try
+      {
+         cart.buy("Memory stick", 1);
+      }
+      catch (javax.ejb.EJBAccessException e)
+      {
+         System.out.println("Caught javax.ejb.EJBAccessException as expected");
+      }
+
+      System.out.println("Setting user/password");
+      env.setProperty(Context.SECURITY_CREDENTIALS, "password");
+
+      ctx = new InitialContext(env);
+
+      System.out.println("bill is a shopper, so is allowed to buy");
+      System.out.println("Buying 1 memory stick");
+      cart.buy("Memory stick", 1);
+      System.out.println("Buying another memory stick");
+      cart.buy("Memory stick", 1);
+
+      System.out.println("Buying a laptop");
+      cart.buy("Laptop", 1);
+
+      System.out.println("Print cart:");
+      HashMap<String, Integer> fullCart = cart.getCartContents();
+      for (String product : fullCart.keySet())
+      {
+         System.out.println(fullCart.get(product) + "     " + product);
+      }
+
+      System.out.println("bill is not a clerk, so is not allowed to price check");
+      try
+      {
+         cart.priceCheck("Laptop");
+      }
+      catch (javax.ejb.EJBAccessException  ex)
+      {
+         System.out.println("Caught SecurityException as expected");
+      }
+
+      System.out.println("Checkout");
+      cart.checkout();
+
+      System.out.println("Should throw an object not found exception by invoking on cart after @Remove method");
+      try
+      {
+         cart.getCartContents();
+      }
+      catch (NoSuchEJBException e)
+      {
+         System.out.println("Successfully caught no such object exception.");
+      }
+   }
+   
+   private static void testStateless() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      StatelessTest stateless = (StatelessTest)jndiContext.lookup("StatelessTest");
+      
+      SecurityAssociation.setPrincipal(new SimplePrincipal("bill2"));
+      SecurityAssociation.setCredential("invalidpassword".toCharArray());
+      
+      try
+      {
+         stateless.testSecurity();
+      }
+      catch (javax.ejb.EJBAccessException e)
+      {
+         System.out.println("Caught javax.ejb.EJBAccessException as expected");
+      }
+      
+      SecurityAssociation.setCredential("password2".toCharArray());
+      
+      stateless.testSecurity();
+      
+      System.out.println("Successfully accessed SLSB in tutorial-test security domain");
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-
-   <display-name>ENC Tests</display-name>
-   <enterprise-beans>
-      <session>
-         <description>A session bean on looks up stuff in the ENC</description>
-         <ejb-name>ENCBean</ejb-name>
-         <remote>org.jboss.tutorial.jboss_resource_ref.bean.TestENC</remote>
-         <ejb-class>org.jboss.tutorial.jboss_resource_ref.bean.TestENCBean</ejb-class>    
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-
-         <!-- JDBC DataSources (java:comp/env/jdbc) -->
-         <resource-ref>
-            <description>The default DS</description>
-            <res-ref-name>jdbc/DefaultDS</res-ref-name>
-            <res-type>javax.sql.DataSource</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-         <!-- JavaMail Connection Factories (java:comp/env/mail) -->
-         <resource-ref>
-            <description>Default Mail</description>
-            <res-ref-name>mail/DefaultMail</res-ref-name>
-            <res-type>javax.mail.Session</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-         <!-- JMS Connection Factories (java:comp/env/jms) -->
-         <resource-ref>
-            <description>Default QueueFactory</description>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <res-type>javax.jms.QueueConnectionFactory</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-         
-         <resource-env-ref>
-            <description>A test of the resource-env-ref tag</description>
-            <resource-env-ref-name>res/aQueue</resource-env-ref-name>
-            <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-         </resource-env-ref>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+
+<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">
+
+   <display-name>ENC Tests</display-name>
+   <enterprise-beans>
+      <session>
+         <description>A session bean on looks up stuff in the ENC</description>
+         <ejb-name>ENCBean</ejb-name>
+         <remote>org.jboss.tutorial.jboss_resource_ref.bean.TestENC</remote>
+         <ejb-class>org.jboss.tutorial.jboss_resource_ref.bean.TestENCBean</ejb-class>    
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+         <!-- JDBC DataSources (java:comp/env/jdbc) -->
+         <resource-ref>
+            <description>The default DS</description>
+            <res-ref-name>jdbc/DefaultDS</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+         <!-- JavaMail Connection Factories (java:comp/env/mail) -->
+         <resource-ref>
+            <description>Default Mail</description>
+            <res-ref-name>mail/DefaultMail</res-ref-name>
+            <res-type>javax.mail.Session</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+         <!-- JMS Connection Factories (java:comp/env/jms) -->
+         <resource-ref>
+            <description>Default QueueFactory</description>
+            <res-ref-name>jms/QueFactory</res-ref-name>
+            <res-type>javax.jms.QueueConnectionFactory</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+         
+         <resource-env-ref>
+            <description>A test of the resource-env-ref tag</description>
+            <resource-env-ref-name>res/aQueue</resource-env-ref-name>
+            <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+         </resource-env-ref>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-    <enterprise-beans>
-        <session>
-            <ejb-name>ENCBean</ejb-name>
-            <jndi-name>ENCBean</jndi-name>
-            <resource-ref>
-                <res-ref-name>jdbc/DefaultDS</res-ref-name>
-                <resource-name>DefaultDS</resource-name>
-            </resource-ref>
-            <resource-ref>
-                <res-ref-name>mail/DefaultMail</res-ref-name>
-                <resource-name>DefaultMail</resource-name>
-            </resource-ref>
-            <resource-ref>
-                <res-ref-name>jms/QueFactory</res-ref-name>
-                <jndi-name>ConnectionFactory</jndi-name>
-            </resource-ref>
-
-            <resource-env-ref>
-                <resource-env-ref-name>res/aQueue</resource-env-ref-name>
-                <jndi-name>queue/testQueue</jndi-name>
-            </resource-env-ref>
-        </session>
-    </enterprise-beans>
-
-    <resource-managers>
-        <resource-manager res-class="">
-            <res-name>DefaultDS</res-name>
-            <res-jndi-name>java:/DefaultDS</res-jndi-name>
-        </resource-manager>
-        <resource-manager res-class="">
-            <res-name>DefaultMail</res-name>
-            <res-jndi-name>java:/Mail</res-jndi-name>
-        </resource-manager>
-    </resource-managers>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+    <enterprise-beans>
+        <session>
+            <ejb-name>ENCBean</ejb-name>
+            <jndi-name>ENCBean</jndi-name>
+            <resource-ref>
+                <res-ref-name>jdbc/DefaultDS</res-ref-name>
+                <resource-name>DefaultDS</resource-name>
+            </resource-ref>
+            <resource-ref>
+                <res-ref-name>mail/DefaultMail</res-ref-name>
+                <resource-name>DefaultMail</resource-name>
+            </resource-ref>
+            <resource-ref>
+                <res-ref-name>jms/QueFactory</res-ref-name>
+                <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+
+            <resource-env-ref>
+                <resource-env-ref-name>res/aQueue</resource-env-ref-name>
+                <jndi-name>queue/testQueue</jndi-name>
+            </resource-env-ref>
+        </session>
+    </enterprise-beans>
+
+    <resource-managers>
+        <resource-manager res-class="">
+            <res-name>DefaultDS</res-name>
+            <res-jndi-name>java:/DefaultDS</res-jndi-name>
+        </resource-manager>
+        <resource-manager res-class="">
+            <res-name>DefaultMail</res-name>
+            <res-jndi-name>java:/Mail</res-jndi-name>
+        </resource-manager>
+    </resource-managers>
+</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.class)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client/Client.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client/Client.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/classes/org/jboss/tutorial/jboss_resource_ref/client/Client.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/tutorial.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build/tutorial.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build/tutorial.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-      <copy file="tutorial-jbossmq-destinations-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.jboss_resource_ref.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial-jbossmq-destinations-service.xml"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/ejb-jar.xml"/>
+            <include name="META-INF/jboss.xml"/>
+         </fileset>
+      </jar>
+      <copy file="tutorial-jbossmq-destinations-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.jboss_resource_ref.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial-jbossmq-destinations-service.xml"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-<html>
-<body>
-<p>
-<h2>jboss.xml Resource References</h2>
-
-Resources (e.g. data sources, JavaMail sessions, JMS queues) may be added to the local jndi namespace of individual EJBs. This is to separate the jndi names used in the
-bean code from the global jndi bindings set by the Deployer. The mapping of the bean local jndi binding and the global binding may be handled via the ejb-jar.xml and 
-jboss.xml deployment descriptors. 
-</p><p>
-<h4>ejb-jar.xml</h4>
-
-Take a look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a>. For <tt>ENCBean</tt>, there are 3 &lt;resource-ref&gt; elements indicating resource reference names and types.
-</p><p>
-<h4>jboss.xml</h4>
-
-Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>. For <tt>ENCBean</tt>, there are again 3 &lt;resource-ref&gt; elements indicating resource reference names and either the global jndi
-binding via the &lt;jndi-name&gt; element or the resource name. Resource managers are used to map resource names to global jndi bindings via the &lt;resource-managers&gt; element.
-</p><p>
-<h4>TestENCBean.java</h4>
-
-Take a look at <a href="src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java">TestENCBean.java</a>. Each one of the resources are accessed from the bean local jndi 
-namespace (i.e. java:comp.ejb3/env) by the value set in the &lt;res-ref-name&gt; values in the deployment descriptors.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-run:
-     [java] Successfully accessed bean resource references
-</pre>
-</p><p>
-<pre>
-13:44:09,500 INFO  [TestENCBean] Found data source resource ref
-13:44:09,500 INFO  [TestENCBean] Found mail resource ref
-13:44:09,500 INFO  [TestENCBean] Found jms queue resource ref
-13:44:09,500 INFO  [TestENCBean] Found jms queue resource env ref
-</pre>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+<html>
+<body>
+<p>
+<h2>jboss.xml Resource References</h2>
+
+Resources (e.g. data sources, JavaMail sessions, JMS queues) may be added to the local jndi namespace of individual EJBs. This is to separate the jndi names used in the
+bean code from the global jndi bindings set by the Deployer. The mapping of the bean local jndi binding and the global binding may be handled via the ejb-jar.xml and 
+jboss.xml deployment descriptors. 
+</p><p>
+<h4>ejb-jar.xml</h4>
+
+Take a look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a>. For <tt>ENCBean</tt>, there are 3 &lt;resource-ref&gt; elements indicating resource reference names and types.
+</p><p>
+<h4>jboss.xml</h4>
+
+Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>. For <tt>ENCBean</tt>, there are again 3 &lt;resource-ref&gt; elements indicating resource reference names and either the global jndi
+binding via the &lt;jndi-name&gt; element or the resource name. Resource managers are used to map resource names to global jndi bindings via the &lt;resource-managers&gt; element.
+</p><p>
+<h4>TestENCBean.java</h4>
+
+Take a look at <a href="src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java">TestENCBean.java</a>. Each one of the resources are accessed from the bean local jndi 
+namespace (i.e. java:comp.ejb3/env) by the value set in the &lt;res-ref-name&gt; values in the deployment descriptors.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+run:
+     [java] Successfully accessed bean resource references
+</pre>
+</p><p>
+<pre>
+13:44:09,500 INFO  [TestENCBean] Found data source resource ref
+13:44:09,500 INFO  [TestENCBean] Found mail resource ref
+13:44:09,500 INFO  [TestENCBean] Found jms queue resource ref
+13:44:09,500 INFO  [TestENCBean] Found jms queue resource env ref
+</pre>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-!!!jboss.xml Resource References
-Resources (e.g. data sources, JavaMail sessions, JMS queues) may be added to the local jndi namespace of individual EJBs. This is to separate the jndi names used in the
-bean code from the global jndi bindings set by the Deployer. The mapping of the bean local jndi binding and the global binding may be handled via the ejb-jar.xml and 
-jboss.xml deployment descriptors. 
-
-!ejb-jar.xml
-Take a look at [ejb-jar.xml|META-INF/ejb-jar.xml]. For {{ENCBean}}, there are 3 <resource-ref> elements indicating resource reference names and types.
-
-!jboss.xml
-Take a look at [jboss.xml|META-INF/jboss.xml]. For {{ENCBean}}, there are again 3 <resource-ref> elements indicating resource reference names and either the global jndi
-binding via the <jndi-name> element or the resource name. Resource managers are used to map resource names to global jndi bindings via the <resource-managers> element.
-
-!TestENCBean.java
-Take a look at [TestENCBean.java|src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java]. Each one of the resources are accessed from the bean local jndi 
-namespace (i.e. java:comp.ejb3/env) by the value set in the <res-ref-name> values in the deployment descriptors.
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-run:
-     [java] Successfully accessed bean resource references
-}}}
-
-{{{
-13:44:09,500 INFO  [TestENCBean] Found data source resource ref
-13:44:09,500 INFO  [TestENCBean] Found mail resource ref
-13:44:09,500 INFO  [TestENCBean] Found jms queue resource ref
-13:44:09,500 INFO  [TestENCBean] Found jms queue resource env ref
-}}}
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jboss_rr.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+!!!jboss.xml Resource References
+Resources (e.g. data sources, JavaMail sessions, JMS queues) may be added to the local jndi namespace of individual EJBs. This is to separate the jndi names used in the
+bean code from the global jndi bindings set by the Deployer. The mapping of the bean local jndi binding and the global binding may be handled via the ejb-jar.xml and 
+jboss.xml deployment descriptors. 
+
+!ejb-jar.xml
+Take a look at [ejb-jar.xml|META-INF/ejb-jar.xml]. For {{ENCBean}}, there are 3 <resource-ref> elements indicating resource reference names and types.
+
+!jboss.xml
+Take a look at [jboss.xml|META-INF/jboss.xml]. For {{ENCBean}}, there are again 3 <resource-ref> elements indicating resource reference names and either the global jndi
+binding via the <jndi-name> element or the resource name. Resource managers are used to map resource names to global jndi bindings via the <resource-managers> element.
+
+!TestENCBean.java
+Take a look at [TestENCBean.java|src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java]. Each one of the resources are accessed from the bean local jndi 
+namespace (i.e. java:comp.ejb3/env) by the value set in the <res-ref-name> values in the deployment descriptors.
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+run:
+     [java] Successfully accessed bean resource references
+}}}
+
+{{{
+13:44:09,500 INFO  [TestENCBean] Found data source resource ref
+13:44:09,500 INFO  [TestENCBean] Found mail resource ref
+13:44:09,500 INFO  [TestENCBean] Found jms queue resource ref
+13:44:09,500 INFO  [TestENCBean] Found jms queue resource env ref
+}}}
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.jboss_resource_ref.bean;
-
-import java.rmi.RemoteException;
-
-import javax.naming.NamingException;
-
-/**
-
- at author  Scott.Stark at jboss.org
- at version $Revision$
-*/
-public interface TestENC
-{
-   public void accessENC() throws NamingException;
-   
-   public void remove();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENC.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_resource_ref.bean;
+
+import java.rmi.RemoteException;
+
+import javax.naming.NamingException;
+
+/**
+
+ at author  Scott.Stark at jboss.org
+ at version $Revision$
+*/
+public interface TestENC
+{
+   public void accessENC() throws NamingException;
+   
+   public void remove();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.jboss_resource_ref.bean;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import javax.ejb.Remove;
-
-import org.apache.log4j.Logger;
-import org.jboss.ejb3.Container;
-
-/** A bean that does nothing but access resources from the ENC
- to test ENC usage.
-
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
-public class TestENCBean implements TestENC
-{
-   Logger log = Logger.getLogger(getClass());
-
-   public void accessENC() throws NamingException
-   {
-      // Obtain the enterprise beans environment naming context.
-      Context initCtx = new InitialContext();
-      Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
-      
-      // This bean should have the full ENC setup of the ENCBean
-      testJdbcDataSource(initCtx, myEnv);
-      testMail(initCtx, myEnv);
-      testJMS(initCtx, myEnv);
-      testResourceEnvEntries(initCtx, myEnv);
-   }
-
-   private void testJdbcDataSource(Context initCtx, Context myEnv) throws NamingException
-   {
-      // JDBC DataSource
-      Object obj = myEnv.lookup("jdbc/DefaultDS");
-      if ((obj instanceof javax.sql.DataSource) == false)
-         throw new NamingException("jdbc/DefaultDS is not a javax.sql.DataSource");
-      log.info("Found data source resource ref");
-   }
-
-   private void testMail(Context initCtx, Context myEnv) throws NamingException
-   {
-      // JavaMail Session
-      Object obj = myEnv.lookup("mail/DefaultMail");
-      if ((obj instanceof javax.mail.Session) == false)
-         throw new NamingException("DefaultMail is not a javax.mail.Session");
-      log.info("Found mail resource ref");
-   }
-
-   private void testJMS(Context initCtx, Context myEnv) throws NamingException
-   {
-      // JavaMail Session
-      Object obj = myEnv.lookup("jms/QueFactory");
-      if ((obj instanceof javax.jms.QueueConnectionFactory) == false)
-         throw new NamingException("mail/DefaultMail is not a javax.jms.QueueConnectionFactory");
-      log.info("Found jms queue resource ref");
-   }
-
-   private void testResourceEnvEntries(Context initCtx, Context myEnv) throws NamingException
-   {
-      Object obj = myEnv.lookup("res/aQueue");
-      if ((obj instanceof javax.jms.Queue) == false)
-         throw new NamingException("res/aQueue is not a javax.jms.Queue");
-      log.info("Found jms queue resource env ref");
-   }
-   
-   @Remove
-   public void remove()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/bean/TestENCBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_resource_ref.bean;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import javax.ejb.Remove;
+
+import org.apache.log4j.Logger;
+import org.jboss.ejb3.Container;
+
+/** A bean that does nothing but access resources from the ENC
+ to test ENC usage.
+
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+public class TestENCBean implements TestENC
+{
+   Logger log = Logger.getLogger(getClass());
+
+   public void accessENC() throws NamingException
+   {
+      // Obtain the enterprise beans environment naming context.
+      Context initCtx = new InitialContext();
+      Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
+      
+      // This bean should have the full ENC setup of the ENCBean
+      testJdbcDataSource(initCtx, myEnv);
+      testMail(initCtx, myEnv);
+      testJMS(initCtx, myEnv);
+      testResourceEnvEntries(initCtx, myEnv);
+   }
+
+   private void testJdbcDataSource(Context initCtx, Context myEnv) throws NamingException
+   {
+      // JDBC DataSource
+      Object obj = myEnv.lookup("jdbc/DefaultDS");
+      if ((obj instanceof javax.sql.DataSource) == false)
+         throw new NamingException("jdbc/DefaultDS is not a javax.sql.DataSource");
+      log.info("Found data source resource ref");
+   }
+
+   private void testMail(Context initCtx, Context myEnv) throws NamingException
+   {
+      // JavaMail Session
+      Object obj = myEnv.lookup("mail/DefaultMail");
+      if ((obj instanceof javax.mail.Session) == false)
+         throw new NamingException("DefaultMail is not a javax.mail.Session");
+      log.info("Found mail resource ref");
+   }
+
+   private void testJMS(Context initCtx, Context myEnv) throws NamingException
+   {
+      // JavaMail Session
+      Object obj = myEnv.lookup("jms/QueFactory");
+      if ((obj instanceof javax.jms.QueueConnectionFactory) == false)
+         throw new NamingException("mail/DefaultMail is not a javax.jms.QueueConnectionFactory");
+      log.info("Found jms queue resource ref");
+   }
+
+   private void testResourceEnvEntries(Context initCtx, Context myEnv) throws NamingException
+   {
+      Object obj = myEnv.lookup("res/aQueue");
+      if ((obj instanceof javax.jms.Queue) == false)
+         throw new NamingException("res/aQueue is not a javax.jms.Queue");
+      log.info("Found jms queue resource env ref");
+   }
+   
+   @Remove
+   public void remove()
+   {
+      
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.jboss_resource_ref.client;
-
-import javax.naming.InitialContext;
-
-import org.jboss.tutorial.jboss_resource_ref.bean.TestENC;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      TestENC bean = (TestENC)new InitialContext().lookup("ENCBean");
- 
-      bean.accessENC();
-      System.out.println("Successfully accessed bean resource references");
-      
-      bean.remove();
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/src/org/jboss/tutorial/jboss_resource_ref/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.jboss_resource_ref.client;
+
+import javax.naming.InitialContext;
+
+import org.jboss.tutorial.jboss_resource_ref.bean.TestENC;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      TestENC bean = (TestENC)new InitialContext().lookup("ENCBean");
+ 
+      bean.accessENC();
+      System.out.println("Successfully accessed bean resource references");
+      
+      bean.remove();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=testTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=testQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=A">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jboss_resource_ref/tutorial-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=testTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=testQueue">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=A">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-<?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">
-   <description>JBoss Message Driven Bean Tutorial</description>
-   <display-name>JBoss Message Driven Bean Tutorial</display-name>
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>ExampleMDB</ejb-name>
-         <ejb-class>org.jboss.tutorial.quartz.QuartzMDBBean</ejb-class>
-         <transaction-type>Container</transaction-type>
-         <activation-config>
-            <activation-config-property>
-               <activation-config-property-name>cronTrigger</activation-config-property-name>
-               <activation-config-property-value>0/2 * * * * ?</activation-config-property-value>
-            </activation-config-property>
-         </activation-config>
-      </message-driven>
-      <message-driven>
-         <ejb-name>ExampleMDB2</ejb-name>
-         <ejb-class>org.jboss.tutorial.quartz.QuartzMDBBean</ejb-class>
-         <transaction-type>Container</transaction-type>
-         <activation-config>
-            <activation-config-property>
-               <activation-config-property-name>cronTrigger</activation-config-property-name>
-               <activation-config-property-value>0/3 * * * * ?</activation-config-property-value>
-            </activation-config-property>
-         </activation-config>
-      </message-driven>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+<?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">
+   <description>JBoss Message Driven Bean Tutorial</description>
+   <display-name>JBoss Message Driven Bean Tutorial</display-name>
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>ExampleMDB</ejb-name>
+         <ejb-class>org.jboss.tutorial.quartz.QuartzMDBBean</ejb-class>
+         <transaction-type>Container</transaction-type>
+         <activation-config>
+            <activation-config-property>
+               <activation-config-property-name>cronTrigger</activation-config-property-name>
+               <activation-config-property-value>0/2 * * * * ?</activation-config-property-value>
+            </activation-config-property>
+         </activation-config>
+      </message-driven>
+      <message-driven>
+         <ejb-name>ExampleMDB2</ejb-name>
+         <ejb-class>org.jboss.tutorial.quartz.QuartzMDBBean</ejb-class>
+         <transaction-type>Container</transaction-type>
+         <activation-config>
+            <activation-config-property>
+               <activation-config-property-name>cronTrigger</activation-config-property-name>
+               <activation-config-property-value>0/3 * * * * ?</activation-config-property-value>
+            </activation-config-property>
+         </activation-config>
+      </message-driven>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>ExampleMDB</ejb-name>
-         <resource-adapter-name>quartz-ra.rar</resource-adapter-name>
-      </message-driven>
-      <message-driven>
-         <ejb-name>ExampleMDB2</ejb-name>
-         <resource-adapter-name>quartz-ra.rar</resource-adapter-name>
-      </message-driven>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>ExampleMDB</ejb-name>
+         <resource-adapter-name>quartz-ra.rar</resource-adapter-name>
+      </message-driven>
+      <message-driven>
+         <ejb-name>ExampleMDB2</ejb-name>
+         <resource-adapter-name>quartz-ra.rar</resource-adapter-name>
+      </message-driven>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property file="../../../local.properties"/>  <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/Annotated*.class"/>
-         </fileset>
-         <!--
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-         -->
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-      <jar jarfile="build/tutorial-xml.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/Quart*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial-xml.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial-xml.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property file="../../../local.properties"/>  <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/Annotated*.class"/>
+         </fileset>
+         <!--
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+         -->
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+      <jar jarfile="build/tutorial-xml.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/Quart*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial-xml.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial-xml.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-<html>
-<body>
-<p>
-<h2> Quartz Scheduler Integration</h2>
-
-</p><p>
-If you have installed JBoss using the 4.0.4.GA installer it comes bundled with Quartz integration packaged as a JCA Message-Inflow resource adapter: quartz-ra.rar.  This package can also be downloaded directly from <a href="http://www.sf.net/projects/jboss">SourceForge</a>.
-</p><p>
-This integration allows you to schedule stateless or stateful quartz jobs and have the job be posted to a Message Driven bean.  The Quartz Resource Adapter creates a non-persistent scheduler.  Jobs are created from deployed MDBs from information in the MDB's activation config spec.  Currently only cron jobs are allowed to be configured.  In future versions we will support other activation config spec setting for Quartz.
-</p><p>
-Here's an example:
-<pre>
-import org.jboss.annotation.ejb.ResourceAdapter;
-import org.jboss.logging.Logger;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-
- at MessageDriven(activationConfig =
-{
-   @ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
-})
- at ResourceAdapter("quartz-ra.rar")
-public class AnnotatedQuartzMDBBean implements Job
-{
-   private static final Logger log = Logger.getLogger(AnnotatedQuartzMDBBean.class);
-
-
-   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
-   {
-      AnnotatedQuartzMDBBean.log.info("************** here in annotated!!!!");
-   }
-}
-</pre>
-   
-This is a simple MDB that implements the org.quartz.Job interface.  The "cronTrigger" activation spec attribute is required.  In this you specify a cron syntax as documented in the Quartz distribution.  The @org.jboss.annotation.ejb.ResourceAdapter annotation is used to tell the EJB container which resource adapter to use for the inflow implementation.
-</p><p>
-If you remove the annotations, this can also be specified in ejb-jar.xml and in jboss.xml.  ejb-jar.xml is responsible for setting up the activation config spec, while jboss.xml defines the resource adapter binding.  
-</p><p>
-The tutorial example deploys both an annotated and XML based MDB that is driven by Quartz.
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+<html>
+<body>
+<p>
+<h2> Quartz Scheduler Integration</h2>
+
+</p><p>
+If you have installed JBoss using the 4.0.4.GA installer it comes bundled with Quartz integration packaged as a JCA Message-Inflow resource adapter: quartz-ra.rar.  This package can also be downloaded directly from <a href="http://www.sf.net/projects/jboss">SourceForge</a>.
+</p><p>
+This integration allows you to schedule stateless or stateful quartz jobs and have the job be posted to a Message Driven bean.  The Quartz Resource Adapter creates a non-persistent scheduler.  Jobs are created from deployed MDBs from information in the MDB's activation config spec.  Currently only cron jobs are allowed to be configured.  In future versions we will support other activation config spec setting for Quartz.
+</p><p>
+Here's an example:
+<pre>
+import org.jboss.annotation.ejb.ResourceAdapter;
+import org.jboss.logging.Logger;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+
+ at MessageDriven(activationConfig =
+{
+   @ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
+})
+ at ResourceAdapter("quartz-ra.rar")
+public class AnnotatedQuartzMDBBean implements Job
+{
+   private static final Logger log = Logger.getLogger(AnnotatedQuartzMDBBean.class);
+
+
+   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
+   {
+      AnnotatedQuartzMDBBean.log.info("************** here in annotated!!!!");
+   }
+}
+</pre>
+   
+This is a simple MDB that implements the org.quartz.Job interface.  The "cronTrigger" activation spec attribute is required.  In this you specify a cron syntax as documented in the Quartz distribution.  The @org.jboss.annotation.ejb.ResourceAdapter annotation is used to tell the EJB container which resource adapter to use for the inflow implementation.
+</p><p>
+If you remove the annotations, this can also be specified in ejb-jar.xml and in jboss.xml.  ejb-jar.xml is responsible for setting up the activation config spec, while jboss.xml defines the resource adapter binding.  
+</p><p>
+The tutorial example deploys both an annotated and XML based MDB that is driven by Quartz.
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-!!! Quartz Scheduler Integration
-
-If you have installed JBoss using the 4.0.4.GA installer it comes bundled with Quartz integration packaged as a JCA Message-Inflow resource adapter: quartz-ra.rar.  This package can also be downloaded directly from [SourceForge|http://www.sf.net/projects/jboss].
-
-This integration allows you to schedule stateless or stateful quartz jobs and have the job be posted to a Message Driven bean.  The Quartz Resource Adapter creates a non-persistent scheduler.  Jobs are created from deployed MDBs from information in the MDB's activation config spec.  Currently only cron jobs are allowed to be configured.  In future versions we will support other activation config spec setting for Quartz.
-
-Here's an example:
-{{{
-import org.jboss.annotation.ejb.ResourceAdapter;
-import org.jboss.logging.Logger;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-
- at MessageDriven(activationConfig =
-{
-   @ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
-})
- at ResourceAdapter("quartz-ra.rar")
-public class AnnotatedQuartzMDBBean implements Job
-{
-   private static final Logger log = Logger.getLogger(AnnotatedQuartzMDBBean.class);
-
-
-   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
-   {
-      AnnotatedQuartzMDBBean.log.info("************** here in annotated!!!!");
-   }
-}
-}}}
-   
-This is a simple MDB that implements the org.quartz.Job interface.  The "cronTrigger" activation spec attribute is required.  In this you specify a cron syntax as documented in the Quartz distribution.  The @org.jboss.annotation.ejb.ResourceAdapter annotation is used to tell the EJB container which resource adapter to use for the inflow implementation.
-
-If you remove the annotations, this can also be specified in ejb-jar.xml and in jboss.xml.  ejb-jar.xml is responsible for setting up the activation config spec, while jboss.xml defines the resource adapter binding.  
-
-The tutorial example deploys both an annotated and XML based MDB that is driven by Quartz.
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/quartz.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+!!! Quartz Scheduler Integration
+
+If you have installed JBoss using the 4.0.4.GA installer it comes bundled with Quartz integration packaged as a JCA Message-Inflow resource adapter: quartz-ra.rar.  This package can also be downloaded directly from [SourceForge|http://www.sf.net/projects/jboss].
+
+This integration allows you to schedule stateless or stateful quartz jobs and have the job be posted to a Message Driven bean.  The Quartz Resource Adapter creates a non-persistent scheduler.  Jobs are created from deployed MDBs from information in the MDB's activation config spec.  Currently only cron jobs are allowed to be configured.  In future versions we will support other activation config spec setting for Quartz.
+
+Here's an example:
+{{{
+import org.jboss.annotation.ejb.ResourceAdapter;
+import org.jboss.logging.Logger;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+
+ at MessageDriven(activationConfig =
+{
+   @ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
+})
+ at ResourceAdapter("quartz-ra.rar")
+public class AnnotatedQuartzMDBBean implements Job
+{
+   private static final Logger log = Logger.getLogger(AnnotatedQuartzMDBBean.class);
+
+
+   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
+   {
+      AnnotatedQuartzMDBBean.log.info("************** here in annotated!!!!");
+   }
+}
+}}}
+   
+This is a simple MDB that implements the org.quartz.Job interface.  The "cronTrigger" activation spec attribute is required.  In this you specify a cron syntax as documented in the Quartz distribution.  The @org.jboss.annotation.ejb.ResourceAdapter annotation is used to tell the EJB container which resource adapter to use for the inflow implementation.
+
+If you remove the annotations, this can also be specified in ejb-jar.xml and in jboss.xml.  ejb-jar.xml is responsible for setting up the activation config spec, while jboss.xml defines the resource adapter binding.  
+
+The tutorial example deploys both an annotated and XML based MDB that is driven by Quartz.
+

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.quartz;
-
-import org.jboss.annotation.ejb.ResourceAdapter;
-import org.jboss.logging.Logger;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-
-/**
- *
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
- */
- at MessageDriven(activationConfig =
-{
-   @ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
-})
- at ResourceAdapter("quartz-ra.rar")
-public class AnnotatedQuartzMDBBean implements Job
-{
-   private static final Logger log = Logger.getLogger(AnnotatedQuartzMDBBean.class);
-
-
-   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
-   {
-      AnnotatedQuartzMDBBean.log.info("************** here in annotated!!!!");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/AnnotatedQuartzMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.quartz;
+
+import org.jboss.annotation.ejb.ResourceAdapter;
+import org.jboss.logging.Logger;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+
+/**
+ *
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
+ */
+ at MessageDriven(activationConfig =
+{
+   @ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
+})
+ at ResourceAdapter("quartz-ra.rar")
+public class AnnotatedQuartzMDBBean implements Job
+{
+   private static final Logger log = Logger.getLogger(AnnotatedQuartzMDBBean.class);
+
+
+   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
+   {
+      AnnotatedQuartzMDBBean.log.info("************** here in annotated!!!!");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.quartz;
-
-import org.jboss.annotation.ejb.ResourceAdapter;
-import org.jboss.logging.Logger;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-import javax.annotation.Resource;
-
-/**
- *
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
- */
-public class QuartzMDBBean implements Job
-{
-   private static final Logger log = Logger.getLogger(QuartzMDBBean.class);
-
-   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
-   {
-      QuartzMDBBean.log.info("************** JOB: " + jobExecutionContext.getJobDetail().getName());
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/quartz/src/org/jboss/tutorial/quartz/QuartzMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.quartz;
+
+import org.jboss.annotation.ejb.ResourceAdapter;
+import org.jboss.logging.Logger;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+import javax.annotation.Resource;
+
+/**
+ *
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
+ */
+public class QuartzMDBBean implements Job
+{
+   private static final Logger log = Logger.getLogger(QuartzMDBBean.class);
+
+   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
+   {
+      QuartzMDBBean.log.info("************** JOB: " + jobExecutionContext.getJobDetail().getName());
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-jboss.home=/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha
-jboss.config=all

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+jboss.home=/eclipse/workspace/jboss-head/build/output/jboss-5.0.0alpha
+jboss.config=all

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,140 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ==========================================================================
-A template build file for building jboss3 applications
-Requires ant1.4+
-
-Distributable under the LGL
-See the terms of license at gnu.org
-=========================================================================== -->
-<project name="testmdb" default="deploy" basedir=".">
-
-<property file="build.properties"/>
-<property file="$(user.home}/build.properties"/>
-
-<!-- ==========================================================================
-Classpath for compilation
-=========================================================================== -->
-<path id="classpath">
-
-   <pathelement location="build"/>
-
-   <pathelement location="lib" />
-
-   <fileset dir="${jboss.home}/lib">
-      <include name="*.jar"/>
-   </fileset>
-
-   <fileset dir="${jboss.home}/server/${jboss.config}/lib">
-      <include name="*.jar"/>
-   </fileset>
-
-   <fileset dir="${jboss.home}/server/${jboss.config}/deploy">
-      <include name="*.jar"/>
-   </fileset>
-
-   <fileset dir="${jboss.home}/server/${jboss.config}/deploy/ejb3.deployer">
-      <include name="*.jar"/>
-   </fileset>
-</path>
-
-<path id="client.classpath">
-
-   <pathelement location="build"/>
-
-   <pathelement location="lib"/>
-
-   <fileset dir="${jboss.home}/lib">
-      <include name="*.jar"/>
-   </fileset>
-
-   <fileset dir="${jboss.home}/server/${jboss.config}/lib">
-      <include name="*.jar"/>
-   </fileset>
-
-   <fileset dir="${jboss.home}/server/${jboss.config}/deploy">
-      <include name="*.jar"/>
-   </fileset>
-
-   <fileset dir="${jboss.home}/server/${jboss.config}/deploy/ejb3.deployer">
-      <include name="*.jar"/>
-   </fileset>
-</path>
-
-<!-- ==========================================================================
-Compile the source
-=========================================================================== -->
-<target name="compile">
-
-   <mkdir dir="build"/>
-
-   <javac destdir="build"
-          debug="on"
-          deprecation="on"
-          optimize="on"
-          classpathref="classpath">
-      <src path="src"/>
-   </javac>
-
-</target>
-
-<!-- ==========================================================================
-Do the packaging
-=========================================================================== -->
-<target name="dist" depends="compile">
-
-   <!--copy todir="build">
-      <fileset dir="resources"/>
-   </copy-->
-
-   <mkdir dir="dist"/>
-
-   <jar jarfile="dist/${ant.project.name}.jar" basedir="build"/>
-
-</target>
-
-<!-- ==========================================================================
-Deploy the package(s)
-=========================================================================== -->
-<target name="deploy" depends="dist">
-
-   <copy todir="${jboss.home}/server/${jboss.config}/deploy">
-      <fileset dir="dist"/>
-   </copy>
-
-</target>
-
-
-<!-- ==========================================================================
-Undeploy the package(s)
-=========================================================================== -->
-<target name="undeploy">
-
-   <delete file="${jboss.home}/server/${jboss.config}/deploy/${ant.project.name}.jar"/>
-
-</target>
-
-<!-- ==========================================================================
-Run the client  
-=========================================================================== -->
-<target name="run" >
-
-   <java classname="test.client.Client" fork="true">
-     <sysproperty key="javax.net.ssl.trustStore" path="${jboss.home}/server/${jboss.config}/conf/test.keystore"/>
-     <classpath refid="client.classpath"/>
-  </java>
-
-</target>
-
-<!-- ==========================================================================
-Cleans the build environment
-=========================================================================== -->
-<target name="clean" depends="undeploy">
-
-   <delete dir="dist"/>
-   <delete dir="build"/>
-   <delete dir="gensrc"/>
-
-</target>
-
-</project>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+
+<!-- ==========================================================================
+A template build file for building jboss3 applications
+Requires ant1.4+
+
+Distributable under the LGL
+See the terms of license at gnu.org
+=========================================================================== -->
+<project name="testmdb" default="deploy" basedir=".">
+
+<property file="build.properties"/>
+<property file="$(user.home}/build.properties"/>
+
+<!-- ==========================================================================
+Classpath for compilation
+=========================================================================== -->
+<path id="classpath">
+
+   <pathelement location="build"/>
+
+   <pathelement location="lib" />
+
+   <fileset dir="${jboss.home}/lib">
+      <include name="*.jar"/>
+   </fileset>
+
+   <fileset dir="${jboss.home}/server/${jboss.config}/lib">
+      <include name="*.jar"/>
+   </fileset>
+
+   <fileset dir="${jboss.home}/server/${jboss.config}/deploy">
+      <include name="*.jar"/>
+   </fileset>
+
+   <fileset dir="${jboss.home}/server/${jboss.config}/deploy/ejb3.deployer">
+      <include name="*.jar"/>
+   </fileset>
+</path>
+
+<path id="client.classpath">
+
+   <pathelement location="build"/>
+
+   <pathelement location="lib"/>
+
+   <fileset dir="${jboss.home}/lib">
+      <include name="*.jar"/>
+   </fileset>
+
+   <fileset dir="${jboss.home}/server/${jboss.config}/lib">
+      <include name="*.jar"/>
+   </fileset>
+
+   <fileset dir="${jboss.home}/server/${jboss.config}/deploy">
+      <include name="*.jar"/>
+   </fileset>
+
+   <fileset dir="${jboss.home}/server/${jboss.config}/deploy/ejb3.deployer">
+      <include name="*.jar"/>
+   </fileset>
+</path>
+
+<!-- ==========================================================================
+Compile the source
+=========================================================================== -->
+<target name="compile">
+
+   <mkdir dir="build"/>
+
+   <javac destdir="build"
+          debug="on"
+          deprecation="on"
+          optimize="on"
+          classpathref="classpath">
+      <src path="src"/>
+   </javac>
+
+</target>
+
+<!-- ==========================================================================
+Do the packaging
+=========================================================================== -->
+<target name="dist" depends="compile">
+
+   <!--copy todir="build">
+      <fileset dir="resources"/>
+   </copy-->
+
+   <mkdir dir="dist"/>
+
+   <jar jarfile="dist/${ant.project.name}.jar" basedir="build"/>
+
+</target>
+
+<!-- ==========================================================================
+Deploy the package(s)
+=========================================================================== -->
+<target name="deploy" depends="dist">
+
+   <copy todir="${jboss.home}/server/${jboss.config}/deploy">
+      <fileset dir="dist"/>
+   </copy>
+
+</target>
+
+
+<!-- ==========================================================================
+Undeploy the package(s)
+=========================================================================== -->
+<target name="undeploy">
+
+   <delete file="${jboss.home}/server/${jboss.config}/deploy/${ant.project.name}.jar"/>
+
+</target>
+
+<!-- ==========================================================================
+Run the client  
+=========================================================================== -->
+<target name="run" >
+
+   <java classname="test.client.Client" fork="true">
+     <sysproperty key="javax.net.ssl.trustStore" path="${jboss.home}/server/${jboss.config}/conf/test.keystore"/>
+     <classpath refid="client.classpath"/>
+  </java>
+
+</target>
+
+<!-- ==========================================================================
+Cleans the build environment
+=========================================================================== -->
+<target name="clean" depends="undeploy">
+
+   <delete dir="dist"/>
+   <delete dir="build"/>
+   <delete dir="gensrc"/>
+
+</target>
+
+</project>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/lib)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-#java.naming.provider.url=192.168.0.99
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/lib/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+#java.naming.provider.url=192.168.0.99
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/resources)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-<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">
-   
-<enterprise-beans>
-  <message-driven>
-    <ejb-name>testmdb</ejb-name>
-    <ejb-class>test.mdb.TestMDBBean</ejb-class>
-         <messaging-type>javax.jms.MessageListener</messaging-type>
-         <transaction-type>Container</transaction-type>
-      <activation-config>
-        <activation-config-property>
-          <activation-config-property-name>
-            DestinationType
-          </activation-config-property-name>
-          <activation-config-property-value>
-            javax.jms.Queue
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            Destination
-          </activation-config-property-name>
-          <activation-config-property-value>
-            testqueue
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            SubscriptionDurability
-          </activation-config-property-name>
-          <activation-config-property-value>
-            Durable
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            ConnectionFactoryName
-          </activation-config-property-name>
-          <activation-config-property-value>
-            ConnectionFactory
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            Transacted
-          </activation-config-property-name>
-          <activation-config-property-value>
-            true
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            Xa
-          </activation-config-property-name>
-          <activation-config-property-value>
-            true
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            DeliveryOption
-          </activation-config-property-name>
-          <activation-config-property-value>
-            B
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            MaxPoolSize
-          </activation-config-property-name>
-          <activation-config-property-value>
-            20
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            MaxMessages
-          </activation-config-property-name>
-          <activation-config-property-value>
-            1
-          </activation-config-property-value>
-        </activation-config-property>
-      </activation-config>
-    </message-driven>
-  </enterprise-beans>
-
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+<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">
+   
+<enterprise-beans>
+  <message-driven>
+    <ejb-name>testmdb</ejb-name>
+    <ejb-class>test.mdb.TestMDBBean</ejb-class>
+         <messaging-type>javax.jms.MessageListener</messaging-type>
+         <transaction-type>Container</transaction-type>
+      <activation-config>
+        <activation-config-property>
+          <activation-config-property-name>
+            DestinationType
+          </activation-config-property-name>
+          <activation-config-property-value>
+            javax.jms.Queue
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            Destination
+          </activation-config-property-name>
+          <activation-config-property-value>
+            testqueue
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            SubscriptionDurability
+          </activation-config-property-name>
+          <activation-config-property-value>
+            Durable
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            ConnectionFactoryName
+          </activation-config-property-name>
+          <activation-config-property-value>
+            ConnectionFactory
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            Transacted
+          </activation-config-property-name>
+          <activation-config-property-value>
+            true
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            Xa
+          </activation-config-property-name>
+          <activation-config-property-value>
+            true
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            DeliveryOption
+          </activation-config-property-name>
+          <activation-config-property-value>
+            B
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            MaxPoolSize
+          </activation-config-property-name>
+          <activation-config-property-value>
+            20
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            MaxMessages
+          </activation-config-property-name>
+          <activation-config-property-value>
+            1
+          </activation-config-property-value>
+        </activation-config-property>
+      </activation-config>
+    </message-driven>
+  </enterprise-beans>
+
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>testmdb</ejb-name>
-         <resource-adapter-name>swiftmq.rar</resource-adapter-name>
-      </message-driven>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>testmdb</ejb-name>
+         <resource-adapter-name>swiftmq.rar</resource-adapter-name>
+      </message-driven>
+   </enterprise-beans>
+</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-* JBoss, the OpenSource J2EE webOS
-*
-* Distributable under LGPL license.
-* See terms of license at gnu.org.
-*/
-package org.jboss.tutorial.jca.inflow.swiftmq.bean;
-
-import org.jboss.annotation.ejb.ResourceAdapter;
-
-import javax.ejb.*;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-
- at MessageDriven(name="testmdb", activationConfig =
-{
- at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
- at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
- at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
- at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
- at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
- at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
- at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
- at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
- at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
-})
- at ResourceAdapter("swiftmq.rar")
-public class AnnotatedTestMDBBean
-   implements MessageListener
-{
-   public void onMessage(Message message)
-   {
-      System.out.println(message);
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/src/org/jboss/tutorial/jca/inflow/swiftmq/bean/AnnotatedTestMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+* JBoss, the OpenSource J2EE webOS
+*
+* Distributable under LGPL license.
+* See terms of license at gnu.org.
+*/
+package org.jboss.tutorial.jca.inflow.swiftmq.bean;
+
+import org.jboss.annotation.ejb.ResourceAdapter;
+
+import javax.ejb.*;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+
+ at MessageDriven(name="testmdb", activationConfig =
+{
+ at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
+ at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
+ at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
+ at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
+ at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
+ at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
+ at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
+})
+ at ResourceAdapter("swiftmq.rar")
+public class AnnotatedTestMDBBean
+   implements MessageListener
+{
+   public void onMessage(Message message)
+   {
+      System.out.println(message);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-<html>
-<body>
-<p>
-<h2>SwiftMQ inbound resource adapter for MDB</h2>
-
-SwiftMQ provide a JCA 1.5 resource that allows JMS message delivery to an MDB. The attached example ant project shows how to deploy such an EJB3 MDB.
-
-</p><p>
-<h4>AnnotatedTestMDBBean.java</h4>
-The AnnotatedTestMDBBean.java is the source for the EJB3 MDB. Note the annotations:
-</p><p>
-<pre>
- at MessageDriven(name="test/mdb", activationConfig =
-{
- at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
- at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
- at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
- at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
- at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
- at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
- at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
- at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
- at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
- at ActivationConfigProperty(propertyName="resourceAdaptorName", propertyValue="swiftmq.rar")
-})
- at ResourceAdapter("swiftmq.rar")
-
-</pre>
-</p><p>
-These annotations correspond the following deployment descriptors:
-</p><p>
-NOTE: these properties could equally go in jboss.xml if you want to avoid
-polluting ejb-jar.xml with vendor specific properties.
-</p><p>
-<a href="resources/META-INF/ejb-jar.xml">ejb-jar.xml</a>
-</p><p>
-<a href="resources/META-INF/jboss.xml">jboss.xml</a>
-</p><p>
-Here we define jboss specific stuff. There are two main items:
-* We define we want to use the jca 1.5 message inflow container
-* We tell jboss which rar will provide the inflow
-</p><p>
-
-<h4>Running the example</h4>
-</p><p>
-* Make sure you have the Swift jmsxaasf swiftlet installed within SwiftMQ<br/>
-* Add swiftmq.rar to the deploy directory<br/>
-* Change build.properties to point at your JBoss installation<br/>
-* Deploy the mdb by typing "ant" to run the deploy target in build.xml<br/>
-* Use the swiftmq example {{{SimpleQueueSender}}} to send a message to the queue<br/>
-</p><p>
-You should get some output like the following on the jboss console:
-</p><p>
-<pre>
-12:47:29,515 INFO  [STDOUT] [TextMessageImpl com.swiftmq.jms.TextMessageImpl at 4065c4
-messageIndex = 5_0
-messageId = ID:/10.10.10.115-11333728494210
-userId = anonymous
-clientId = null
-timeStamp = 113337849421
-correlationId = null
-replyTo = null
-destination = testqueue at router1
-deliveryMode = 2
-redelivered = false
-deliveryCount = 1
-type = null
-expiration = 0
-priority = 4
-props = null
-readOnly = true
-sourceRouter = null
-destRouter = null
-destQueue = testqueue at router1 text=Here is a message]
-</pre>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+<html>
+<body>
+<p>
+<h2>SwiftMQ inbound resource adapter for MDB</h2>
+
+SwiftMQ provide a JCA 1.5 resource that allows JMS message delivery to an MDB. The attached example ant project shows how to deploy such an EJB3 MDB.
+
+</p><p>
+<h4>AnnotatedTestMDBBean.java</h4>
+The AnnotatedTestMDBBean.java is the source for the EJB3 MDB. Note the annotations:
+</p><p>
+<pre>
+ at MessageDriven(name="test/mdb", activationConfig =
+{
+ at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
+ at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
+ at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
+ at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
+ at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
+ at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
+ at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
+ at ActivationConfigProperty(propertyName="resourceAdaptorName", propertyValue="swiftmq.rar")
+})
+ at ResourceAdapter("swiftmq.rar")
+
+</pre>
+</p><p>
+These annotations correspond the following deployment descriptors:
+</p><p>
+NOTE: these properties could equally go in jboss.xml if you want to avoid
+polluting ejb-jar.xml with vendor specific properties.
+</p><p>
+<a href="resources/META-INF/ejb-jar.xml">ejb-jar.xml</a>
+</p><p>
+<a href="resources/META-INF/jboss.xml">jboss.xml</a>
+</p><p>
+Here we define jboss specific stuff. There are two main items:
+* We define we want to use the jca 1.5 message inflow container
+* We tell jboss which rar will provide the inflow
+</p><p>
+
+<h4>Running the example</h4>
+</p><p>
+* Make sure you have the Swift jmsxaasf swiftlet installed within SwiftMQ<br/>
+* Add swiftmq.rar to the deploy directory<br/>
+* Change build.properties to point at your JBoss installation<br/>
+* Deploy the mdb by typing "ant" to run the deploy target in build.xml<br/>
+* Use the swiftmq example {{{SimpleQueueSender}}} to send a message to the queue<br/>
+</p><p>
+You should get some output like the following on the jboss console:
+</p><p>
+<pre>
+12:47:29,515 INFO  [STDOUT] [TextMessageImpl com.swiftmq.jms.TextMessageImpl at 4065c4
+messageIndex = 5_0
+messageId = ID:/10.10.10.115-11333728494210
+userId = anonymous
+clientId = null
+timeStamp = 113337849421
+correlationId = null
+replyTo = null
+destination = testqueue at router1
+deliveryMode = 2
+redelivered = false
+deliveryCount = 1
+type = null
+expiration = 0
+priority = 4
+props = null
+readOnly = true
+sourceRouter = null
+destRouter = null
+destQueue = testqueue at router1 text=Here is a message]
+</pre>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,201 +0,0 @@
-!!! SwiftMQ inbound resource adapter for MDB
-
-SwiftMQ provide a JCA 1.5 resource that allows JMS message delivery to an MDB. The attached example ant project shows how to deploy such an EJB3 MDB.
-
-!! AnnotatedTestMDBBean.java
-
-The AnnotatedTestMDBBean.java is the source for the EJB3 MDB. Note the annotations:
-
-{{{
- at MessageDriven(name="test/mdb", activationConfig =
-{
- at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
- at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
- at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
- at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
- at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
- at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
- at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
- at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
- at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
-})
- at ResourceAdapter("swiftmq.rar")
-}}}
-
-These annotations correspond the following deployment descriptors:
-
-NOTE: these properties could equally go in jboss.xml if you want to avoid
-polluting ejb-jar.xml with vendor specific properties.
-
-!! ejb-jar.xml
-
-{{{
-<?xml version="1.0" encoding="UTF-8"?>
-
-<ejb-jar 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/ejb-jar_2_1.xsd"
-         version="2.1">
-
-   <enterprise-beans>
-      <message-driven >
-         <ejb-name>test/mdb</ejb-name>
-         <ejb-class>test.mdb.TestMDBBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
-      <transaction-type>Container</transaction-type>
-      <activation-config>
-        <activation-config-property>
-          <activation-config-property-name>
-            DestinationType
-          </activation-config-property-name>
-          <activation-config-property-value>
-            javax.jms.Queue
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            Destination
-          </activation-config-property-name>
-          <activation-config-property-value>
-            testqueue
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            SubscriptionDurability
-          </activation-config-property-name>
-          <activation-config-property-value>
-            Durable
-          </activation-config-property-value>
-        </activation-config-property>
-        <!--activation-config-property>
-          <activation-config-property-name>
-            ClientId
-          </activation-config-property-name>
-          <activation-config-property-value>
-            Testclient
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            DurableName
-          </activation-config-property-name>
-          <activation-config-property-value>
-            dur1
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            MessageSelector
-          </activation-config-property-name>
-          <activation-config-property-value>
-            msgno between 20 and 30
-          </activation-config-property-value>
-        </activation-config-property-->
-        <activation-config-property>
-          <activation-config-property-name>
-            ConnectionFactoryName
-          </activation-config-property-name>
-          <activation-config-property-value>
-            ConnectionFactory
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            Transacted
-          </activation-config-property-name>
-          <activation-config-property-value>
-            true
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            Xa
-          </activation-config-property-name>
-          <activation-config-property-value>
-            true
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            DeliveryOption
-          </activation-config-property-name>
-          <activation-config-property-value>
-            B
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            MaxPoolSize
-          </activation-config-property-name>
-          <activation-config-property-value>
-            20
-          </activation-config-property-value>
-        </activation-config-property>
-        <activation-config-property>
-          <activation-config-property-name>
-            MaxMessages
-          </activation-config-property-name>
-          <activation-config-property-value>
-            1
-          </activation-config-property-value>
-        </activation-config-property>
-      </activation-config>
-    </message-driven>
-  </enterprise-beans>
-</ejb-jar>
-}}}
-
-!! jboss.xml
-
-Here we define jboss specific stuff. There are two main items:
-* We define we want to use the jca 1.5 message inflow container
-* We tell jboss which rar will provide the inflow
-
-{{{
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS//EN" "http://www.jboss.org/j2ee/dtd/jboss.dtd">
-
-<jboss>
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>test/mdb</ejb-name>
-         <resource-adapter-name>swiftmq.rar</resource-adapter-name>
-      </message-driven>
-   </enterprise-beans>
-</jboss>
-}}}
-
-!! Running the example
-
-* Make sure you have the Swift jmsxaasf swiftlet installed within SwiftMQ
-* Add swiftmq.rar to the deploy directory
-* Change build.properties to point at your JBoss installation
-* Deploy the mdb by typing "ant" to run the deploy target in build.xml
-* Use the swiftmq example {{{SimpleQueueSender}}} to send a message to the queue
-
-You should get some output like the following on the jboss console:
-{{{
-12:47:29,515 INFO  [STDOUT] [TextMessageImpl com.swiftmq.jms.TextMessageImpl at 4065c4
-messageIndex = 5_0
-messageId = ID:/10.10.10.115-11333728494210
-userId = anonymous
-clientId = null
-timeStamp = 1133372849421
-correlationId = null
-replyTo = null
-destination = testqueue at router1
-deliveryMode = 2
-redelivered = false
-deliveryCount = 1
-type = null
-expiration = 0
-priority = 4
-props = null
-readOnly = true
-sourceRouter = null
-destRouter = null
-destQueue = testqueue at router1 text=Here is a message]}}}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jca/inflow/swiftmq/swiftMQ.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,201 @@
+!!! SwiftMQ inbound resource adapter for MDB
+
+SwiftMQ provide a JCA 1.5 resource that allows JMS message delivery to an MDB. The attached example ant project shows how to deploy such an EJB3 MDB.
+
+!! AnnotatedTestMDBBean.java
+
+The AnnotatedTestMDBBean.java is the source for the EJB3 MDB. Note the annotations:
+
+{{{
+ at MessageDriven(name="test/mdb", activationConfig =
+{
+ at ActivationConfigProperty(propertyName="messagingType", propertyValue="javax.jms.MessageListener"),
+ at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ at ActivationConfigProperty(propertyName="Destination", propertyValue="testqueue"),
+ at ActivationConfigProperty(propertyName="ConnectionFactoryName", propertyValue="ConnectionFactory"),
+ at ActivationConfigProperty(propertyName="Transacted", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="Xa", propertyValue="true"),
+ at ActivationConfigProperty(propertyName="DeliveryOption", propertyValue="B"),
+ at ActivationConfigProperty(propertyName="SubscriptionDurability", propertyValue="Durable"),
+ at ActivationConfigProperty(propertyName="MaxPoolSize", propertyValue="20"),
+ at ActivationConfigProperty(propertyName="MaxMessages", propertyValue="1"),
+})
+ at ResourceAdapter("swiftmq.rar")
+}}}
+
+These annotations correspond the following deployment descriptors:
+
+NOTE: these properties could equally go in jboss.xml if you want to avoid
+polluting ejb-jar.xml with vendor specific properties.
+
+!! ejb-jar.xml
+
+{{{
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ejb-jar 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/ejb-jar_2_1.xsd"
+         version="2.1">
+
+   <enterprise-beans>
+      <message-driven >
+         <ejb-name>test/mdb</ejb-name>
+         <ejb-class>test.mdb.TestMDBBean</ejb-class>
+      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <transaction-type>Container</transaction-type>
+      <activation-config>
+        <activation-config-property>
+          <activation-config-property-name>
+            DestinationType
+          </activation-config-property-name>
+          <activation-config-property-value>
+            javax.jms.Queue
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            Destination
+          </activation-config-property-name>
+          <activation-config-property-value>
+            testqueue
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            SubscriptionDurability
+          </activation-config-property-name>
+          <activation-config-property-value>
+            Durable
+          </activation-config-property-value>
+        </activation-config-property>
+        <!--activation-config-property>
+          <activation-config-property-name>
+            ClientId
+          </activation-config-property-name>
+          <activation-config-property-value>
+            Testclient
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            DurableName
+          </activation-config-property-name>
+          <activation-config-property-value>
+            dur1
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            MessageSelector
+          </activation-config-property-name>
+          <activation-config-property-value>
+            msgno between 20 and 30
+          </activation-config-property-value>
+        </activation-config-property-->
+        <activation-config-property>
+          <activation-config-property-name>
+            ConnectionFactoryName
+          </activation-config-property-name>
+          <activation-config-property-value>
+            ConnectionFactory
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            Transacted
+          </activation-config-property-name>
+          <activation-config-property-value>
+            true
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            Xa
+          </activation-config-property-name>
+          <activation-config-property-value>
+            true
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            DeliveryOption
+          </activation-config-property-name>
+          <activation-config-property-value>
+            B
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            MaxPoolSize
+          </activation-config-property-name>
+          <activation-config-property-value>
+            20
+          </activation-config-property-value>
+        </activation-config-property>
+        <activation-config-property>
+          <activation-config-property-name>
+            MaxMessages
+          </activation-config-property-name>
+          <activation-config-property-value>
+            1
+          </activation-config-property-value>
+        </activation-config-property>
+      </activation-config>
+    </message-driven>
+  </enterprise-beans>
+</ejb-jar>
+}}}
+
+!! jboss.xml
+
+Here we define jboss specific stuff. There are two main items:
+* We define we want to use the jca 1.5 message inflow container
+* We tell jboss which rar will provide the inflow
+
+{{{
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS//EN" "http://www.jboss.org/j2ee/dtd/jboss.dtd">
+
+<jboss>
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>test/mdb</ejb-name>
+         <resource-adapter-name>swiftmq.rar</resource-adapter-name>
+      </message-driven>
+   </enterprise-beans>
+</jboss>
+}}}
+
+!! Running the example
+
+* Make sure you have the Swift jmsxaasf swiftlet installed within SwiftMQ
+* Add swiftmq.rar to the deploy directory
+* Change build.properties to point at your JBoss installation
+* Deploy the mdb by typing "ant" to run the deploy target in build.xml
+* Use the swiftmq example {{{SimpleQueueSender}}} to send a message to the queue
+
+You should get some output like the following on the jboss console:
+{{{
+12:47:29,515 INFO  [STDOUT] [TextMessageImpl com.swiftmq.jms.TextMessageImpl at 4065c4
+messageIndex = 5_0
+messageId = ID:/10.10.10.115-11333728494210
+userId = anonymous
+clientId = null
+timeStamp = 1133372849421
+correlationId = null
+replyTo = null
+destination = testqueue at router1
+deliveryMode = 2
+redelivered = false
+deliveryCount = 1
+type = null
+expiration = 0
+priority = 4
+props = null
+readOnly = true
+sourceRouter = null
+destRouter = null
+destQueue = testqueue at router1 text=Here is a message]}}}
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/jndibinding/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/jndibinding/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/joininheritance/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Modified: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/join.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/join.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/join.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -35,7 +35,7 @@
 <pre>
    public List findByWeight(double weight)
    {
-      return manager.createQuery("select p from Pet p where p.weight &lt; :weight").setParameter("weight", weight).getResultList();
+      return manager.createQuery("from Pet p where p.weight &lt; :weight").setParameter("weight", weight).getResultList();
    }
 </pre>
 </p><p>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/joininheritance/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -56,6 +56,6 @@
 
    public List findByWeight(double weight)
    {
-      return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+      return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
    }
 }

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/local.properties
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/local.properties	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/local.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-# The jboss server distribution root directory
-#jboss.home=../../../../build/output/jboss-4.0.4beta
-#jboss.server.config=default
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/docs/tutorial/mdb/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,24 +0,0 @@
-<?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">
-   <description>JBoss Message Driven Bean Tutorial</description>
-   <display-name>JBoss Message Driven Bean Tutorial</display-name>
-   <enterprise-beans>
-      <message-driven>
-	   <ejb-name>ExampleMDB</ejb-name>
-	   <ejb-class>org.jboss.tutorial.mdb_deployment_descriptor.bean.ExampleMDB</ejb-class>
-         <transaction-type>Bean</transaction-type>
-         <message-destination-type>javax.jms.Queue</message-destination-type>
-       <activation-config>   
-          <activation-config-property>
-          	<activation-config-property-name>acknowledgeMode</activation-config-property-name>
-          	<activation-config-property-value>AUTO_ACKNOWLEDGE</activation-config-property-value>
-          </activation-config-property>
-        </activation-config>
-      </message-driven>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,24 @@
+<?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">
+   <description>JBoss Message Driven Bean Tutorial</description>
+   <display-name>JBoss Message Driven Bean Tutorial</display-name>
+   <enterprise-beans>
+      <message-driven>
+	   <ejb-name>ExampleMDB</ejb-name>
+	   <ejb-class>org.jboss.tutorial.mdb_deployment_descriptor.bean.ExampleMDB</ejb-class>
+         <transaction-type>Bean</transaction-type>
+         <message-destination-type>javax.jms.Queue</message-destination-type>
+       <activation-config>   
+          <activation-config-property>
+          	<activation-config-property-name>acknowledgeMode</activation-config-property-name>
+          	<activation-config-property-value>AUTO_ACKNOWLEDGE</activation-config-property-value>
+          </activation-config-property>
+        </activation-config>
+      </message-driven>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>ExampleMDB</ejb-name>
-         <destination-jndi-name>queue/tutorial/example</destination-jndi-name>
-      </message-driven>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>ExampleMDB</ejb-name>
+         <destination-jndi-name>queue/tutorial/example</destination-jndi-name>
+      </message-driven>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-      <copy file="queue-example-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-      <sleep seconds="5"/>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.mdb_deployment_descriptor.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/queue-example-service.xml"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
+      <copy file="queue-example-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+      <sleep seconds="5"/>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.mdb_deployment_descriptor.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/queue-example-service.xml"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Message Drive Beans</h2>
-
-This example shows you how to implement an MDB with EJB 3.0.
-</p><p>
-</p><p>
-You configure properties by using the &lt;message-driven&gt; element and sub elements which correspond to the @ActivationConfigProperty annotation.  All 
-properties that you can set are defined in the <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a> and
-<a href="META-INF/jboss.xml">jboss.xml</a> deployment descriptors. 
-</p><p>
-<a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java?rev=1.1&view=markup">MDBConfig.java</a>
-</p><p>
-Take a look at <a href="src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java">ExampleMDB.java</a>.
-</p><p>
-The <a href="queue-example-service.xml">queue-example-service.xml</a> file defines the queue.  This is the same in regular JBoss.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-</pre>
-</p><p>
-Look in the console window to determine that the message was sent.
-</p><p>
-<pre>
-01:01:20,828 INFO  [STDOUT] ----------------
-01:01:20,828 INFO  [STDOUT] Received message
-01:01:20,828 INFO  [STDOUT] ----------------
-</pre>
-</p><p>
-</p><p>
-</p><p>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+<html>
+<body>
+<p>
+<h2>Message Drive Beans</h2>
+
+This example shows you how to implement an MDB with EJB 3.0.
+</p><p>
+</p><p>
+You configure properties by using the &lt;message-driven&gt; element and sub elements which correspond to the @ActivationConfigProperty annotation.  All 
+properties that you can set are defined in the <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a> and
+<a href="META-INF/jboss.xml">jboss.xml</a> deployment descriptors. 
+</p><p>
+<a href="http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java?rev=1.1&view=markup">MDBConfig.java</a>
+</p><p>
+Take a look at <a href="src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java">ExampleMDB.java</a>.
+</p><p>
+The <a href="queue-example-service.xml">queue-example-service.xml</a> file defines the queue.  This is the same in regular JBoss.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+</pre>
+</p><p>
+Look in the console window to determine that the message was sent.
+</p><p>
+<pre>
+01:01:20,828 INFO  [STDOUT] ----------------
+01:01:20,828 INFO  [STDOUT] Received message
+01:01:20,828 INFO  [STDOUT] ----------------
+</pre>
+</p><p>
+</p><p>
+</p><p>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-!!!Message Drive Beans
-This example shows you how to implement an MDB with EJB 3.0.
-
-
-You configure properties by using the <message-driven> element and sub elements which correspond to the @ActivationConfigProperty annotation.  All 
-properties that you can set are defined in the [ejb-jar.xml|META-INF/ejb-jar.xml] and
-[jboss.xml|META-INF/jboss.xml] deployment descriptors. 
-
-[MDBConfig.java|http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java?rev=1.1&view=markup]
-
-Take a look at [ExampleMDB.java|src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java].
-
-The [queue-example-service.xml|queue-example-service.xml] file defines the queue.  This is the same in regular JBoss.
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-}}}
-
-Look in the console window to determine that the message was sent.
-
-{{{
-01:01:20,828 INFO  [STDOUT] ----------------
-01:01:20,828 INFO  [STDOUT] Received message
-01:01:20,828 INFO  [STDOUT] ----------------
-}}}
-
-
-
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/mdb.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+!!!Message Drive Beans
+This example shows you how to implement an MDB with EJB 3.0.
+
+
+You configure properties by using the <message-driven> element and sub elements which correspond to the @ActivationConfigProperty annotation.  All 
+properties that you can set are defined in the [ejb-jar.xml|META-INF/ejb-jar.xml] and
+[jboss.xml|META-INF/jboss.xml] deployment descriptors. 
+
+[MDBConfig.java|http://cvs.sourceforge.net/viewcvs.py/jboss/jboss-ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java?rev=1.1&view=markup]
+
+Take a look at [ExampleMDB.java|src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java].
+
+The [queue-example-service.xml|queue-example-service.xml] file defines the queue.  This is the same in regular JBoss.
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+}}}
+
+Look in the console window to determine that the message was sent.
+
+{{{
+01:01:20,828 INFO  [STDOUT] ----------------
+01:01:20,828 INFO  [STDOUT] Received message
+01:01:20,828 INFO  [STDOUT] ----------------
+}}}
+
+
+
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=tutorial">
-      <attribute name="JNDIName">queue/tutorial/example</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/queue-example-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=tutorial">
+      <attribute name="JNDIName">queue/tutorial/example</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+
+</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.mdb_deployment_descriptor.bean;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-public class ExampleMDB implements MessageListener
-{
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("----------------");
-      System.out.println("Received message");
-      System.out.println("----------------");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/bean/ExampleMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mdb_deployment_descriptor.bean;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+public class ExampleMDB implements MessageListener
+{
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("----------------");
+      System.out.println("Received message");
+      System.out.println("----------------");
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.mdb_deployment_descriptor.client;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-      InitialContext ctx = new InitialContext();
-      Queue queue = (Queue) ctx.lookup("queue/tutorial/example");
-      QueueConnectionFactory factory = (QueueConnectionFactory) ctx.lookup("ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createSender(queue);
-      sender.send(msg);
-      System.out.println("Message sent successfully to remote queue.");
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/mdb_deployment_descriptor/src/org/jboss/tutorial/mdb_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.mdb_deployment_descriptor.client;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+      InitialContext ctx = new InitialContext();
+      Queue queue = (Queue) ctx.lookup("queue/tutorial/example");
+      QueueConnectionFactory factory = (QueueConnectionFactory) ctx.lookup("ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+      System.out.println("Message sent successfully to remote queue.");
+
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/merge/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/merge/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/merge/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/merge/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/merge/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/merge/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/merge/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/merge/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/merge/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/merge/merge.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/merge/merge.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/merge/merge.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 <pre>
    public List findByLastName(String name)
    {
-      return manager.createQuery("select c from Customer c where c.last = :name").setParameter("name", name).getResultList();
+      return manager.createQuery("from Customer c where c.last = :name").setParameter("name", name).getResultList();
    }
 </pre>
 </p><p>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -49,7 +49,7 @@
 
    public List findByLastName(String name)
    {
-      return manager.createQuery("select c from Customer c where c.last = :name").setParameter("name", name).getResultList();
+      return manager.createQuery("from Customer c where c.last = :name").setParameter("name", name).getResultList();
    }
 
    public void merge(Customer c)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="org/jboss/tutorial/packaging/bean/Session*.class"/>
-         </fileset>
-      </jar>
-      <jar jarfile="build/em1.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="org/jboss/tutorial/packaging/bean/Entity1.class"/>
-         </fileset>
-         <fileset dir="resources/em1">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="build/em2.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="org/jboss/tutorial/packaging/bean/Entity2.class"/>
-         </fileset>
-         <fileset dir="resources/em2">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <zip zipfile="build/tutorial.ear">
-         <zipfileset dir="resources" prefix="META-INF">
-            <include name="application.xml"/>
-         </zipfileset>
-         <zipfileset dir="build">
-            <include name="tutorial.jar"/>
-         </zipfileset>
-         <zipfileset dir="build">
-            <include name="em1.jar"/>
-         </zipfileset>
-         <zipfileset dir="build">
-            <include name="em2.jar"/>
-         </zipfileset>
-      </zip>
-      <copy file="build/tutorial.ear" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <java classname="org.jboss.tutorial.packaging.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.ear"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="org/jboss/tutorial/packaging/bean/Session*.class"/>
+         </fileset>
+      </jar>
+      <jar jarfile="build/em1.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="org/jboss/tutorial/packaging/bean/Entity1.class"/>
+         </fileset>
+         <fileset dir="resources/em1">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+      <jar jarfile="build/em2.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="org/jboss/tutorial/packaging/bean/Entity2.class"/>
+         </fileset>
+         <fileset dir="resources/em2">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+      <zip zipfile="build/tutorial.ear">
+         <zipfileset dir="resources" prefix="META-INF">
+            <include name="application.xml"/>
+         </zipfileset>
+         <zipfileset dir="build">
+            <include name="tutorial.jar"/>
+         </zipfileset>
+         <zipfileset dir="build">
+            <include name="em1.jar"/>
+         </zipfileset>
+         <zipfileset dir="build">
+            <include name="em2.jar"/>
+         </zipfileset>
+      </zip>
+      <copy file="build/tutorial.ear" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <java classname="org.jboss.tutorial.packaging.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.ear"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/packaging.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Entity Packaging and EntityManagerFactory</h2>
-
-This tutorial exposes you to a variety of things:
-<ul>
-<li> persistence.xml files</li>
-<li> EntityManagerFactory</li>
-</ul>
-</p><p>
-The EJB3 specification requires that persistence unit definitions and entity
-classes and mappings are contained within a .jar archive.
-</p><p>
-<h4>persistence.xml</h4>
-
-Each .jar file contains a persistence.xml file.  The persistence.xml file
-defines datasources, the entity manager's name, and additonal vendor specific
-properties.  See the docbook that comes with this distribution for more
-information, but you can see examples of it within
-resources/em1/META-INF/persistence.xml
-</p><p>
-<h4>EntityManagerFactory</h4>
-
-EntityManagerFactory is a service that allows you to manually create and
-managed EntityManager instances.  It is not recommended for you to use this
-feature as you should be letting the application server manage EntityManager
-instances.  EntityManagerFactory's are really for out-of-container
-applications that use EJB persistence.
-</p><p>
-<h4>EntityManager</h4>
-
-For information on looking up EntityManagers from EAR/WAR files, please see the <tt>ear</tt> tutorial.
-</p><p>
-<h4>Ear packaging</h4>
-
-The EJB 3 specification defines a new module type for application.xml
-<pre>
-&lt;application&gt;
-  &lt;module&gt;
-    &lt;persistence&gt;em1.jar&lt;/persistence&gt;
-  &lt;/module&gt;
-</pre>
-</p><p>
-JBoss does not yet support this xml, so in the meantime, put .par files within
-an ejb module. i.e...
-</p><p>
-<pre>
-&lt;module&gt;
-   &lt;ejb&gt;em1.par&lt;/ejb&gt;
-&lt;/module&gt;
-</pre>
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-Buildfile: build.xml
-
-prepare:
-
-compile:
-
-ejbjar:
-
-run:
-     [java] factory: oneFactory
-     [java] manager: oneManager
-     [java] factory: twoFactory
-     [java] manager: twoManager
-</pre>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/packaging.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+<html>
+<body>
+<p>
+<h2>Entity Packaging and EntityManagerFactory</h2>
+
+This tutorial exposes you to a variety of things:
+<ul>
+<li> persistence.xml files</li>
+<li> EntityManagerFactory</li>
+</ul>
+</p><p>
+The EJB3 specification requires that persistence unit definitions and entity
+classes and mappings are contained within a .jar archive.
+</p><p>
+<h4>persistence.xml</h4>
+
+Each .jar file contains a persistence.xml file.  The persistence.xml file
+defines datasources, the entity manager's name, and additonal vendor specific
+properties.  See the docbook that comes with this distribution for more
+information, but you can see examples of it within
+resources/em1/META-INF/persistence.xml
+</p><p>
+<h4>EntityManagerFactory</h4>
+
+EntityManagerFactory is a service that allows you to manually create and
+managed EntityManager instances.  It is not recommended for you to use this
+feature as you should be letting the application server manage EntityManager
+instances.  EntityManagerFactory's are really for out-of-container
+applications that use EJB persistence.
+</p><p>
+<h4>EntityManager</h4>
+
+For information on looking up EntityManagers from EAR/WAR files, please see the <tt>ear</tt> tutorial.
+</p><p>
+<h4>Ear packaging</h4>
+
+The EJB 3 specification defines a new module type for application.xml
+<pre>
+&lt;application&gt;
+  &lt;module&gt;
+    &lt;persistence&gt;em1.jar&lt;/persistence&gt;
+  &lt;/module&gt;
+</pre>
+</p><p>
+JBoss does not yet support this xml, so in the meantime, put .par files within
+an ejb module. i.e...
+</p><p>
+<pre>
+&lt;module&gt;
+   &lt;ejb&gt;em1.par&lt;/ejb&gt;
+&lt;/module&gt;
+</pre>
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+Buildfile: build.xml
+
+prepare:
+
+compile:
+
+ejbjar:
+
+run:
+     [java] factory: oneFactory
+     [java] manager: oneManager
+     [java] factory: twoFactory
+     [java] manager: twoManager
+</pre>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/packaging.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-!!!Entity Packaging and EntityManagerFactory
-This tutorial exposes you to a variety of things:
-* persistence.xml files
-* EntityManagerFactory
-
-The EJB3 specification requires that persistence unit definitions and entity
-classes and mappings are contained within a .jar archive.
-
-!persistence.xml
-Each .jar file contains a persistence.xml file.  The persistence.xml file
-defines datasources, the entity manager's name, and additonal vendor specific
-properties.  See the docbook that comes with this distribution for more
-information, but you can see examples of it within
-resources/em1/META-INF/persistence.xml
-
-!EntityManagerFactory
-EntityManagerFactory is a service that allows you to manually create and
-managed EntityManager instances.  It is not recommended for you to use this
-feature as you should be letting the application server manage EntityManager
-instances.  EntityManagerFactory's are really for out-of-container
-applications that use EJB persistence.
-
-!EntityManager
-For information on looking up EntityManagers from EAR/WAR files, please see the {{ear}} tutorial.
-
-!Ear packaging
-The EJB 3 specification defines a new module type for application.xml
-{{{
-<application>
-  <module>
-    <persistence>em1.jar</persistence>
-  </module>
-}}}
-
-JBoss does not yet support this xml, so in the meantime, put .par files within
-an ejb module. i.e...
-
-{{{
-<module>
-   <ejb>em1.par</ejb>
-</module>
-}}}
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-Buildfile: build.xml
-
-prepare:
-
-compile:
-
-ejbjar:
-
-run:
-     [java] factory: oneFactory
-     [java] manager: oneManager
-     [java] factory: twoFactory
-     [java] manager: twoManager
-}}}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/packaging.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/packaging.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+!!!Entity Packaging and EntityManagerFactory
+This tutorial exposes you to a variety of things:
+* persistence.xml files
+* EntityManagerFactory
+
+The EJB3 specification requires that persistence unit definitions and entity
+classes and mappings are contained within a .jar archive.
+
+!persistence.xml
+Each .jar file contains a persistence.xml file.  The persistence.xml file
+defines datasources, the entity manager's name, and additonal vendor specific
+properties.  See the docbook that comes with this distribution for more
+information, but you can see examples of it within
+resources/em1/META-INF/persistence.xml
+
+!EntityManagerFactory
+EntityManagerFactory is a service that allows you to manually create and
+managed EntityManager instances.  It is not recommended for you to use this
+feature as you should be letting the application server manage EntityManager
+instances.  EntityManagerFactory's are really for out-of-container
+applications that use EJB persistence.
+
+!EntityManager
+For information on looking up EntityManagers from EAR/WAR files, please see the {{ear}} tutorial.
+
+!Ear packaging
+The EJB 3 specification defines a new module type for application.xml
+{{{
+<application>
+  <module>
+    <persistence>em1.jar</persistence>
+  </module>
+}}}
+
+JBoss does not yet support this xml, so in the meantime, put .par files within
+an ejb module. i.e...
+
+{{{
+<module>
+   <ejb>em1.par</ejb>
+</module>
+}}}
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+Buildfile: build.xml
+
+prepare:
+
+compile:
+
+ejbjar:
+
+run:
+     [java] factory: oneFactory
+     [java] manager: oneManager
+     [java] factory: twoFactory
+     [java] manager: twoManager
+}}}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>EJB3 Ear tutorial</display-name>
-
-   <module>
-      <ejb>em1.jar</ejb>
-   </module>
-   <module>
-      <ejb>em2.jar</ejb>
-   </module>
-   <module>
-      <ejb>tutorial.jar</ejb>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>EJB3 Ear tutorial</display-name>
+
+   <module>
+      <ejb>em1.jar</ejb>
+   </module>
+   <module>
+      <ejb>em2.jar</ejb>
+   </module>
+   <module>
+      <ejb>tutorial.jar</ejb>
+   </module>
+</application>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em1)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em1/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager1">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager1">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em2)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em2/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager2">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/resources/em2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager2">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.packaging.bean;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Entity1 implements Serializable
-{
-   private int id;
-   private String string;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getString()
-   {
-      return string;
-   }
-
-   public void setString(String string)
-   {
-      this.string = string;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.packaging.bean;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Entity1 implements Serializable
+{
+   private int id;
+   private String string;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getString()
+   {
+      return string;
+   }
+
+   public void setString(String string)
+   {
+      this.string = string;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.packaging.bean;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Entity2 implements Serializable
-{
-   private int id;
-   private String string;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getString()
-   {
-      return string;
-   }
-
-   public void setString(String string)
-   {
-      this.string = string;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Entity2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.packaging.bean;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Entity2 implements Serializable
+{
+   private int id;
+   private String string;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getString()
+   {
+      return string;
+   }
+
+   public void setString(String string)
+   {
+      this.string = string;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.packaging.bean;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Session1
-{
-   int create1FromManager();
-
-   int create1FromFactory();
-
-   int create2FromManager();
-
-   int create2FromFactory();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.packaging.bean;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Session1
+{
+   int create1FromManager();
+
+   int create1FromFactory();
+
+   int create2FromManager();
+
+   int create2FromFactory();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.packaging.bean;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(Session1.class)
-public class Session1Bean implements Session1
-{
-   @PersistenceContext(unitName="manager1") EntityManager manager1;
-   @PersistenceContext(unitName="manager2") EntityManager manager2;
-   @PersistenceUnit(unitName="manager1") EntityManagerFactory factory1;
-   @PersistenceUnit(unitName="manager2") EntityManagerFactory factory2;
-
-   public int create1FromManager()
-   {
-      Entity1 one = new Entity1();
-      one.setString("oneManager");
-      manager1.persist(one);
-      return one.getId();
-   }
-   public int create1FromFactory()
-   {
-      Entity1 one = new Entity1();
-      one.setString("oneFactory");
-      EntityManager m = factory1.createEntityManager();
-      m.persist(one);
-      System.out.println(one.getId());
-      return one.getId();
-   }
-
-   public int create2FromManager()
-   {
-      Entity2 two = new Entity2();
-      two.setString("twoManager");
-      manager2.persist(two);
-      return two.getId();
-   }
-   public int create2FromFactory()
-   {
-      Entity2 two = new Entity2();
-      two.setString("twoFactory");
-      EntityManager m = factory2.createEntityManager();
-      m.persist(two);
-      return two.getId();
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.packaging.bean;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(Session1.class)
+public class Session1Bean implements Session1
+{
+   @PersistenceContext(unitName="manager1") EntityManager manager1;
+   @PersistenceContext(unitName="manager2") EntityManager manager2;
+   @PersistenceUnit(unitName="manager1") EntityManagerFactory factory1;
+   @PersistenceUnit(unitName="manager2") EntityManagerFactory factory2;
+
+   public int create1FromManager()
+   {
+      Entity1 one = new Entity1();
+      one.setString("oneManager");
+      manager1.persist(one);
+      return one.getId();
+   }
+   public int create1FromFactory()
+   {
+      Entity1 one = new Entity1();
+      one.setString("oneFactory");
+      EntityManager m = factory1.createEntityManager();
+      m.persist(one);
+      System.out.println(one.getId());
+      return one.getId();
+   }
+
+   public int create2FromManager()
+   {
+      Entity2 two = new Entity2();
+      two.setString("twoManager");
+      manager2.persist(two);
+      return two.getId();
+   }
+   public int create2FromFactory()
+   {
+      Entity2 two = new Entity2();
+      two.setString("twoFactory");
+      EntityManager m = factory2.createEntityManager();
+      m.persist(two);
+      return two.getId();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.packaging.bean;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Session2
-{
-   Entity1 find1FromManager(int id);
-
-   Entity1 find1FromFactory(int id);
-
-   Entity2 find2FromManager(int id);
-
-   Entity2 find2FromFactory(int id);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.packaging.bean;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Session2
+{
+   Entity1 find1FromManager(int id);
+
+   Entity1 find1FromFactory(int id);
+
+   Entity2 find2FromManager(int id);
+
+   Entity2 find2FromFactory(int id);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.packaging.bean;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(Session2.class)
-public class Session2Bean implements Session2
-{
-   @PersistenceContext(unitName="manager1") EntityManager manager1;
-   @PersistenceContext(unitName="manager2") EntityManager manager2;
-   @PersistenceUnit(unitName="manager1") EntityManagerFactory factory1;
-   @PersistenceUnit(unitName="manager2") EntityManagerFactory factory2;
-
-   public Entity1 find1FromManager(int id)
-   {
-      return manager1.find(Entity1.class, id);
-   }
-   public Entity1 find1FromFactory(int id)
-   {
-      EntityManager m = factory1.createEntityManager();
-      Entity1 one = m.find(Entity1.class, id);
-      return one;
-   }
-   public Entity2 find2FromManager(int id)
-   {
-      return manager2.find(Entity2.class, id);
-   }
-   public Entity2 find2FromFactory(int id)
-   {
-      EntityManager m = factory2.createEntityManager();
-      Entity2 two = m.find(Entity2.class, id);
-      return two;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/bean/Session2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.packaging.bean;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(Session2.class)
+public class Session2Bean implements Session2
+{
+   @PersistenceContext(unitName="manager1") EntityManager manager1;
+   @PersistenceContext(unitName="manager2") EntityManager manager2;
+   @PersistenceUnit(unitName="manager1") EntityManagerFactory factory1;
+   @PersistenceUnit(unitName="manager2") EntityManagerFactory factory2;
+
+   public Entity1 find1FromManager(int id)
+   {
+      return manager1.find(Entity1.class, id);
+   }
+   public Entity1 find1FromFactory(int id)
+   {
+      EntityManager m = factory1.createEntityManager();
+      Entity1 one = m.find(Entity1.class, id);
+      return one;
+   }
+   public Entity2 find2FromManager(int id)
+   {
+      return manager2.find(Entity2.class, id);
+   }
+   public Entity2 find2FromFactory(int id)
+   {
+      EntityManager m = factory2.createEntityManager();
+      Entity2 two = m.find(Entity2.class, id);
+      return two;
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.packaging.client;
-
-import javax.naming.InitialContext;
-import org.jboss.tutorial.packaging.bean.Session2;
-import org.jboss.tutorial.packaging.bean.Session1;
-import org.jboss.tutorial.packaging.bean.Entity1;
-import org.jboss.tutorial.packaging.bean.Entity2;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class Client
-{
-
-   public static void main(String[] args) throws Exception
-   {
-      Session1 session1 = (Session1) getInitialContext().lookup("tutorial/Session1Bean/remote");
-      Session2 session2 = (Session2) getInitialContext().lookup("tutorial/Session2Bean/remote");
-
-      int oneF = session1.create1FromFactory();
-      int oneM = session1.create1FromManager();
-      int twoF = session1.create2FromFactory();
-      int twoM = session1.create2FromManager();
-
-      Entity1 one = session2.find1FromFactory(oneF);
-      System.out.println("factory: " + one.getString());
-
-      one = session2.find1FromManager(oneM);
-      System.out.println("manager: " + one.getString());
-
-
-      Entity2 two = session2.find2FromFactory(twoF);
-      System.out.println("factory: " + two.getString());
-
-      two = session2.find2FromManager(twoM);
-      System.out.println("manager: " + two.getString());
-   }
-
-   public static InitialContext getInitialContext()  throws Exception
-   {
-      return new InitialContext();
-   }
-
-
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/packaging/src/org/jboss/tutorial/packaging/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.packaging.client;
+
+import javax.naming.InitialContext;
+import org.jboss.tutorial.packaging.bean.Session2;
+import org.jboss.tutorial.packaging.bean.Session1;
+import org.jboss.tutorial.packaging.bean.Entity1;
+import org.jboss.tutorial.packaging.bean.Entity2;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class Client
+{
+
+   public static void main(String[] args) throws Exception
+   {
+      Session1 session1 = (Session1) getInitialContext().lookup("tutorial/Session1Bean/remote");
+      Session2 session2 = (Session2) getInitialContext().lookup("tutorial/Session2Bean/remote");
+
+      int oneF = session1.create1FromFactory();
+      int oneM = session1.create1FromManager();
+      int twoF = session1.create2FromFactory();
+      int twoM = session1.create2FromManager();
+
+      Entity1 one = session2.find1FromFactory(oneF);
+      System.out.println("factory: " + one.getString());
+
+      one = session2.find1FromManager(oneM);
+      System.out.println("manager: " + one.getString());
+
+
+      Entity2 two = session2.find2FromFactory(twoF);
+      System.out.println("factory: " + two.getString());
+
+      two = session2.find2FromManager(twoM);
+      System.out.println("manager: " + two.getString());
+   }
+
+   public static InitialContext getInitialContext()  throws Exception
+   {
+      return new InitialContext();
+   }
+
+
+
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-<?xml version='1.0' ?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" 
-                         "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar>
-	<enterprise-beans>
-		<session>
-        	<ejb-name>ejb/Stateless2</ejb-name>
-         	<home>org.jboss.tutorial.reference21_30.bean.Stateless2Home</home>
-         	<remote>org.jboss.tutorial.reference21_30.bean.Stateless2</remote>
-         	<ejb-class>org.jboss.tutorial.reference21_30.bean.Stateless2Bean</ejb-class>
-         	<session-type>Stateless</session-type>
-         	<transaction-type>Container</transaction-type>
-            <ejb-ref>
-				<ejb-ref-name>ejb/Stateless3</ejb-ref-name>
-				<ejb-ref-type>Session</ejb-ref-type>
-				<home>org.jboss.tutorial.reference21_30.bean.Stateless3Home</home>
-				<remote>org.jboss.tutorial.reference21_30.bean.Stateless3</remote>
-			</ejb-ref> 
-    	</session>
-	</enterprise-beans>
-</ejb-jar>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+<?xml version='1.0' ?>
+<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" 
+                         "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+<ejb-jar>
+	<enterprise-beans>
+		<session>
+        	<ejb-name>ejb/Stateless2</ejb-name>
+         	<home>org.jboss.tutorial.reference21_30.bean.Stateless2Home</home>
+         	<remote>org.jboss.tutorial.reference21_30.bean.Stateless2</remote>
+         	<ejb-class>org.jboss.tutorial.reference21_30.bean.Stateless2Bean</ejb-class>
+         	<session-type>Stateless</session-type>
+         	<transaction-type>Container</transaction-type>
+            <ejb-ref>
+				<ejb-ref-name>ejb/Stateless3</ejb-ref-name>
+				<ejb-ref-type>Session</ejb-ref-type>
+				<home>org.jboss.tutorial.reference21_30.bean.Stateless3Home</home>
+				<remote>org.jboss.tutorial.reference21_30.bean.Stateless3</remote>
+			</ejb-ref> 
+    	</session>
+	</enterprise-beans>
+</ejb-jar>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version='1.0' ?>
-<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">
-	<enterprise-beans>
-		<session>
-			<ejb-name>Stateless3</ejb-name>
-			<ejb-ref>
-				<ejb-ref-name>ejb/Stateless2</ejb-ref-name>
-				<ejb-ref-type>Session</ejb-ref-type>
-			</ejb-ref>            
-		</session>
-	</enterprise-beans>
-</ejb-jar>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/ejb-jar3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version='1.0' ?>
+<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">
+	<enterprise-beans>
+		<session>
+			<ejb-name>Stateless3</ejb-name>
+			<ejb-ref>
+				<ejb-ref-name>ejb/Stateless2</ejb-ref-name>
+				<ejb-ref-type>Session</ejb-ref-type>
+			</ejb-ref>            
+		</session>
+	</enterprise-beans>
+</ejb-jar>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss>
-   <enterprise-beans>
-      <session>
-         <ejb-name>ejb/Stateless2</ejb-name>
-         <jndi-name>Stateless2</jndi-name>
-         <ejb-ref>
-				<ejb-ref-name>ejb/Stateless3</ejb-ref-name>
-				<jndi-name>Stateless3</jndi-name>
-			</ejb-ref>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss>
+   <enterprise-beans>
+      <session>
+         <ejb-name>ejb/Stateless2</ejb-name>
+         <jndi-name>Stateless2</jndi-name>
+         <ejb-ref>
+				<ejb-ref-name>ejb/Stateless3</ejb-ref-name>
+				<jndi-name>Stateless3</jndi-name>
+			</ejb-ref>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-	<enterprise-beans>
-		<session>
-			<ejb-name>Stateless3</ejb-name>
-			<ejb-ref>
-				<ejb-ref-name>ejb/Stateless2</ejb-ref-name>
-				<jndi-name>Stateless2</jndi-name>
-			</ejb-ref>
-		</session>
-	</enterprise-beans>
-</jboss>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/META-INF/jboss3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+	<enterprise-beans>
+		<session>
+			<ejb-name>Stateless3</ejb-name>
+			<ejb-ref>
+				<ejb-ref-name>ejb/Stateless2</ejb-ref-name>
+				<jndi-name>Stateless2</jndi-name>
+			</ejb-ref>
+		</session>
+	</enterprise-beans>
+</jboss>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>  
-   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <copy file="META-INF/ejb-jar2.xml" tofile="META-INF/ejb-jar.xml"/>
-   	  <copy file="META-INF/jboss2.xml" tofile="META-INF/jboss.xml"/>
-      <jar jarfile="build/tutorial21.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/Stateless2*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-      <delete file="META-INF/ejb-jar.xml"/>
-      <delete file="META-INF/jboss.xml"/>
-      <copy file="build/tutorial21.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-      
-      <sleep seconds="30"/>
-      
-   	  <copy file="META-INF/ejb-jar3.xml" tofile="META-INF/ejb-jar.xml"/>
-   	  <copy file="META-INF/jboss3.xml" tofile="META-INF/jboss.xml"/>
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/Stateless3*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-      <delete file="META-INF/ejb-jar.xml"/>
-      <delete file="META-INF/jboss.xml"/>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.reference21_30.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial21.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>  
+   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <copy file="META-INF/ejb-jar2.xml" tofile="META-INF/ejb-jar.xml"/>
+   	  <copy file="META-INF/jboss2.xml" tofile="META-INF/jboss.xml"/>
+      <jar jarfile="build/tutorial21.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/Stateless2*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/ejb-jar.xml"/>
+            <include name="META-INF/jboss.xml"/>
+         </fileset>
+      </jar>
+      <delete file="META-INF/ejb-jar.xml"/>
+      <delete file="META-INF/jboss.xml"/>
+      <copy file="build/tutorial21.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+      
+      <sleep seconds="30"/>
+      
+   	  <copy file="META-INF/ejb-jar3.xml" tofile="META-INF/ejb-jar.xml"/>
+   	  <copy file="META-INF/jboss3.xml" tofile="META-INF/jboss.xml"/>
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/Stateless3*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/ejb-jar.xml"/>
+            <include name="META-INF/jboss.xml"/>
+         </fileset>
+      </jar>
+      <delete file="META-INF/ejb-jar.xml"/>
+      <delete file="META-INF/jboss.xml"/>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.reference21_30.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial21.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/reference21_30.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-<html>
-<body>
-<p>
-<h2>EJB 2.1/3.0 References</h2>
-
-3.0 EJBs may reference 2.x EJBs and vice versa. This tutorial demonstrates mechanisms for such references. To start, take a look at the 3.0 SLSB 
-<a href="src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java">Stateless3Bean.java</a>, the 2.x SLSB 
-<a href="src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java">Stateless2Bean.java</a> and the deployment descriptors for the 2.x SLSB 
-<a href="META-INF/ejb-jar2.xml">ejb-jar2.xml</a> and <a href="META-INF/jboss2.xml">jboss2.xml</a>.
-</p><p>
-<h3>EJB3.0 Reference to EJB2.x</h3>
-
-Two mechanisms for referencing 2.x EJBs from a 3.0 EJB are demonstrated. The first mechanism uses annotations exclusively. Note the <tt>@EJBs</tt> annotation. The 
-<tt>name</tt> parameter specifies the binding for the 2.x EJB in the local JNDI environment. The <tt>mapped-name</tt> parameter specifies the global JNDI binding of 
-the 2.1 EJB. Note the JNDI lookup in the <tt>testAccess()</tt> method which uses the local binding of the 2.x EJB.
-</p><p>
-The second mechanism demonstrates injection and the use of EJB3.0 deployment descriptors to augment the annotations. Take a look at 
-<a href="META-INF/ejb-jar3.xml">ejb-jar3.xml</a>. The <tt>ejb-ref</tt> establishes the <tt>ejb/Stateless2</tt> reference. Now take a look at <a href="META-INF/jboss3.xml">jboss3.xml</a>. The
-<tt>ejb-ref</tt> sets the <tt>jndi-name</tt> for the reference. This reference is used to inject the 2.x EJB using the <tt>@EJB(name="ejb/Stateless2")</tt> annotation.
-</p><p>
-<h3>EJB2.x Reference to EJB3.0</h3>
-
-Take another look at <a href="META-INF/ejb-jar2.xml">ejb-jar2.xml</a>. The <tt>ejb-ref</tt> element references the 3.0 EJB with the <tt>ejb/Stateless3</tt> name. Take another
-look at <a href="META-INF/jboss2.xml">jboss2.xml</a>. The <tt>Stateless3</tt> global JNDI binding is set in the reference. This reference is used in the 2.x EJB to lookup
-the 3.0 EJB in the local JNDI environment.
-</p><p>
-Note the differences in the root path of the local JNDI environment between EJB3.0 and EJB2.x.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual
-on how to install EJB 3.0. Start JBoss prior to running the tutorial. Building the tutorial will deploy two JAR files, one for the 3.0 EJB and one for the
-2.x EJB.
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-run:
-     [java] Testing EJB3.0 references to EJB2.x
-     [java] Testing EJB2.x references to EJB3.0
-     [java] Succeeded
-</pre>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/reference21_30.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+<html>
+<body>
+<p>
+<h2>EJB 2.1/3.0 References</h2>
+
+3.0 EJBs may reference 2.x EJBs and vice versa. This tutorial demonstrates mechanisms for such references. To start, take a look at the 3.0 SLSB 
+<a href="src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java">Stateless3Bean.java</a>, the 2.x SLSB 
+<a href="src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java">Stateless2Bean.java</a> and the deployment descriptors for the 2.x SLSB 
+<a href="META-INF/ejb-jar2.xml">ejb-jar2.xml</a> and <a href="META-INF/jboss2.xml">jboss2.xml</a>.
+</p><p>
+<h3>EJB3.0 Reference to EJB2.x</h3>
+
+Two mechanisms for referencing 2.x EJBs from a 3.0 EJB are demonstrated. The first mechanism uses annotations exclusively. Note the <tt>@EJBs</tt> annotation. The 
+<tt>name</tt> parameter specifies the binding for the 2.x EJB in the local JNDI environment. The <tt>mapped-name</tt> parameter specifies the global JNDI binding of 
+the 2.1 EJB. Note the JNDI lookup in the <tt>testAccess()</tt> method which uses the local binding of the 2.x EJB.
+</p><p>
+The second mechanism demonstrates injection and the use of EJB3.0 deployment descriptors to augment the annotations. Take a look at 
+<a href="META-INF/ejb-jar3.xml">ejb-jar3.xml</a>. The <tt>ejb-ref</tt> establishes the <tt>ejb/Stateless2</tt> reference. Now take a look at <a href="META-INF/jboss3.xml">jboss3.xml</a>. The
+<tt>ejb-ref</tt> sets the <tt>jndi-name</tt> for the reference. This reference is used to inject the 2.x EJB using the <tt>@EJB(name="ejb/Stateless2")</tt> annotation.
+</p><p>
+<h3>EJB2.x Reference to EJB3.0</h3>
+
+Take another look at <a href="META-INF/ejb-jar2.xml">ejb-jar2.xml</a>. The <tt>ejb-ref</tt> element references the 3.0 EJB with the <tt>ejb/Stateless3</tt> name. Take another
+look at <a href="META-INF/jboss2.xml">jboss2.xml</a>. The <tt>Stateless3</tt> global JNDI binding is set in the reference. This reference is used in the 2.x EJB to lookup
+the 3.0 EJB in the local JNDI environment.
+</p><p>
+Note the differences in the root path of the local JNDI environment between EJB3.0 and EJB2.x.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual
+on how to install EJB 3.0. Start JBoss prior to running the tutorial. Building the tutorial will deploy two JAR files, one for the 3.0 EJB and one for the
+2.x EJB.
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+run:
+     [java] Testing EJB3.0 references to EJB2.x
+     [java] Testing EJB2.x references to EJB3.0
+     [java] Succeeded
+</pre>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/reference21_30.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-!!!EJB 2.1/3.0 References
-3.0 EJBs may reference 2.x EJBs and vice versa. This tutorial demonstrates mechanisms for such references. To start, take a look at the 3.0 SLSB 
-[Stateless3Bean.java|src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java], the 2.x SLSB 
-[Stateless2Bean.java|src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java] and the deployment descriptors for the 2.x SLSB 
-[ejb-jar2.xml|META-INF/ejb-jar2.xml] and [jboss2.xml|META-INF/jboss2.xml].
-
-!!EJB3.0 Reference to EJB2.x
-Two mechanisms for referencing 2.x EJBs from a 3.0 EJB are demonstrated. The first mechanism uses annotations exclusively. Note the {{@EJBs}} annotation. The 
-{{name}} parameter specifies the binding for the 2.x EJB in the local JNDI environment. The {{mapped-name}} parameter specifies the global JNDI binding of 
-the 2.1 EJB. Note the JNDI lookup in the {{testAccess()}} method which uses the local binding of the 2.x EJB.
-
-The second mechanism demonstrates injection and the use of EJB3.0 deployment descriptors to augment the annotations. Take a look at 
-[ejb-jar3.xml|META-INF/ejb-jar3.xml]. The {{ejb-ref}} establishes the {{ejb/Stateless2}} reference. Now take a look at [jboss3.xml|META-INF/jboss3.xml]. The
-{{ejb-ref}} sets the {{jndi-name}} for the reference. This reference is used to inject the 2.x EJB using the {{@EJB(name="ejb/Stateless2")}} annotation.
-
-!!EJB2.x Reference to EJB3.0
-Take another look at [ejb-jar2.xml|META-INF/ejb-jar2.xml]. The {{ejb-ref}} element references the 3.0 EJB with the {{ejb/Stateless3}} name. Take another
-look at [jboss2.xml|META-INF/jboss2.xml]. The {{Stateless3}} global JNDI binding is set in the reference. This reference is used in the 2.x EJB to lookup
-the 3.0 EJB in the local JNDI environment.
-
-Note the differences in the root path of the local JNDI environment between EJB3.0 and EJB2.x.
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual
-on how to install EJB 3.0. Start JBoss prior to running the tutorial. Building the tutorial will deploy two JAR files, one for the 3.0 EJB and one for the
-2.x EJB.
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-run:
-     [java] Testing EJB3.0 references to EJB2.x
-     [java] Testing EJB2.x references to EJB3.0
-     [java] Succeeded
-}}}
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/reference21_30.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/reference21_30.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+!!!EJB 2.1/3.0 References
+3.0 EJBs may reference 2.x EJBs and vice versa. This tutorial demonstrates mechanisms for such references. To start, take a look at the 3.0 SLSB 
+[Stateless3Bean.java|src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java], the 2.x SLSB 
+[Stateless2Bean.java|src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java] and the deployment descriptors for the 2.x SLSB 
+[ejb-jar2.xml|META-INF/ejb-jar2.xml] and [jboss2.xml|META-INF/jboss2.xml].
+
+!!EJB3.0 Reference to EJB2.x
+Two mechanisms for referencing 2.x EJBs from a 3.0 EJB are demonstrated. The first mechanism uses annotations exclusively. Note the {{@EJBs}} annotation. The 
+{{name}} parameter specifies the binding for the 2.x EJB in the local JNDI environment. The {{mapped-name}} parameter specifies the global JNDI binding of 
+the 2.1 EJB. Note the JNDI lookup in the {{testAccess()}} method which uses the local binding of the 2.x EJB.
+
+The second mechanism demonstrates injection and the use of EJB3.0 deployment descriptors to augment the annotations. Take a look at 
+[ejb-jar3.xml|META-INF/ejb-jar3.xml]. The {{ejb-ref}} establishes the {{ejb/Stateless2}} reference. Now take a look at [jboss3.xml|META-INF/jboss3.xml]. The
+{{ejb-ref}} sets the {{jndi-name}} for the reference. This reference is used to inject the 2.x EJB using the {{@EJB(name="ejb/Stateless2")}} annotation.
+
+!!EJB2.x Reference to EJB3.0
+Take another look at [ejb-jar2.xml|META-INF/ejb-jar2.xml]. The {{ejb-ref}} element references the 3.0 EJB with the {{ejb/Stateless3}} name. Take another
+look at [jboss2.xml|META-INF/jboss2.xml]. The {{Stateless3}} global JNDI binding is set in the reference. This reference is used in the 2.x EJB to lookup
+the 3.0 EJB in the local JNDI environment.
+
+Note the differences in the root path of the local JNDI environment between EJB3.0 and EJB2.x.
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual
+on how to install EJB 3.0. Start JBoss prior to running the tutorial. Building the tutorial will deploy two JAR files, one for the 3.0 EJB and one for the
+2.x EJB.
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+run:
+     [java] Testing EJB3.0 references to EJB2.x
+     [java] Testing EJB2.x references to EJB3.0
+     [java] Succeeded
+}}}
+

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.reference21_30.bean;
-
-import java.rmi.RemoteException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface Stateless2
-   extends javax.ejb.EJBObject
-{
-   void testAccess() throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.reference21_30.bean;
+
+import java.rmi.RemoteException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface Stateless2
+   extends javax.ejb.EJBObject
+{
+   void testAccess() throws RemoteException;
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.reference21_30.bean;
-
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Stateless2Bean
-implements javax.ejb.SessionBean
-{
-   private static final Logger log = Logger.getLogger(Stateless2Bean.class);
-    
-   public void testAccess()
-   {
-      try
-      {
-         InitialContext jndiContext = new InitialContext();
-         Stateless3 session = (Stateless3)jndiContext.lookup("java:comp/env/ejb/Stateless3");
-         session.testAccess();
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-   
-   public void ejbCreate()
-   {
-    
-   }
-   
-   public void ejbActivate()
-   {
-   
-   }
-   
-   public void ejbPassivate()
-   {
-      
-   }
-   
-   public void ejbRemove()
-   {
-      
-   }
-   
-   public void setSessionContext(SessionContext context)
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.reference21_30.bean;
+
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Stateless2Bean
+implements javax.ejb.SessionBean
+{
+   private static final Logger log = Logger.getLogger(Stateless2Bean.class);
+    
+   public void testAccess()
+   {
+      try
+      {
+         InitialContext jndiContext = new InitialContext();
+         Stateless3 session = (Stateless3)jndiContext.lookup("java:comp/env/ejb/Stateless3");
+         session.testAccess();
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+   
+   public void ejbCreate()
+   {
+    
+   }
+   
+   public void ejbActivate()
+   {
+   
+   }
+   
+   public void ejbPassivate()
+   {
+      
+   }
+   
+   public void ejbRemove()
+   {
+      
+   }
+   
+   public void setSessionContext(SessionContext context)
+   {
+      
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.reference21_30.bean;
-
-import javax.ejb.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Stateless2Home extends EJBHome {
-    
-  public Stateless2 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless2Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.reference21_30.bean;
+
+import javax.ejb.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Stateless2Home extends EJBHome {
+    
+  public Stateless2 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+} 
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.reference21_30.bean;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface Stateless3
-{
-   void testAccess() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.reference21_30.bean;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface Stateless3
+{
+   void testAccess() throws Exception;
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.reference21_30.bean;
-
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless(name="Stateless3")
- at Remote(Stateless3.class)
- at RemoteBinding(jndiBinding="Stateless3")
- at RemoteHome(Stateless3Home.class)
- at EJBs({@EJB(name="injected/Stateless2",  mappedName="Stateless2")})
-public class Stateless3Bean
-   implements Stateless3
-{
-   private static final Logger log = Logger.getLogger(Stateless3Bean.class);
-   
-   @EJB(name="ejb/Stateless2")
-   private Stateless2Home stateless2Home=null;
-    
-   public void testAccess() throws Exception
-   {
-      Stateless2 test2 = stateless2Home.create();
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Stateless2Home home = (Stateless2Home)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/injected/Stateless2");
-         test2 = home.create();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.reference21_30.bean;
+
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.Container;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless(name="Stateless3")
+ at Remote(Stateless3.class)
+ at RemoteBinding(jndiBinding="Stateless3")
+ at RemoteHome(Stateless3Home.class)
+ at EJBs({@EJB(name="injected/Stateless2",  mappedName="Stateless2")})
+public class Stateless3Bean
+   implements Stateless3
+{
+   private static final Logger log = Logger.getLogger(Stateless3Bean.class);
+   
+   @EJB(name="ejb/Stateless2")
+   private Stateless2Home stateless2Home=null;
+    
+   public void testAccess() throws Exception
+   {
+      Stateless2 test2 = stateless2Home.create();
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Stateless2Home home = (Stateless2Home)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/injected/Stateless2");
+         test2 = home.create();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.tutorial.reference21_30.bean;
-
-import javax.ejb.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Stateless3Home extends EJBHome {
-    
-  public Stateless3 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/bean/Stateless3Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.reference21_30.bean;
+
+import javax.ejb.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Stateless3Home extends EJBHome {
+    
+  public Stateless3 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+} 
+

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.reference21_30.client;
-
-import org.jboss.tutorial.reference21_30.bean.Stateless2;
-import org.jboss.tutorial.reference21_30.bean.Stateless2Home;
-import org.jboss.tutorial.reference21_30.bean.Stateless3;
-
-
-import javax.naming.InitialContext;
-
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      accessReferences();
-   }
-   
-   public static void accessReferences() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      System.out.println("Testing EJB3.0 references to EJB2.x");
-      Stateless3 test3 = (Stateless3)jndiContext.lookup("Stateless3");
-      test3.testAccess();
-      
-      System.out.println("Testing EJB2.x references to EJB3.0");
-      Stateless2Home home = (Stateless2Home)jndiContext.lookup("Stateless2");
-      Stateless2 test2 = home.create();
-      test2.testAccess();
-      
-      System.out.println("Succeeded");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/reference21_30/src/org/jboss/tutorial/reference21_30/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.reference21_30.client;
+
+import org.jboss.tutorial.reference21_30.bean.Stateless2;
+import org.jboss.tutorial.reference21_30.bean.Stateless2Home;
+import org.jboss.tutorial.reference21_30.bean.Stateless3;
+
+
+import javax.naming.InitialContext;
+
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      accessReferences();
+   }
+   
+   public static void accessReferences() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      System.out.println("Testing EJB3.0 references to EJB2.x");
+      Stateless3 test3 = (Stateless3)jndiContext.lookup("Stateless3");
+      test3.testAccess();
+      
+      System.out.println("Testing EJB2.x references to EJB3.0");
+      Stateless2Home home = (Stateless2Home)jndiContext.lookup("Stateless2");
+      Stateless2 test2 = home.create();
+      test2.testAccess();
+      
+      System.out.println("Succeeded");
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/relationships/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/relationships/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/relationships/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/relationships/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/relationships/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/relationships/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/relationships/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/relationships/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/relationships/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/secondary/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/secondary/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/secondary/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/secondary/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/secondary/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/secondary/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/secondary/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/secondary/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/secondary/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -50,7 +50,7 @@
 
    public List findByLastName(String name)
    {
-      return manager.createQuery("select c from Customer c where c.last = :name").setParameter("name", name).getResultList();
+      return manager.createQuery("from Customer c where c.last = :name").setParameter("name", name).getResultList();
    }
 
    public void merge(Customer c)

Modified: branches/Branch_4_2/ejb3/docs/tutorial/security/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/security/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/security/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/security/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/security/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/service/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.ejb3.test.service.Tester" name="jboss.ejb3:service=Tester,test=service"/>
-
-</server>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.ejb3.test.service.Tester" name="jboss.ejb3:service=Tester,test=service"/>
+
+</server>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <service>
-	     <ejb-name>ServiceOne</ejb-name>
-         <ejb-class>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOne</ejb-class>
-         <local>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneLocal</local>
-         <remote>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneRemote</remote>
-         <management>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneManagement</management>
-         <jndi-name>serviceOne/remote</jndi-name>
-         <local-jndi-name>serviceOne/local</local-jndi-name>
-      </service>
-      <service>
-		 <ejb-name>ServiceTwo</ejb-name>
-         <ejb-class>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceTwo</ejb-class>
-	     <object-name>tutorial:service=serviceTwo</object-name>
-         <management>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceTwoManagement</management>
-      </service>
-      <service>
-		 <ejb-name>ServiceThree</ejb-name>
-         <ejb-class>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceThree</ejb-class>
-         <management>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceThreeManagement</management>
-      </service>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <service>
+	     <ejb-name>ServiceOne</ejb-name>
+         <ejb-class>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOne</ejb-class>
+         <local>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneLocal</local>
+         <remote>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneRemote</remote>
+         <management>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneManagement</management>
+         <jndi-name>serviceOne/remote</jndi-name>
+         <local-jndi-name>serviceOne/local</local-jndi-name>
+      </service>
+      <service>
+		 <ejb-name>ServiceTwo</ejb-name>
+         <ejb-class>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceTwo</ejb-class>
+	     <object-name>tutorial:service=serviceTwo</object-name>
+         <management>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceTwoManagement</management>
+      </service>
+      <service>
+		 <ejb-name>ServiceThree</ejb-name>
+         <ejb-class>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceThree</ejb-class>
+         <management>org.jboss.tutorial.service_deployment_descriptor.bean.ServiceThreeManagement</management>
+      </service>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <java classname="org.jboss.tutorial.service_deployment_descriptor.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <java classname="org.jboss.tutorial.service_deployment_descriptor.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/service.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,86 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Service POJOS via the deployment descriptor</h2>
-
-</p><p>
-Service POJOs allow you to define POJOs as JBoss services. The way you define them is very similar to how you define
-<a href="../stateless_deployment_descriptor/stateless.html">stateless</a> or <a href="../stateful_deployment_descriptor/stateful.html">stateful</a> session beans.
-One very important difference is that there will only ever be ONE instance of the service bean. i.e. it is not pooled - the bean instance is a singleton. The
-singleton bean contains shared state, so data set by one client is accessible by other clients.
-</p><p>
-<h3>Example simple ServicePOJO</h3>
-
-</p><p>
-Take a look at <a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java">ServiceOne.java</a> and the corresponding deployment
-descriptor <a href="META-INF/jboss.xml">jboss.xml</a>. The <tt>service</tt> tag defines it as a singleton service in JBoss. It implements
-<a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java">ServiceOneRemote</a> and
-<a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java">ServiceOneLocal</a>
-just as you would do for a normal stateful/stateless bean using the <tt>remote</tt> and <tt>local</tt> tags. 
-</p><p>
-ServiceOne also implements <a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java">ServiceOneManagement.java</a> identified
-through the <tt>management</tt> tag. JBoss will inspect this interface, and create and install an MBean implementing the attributes and operations defined in
-the interface. The MBean will work on the same singleton bean instance as the remote and local interfaces.
-</p><p>
-The default ObjectName used for a service bean is 
-</p><p>
-   <tt>jboss.j2ee:jar=&lt;jar file name&gt;service=EJB3,name=&lt;Name of @Service bean&gt;,type=&lt;Interface&gt;</tt>
-</p><p>
-So in our case it will be
-   <tt>jboss.j2ee:jar-tutorial.jar,service=EJB3,name=ServiceOne,type=ManagementInterface</tt>
-</p><p>
-Note that the default ObjectName can be overriden as is the case with <a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java">ServiceTwo.java</a>
-through the <tt>object-name</tt> tag.
-</p><p>
-<h3>Building</h3>
-
-To build and run the example, make sure you have ejb3.deployer installed in JBoss 4.0.x and have JBoss running. See the reference manual on how to install EJB 3.0.
-</p><p>
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-</pre>
-</p><p>
-In the JBoss console you should see output similar to this when the .jar archive is deployed
-<pre>
-16:52:30,326 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceOne
-16:52:30,387 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceThree
-16:52:30,397 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceTwo
-16:52:30,427 INFO  [ProxyDeployer] no declared remote bindings
-16:52:30,437 INFO  [ProxyDeployer] there is remote interfaces
-16:52:30,437 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.service.bean.ServiceOneRemote
-16:52:35,113 INFO  [STDOUT] ServiceOne - Creating
-16:52:35,113 INFO  [STDOUT] ServiceOne - Starting
-16:52:35,244 INFO  [ProxyDeployer] no declared remote bindings
-16:52:35,945 INFO  [STDOUT] ServiceTwo - Starting
-16:52:35,965 INFO  [ProxyDeployer] no declared remote bindings
-16:52:36,585 INFO  [STDOUT] ServiceThree - Starting
-16:52:36,585 INFO  [EJB3Deployer] Deployed: file:/C:/cygwin/home/Kab/cvs/jboss-head/build/output/jboss-5.0.0alpha/server/all/deploy/tutorial.jar
-</pre>
-</p><p>
-ServiceOne starts before ServiceTwo which starts before ServiceThree, due to the dependencies we set up earlier.
-</p><p>
-Then to run the example
-<pre>
-$ ant run
-Buildfile: build.xml
-
-run:
-     [java] attribute value for singleton obtained via JMX is what we set via remote i/f: 100
-     [java] Hello from service One
-     [java] Hello from service Two
-
-</pre>
-</p><p>
-The JBoss console should show the following output
-<pre>
-17:05:07,796 INFO  [STDOUT] ServiceThree - Interceptor
-17:05:07,796 INFO  [STDOUT] ServiceThree - Calling ServiceOne.sayHello() via JMX server
-17:05:07,806 INFO  [STDOUT] ServiceThree - Interceptor
-17:05:07,806 INFO  [STDOUT] ServiceThree - Calling ServiceTwo.sayHello() via MBean proxy
-</pre>
-Notice that the calls to the ServiceThree methods get intercepted.
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/service.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,86 @@
+<html>
+<body>
+<p>
+<h2>Service POJOS via the deployment descriptor</h2>
+
+</p><p>
+Service POJOs allow you to define POJOs as JBoss services. The way you define them is very similar to how you define
+<a href="../stateless_deployment_descriptor/stateless.html">stateless</a> or <a href="../stateful_deployment_descriptor/stateful.html">stateful</a> session beans.
+One very important difference is that there will only ever be ONE instance of the service bean. i.e. it is not pooled - the bean instance is a singleton. The
+singleton bean contains shared state, so data set by one client is accessible by other clients.
+</p><p>
+<h3>Example simple ServicePOJO</h3>
+
+</p><p>
+Take a look at <a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java">ServiceOne.java</a> and the corresponding deployment
+descriptor <a href="META-INF/jboss.xml">jboss.xml</a>. The <tt>service</tt> tag defines it as a singleton service in JBoss. It implements
+<a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java">ServiceOneRemote</a> and
+<a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java">ServiceOneLocal</a>
+just as you would do for a normal stateful/stateless bean using the <tt>remote</tt> and <tt>local</tt> tags. 
+</p><p>
+ServiceOne also implements <a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java">ServiceOneManagement.java</a> identified
+through the <tt>management</tt> tag. JBoss will inspect this interface, and create and install an MBean implementing the attributes and operations defined in
+the interface. The MBean will work on the same singleton bean instance as the remote and local interfaces.
+</p><p>
+The default ObjectName used for a service bean is 
+</p><p>
+   <tt>jboss.j2ee:jar=&lt;jar file name&gt;service=EJB3,name=&lt;Name of @Service bean&gt;,type=&lt;Interface&gt;</tt>
+</p><p>
+So in our case it will be
+   <tt>jboss.j2ee:jar-tutorial.jar,service=EJB3,name=ServiceOne,type=ManagementInterface</tt>
+</p><p>
+Note that the default ObjectName can be overriden as is the case with <a href="src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java">ServiceTwo.java</a>
+through the <tt>object-name</tt> tag.
+</p><p>
+<h3>Building</h3>
+
+To build and run the example, make sure you have ejb3.deployer installed in JBoss 4.0.x and have JBoss running. See the reference manual on how to install EJB 3.0.
+</p><p>
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+</pre>
+</p><p>
+In the JBoss console you should see output similar to this when the .jar archive is deployed
+<pre>
+16:52:30,326 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceOne
+16:52:30,387 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceThree
+16:52:30,397 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceTwo
+16:52:30,427 INFO  [ProxyDeployer] no declared remote bindings
+16:52:30,437 INFO  [ProxyDeployer] there is remote interfaces
+16:52:30,437 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.service.bean.ServiceOneRemote
+16:52:35,113 INFO  [STDOUT] ServiceOne - Creating
+16:52:35,113 INFO  [STDOUT] ServiceOne - Starting
+16:52:35,244 INFO  [ProxyDeployer] no declared remote bindings
+16:52:35,945 INFO  [STDOUT] ServiceTwo - Starting
+16:52:35,965 INFO  [ProxyDeployer] no declared remote bindings
+16:52:36,585 INFO  [STDOUT] ServiceThree - Starting
+16:52:36,585 INFO  [EJB3Deployer] Deployed: file:/C:/cygwin/home/Kab/cvs/jboss-head/build/output/jboss-5.0.0alpha/server/all/deploy/tutorial.jar
+</pre>
+</p><p>
+ServiceOne starts before ServiceTwo which starts before ServiceThree, due to the dependencies we set up earlier.
+</p><p>
+Then to run the example
+<pre>
+$ ant run
+Buildfile: build.xml
+
+run:
+     [java] attribute value for singleton obtained via JMX is what we set via remote i/f: 100
+     [java] Hello from service One
+     [java] Hello from service Two
+
+</pre>
+</p><p>
+The JBoss console should show the following output
+<pre>
+17:05:07,796 INFO  [STDOUT] ServiceThree - Interceptor
+17:05:07,796 INFO  [STDOUT] ServiceThree - Calling ServiceOne.sayHello() via JMX server
+17:05:07,806 INFO  [STDOUT] ServiceThree - Interceptor
+17:05:07,806 INFO  [STDOUT] ServiceThree - Calling ServiceTwo.sayHello() via MBean proxy
+</pre>
+Notice that the calls to the ServiceThree methods get intercepted.
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,77 +0,0 @@
-!!!Service POJOS via the deployment descriptor
-
-Service POJOs allow you to define POJOs as JBoss services. The way you define them is very similar to how you define
-[stateless|../stateless_deployment_descriptor/stateless.html] or [stateful|../stateful_deployment_descriptor/stateful.html] session beans.
-One very important difference is that there will only ever be ONE instance of the service bean. i.e. it is not pooled - the bean instance is a singleton. The
-singleton bean contains shared state, so data set by one client is accessible by other clients.
-
-!!Example simple ServicePOJO
-
-Take a look at [ServiceOne.java|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java] and the corresponding deployment
-descriptor [jboss.xml|META-INF/jboss.xml]. The {{service}} tag defines it as a singleton service in JBoss. It implements
-[ServiceOneRemote|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java] and
-[ServiceOneLocal|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java]
-just as you would do for a normal stateful/stateless bean using the {{remote}} and {{local}} tags. 
-
-ServiceOne also implements [ServiceOneManagement.java|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java] identified
-through the {{management}} tag. JBoss will inspect this interface, and create and install an MBean implementing the attributes and operations defined in
-the interface. The MBean will work on the same singleton bean instance as the remote and local interfaces.
-
-The default ObjectName used for a service bean is 
-
-   {{jboss.j2ee:jar=<jar file name>service=EJB3,name=<Name of @Service bean>,type=<Interface>}}
-
-So in our case it will be
-   {{jboss.j2ee:jar-tutorial.jar,service=EJB3,name=ServiceOne,type=ManagementInterface}}
-
-Note that the default ObjectName can be overriden as is the case with [ServiceTwo.java|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java]
-through the {{object-name}} tag.
-
-!!Building
-To build and run the example, make sure you have ejb3.deployer installed in JBoss 4.0.x and have JBoss running. See the reference manual on how to install EJB 3.0.
-
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-}}}
-
-In the JBoss console you should see output similar to this when the .jar archive is deployed
-{{{
-16:52:30,326 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceOne
-16:52:30,387 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceThree
-16:52:30,397 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceTwo
-16:52:30,427 INFO  [ProxyDeployer] no declared remote bindings
-16:52:30,437 INFO  [ProxyDeployer] there is remote interfaces
-16:52:30,437 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.service.bean.ServiceOneRemote
-16:52:35,113 INFO  [STDOUT] ServiceOne - Creating
-16:52:35,113 INFO  [STDOUT] ServiceOne - Starting
-16:52:35,244 INFO  [ProxyDeployer] no declared remote bindings
-16:52:35,945 INFO  [STDOUT] ServiceTwo - Starting
-16:52:35,965 INFO  [ProxyDeployer] no declared remote bindings
-16:52:36,585 INFO  [STDOUT] ServiceThree - Starting
-16:52:36,585 INFO  [EJB3Deployer] Deployed: file:/C:/cygwin/home/Kab/cvs/jboss-head/build/output/jboss-5.0.0alpha/server/all/deploy/tutorial.jar
-}}}
-
-ServiceOne starts before ServiceTwo which starts before ServiceThree, due to the dependencies we set up earlier.
-
-Then to run the example
-{{{
-$ ant run
-Buildfile: build.xml
-
-run:
-     [java] attribute value for singleton obtained via JMX is what we set via remote i/f: 100
-     [java] Hello from service One
-     [java] Hello from service Two
-
-}}}
-
-The JBoss console should show the following output
-{{{
-17:05:07,796 INFO  [STDOUT] ServiceThree - Interceptor
-17:05:07,796 INFO  [STDOUT] ServiceThree - Calling ServiceOne.sayHello() via JMX server
-17:05:07,806 INFO  [STDOUT] ServiceThree - Interceptor
-17:05:07,806 INFO  [STDOUT] ServiceThree - Calling ServiceTwo.sayHello() via MBean proxy
-}}}
-Notice that the calls to the ServiceThree methods get intercepted.

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/service.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,77 @@
+!!!Service POJOS via the deployment descriptor
+
+Service POJOs allow you to define POJOs as JBoss services. The way you define them is very similar to how you define
+[stateless|../stateless_deployment_descriptor/stateless.html] or [stateful|../stateful_deployment_descriptor/stateful.html] session beans.
+One very important difference is that there will only ever be ONE instance of the service bean. i.e. it is not pooled - the bean instance is a singleton. The
+singleton bean contains shared state, so data set by one client is accessible by other clients.
+
+!!Example simple ServicePOJO
+
+Take a look at [ServiceOne.java|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java] and the corresponding deployment
+descriptor [jboss.xml|META-INF/jboss.xml]. The {{service}} tag defines it as a singleton service in JBoss. It implements
+[ServiceOneRemote|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java] and
+[ServiceOneLocal|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java]
+just as you would do for a normal stateful/stateless bean using the {{remote}} and {{local}} tags. 
+
+ServiceOne also implements [ServiceOneManagement.java|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java] identified
+through the {{management}} tag. JBoss will inspect this interface, and create and install an MBean implementing the attributes and operations defined in
+the interface. The MBean will work on the same singleton bean instance as the remote and local interfaces.
+
+The default ObjectName used for a service bean is 
+
+   {{jboss.j2ee:jar=<jar file name>service=EJB3,name=<Name of @Service bean>,type=<Interface>}}
+
+So in our case it will be
+   {{jboss.j2ee:jar-tutorial.jar,service=EJB3,name=ServiceOne,type=ManagementInterface}}
+
+Note that the default ObjectName can be overriden as is the case with [ServiceTwo.java|src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java]
+through the {{object-name}} tag.
+
+!!Building
+To build and run the example, make sure you have ejb3.deployer installed in JBoss 4.0.x and have JBoss running. See the reference manual on how to install EJB 3.0.
+
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+}}}
+
+In the JBoss console you should see output similar to this when the .jar archive is deployed
+{{{
+16:52:30,326 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceOne
+16:52:30,387 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceThree
+16:52:30,397 INFO  [Ejb3Module] found EJB3 service bean: org.jboss.tutorial.service.bean.ServiceTwo
+16:52:30,427 INFO  [ProxyDeployer] no declared remote bindings
+16:52:30,437 INFO  [ProxyDeployer] there is remote interfaces
+16:52:30,437 INFO  [ProxyDeployer] default remote binding has jndiName of org.jboss.tutorial.service.bean.ServiceOneRemote
+16:52:35,113 INFO  [STDOUT] ServiceOne - Creating
+16:52:35,113 INFO  [STDOUT] ServiceOne - Starting
+16:52:35,244 INFO  [ProxyDeployer] no declared remote bindings
+16:52:35,945 INFO  [STDOUT] ServiceTwo - Starting
+16:52:35,965 INFO  [ProxyDeployer] no declared remote bindings
+16:52:36,585 INFO  [STDOUT] ServiceThree - Starting
+16:52:36,585 INFO  [EJB3Deployer] Deployed: file:/C:/cygwin/home/Kab/cvs/jboss-head/build/output/jboss-5.0.0alpha/server/all/deploy/tutorial.jar
+}}}
+
+ServiceOne starts before ServiceTwo which starts before ServiceThree, due to the dependencies we set up earlier.
+
+Then to run the example
+{{{
+$ ant run
+Buildfile: build.xml
+
+run:
+     [java] attribute value for singleton obtained via JMX is what we set via remote i/f: 100
+     [java] Hello from service One
+     [java] Hello from service Two
+
+}}}
+
+The JBoss console should show the following output
+{{{
+17:05:07,796 INFO  [STDOUT] ServiceThree - Interceptor
+17:05:07,796 INFO  [STDOUT] ServiceThree - Calling ServiceOne.sayHello() via JMX server
+17:05:07,806 INFO  [STDOUT] ServiceThree - Interceptor
+17:05:07,806 INFO  [STDOUT] ServiceThree - Calling ServiceTwo.sayHello() via MBean proxy
+}}}
+Notice that the calls to the ServiceThree methods get intercepted.

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ejb.Management;
-
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class ServiceOne implements ServiceOneLocal, ServiceOneRemote, ServiceOneManagement
-{
-   int attribute;
-
-   public void setAttribute(int attribute)
-   {
-      this.attribute = attribute;
-   }
-
-   public int getAttribute()
-   {
-      return this.attribute;
-   }
-
-   public String sayHello()
-   {
-      return "Hello from service One";
-   }
-
-   // Lifecycle methods
-   public void create() throws Exception
-   {
-      System.out.println("ServiceOne - Creating");
-   }
-
-   public void start() throws Exception
-   {
-      System.out.println("ServiceOne - Starting");
-   }
-
-   public void stop()
-   {
-      System.out.println("ServiceOne - Stopping");
-   }
-
-   public void destroy()
-   {
-      System.out.println("ServiceOne - Destroying");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOne.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.annotation.ejb.Management;
+
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ServiceOne implements ServiceOneLocal, ServiceOneRemote, ServiceOneManagement
+{
+   int attribute;
+
+   public void setAttribute(int attribute)
+   {
+      this.attribute = attribute;
+   }
+
+   public int getAttribute()
+   {
+      return this.attribute;
+   }
+
+   public String sayHello()
+   {
+      return "Hello from service One";
+   }
+
+   // Lifecycle methods
+   public void create() throws Exception
+   {
+      System.out.println("ServiceOne - Creating");
+   }
+
+   public void start() throws Exception
+   {
+      System.out.println("ServiceOne - Starting");
+   }
+
+   public void stop()
+   {
+      System.out.println("ServiceOne - Stopping");
+   }
+
+   public void destroy()
+   {
+      System.out.println("ServiceOne - Destroying");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface ServiceOneLocal
-{
-   public void setAttribute(int attribute);
-   public int getAttribute();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface ServiceOneLocal
+{
+   public void setAttribute(int attribute);
+   public int getAttribute();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface ServiceOneManagement
-{
-   void setAttribute(int attribute);
-   int getAttribute();
-   String sayHello();
-
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface ServiceOneManagement
+{
+   void setAttribute(int attribute);
+   int getAttribute();
+   String sayHello();
+
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface ServiceOneRemote
-{
-   public void setAttribute(int attribute);
-   public int getAttribute();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceOneRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface ServiceOneRemote
+{
+   public void setAttribute(int attribute);
+   public int getAttribute();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-import org.jboss.annotation.ejb.Depends;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.management.ObjectName;
-import javax.management.MBeanServerFactory;
-import javax.management.MBeanServer;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class ServiceThree implements ServiceThreeManagement
-{
-   @Depends ("jboss.j2ee:jar=tutorial.jar,name=ServiceOne,service=EJB3,type=ManagementInterface")
-   public ObjectName serviceOneName;
-   private ServiceTwoManagement service2;
-
-   @Depends ("tutorial:service=serviceTwo")
-   public void setServiceTwo(ServiceTwoManagement service2)
-   {
-      this.service2 = service2;
-   }
-
-   public String serviceOneHello()throws Exception
-   {
-      Object[] args = new Object[0];
-      String[] signature = new String[0];
-      System.out.println("ServiceThree - Calling ServiceOne.sayHello() via JMX server");
-      MBeanServer server = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
-      return (String)server.invoke(serviceOneName, "sayHello", args, signature);
-   }
-
-   public String serviceTwoHello()
-   {
-      System.out.println("ServiceThree - Calling ServiceTwo.sayHello() via MBean proxy");
-      return service2.sayHello();
-   }
-
-   // Interceptors
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("ServiceThree - Interceptor");
-      return ctx.proceed();
-   }
-
-   // Lifecycle methods
-   public void start() throws Exception
-   {
-      System.out.println("ServiceThree - Starting");
-   }
-
-   public void stop()
-   {
-      System.out.println("ServiceThree - Stopping");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThree.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+import org.jboss.annotation.ejb.Depends;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.management.ObjectName;
+import javax.management.MBeanServerFactory;
+import javax.management.MBeanServer;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ServiceThree implements ServiceThreeManagement
+{
+   @Depends ("jboss.j2ee:jar=tutorial.jar,name=ServiceOne,service=EJB3,type=ManagementInterface")
+   public ObjectName serviceOneName;
+   private ServiceTwoManagement service2;
+
+   @Depends ("tutorial:service=serviceTwo")
+   public void setServiceTwo(ServiceTwoManagement service2)
+   {
+      this.service2 = service2;
+   }
+
+   public String serviceOneHello()throws Exception
+   {
+      Object[] args = new Object[0];
+      String[] signature = new String[0];
+      System.out.println("ServiceThree - Calling ServiceOne.sayHello() via JMX server");
+      MBeanServer server = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
+      return (String)server.invoke(serviceOneName, "sayHello", args, signature);
+   }
+
+   public String serviceTwoHello()
+   {
+      System.out.println("ServiceThree - Calling ServiceTwo.sayHello() via MBean proxy");
+      return service2.sayHello();
+   }
+
+   // Interceptors
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("ServiceThree - Interceptor");
+      return ctx.proceed();
+   }
+
+   // Lifecycle methods
+   public void start() throws Exception
+   {
+      System.out.println("ServiceThree - Starting");
+   }
+
+   public void stop()
+   {
+      System.out.println("ServiceThree - Stopping");
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface ServiceThreeManagement
-{
-   String serviceOneHello()throws Exception;
-   String serviceTwoHello();
-
-   void start() throws Exception;
-   void stop();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface ServiceThreeManagement
+{
+   String serviceOneHello()throws Exception;
+   String serviceTwoHello();
+
+   void start() throws Exception;
+   void stop();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Depends("jboss.j2ee:jar=tutorial.jar,name=ServiceOne,service=EJB3")
-public class ServiceTwo implements ServiceTwoManagement
-{
-   public String sayHello()
-   {
-      return "Hello from service Two";
-   }
-
-   // Lifecycle methods
-   public void start() throws Exception
-   {
-      System.out.println("ServiceTwo - Starting");
-   }
-
-   public void stop()
-   {
-      System.out.println("ServiceTwo - Stopping");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+import org.jboss.annotation.ejb.Service;
+import org.jboss.annotation.ejb.Depends;
+import org.jboss.annotation.ejb.Management;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Depends("jboss.j2ee:jar=tutorial.jar,name=ServiceOne,service=EJB3")
+public class ServiceTwo implements ServiceTwoManagement
+{
+   public String sayHello()
+   {
+      return "Hello from service Two";
+   }
+
+   // Lifecycle methods
+   public void start() throws Exception
+   {
+      System.out.println("ServiceTwo - Starting");
+   }
+
+   public void stop()
+   {
+      System.out.println("ServiceTwo - Stopping");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.bean;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface ServiceTwoManagement
-{
-   String sayHello();
-   void start() throws Exception;
-   void stop() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceTwoManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.bean;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface ServiceTwoManagement
+{
+   String sayHello();
+   void start() throws Exception;
+   void stop() throws Exception;
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.service_deployment_descriptor.client;
-
-import org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneRemote;
-import org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOne;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-
-import javax.naming.InitialContext;
-import javax.management.ObjectName;
-
-
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      try {
-      InitialContext ctx = new InitialContext();
-      //Get hold of the MBean server invoker
-      RMIAdaptor server = (RMIAdaptor)ctx.lookup("jmx/invoker/RMIAdaptor");
-
-      //Set attribute on singleton ServiceOne via remote interface
-      ServiceOneRemote serviceOne = (ServiceOneRemote) ctx.lookup("serviceOne/remote");
-      serviceOne.setAttribute(100);
-
-      //Create object name for ServiceOne
-      ObjectName service1 = new ObjectName("jboss.j2ee:jar=tutorial.jar,service=EJB3,name=ServiceOne,type=ManagementInterface");
-      //Get attribute of singleton ServiceOne via JMX
-      int attr1 = (Integer)server.getAttribute(service1, "Attribute");
-      System.out.println("attribute value for singleton obtained via JMX is what we set via remote i/f: " + attr1);
-
-      //Create object name for ServiceThree
-      ObjectName service3 = new ObjectName("jboss.j2ee:jar=tutorial.jar,service=EJB3,name=ServiceThree,type=ManagementInterface");
-      //Call serviceOneHello() and serviceTwoHello() on ServiceThree
-      Object[] noArgs = new Object[0];//No arguments
-      String[] noSig = new String[0];//No parameters in signature
-
-      String service1Hello = (String)server.invoke(service3, "serviceOneHello", noArgs, noSig);
-      System.out.println(service1Hello);
-      String service2Hello = (String)server.invoke(service3, "serviceTwoHello", noArgs, noSig);
-      System.out.println(service2Hello);
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.service_deployment_descriptor.client;
+
+import org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOneRemote;
+import org.jboss.tutorial.service_deployment_descriptor.bean.ServiceOne;
+import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+
+import javax.naming.InitialContext;
+import javax.management.ObjectName;
+
+
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      try {
+      InitialContext ctx = new InitialContext();
+      //Get hold of the MBean server invoker
+      RMIAdaptor server = (RMIAdaptor)ctx.lookup("jmx/invoker/RMIAdaptor");
+
+      //Set attribute on singleton ServiceOne via remote interface
+      ServiceOneRemote serviceOne = (ServiceOneRemote) ctx.lookup("serviceOne/remote");
+      serviceOne.setAttribute(100);
+
+      //Create object name for ServiceOne
+      ObjectName service1 = new ObjectName("jboss.j2ee:jar=tutorial.jar,service=EJB3,name=ServiceOne,type=ManagementInterface");
+      //Get attribute of singleton ServiceOne via JMX
+      int attr1 = (Integer)server.getAttribute(service1, "Attribute");
+      System.out.println("attribute value for singleton obtained via JMX is what we set via remote i/f: " + attr1);
+
+      //Create object name for ServiceThree
+      ObjectName service3 = new ObjectName("jboss.j2ee:jar=tutorial.jar,service=EJB3,name=ServiceThree,type=ManagementInterface");
+      //Call serviceOneHello() and serviceTwoHello() on ServiceThree
+      Object[] noArgs = new Object[0];//No arguments
+      String[] noSig = new String[0];//No parameters in signature
+
+      String service1Hello = (String)server.invoke(service3, "serviceOneHello", noArgs, noSig);
+      System.out.println(service1Hello);
+      String service2Hello = (String)server.invoke(service3, "serviceTwoHello", noArgs, noSig);
+      System.out.println(service2Hello);
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/singleinheritance/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/singleinheritance/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/single.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/single.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/single.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -39,7 +39,7 @@
 <pre>
    public List findByWeight(double weight)
    {
-      return manager.createQuery("select p from Pet p where p.weight &lt; :weight").setParameter("weight", weight).getResultList();
+      return manager.createQuery("from Pet p where p.weight &lt; :weight").setParameter("weight", weight).getResultList();
    }
 </pre>
 </p><p>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -54,6 +54,6 @@
 
    public List findByWeight(double weight)
    {
-      return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+      return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
    }
 }

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl)


Property changes on: branches/Branch_4_2/ejb3/docs/tutorial/ssl
___________________________________________________________________
Name: svn:ignore
   + build


Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property file="../local.properties"/>  <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   
-   <property name="jboss.server.config" value="default"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-      <!-- So that we can get jndi.properties for InitialContext -->
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <!--include name="ssl-service.xml"/-->
-            <!--include name="localhost.keystore"/-->
-            <include name="*.properties"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <java classname="org.jboss.tutorial.ssl.client.Client" fork="yes" dir=".">
-         <jvmarg line="-Djavax.net.ssl.trustStore=${jboss.home}/server/${jboss.server.config}/conf/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property file="../local.properties"/>  <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   
+   <property name="jboss.server.config" value="default"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+      <!-- So that we can get jndi.properties for InitialContext -->
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <!--include name="ssl-service.xml"/-->
+            <!--include name="localhost.keystore"/-->
+            <include name="*.properties"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <java classname="org.jboss.tutorial.ssl.client.Client" fork="yes" dir=".">
+         <jvmarg line="-Djavax.net.ssl.trustStore=${jboss.home}/server/${jboss.server.config}/conf/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.keystore
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.keystore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/localhost.keystore)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.truststore
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/localhost.truststore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/localhost.truststore)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-kabir=student

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+kabir=student

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.ssl.bean;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface Calculator
-{
-   int add(int x, int y);
-
-   int subtract(int x, int y);
-
-   int divide(int x, int y);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.ssl.bean;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface Calculator
+{
+   int add(int x, int y);
+
+   int subtract(int x, int y);
+
+   int divide(int x, int y);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.ssl.bean;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.ejb.RemoteBinding;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-
- at Stateless
- at RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843")
- at SecurityDomain("other")
-public class CalculatorBean implements Calculator
-{
-   @PermitAll
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public int add(int x, int y)
-   {
-      return x + y;
-   }
-
-   @RolesAllowed({"student"})
-   public int subtract(int x, int y)
-   {
-      return x - y;
-   }
-
-   @RolesAllowed({"teacher"})
-   public int divide(int x, int y)
-   {
-      return x / y;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.ssl.bean;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.annotation.ejb.RemoteBinding;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+
+ at Stateless
+ at RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843")
+ at SecurityDomain("other")
+public class CalculatorBean implements Calculator
+{
+   @PermitAll
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public int add(int x, int y)
+   {
+      return x + y;
+   }
+
+   @RolesAllowed({"student"})
+   public int subtract(int x, int y)
+   {
+      return x - y;
+   }
+
+   @RolesAllowed({"teacher"})
+   public int divide(int x, int y)
+   {
+      return x / y;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,80 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.ssl.client;
-
-import org.jboss.tutorial.ssl.bean.Calculator;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.ejb.EJBAccessException;
-import java.util.Properties;
-
-/**
- * @version $Revision$
- */
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      // Establish the proxy with an incorrect security identity
-      Properties env = new Properties();
-      env.setProperty(Context.SECURITY_PRINCIPAL, "kabir");
-      env.setProperty(Context.SECURITY_CREDENTIALS, "invalidpassword");
-      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
-      InitialContext ctx = new InitialContext(env);
-      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
-
-      System.out.println("Kabir is a student.");
-      System.out.println("Kabir types in the wrong password");
-      try
-      {
-         System.out.println("1 + 1 = " + calculator.add(1, 1));
-      }
-      catch (EJBAccessException ex)
-      {
-         System.out.println("Saw expected SecurityException: " + ex.getMessage());
-      }
-
-      System.out.println("Kabir types in correct password.");
-      System.out.println("Kabir does unchecked addition.");
-
-      // Re-establish the proxy with the correct security identity
-      env.setProperty(Context.SECURITY_CREDENTIALS, "validpassword");
-      ctx = new InitialContext(env);
-      calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
-
-      System.out.println("1 + 1 = " + calculator.add(1, 1));
-
-      System.out.println("Kabir is not a teacher so he cannot do division");
-      try
-      {
-         calculator.divide(16, 4);
-      }
-      catch (EJBAccessException  ex)
-      {
-         System.out.println(ex.getMessage());
-      }
-
-      System.out.println("Students are allowed to do subtraction");
-      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/src/org/jboss/tutorial/ssl/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.ssl.client;
+
+import org.jboss.tutorial.ssl.bean.Calculator;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.ejb.EJBAccessException;
+import java.util.Properties;
+
+/**
+ * @version $Revision$
+ */
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      // Establish the proxy with an incorrect security identity
+      Properties env = new Properties();
+      env.setProperty(Context.SECURITY_PRINCIPAL, "kabir");
+      env.setProperty(Context.SECURITY_CREDENTIALS, "invalidpassword");
+      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      InitialContext ctx = new InitialContext(env);
+      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
+
+      System.out.println("Kabir is a student.");
+      System.out.println("Kabir types in the wrong password");
+      try
+      {
+         System.out.println("1 + 1 = " + calculator.add(1, 1));
+      }
+      catch (EJBAccessException ex)
+      {
+         System.out.println("Saw expected SecurityException: " + ex.getMessage());
+      }
+
+      System.out.println("Kabir types in correct password.");
+      System.out.println("Kabir does unchecked addition.");
+
+      // Re-establish the proxy with the correct security identity
+      env.setProperty(Context.SECURITY_CREDENTIALS, "validpassword");
+      ctx = new InitialContext(env);
+      calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
+
+      System.out.println("1 + 1 = " + calculator.add(1, 1));
+
+      System.out.println("Kabir is not a teacher so he cannot do division");
+      try
+      {
+         calculator.divide(16, 4);
+      }
+      catch (EJBAccessException  ex)
+      {
+         System.out.println(ex.getMessage());
+      }
+
+      System.out.println("Students are allowed to do subtraction");
+      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/ssl-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-   <!-- The server socket factory mbean to be used as attribute to socket invoker -->
-   <!-- which uses the JaasSecurityDomain -->
-   <mbean code="org.jboss.remoting.security.domain.DomainServerSocketFactoryService"
-      name="jboss.remoting:service=ServerSocketFactory,type=SecurityDomainAdvanced"
-      display-name="SecurityDomain Server Socket Factory">
-       <attribute name="SecurityDomain">java:/jaas/SSLAdvanced</attribute>
-      <depends>jboss.security:service=JaasSecurityDomain,domain=SSLAdvanced</depends>
-   </mbean>
-   
-     <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
-         name="jboss.security:service=JaasSecurityDomain,domain=SSLAdvanced">
-     <!-- This must correlate with the java:/jaas/SSL above -->
-     <constructor>
-        <arg type="java.lang.String" value="SSLAdvanced"/>
-     </constructor>
-     <!-- The location of the keystore
-          resource: loads from the classloaders conf/ is the first classloader -->
-     <attribute name="KeyStoreURL">localhost.keystore</attribute>
-     <attribute name="KeyStorePass">opensource</attribute>
-  </mbean>
-
-   <!-- The Connector is the core component of the remoting server service. -->
-   <!-- It binds the remoting invoker (transport protocol, callback configuration, -->
-   <!-- data marshalling, etc.) with the invocation handlers.  -->
-   <mbean code="org.jboss.remoting.transport.Connector"
-          xmbean-dd="org/jboss/remoting/transport/Connector.xml"
-          name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
-          display-name="Socket transport Connector">
-
-      <attribute name="Configuration">
-         <config>
-             <invoker transport="sslsocket">
-               <attribute name="dataType" isParam="true">invocation</attribute>
-               <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
-               <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
-               <!-- The following is for setting the server socket factory.  If want ssl support -->
-               <!-- use a server socket factory that supports ssl.  The only requirement is that -->
-               <!-- the server socket factory value must be an ObjectName, meaning the -->
-               <!-- server socket factory implementation must be a MBean and also -->
-               <!-- MUST implement the org.jboss.remoting.security.ServerSocketFactoryMBean interface. -->
-               <attribute name="serverSocketFactory">jboss.remoting:service=ServerSocketFactory,type=SecurityDomainAdvanced</attribute>
-               <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
-               <attribute name="serverBindPort">3843</attribute>
-            </invoker>
-            <handlers>
-            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
-            </handlers>
-         </config>
-      </attribute>
-      <depends>jboss.remoting:service=ServerSocketFactory,type=SecurityDomainAdvanced</depends>
-      <depends>jboss.aop:service=AspectDeployer</depends>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/ssl-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+   <!-- The server socket factory mbean to be used as attribute to socket invoker -->
+   <!-- which uses the JaasSecurityDomain -->
+   <mbean code="org.jboss.remoting.security.domain.DomainServerSocketFactoryService"
+      name="jboss.remoting:service=ServerSocketFactory,type=SecurityDomainAdvanced"
+      display-name="SecurityDomain Server Socket Factory">
+       <attribute name="SecurityDomain">java:/jaas/SSLAdvanced</attribute>
+      <depends>jboss.security:service=JaasSecurityDomain,domain=SSLAdvanced</depends>
+   </mbean>
+   
+     <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
+         name="jboss.security:service=JaasSecurityDomain,domain=SSLAdvanced">
+     <!-- This must correlate with the java:/jaas/SSL above -->
+     <constructor>
+        <arg type="java.lang.String" value="SSLAdvanced"/>
+     </constructor>
+     <!-- The location of the keystore
+          resource: loads from the classloaders conf/ is the first classloader -->
+     <attribute name="KeyStoreURL">localhost.keystore</attribute>
+     <attribute name="KeyStorePass">opensource</attribute>
+  </mbean>
+
+   <!-- The Connector is the core component of the remoting server service. -->
+   <!-- It binds the remoting invoker (transport protocol, callback configuration, -->
+   <!-- data marshalling, etc.) with the invocation handlers.  -->
+   <mbean code="org.jboss.remoting.transport.Connector"
+          xmbean-dd="org/jboss/remoting/transport/Connector.xml"
+          name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
+          display-name="Socket transport Connector">
+
+      <attribute name="Configuration">
+         <config>
+             <invoker transport="sslsocket">
+               <attribute name="dataType" isParam="true">invocation</attribute>
+               <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+               <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+               <!-- The following is for setting the server socket factory.  If want ssl support -->
+               <!-- use a server socket factory that supports ssl.  The only requirement is that -->
+               <!-- the server socket factory value must be an ObjectName, meaning the -->
+               <!-- server socket factory implementation must be a MBean and also -->
+               <!-- MUST implement the org.jboss.remoting.security.ServerSocketFactoryMBean interface. -->
+               <attribute name="serverSocketFactory">jboss.remoting:service=ServerSocketFactory,type=SecurityDomainAdvanced</attribute>
+               <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+               <attribute name="serverBindPort">3843</attribute>
+            </invoker>
+            <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+            </handlers>
+         </config>
+      </attribute>
+      <depends>jboss.remoting:service=ServerSocketFactory,type=SecurityDomainAdvanced</depends>
+      <depends>jboss.aop:service=AspectDeployer</depends>
+   </mbean>
+
+</server>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/ssl.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,115 +0,0 @@
-<html>
-<head>
-<title>EJB3 SSL Tutorial</title>
-</head>
-<body>
-<p>
-<h2>Invoking EJBs through SSL</h2>
-
-This tutorial shows you how to invoke remote EJBs through a SSL connection.
-</p><p>
-Setting up SSL for use in EJB3 involves creating a keystore and making sure the correct transport is available in the EJB3 configuration.
-After which you only have to use the RemoteBinding annotation with a clientBindUrl to make sure the bean is called through SSL.
-</p><p>
-This tutorial assumes you've setup JBoss 4.0.4.GA with EJB3 support. Make sure the enviroment variable JBOSS_HOME refers to the
-installation directory.
-<br/><i>TODO: simple SSL remoting doesn't work in 4.0.4.GA, only advanced.</i>
-</p><p>
-<h4>Creating a keystore</h4>
-For SSL to work we need to create a public/private key pair, which will be stored in a keystore. Generate this using the <tt class="literal">genkey</tt> command that comes with the JDK.
-<pre class="programlisting">
-   $ cd $JBOSS_HOME/server/default/conf/
-   $ keytool -genkey -alias ejb3-ssl -keypass opensource -keystore localhost.keystore
-   Enter keystore password:  opensource
-   What is your first and last name?
-     [Unknown]:
-   What is the name of your organizational unit?
-     [Unknown]:
-   What is the name of your organization?
-     [Unknown]:
-   What is the name of your City or Locality?
-     [Unknown]:
-   What is the name of your State or Province?
-     [Unknown]:
-   What is the two-letter country code for this unit?
-     [Unknown]:
-   Is CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown correct?
-     [no]:  yes
-</pre>
-</p><p>
-Since we have not signed our certificate through any certification authoritiy, we also need to create a truststore for the client, 
-explicitly saying that we trust the certificate we just created. The first step is to export the certificate using the JDK keytool:
-<pre class="programlisting">
-   $ keytool -export -alias ejb3-ssl -file mycert.cer -keystore localhost.keystore
-   Enter keystore password:  opensource
-   Certificate stored in file &lt;mycert.cer&gt;
-
-</pre>
-</p><p>
-Then we need to create the truststore if it does not exist and import the certificate into the trueststore:
-<pre class="programlisting">
-   $ keytool -import -alias ejb3-ssl -file mycert.cer -keystore localhost.truststore
-   Enter keystore password:  opensource
-   Owner: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
-   Issuer: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
-   Serial number: 43bff927
-   Valid from: Sat Jan 07 18:23:51 CET 2006 until: Fri Apr 07 19:23:51 CEST 2006
-   Certificate fingerprints:
-            MD5:  CF:DC:71:A8:F4:EA:8F:5A:E9:94:E3:E6:5B:A9:C8:F3
-            SHA1: 0E:AD:F3:D6:41:5E:F6:84:9A:D1:54:3D:DE:A9:B2:01:28:F6:7C:26
-   Trust this certificate? [no]:  yes
-   Certificate was added to keystore 
-</pre>
-</p><p>
-<h4>Setting up the transport</h4>
-To setup the transport open $JBOSS_HOME/server/default/deploy/ejb3.deployer/META-INF/jboss-service.xml in your favorite text editor.
-Add the following mbean to it:
-<pre>
-   &lt;mbean code="org.jboss.remoting.transport.Connector"
-      name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3"&gt;
-      &lt;depends&gt;jboss.aop:service=AspectDeployer&lt;/depends&gt;
-      &lt;attribute name="InvokerLocator"&gt;sslsocket://0.0.0.0:3843&lt;/attribute&gt;
-      &lt;attribute name="Configuration"&gt;
-         &lt;handlers&gt;
-            &lt;handler subsystem="AOP"&gt;org.jboss.aspects.remoting.AOPRemotingInvocationHandler&lt;/handler&gt;
-         &lt;/handlers&gt;
-      &lt;/attribute&gt;
-   &lt;/mbean&gt;
-</pre>
-</p><p>
-<h4>Starting JBoss</h4>
-We need to tell JBoss Remoting where to find the keystore to be used for SSl and its password. This is done using the
-<tt class="literal">javax.net.ssl.keyStore</tt> and <tt class="literal">javax.net.ssl.keyStorePassword=opensource</tt> system properties when starting JBoss, as the
-following example shows:
-<pre class="programlisting">
-    $ cd $JBOSS_HOME/bin
-    $ ./run.sh -Djavax.net.ssl.keyStore=../server/default/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource
-</pre>
-</p><p>
-<h4>Creating your beans</h4>
-Create your EJBs as usual and add the following annotation to bind it to the SSL invoker.
-<pre>
- at RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843")
-</pre>
-For the purpose this tutorial an example bean is provided (see src/org/jboss/tutorial/ssl/bean/CalculatorBean.java).
-To compile and deploy the example simple execute <tt class="literal">ant ejbjar</tt>.
-</p><p>
-<h4>Running your client</h4>
-While making sure all the correct libraries are on the classpath we can run the provided client.
-<pre class="programlisting">
-    $ java -Djavax.net.ssl.trustStore=$JBOSS_HOME/server/default/conf/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource org.jboss.tutorial.ssl.client.Client
-</pre>
-Or better yet, just run <tt class="literal">ant run</tt>.
-<h4>OLD</h4>
-If you build the tutorial, an ejb jar is created with ssl-service.xml and the local.keystore file.  The ssl-service.xml sets up a JAAS security manager to manage the SSL keystore.  This is documented pretty well in the JBoss 4.x manual.  ssl-service.xml also defines a JBoss Remoting connector.  The CalculatorBean EJB, uses the @RemoteBinding annotation to bind the SSL connector to the EJB.  The client has define the truststore used be the client.
-</p><p>
-<i>TODO:  better explanation here!</i>
-</p><p>
-<h4>References</h4>
-<ul>
-<li><a href="http://docs.jboss.org/ejb3/app-server/reference/build/reference/en/html/transport.html">JBoss EJB3 Reference, Chapter 9. Transports</a></li>
-<li><a href="http://labs.jboss.com/portal/jbossremoting/docs/guide/ch05.html">JBoss Remoting Guide, Chapter 5. Configuration</a></li>
-</ul>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/ssl.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,115 @@
+<html>
+<head>
+<title>EJB3 SSL Tutorial</title>
+</head>
+<body>
+<p>
+<h2>Invoking EJBs through SSL</h2>
+
+This tutorial shows you how to invoke remote EJBs through a SSL connection.
+</p><p>
+Setting up SSL for use in EJB3 involves creating a keystore and making sure the correct transport is available in the EJB3 configuration.
+After which you only have to use the RemoteBinding annotation with a clientBindUrl to make sure the bean is called through SSL.
+</p><p>
+This tutorial assumes you've setup JBoss 4.0.4.GA with EJB3 support. Make sure the enviroment variable JBOSS_HOME refers to the
+installation directory.
+<br/><i>TODO: simple SSL remoting doesn't work in 4.0.4.GA, only advanced.</i>
+</p><p>
+<h4>Creating a keystore</h4>
+For SSL to work we need to create a public/private key pair, which will be stored in a keystore. Generate this using the <tt class="literal">genkey</tt> command that comes with the JDK.
+<pre class="programlisting">
+   $ cd $JBOSS_HOME/server/default/conf/
+   $ keytool -genkey -alias ejb3-ssl -keypass opensource -keystore localhost.keystore
+   Enter keystore password:  opensource
+   What is your first and last name?
+     [Unknown]:
+   What is the name of your organizational unit?
+     [Unknown]:
+   What is the name of your organization?
+     [Unknown]:
+   What is the name of your City or Locality?
+     [Unknown]:
+   What is the name of your State or Province?
+     [Unknown]:
+   What is the two-letter country code for this unit?
+     [Unknown]:
+   Is CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown correct?
+     [no]:  yes
+</pre>
+</p><p>
+Since we have not signed our certificate through any certification authoritiy, we also need to create a truststore for the client, 
+explicitly saying that we trust the certificate we just created. The first step is to export the certificate using the JDK keytool:
+<pre class="programlisting">
+   $ keytool -export -alias ejb3-ssl -file mycert.cer -keystore localhost.keystore
+   Enter keystore password:  opensource
+   Certificate stored in file &lt;mycert.cer&gt;
+
+</pre>
+</p><p>
+Then we need to create the truststore if it does not exist and import the certificate into the trueststore:
+<pre class="programlisting">
+   $ keytool -import -alias ejb3-ssl -file mycert.cer -keystore localhost.truststore
+   Enter keystore password:  opensource
+   Owner: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
+   Issuer: CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown
+   Serial number: 43bff927
+   Valid from: Sat Jan 07 18:23:51 CET 2006 until: Fri Apr 07 19:23:51 CEST 2006
+   Certificate fingerprints:
+            MD5:  CF:DC:71:A8:F4:EA:8F:5A:E9:94:E3:E6:5B:A9:C8:F3
+            SHA1: 0E:AD:F3:D6:41:5E:F6:84:9A:D1:54:3D:DE:A9:B2:01:28:F6:7C:26
+   Trust this certificate? [no]:  yes
+   Certificate was added to keystore 
+</pre>
+</p><p>
+<h4>Setting up the transport</h4>
+To setup the transport open $JBOSS_HOME/server/default/deploy/ejb3.deployer/META-INF/jboss-service.xml in your favorite text editor.
+Add the following mbean to it:
+<pre>
+   &lt;mbean code="org.jboss.remoting.transport.Connector"
+      name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3"&gt;
+      &lt;depends&gt;jboss.aop:service=AspectDeployer&lt;/depends&gt;
+      &lt;attribute name="InvokerLocator"&gt;sslsocket://0.0.0.0:3843&lt;/attribute&gt;
+      &lt;attribute name="Configuration"&gt;
+         &lt;handlers&gt;
+            &lt;handler subsystem="AOP"&gt;org.jboss.aspects.remoting.AOPRemotingInvocationHandler&lt;/handler&gt;
+         &lt;/handlers&gt;
+      &lt;/attribute&gt;
+   &lt;/mbean&gt;
+</pre>
+</p><p>
+<h4>Starting JBoss</h4>
+We need to tell JBoss Remoting where to find the keystore to be used for SSl and its password. This is done using the
+<tt class="literal">javax.net.ssl.keyStore</tt> and <tt class="literal">javax.net.ssl.keyStorePassword=opensource</tt> system properties when starting JBoss, as the
+following example shows:
+<pre class="programlisting">
+    $ cd $JBOSS_HOME/bin
+    $ ./run.sh -Djavax.net.ssl.keyStore=../server/default/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource
+</pre>
+</p><p>
+<h4>Creating your beans</h4>
+Create your EJBs as usual and add the following annotation to bind it to the SSL invoker.
+<pre>
+ at RemoteBinding(clientBindUrl="sslsocket://0.0.0.0:3843")
+</pre>
+For the purpose this tutorial an example bean is provided (see src/org/jboss/tutorial/ssl/bean/CalculatorBean.java).
+To compile and deploy the example simple execute <tt class="literal">ant ejbjar</tt>.
+</p><p>
+<h4>Running your client</h4>
+While making sure all the correct libraries are on the classpath we can run the provided client.
+<pre class="programlisting">
+    $ java -Djavax.net.ssl.trustStore=$JBOSS_HOME/server/default/conf/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource org.jboss.tutorial.ssl.client.Client
+</pre>
+Or better yet, just run <tt class="literal">ant run</tt>.
+<h4>OLD</h4>
+If you build the tutorial, an ejb jar is created with ssl-service.xml and the local.keystore file.  The ssl-service.xml sets up a JAAS security manager to manage the SSL keystore.  This is documented pretty well in the JBoss 4.x manual.  ssl-service.xml also defines a JBoss Remoting connector.  The CalculatorBean EJB, uses the @RemoteBinding annotation to bind the SSL connector to the EJB.  The client has define the truststore used be the client.
+</p><p>
+<i>TODO:  better explanation here!</i>
+</p><p>
+<h4>References</h4>
+<ul>
+<li><a href="http://docs.jboss.org/ejb3/app-server/reference/build/reference/en/html/transport.html">JBoss EJB3 Reference, Chapter 9. Transports</a></li>
+<li><a href="http://labs.jboss.com/portal/jbossremoting/docs/guide/ch05.html">JBoss Remoting Guide, Chapter 5. Configuration</a></li>
+</ul>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/ssl.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-!!! Invoking EJBs through SSL
-
-If you build the tutorial, an ejb jar is created with ssl-service.xml and the local.keystore file.  The ssl-service.xml sets up a JAAS security manager to manage the SSL keystore.  This is documented pretty well in the JBoss 4.x manual.  ssl-service.xml also defines a JBoss Remoting connector.  The CalculatorBean EJB, uses the @RemoteBinding annotation to bind the SSL connector to the EJB.  The client has define the truststore used be the client.
-
-''TODO:  better explanation here!''

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/ssl.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/ssl.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+!!! Invoking EJBs through SSL
+
+If you build the tutorial, an ejb jar is created with ssl-service.xml and the local.keystore file.  The ssl-service.xml sets up a JAAS security manager to manage the SSL keystore.  This is documented pretty well in the JBoss 4.x manual.  ssl-service.xml also defines a JBoss Remoting connector.  The CalculatorBean EJB, uses the @RemoteBinding annotation to bind the SSL connector to the EJB.  The client has define the truststore used be the client.
+
+''TODO:  better explanation here!''

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/ssl/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-kabir=validpassword
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/ssl/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/ssl/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/ssl/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/ssl/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+kabir=validpassword
+

Modified: branches/Branch_4_2/ejb3/docs/tutorial/stateful/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -62,7 +62,7 @@
       {
          cart.getCartContents();
       }
-      catch (javax.ejb.EJBNoSuchObjectException e)
+      catch (javax.ejb.NoSuchEJBException e)
       {
          System.out.println("Successfully caught no such object exception.");
       }

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,25 +0,0 @@
-<?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">
-   <description>JBoss Stateful Session Bean Tutorial</description>
-   <display-name>JBoss Stateful Session Bean Tutorial</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>ShoppingCart</ejb-name>
-         <remote>org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCart</remote>
-         <ejb-class>org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCartBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <remove-method>
-            <bean-method>
-               <method-name>checkout</method-name>
-            </bean-method>
-            <retain-if-exception>false</retain-if-exception>
-         </remove-method>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,25 @@
+<?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">
+   <description>JBoss Stateful Session Bean Tutorial</description>
+   <display-name>JBoss Stateful Session Bean Tutorial</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>ShoppingCart</ejb-name>
+         <remote>org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCart</remote>
+         <ejb-class>org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCartBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <remove-method>
+            <bean-method>
+               <method-name>checkout</method-name>
+            </bean-method>
+            <retain-if-exception>false</retain-if-exception>
+         </remove-method>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>ShoppingCart</ejb-name>
-         <jndi-name>org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCart</jndi-name>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>ShoppingCart</ejb-name>
+         <jndi-name>org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCart</jndi-name>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.stateful_deployment_descriptor.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.stateful_deployment_descriptor.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateful_deployment_descriptor.bean;
-
-import java.util.HashMap;
-import javax.ejb.Remove;
-
-public interface ShoppingCart
-{
-   void buy(String product, int quantity);
-
-   HashMap<String, Integer> getCartContents();
-
-   void checkout();
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateful_deployment_descriptor.bean;
+
+import java.util.HashMap;
+import javax.ejb.Remove;
+
+public interface ShoppingCart
+{
+   void buy(String product, int quantity);
+
+   HashMap<String, Integer> getCartContents();
+
+   void checkout();
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateful_deployment_descriptor.bean;
-
-import java.io.Serializable;
-import java.util.HashMap;
-
-public class ShoppingCartBean implements ShoppingCart, Serializable
-{
-   private HashMap<String, Integer> cart = new HashMap<String, Integer>();
-
-   public void buy(String product, int quantity)
-   {
-      if (cart.containsKey(product))
-      {
-         int currq = cart.get(product);
-         currq += quantity;
-         cart.put(product, currq);
-      }
-      else
-      {
-         cart.put(product, quantity);
-      }
-   }
-
-   public HashMap<String, Integer> getCartContents()
-   {
-      return cart;
-   }
-
-   public void checkout()
-   {
-      System.out.println("To be implemented");
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateful_deployment_descriptor.bean;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+public class ShoppingCartBean implements ShoppingCart, Serializable
+{
+   private HashMap<String, Integer> cart = new HashMap<String, Integer>();
+
+   public void buy(String product, int quantity)
+   {
+      if (cart.containsKey(product))
+      {
+         int currq = cart.get(product);
+         currq += quantity;
+         cart.put(product, currq);
+      }
+      else
+      {
+         cart.put(product, quantity);
+      }
+   }
+
+   public HashMap<String, Integer> getCartContents()
+   {
+      return cart;
+   }
+
+   public void checkout()
+   {
+      System.out.println("To be implemented");
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,77 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateful_deployment_descriptor.client;
-
-
-import org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCart;
-
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.naming.InitialContext;
-
-import java.rmi.NoSuchObjectException;
-import java.util.HashMap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      ShoppingCart cart = (ShoppingCart) ctx.lookup(ShoppingCart.class.getName());
-
-      System.out.println("Buying 1 memory stick");
-      cart.buy("Memory stick", 1);
-      System.out.println("Buying another memory stick");
-      cart.buy("Memory stick", 1);
-
-      System.out.println("Buying a laptop");
-      cart.buy("Laptop", 1);
-
-      System.out.println("Print cart:");
-      HashMap<String, Integer> fullCart = cart.getCartContents();
-      for (String product : fullCart.keySet())
-      {
-         System.out.println(fullCart.get(product) + "     " + product);
-      }
-
-      System.out.println("Checkout");
-      cart.checkout();
-
-      System.out.println("Should throw an object not found exception by invoking on cart after @Remove method");
-      try
-      {
-         cart.getCartContents();
-      }
-      catch (NoSuchEJBException e)
-      {
-            System.out.println("Successfully caught no such object exception.");
-      }
-
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateful_deployment_descriptor.client;
+
+
+import org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCart;
+
+import javax.ejb.EJBException;
+import javax.ejb.NoSuchEJBException;
+import javax.naming.InitialContext;
+
+import java.rmi.NoSuchObjectException;
+import java.util.HashMap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      ShoppingCart cart = (ShoppingCart) ctx.lookup(ShoppingCart.class.getName());
+
+      System.out.println("Buying 1 memory stick");
+      cart.buy("Memory stick", 1);
+      System.out.println("Buying another memory stick");
+      cart.buy("Memory stick", 1);
+
+      System.out.println("Buying a laptop");
+      cart.buy("Laptop", 1);
+
+      System.out.println("Print cart:");
+      HashMap<String, Integer> fullCart = cart.getCartContents();
+      for (String product : fullCart.keySet())
+      {
+         System.out.println(fullCart.get(product) + "     " + product);
+      }
+
+      System.out.println("Checkout");
+      cart.checkout();
+
+      System.out.println("Should throw an object not found exception by invoking on cart after @Remove method");
+      try
+      {
+         cart.getCartContents();
+      }
+      catch (NoSuchEJBException e)
+      {
+            System.out.println("Successfully caught no such object exception.");
+      }
+
+
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Stateful Beans Using Deployment Descriptors</h2>
-
-Take a look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a> and <a href="src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java">ShoppingCartBean.java</a>.
-You specify a stateful bean with the "session" and "session-type" tags. Note that all
-bean types in EJB 3.0 are homeless, so there is no requirement for a "home" or "local-home" tag. The bean class is specified with the "ejb-class" tag.
-ShoppingCartBean also implements a remote interface. Take a look at <a href="src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java">ShoppingCart.java</a>.
-To define this as the remote interface of ShoppingCartBean you need to use the "remote" tag.
-</p><p>
-<h4>@Remove</h4>
-
-Take another look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a>.  Look for the "remove-list" tag.  Instead of explicitly calling EJBObject.remove()
-in your applications and thus polluting it further with J2EE specific code, any method specified in the "remove-list" tag will cause the stateful bean
-instance to be removed from the container at the end of the method call. This deployment descriptor behavior mimics the @Remove annotation. 
-</p><p>
-<h4>JNDI Bindings</h4>
-
-The ShoppingCartBean will have its remote interface bound in JNDI. Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>. Note the "jndi-name" tag. This specifies the jndi binding for the remote interface.
-</p><p>
-<h4>Client</h4>
-
-Open up <a href="src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java">Client.java</a>.  You'll see that it looks up the stateful
-bean under its jndi name.  Also notice that there is no Home interface and you can begin executing on the stateful
-bean right away.  When you access the bean in JNDI, an instance of the stateful bean will be created on the server.  So, when you need a different
-instance of the stateful bean, you do an additional <tt>jndi.lookup()</tt> to get this new reference.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-run:
-run:
-     [java] Buying 1 memory stick
-     [java] 2004-10-06 19:37:16,869 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
-rt: org/apache/axis/AxisFault
-     [java] Buying another memory stick
-     [java] Buying a laptop
-     [java] Print cart:
-     [java] 2     Memory stick
-     [java] 1     Laptop
-     [java] Checkout
-     [java] Should throw an object not found exception by invoking on cart after @Remove method
-     [java] Successfully caught no such object exception.
-</pre>
-</p><p>
-The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
-</p><p>
-<h4>Jar structure</h4>
-
-EJB 3.0 beans must be packaged in a JAR file with the suffix <tt>.jar</tt>.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the ShoppingCartBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
-</p><p>
-</p><p>
-</p><p>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+<html>
+<body>
+<p>
+<h2>Stateful Beans Using Deployment Descriptors</h2>
+
+Take a look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a> and <a href="src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java">ShoppingCartBean.java</a>.
+You specify a stateful bean with the "session" and "session-type" tags. Note that all
+bean types in EJB 3.0 are homeless, so there is no requirement for a "home" or "local-home" tag. The bean class is specified with the "ejb-class" tag.
+ShoppingCartBean also implements a remote interface. Take a look at <a href="src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java">ShoppingCart.java</a>.
+To define this as the remote interface of ShoppingCartBean you need to use the "remote" tag.
+</p><p>
+<h4>@Remove</h4>
+
+Take another look at <a href="META-INF/ejb-jar.xml">ejb-jar.xml</a>.  Look for the "remove-list" tag.  Instead of explicitly calling EJBObject.remove()
+in your applications and thus polluting it further with J2EE specific code, any method specified in the "remove-list" tag will cause the stateful bean
+instance to be removed from the container at the end of the method call. This deployment descriptor behavior mimics the @Remove annotation. 
+</p><p>
+<h4>JNDI Bindings</h4>
+
+The ShoppingCartBean will have its remote interface bound in JNDI. Take a look at <a href="META-INF/jboss.xml">jboss.xml</a>. Note the "jndi-name" tag. This specifies the jndi binding for the remote interface.
+</p><p>
+<h4>Client</h4>
+
+Open up <a href="src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java">Client.java</a>.  You'll see that it looks up the stateful
+bean under its jndi name.  Also notice that there is no Home interface and you can begin executing on the stateful
+bean right away.  When you access the bean in JNDI, an instance of the stateful bean will be created on the server.  So, when you need a different
+instance of the stateful bean, you do an additional <tt>jndi.lookup()</tt> to get this new reference.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+run:
+run:
+     [java] Buying 1 memory stick
+     [java] 2004-10-06 19:37:16,869 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
+rt: org/apache/axis/AxisFault
+     [java] Buying another memory stick
+     [java] Buying a laptop
+     [java] Print cart:
+     [java] 2     Memory stick
+     [java] 1     Laptop
+     [java] Checkout
+     [java] Should throw an object not found exception by invoking on cart after @Remove method
+     [java] Successfully caught no such object exception.
+</pre>
+</p><p>
+The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
+</p><p>
+<h4>Jar structure</h4>
+
+EJB 3.0 beans must be packaged in a JAR file with the suffix <tt>.jar</tt>.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the ShoppingCartBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
+</p><p>
+</p><p>
+</p><p>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-!!!Stateful Beans Using Deployment Descriptors
-Take a look at [ejb-jar.xml|META-INF/ejb-jar.xml] and [ShoppingCartBean.java|src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java].
-You specify a stateful bean with the "session" and "session-type" tags. Note that all
-bean types in EJB 3.0 are homeless, so there is no requirement for a "home" or "local-home" tag. The bean class is specified with the "ejb-class" tag.
-ShoppingCartBean also implements a remote interface. Take a look at [ShoppingCart.java|src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java].
-To define this as the remote interface of ShoppingCartBean you need to use the "remote" tag.
-
-!@Remove
-Take another look at [ejb-jar.xml/META-INF/ejb-jar.xml].  Look for the "remove-list" tag.  Instead of explicitly calling EJBObject.remove()
-in your applications and thus polluting it further with J2EE specific code, any method specified in the "remove-list" tag will cause the stateful bean
-instance to be removed from the container at the end of the method call. This deployment descriptor behavior mimics the @Remove annotation. 
-
-!JNDI Bindings
-The CalculatorBean will have its remote interface bound in JNDI. Take a look at [jboss.xml|META-INF/jboss.xml]. Note the "jndi-name" tag. This specifies the jndi binding for the remote interface.
-
-!Client
-Open up [Client.java|src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java].  You'll see that it looks up the stateful bean under its jndi name.  Also notice that there is no Home interface and you can begin executing on the stateful bean right away.  When you access the bean in JNDI, an instance of the stateful bean will be created on the server.  So, when you need a different instance of the stateful bean, you do an additional {{jndi.lookup()}} to get this new reference.
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-run:
-run:
-     [java] Buying 1 memory stick
-     [java] 2004-10-06 19:37:16,869 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
-rt: org/apache/axis/AxisFault
-     [java] Buying another memory stick
-     [java] Buying a laptop
-     [java] Print cart:
-     [java] 2     Memory stick
-     [java] 1     Laptop
-     [java] Checkout
-     [java] Should throw an object not found exception by invoking on cart after @Remove method
-     [java] Successfully caught no such object exception.
-}}}
-
-The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
-
-!Jar structure
-EJB 3.0 beans must be packaged in a JAR file with the suffix {{.jar}}.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the ShoppingCartBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
-
-
-
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateful_deployment_descriptor/stateful.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+!!!Stateful Beans Using Deployment Descriptors
+Take a look at [ejb-jar.xml|META-INF/ejb-jar.xml] and [ShoppingCartBean.java|src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java].
+You specify a stateful bean with the "session" and "session-type" tags. Note that all
+bean types in EJB 3.0 are homeless, so there is no requirement for a "home" or "local-home" tag. The bean class is specified with the "ejb-class" tag.
+ShoppingCartBean also implements a remote interface. Take a look at [ShoppingCart.java|src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCart.java].
+To define this as the remote interface of ShoppingCartBean you need to use the "remote" tag.
+
+!@Remove
+Take another look at [ejb-jar.xml/META-INF/ejb-jar.xml].  Look for the "remove-list" tag.  Instead of explicitly calling EJBObject.remove()
+in your applications and thus polluting it further with J2EE specific code, any method specified in the "remove-list" tag will cause the stateful bean
+instance to be removed from the container at the end of the method call. This deployment descriptor behavior mimics the @Remove annotation. 
+
+!JNDI Bindings
+The CalculatorBean will have its remote interface bound in JNDI. Take a look at [jboss.xml|META-INF/jboss.xml]. Note the "jndi-name" tag. This specifies the jndi binding for the remote interface.
+
+!Client
+Open up [Client.java|src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java].  You'll see that it looks up the stateful bean under its jndi name.  Also notice that there is no Home interface and you can begin executing on the stateful bean right away.  When you access the bean in JNDI, an instance of the stateful bean will be created on the server.  So, when you need a different instance of the stateful bean, you do an additional {{jndi.lookup()}} to get this new reference.
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+run:
+run:
+     [java] Buying 1 memory stick
+     [java] 2004-10-06 19:37:16,869 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
+rt: org/apache/axis/AxisFault
+     [java] Buying another memory stick
+     [java] Buying a laptop
+     [java] Print cart:
+     [java] 2     Memory stick
+     [java] 1     Laptop
+     [java] Checkout
+     [java] Should throw an object not found exception by invoking on cart after @Remove method
+     [java] Successfully caught no such object exception.
+}}}
+
+The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
+
+!Jar structure
+EJB 3.0 beans must be packaged in a JAR file with the suffix {{.jar}}.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the ShoppingCartBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
+
+
+
+

Modified: branches/Branch_4_2/ejb3/docs/tutorial/stateless/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,7 +6,7 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
    <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
    <property name="build.dir" value="${basedir}/build"/>
@@ -22,10 +22,10 @@
       <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
          <include name="**/*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deployers/ejb3.deployer">
          <include name="*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deployers/jboss-aop-jdk50.deployer">
          <include name="*.jar"/>
       </fileset>
       <pathelement location="${build.classes.dir}"/>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/stateless/src/org/jboss/tutorial/stateless/bean/CalculatorBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless/src/org/jboss/tutorial/stateless/bean/CalculatorBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless/src/org/jboss/tutorial/stateless/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -22,12 +22,23 @@
 package org.jboss.tutorial.stateless.bean;
 
 import javax.ejb.Stateless;
+import javax.sql.DataSource;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 @Stateless
 public class CalculatorBean implements CalculatorRemote, CalculatorLocal
 {
    public int add(int x, int y)
    {
+      try
+      {
+         DataSource ds = (DataSource)new InitialContext().lookup("java:/DefaultDS");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
       return x + y;
    }
 

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-<?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">
-   <description>JBoss Stateless Session Bean Tutorial</description>
-   <display-name>JBoss Stateless Session Bean Tutorial</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>Calculator</ejb-name>
-         <remote>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorRemote</remote>
-         <local>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorLocal</local>
-         <ejb-class>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -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">
+   <description>JBoss Stateless Session Bean Tutorial</description>
+   <display-name>JBoss Stateless Session Bean Tutorial</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>Calculator</ejb-name>
+         <remote>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorRemote</remote>
+         <local>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorLocal</local>
+         <ejb-class>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>Calculator</ejb-name>
-         <jndi-name>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorRemote</jndi-name>
-         <local-jndi-name>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorLocal</local-jndi-name>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>Calculator</ejb-name>
+         <jndi-name>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorRemote</jndi-name>
+         <local-jndi-name>org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorLocal</local-jndi-name>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="**/*.class"/>
-         </fileset>
-         <fileset dir=".">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run">
-      <java classname="org.jboss.tutorial.stateless_deployment_descriptor.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="**/*.class"/>
+         </fileset>
+         <fileset dir=".">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run">
+      <java classname="org.jboss.tutorial.stateless_deployment_descriptor.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateless_deployment_descriptor.bean;
-
-public interface Calculator
-{
-   int add(int x, int y);
-
-   int subtract(int x, int y);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateless_deployment_descriptor.bean;
+
+public interface Calculator
+{
+   int add(int x, int y);
+
+   int subtract(int x, int y);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateless_deployment_descriptor.bean;
-
-public class CalculatorBean implements CalculatorRemote, CalculatorLocal
-{
-   public int add(int x, int y)
-   {
-      return x + y;
-   }
-
-   public int subtract(int x, int y)
-   {
-      return x - y;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateless_deployment_descriptor.bean;
+
+public class CalculatorBean implements CalculatorRemote, CalculatorLocal
+{
+   public int add(int x, int y)
+   {
+      return x + y;
+   }
+
+   public int subtract(int x, int y)
+   {
+      return x - y;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,28 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateless_deployment_descriptor.bean;
-
-
-
-public interface CalculatorLocal extends Calculator
-{
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateless_deployment_descriptor.bean;
+
+
+
+public interface CalculatorLocal extends Calculator
+{
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateless_deployment_descriptor.bean;
-
-
-
-public interface CalculatorRemote extends Calculator
-{
-
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateless_deployment_descriptor.bean;
+
+
+
+public interface CalculatorRemote extends Calculator
+{
+
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.stateless_deployment_descriptor.client;
-
-import org.jboss.tutorial.stateless_deployment_descriptor.bean.Calculator;
-import org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorRemote;
-
-import javax.naming.InitialContext;
-
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      Calculator calculator = (Calculator) ctx.lookup(CalculatorRemote.class.getName());
-
-      System.out.println("1 + 1 = " + calculator.add(1, 1));
-      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.stateless_deployment_descriptor.client;
+
+import org.jboss.tutorial.stateless_deployment_descriptor.bean.Calculator;
+import org.jboss.tutorial.stateless_deployment_descriptor.bean.CalculatorRemote;
+
+import javax.naming.InitialContext;
+
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      Calculator calculator = (Calculator) ctx.lookup(CalculatorRemote.class.getName());
+
+      System.out.println("1 + 1 = " + calculator.add(1, 1));
+      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
+   }
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-<html>
-<body>
-<p>
-<h2>Stateless Beans</h2>
-
-It is very easy to create a Stateless Bean with EJB 3.0.  All bean types are homeless in EJB 3.0 so all you have to do to
-create a Stateless bean is to create a bean class and have it implement at least one interface.
-Take a look at <a href="src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java">CalculatorBean.java</a>
-</p><p>
-<h4>ejb-jar.xml</h4>
-
-</p><p>
-CalculatorBean is defined as a stateless session bean through the &lt;session&gt; and &lt;session-type&gt; elements.  This marks the class as a stateless bean and
-the deployer will deploy that class as a stateless bean EJB container.
-</p><p>
-CalculatorBean also implements two interfaces.  One is the remote interface of the EJB the other is the local interface.
-</p><p>
-Take a look at <a href="src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java">CalculatorRemote.java</a>.  To define this as the remote
-interface of Calculator bean you specify the interface with the &lt;remote&gt; tag. Similar for
-<a href="src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java">CalculatorLocal.java</a> as you need to specify the local 
-interface with the &lt;local&gt; tag.
-</p><p>
-<h4>JNDI Bindings</h4>
-
-The Calculator bean will have two JNDI bindings for the remote and Local interface.  By default, JBoss will use ejbName/local and ejbName/remote for the local and
-remote interfaces, respectively.
-</p><p>
-<h4>Client</h4>
-
-Open up <a href="src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java">Client.java</a>.  You'll see that it looks up the stateless bean under
-"ejbName/remote". Also notice that there is no Home interface and you can begin executing on the stateless bean right away.
-</p><p>
-<h4>Building and Running</h4>
-
-To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-<pre>
-Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
-$ ant
-$ ant run
-
-run:
-     [java] 2004-10-06 19:10:35,857 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
-rt: org/apache/axis/AxisFault
-     [java] 1 + 1 = 2
-     [java] 1 - 1 = 0
-</pre>
-</p><p>
-The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
-</p><p>
-<h4>Jar structure</h4>
-
-EJB 3.0 beans must be packaged in a JAR file with the suffix <tt>.jar</tt>.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
-</p><p>
-</p><p>
-</p><p>
-</p><p>
-</p>
-</body>
-</html>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+<html>
+<body>
+<p>
+<h2>Stateless Beans</h2>
+
+It is very easy to create a Stateless Bean with EJB 3.0.  All bean types are homeless in EJB 3.0 so all you have to do to
+create a Stateless bean is to create a bean class and have it implement at least one interface.
+Take a look at <a href="src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java">CalculatorBean.java</a>
+</p><p>
+<h4>ejb-jar.xml</h4>
+
+</p><p>
+CalculatorBean is defined as a stateless session bean through the &lt;session&gt; and &lt;session-type&gt; elements.  This marks the class as a stateless bean and
+the deployer will deploy that class as a stateless bean EJB container.
+</p><p>
+CalculatorBean also implements two interfaces.  One is the remote interface of the EJB the other is the local interface.
+</p><p>
+Take a look at <a href="src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java">CalculatorRemote.java</a>.  To define this as the remote
+interface of Calculator bean you specify the interface with the &lt;remote&gt; tag. Similar for
+<a href="src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java">CalculatorLocal.java</a> as you need to specify the local 
+interface with the &lt;local&gt; tag.
+</p><p>
+<h4>JNDI Bindings</h4>
+
+The Calculator bean will have two JNDI bindings for the remote and Local interface.  By default, JBoss will use ejbName/local and ejbName/remote for the local and
+remote interfaces, respectively.
+</p><p>
+<h4>Client</h4>
+
+Open up <a href="src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java">Client.java</a>.  You'll see that it looks up the stateless bean under
+"ejbName/remote". Also notice that there is no Home interface and you can begin executing on the stateless bean right away.
+</p><p>
+<h4>Building and Running</h4>
+
+To build and run the example, make sure you have <tt>ejb3.deployer</tt> installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+<pre>
+Unix:    $ export JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+Windows: $ set JBOSS_HOME=&lt;where your jboss 4.0 distribution is&gt;
+$ ant
+$ ant run
+
+run:
+     [java] 2004-10-06 19:10:35,857 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
+rt: org/apache/axis/AxisFault
+     [java] 1 + 1 = 2
+     [java] 1 - 1 = 0
+</pre>
+</p><p>
+The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
+</p><p>
+<h4>Jar structure</h4>
+
+EJB 3.0 beans must be packaged in a JAR file with the suffix <tt>.jar</tt>.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
+</p><p>
+</p><p>
+</p><p>
+</p><p>
+</p>
+</body>
+</html>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-!!!Stateless Beans
-It is very easy to create a Stateless Bean with EJB 3.0.  All bean types are homeless in EJB 3.0 so all you have to do to
-create a Stateless bean is to create a bean class and have it implement at least one interface.
-Take a look at [CalculatorBean.java|src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java]
-
-!ejb-jar.xml
-
-CalculatorBean is defined as a stateless session bean through the <session> and <session-type> elements.  This marks the class as a stateless bean and
-the deployer will deploy that class as a stateless bean EJB container.
-
-CalculatorBean also implements two interfaces.  One is the remote interface of the EJB the other is the local interface.
-
-Take a look at [CalculatorRemote.java|src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java].  To define this as the remote
-interface of Calculator bean you specify the interface with the <remote> tag. Similar for
-[CalculatorLocal.java|src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java] as you need to specify the local 
-interface with the <local> tag.
-
-!JNDI Bindings
-The Calculator bean will have two JNDI bindings for the remote and Local interface.  By default, JBoss will use ejbName/local and ejbName/remote for the local and
-remote interfaces, respectively.
-
-!Client
-Open up [Client.java|src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java].  You'll see that it looks up the stateless bean under
-"ejbName/remote". Also notice that there is no Home interface and you can begin executing on the stateless bean right away.
-
-!Building and Running
-To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
-{{{
-Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
-Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
-$ ant
-$ ant run
-
-run:
-     [java] 2004-10-06 19:10:35,857 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
-rt: org/apache/axis/AxisFault
-     [java] 1 + 1 = 2
-     [java] 1 - 1 = 0
-}}}
-
-The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
-
-!Jar structure
-EJB 3.0 beans must be packaged in a JAR file with the suffix {{.jar}}.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
-
-
-
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/stateless_deployment_descriptor/stateless.wiki	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+!!!Stateless Beans
+It is very easy to create a Stateless Bean with EJB 3.0.  All bean types are homeless in EJB 3.0 so all you have to do to
+create a Stateless bean is to create a bean class and have it implement at least one interface.
+Take a look at [CalculatorBean.java|src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorBean.java]
+
+!ejb-jar.xml
+
+CalculatorBean is defined as a stateless session bean through the <session> and <session-type> elements.  This marks the class as a stateless bean and
+the deployer will deploy that class as a stateless bean EJB container.
+
+CalculatorBean also implements two interfaces.  One is the remote interface of the EJB the other is the local interface.
+
+Take a look at [CalculatorRemote.java|src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorRemote.java].  To define this as the remote
+interface of Calculator bean you specify the interface with the <remote> tag. Similar for
+[CalculatorLocal.java|src/org/jboss/tutorial/stateless_deployment_descriptor/bean/CalculatorLocal.java] as you need to specify the local 
+interface with the <local> tag.
+
+!JNDI Bindings
+The Calculator bean will have two JNDI bindings for the remote and Local interface.  By default, JBoss will use ejbName/local and ejbName/remote for the local and
+remote interfaces, respectively.
+
+!Client
+Open up [Client.java|src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java].  You'll see that it looks up the stateless bean under
+"ejbName/remote". Also notice that there is no Home interface and you can begin executing on the stateless bean right away.
+
+!Building and Running
+To build and run the example, make sure you have {{ejb3.deployer}} installed in JBoss 4.0.x and have JBoss running.  See the reference manual on how to install EJB 3.0.  
+{{{
+Unix:    $ export JBOSS_HOME=<where your jboss 4.0 distribution is>
+Windows: $ set JBOSS_HOME=<where your jboss 4.0 distribution is>
+$ ant
+$ ant run
+
+run:
+     [java] 2004-10-06 19:10:35,857 INFO org.jboss.remoting.InvokerRegistry[main] - Failed to load soap remoting transpo
+rt: org/apache/axis/AxisFault
+     [java] 1 + 1 = 2
+     [java] 1 - 1 = 0
+}}}
+
+The INFO message you can ignore.  It will be fixed in later releases of JBoss 4.0.
+
+!Jar structure
+EJB 3.0 beans must be packaged in a JAR file with the suffix {{.jar}}.  Running the ant script above creates a JAR file within the deploy/ directory of JBoss.  All that needs to be in that jar is your server-side class files.  So basically just the CalculatorBean and the interfaces it implements.  JBoss will automatically browse the JAR file to determine if any EJBs are annotated by any classes within it.  THere is no precompilation step.
+
+
+
+

Copied: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/tableperinheritance/META-INF)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/tableperinheritance/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -55,6 +55,6 @@
 
    public List findByWeight(double weight)
    {
-      return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+      return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
    }
 }

Modified: branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/table.html
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/table.html	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/tableperinheritance/table.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -35,7 +35,7 @@
 <pre>
    public List findByWeight(double weight)
    {
-      return manager.createQuery("select p from Pet p where p.weight &lt; :weight").setParameter("weight", weight).getResultList();
+      return manager.createQuery("from Pet p where p.weight &lt; :weight").setParameter("weight", weight).getResultList();
    }
 </pre>
 </p><p>

Modified: branches/Branch_4_2/ejb3/docs/tutorial/timer/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/timer/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/timer/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -6,9 +6,9 @@
 
 <project name="JBoss" default="ejbjar" basedir=".">
 
-   <property file="../local.properties"/>  <property environment="env"/>
+   <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/timer/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/timer/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/Calculator.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/Calculator.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/Calculator.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/CalculatorBean.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/CalculatorBean.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/bean/CalculatorBean.class)
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client/Client.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client/Client.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/classes/org/jboss/tutorial/webservice/client/Client.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/tutorial.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build/tutorial.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build/tutorial.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================= -->
-<!-- JBoss build file                                                       -->
-<!-- ======================================================================= -->
-
-<project name="JBoss" default="ejbjar" basedir=".">
-
-   <property environment="env"/>
-   <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
-   <property name="jboss.server.config" value="test"/>
-   <property name="build.dir" value="${basedir}/build"/>
-   <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-   <!-- Build classpath -->
-   <path id="classpath">
-      <!-- So that we can get jndi.properties for InitialContext -->
-      <pathelement location="${basedir}"/>
-      <fileset dir="${jboss.home}/client">
-         <include name="**/*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.home}/lib/endorsed">
-         <include name="**/*.jar"/>
-      </fileset>
-      <pathelement location="${build.classes.dir}"/>
-   </path>
-
-   <property name="build.classpath" refid="classpath"/>
-
-   <!-- =================================================================== -->
-   <!-- Prepares the build directory                                        -->
-   <!-- =================================================================== -->
-   <target name="prepare">
-      <mkdir dir="${build.dir}"/>
-      <mkdir dir="${build.classes.dir}"/>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Compiles the source code                                            -->
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-      <javac srcdir="${src.dir}"
-         destdir="${build.classes.dir}"
-         debug="on"
-         deprecation="on"
-         optimize="off"
-         includes="**">
-         <classpath refid="classpath"/>
-      </javac>
-   </target>
-
-   <target name="ejbjar" depends="compile">
-      <jar jarfile="build/tutorial.jar">
-         <fileset dir="${build.classes.dir}">
-            <include name="org/jboss/tutorial/webservice/bean/*.class"/>
-         </fileset>
-      </jar>
-      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-   </target>
-
-   <target name="run" depends="ejbjar">
-      <java classname="org.jboss.tutorial.webservice.client.Client" fork="yes" dir=".">
-         <classpath refid="classpath"/>
-      </java>
-   </target>
-
-   <!-- =================================================================== -->
-   <!-- Cleans up generated stuff                                           -->
-   <!-- =================================================================== -->
-   <target name="clean.db">
-      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build.dir}"/>
-      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
-   </target>
-
-
-</project>
-

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/build.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/build.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/webservice/build.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+
+<!-- ======================================================================= -->
+<!-- JBoss build file                                                       -->
+<!-- ======================================================================= -->
+
+<project name="JBoss" default="ejbjar" basedir=".">
+
+   <property environment="env"/>
+   <property name="src.dir" value="${basedir}/src"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+   <property name="jboss.server.config" value="test"/>
+   <property name="build.dir" value="${basedir}/build"/>
+   <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+   <!-- Build classpath -->
+   <path id="classpath">
+      <!-- So that we can get jndi.properties for InitialContext -->
+      <pathelement location="${basedir}"/>
+      <fileset dir="${jboss.home}/client">
+         <include name="**/*.jar"/>
+      </fileset>
+      <fileset dir="${jboss.home}/lib/endorsed">
+         <include name="**/*.jar"/>
+      </fileset>
+      <pathelement location="${build.classes.dir}"/>
+   </path>
+
+   <property name="build.classpath" refid="classpath"/>
+
+   <!-- =================================================================== -->
+   <!-- Prepares the build directory                                        -->
+   <!-- =================================================================== -->
+   <target name="prepare">
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.classes.dir}"/>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+   <target name="compile" depends="prepare">
+      <javac srcdir="${src.dir}"
+         destdir="${build.classes.dir}"
+         debug="on"
+         deprecation="on"
+         optimize="off"
+         includes="**">
+         <classpath refid="classpath"/>
+      </javac>
+   </target>
+
+   <target name="ejbjar" depends="compile">
+      <jar jarfile="build/tutorial.jar">
+         <fileset dir="${build.classes.dir}">
+            <include name="org/jboss/tutorial/webservice/bean/*.class"/>
+         </fileset>
+      </jar>
+      <copy file="build/tutorial.jar" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
+   </target>
+
+   <target name="run" depends="ejbjar">
+      <java classname="org.jboss.tutorial.webservice.client.Client" fork="yes" dir=".">
+         <classpath refid="classpath"/>
+      </java>
+   </target>
+
+   <!-- =================================================================== -->
+   <!-- Cleans up generated stuff                                           -->
+   <!-- =================================================================== -->
+   <target name="clean.db">
+      <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+      <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
+   </target>
+
+
+</project>
+

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/config.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/config.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<!-- C:\jboss\jboss-head\ejb3\docs\tutorial\webservice>wscompile.bat -import -keep -mapping jaxrpc-mapping.xml -s src config.xml -->
-
-<configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> 
-<wsdl location="http://localhost:8080/tutorial/CalculatorBean?wsdl" packageName="org.jboss.tutorial.webservice.generated"/>
-</configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/config.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/config.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/webservice/config.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<!-- C:\jboss\jboss-head\ejb3\docs\tutorial\webservice>wscompile.bat -import -keep -mapping jaxrpc-mapping.xml -s src config.xml -->
+
+<configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> 
+<wsdl location="http://localhost:8080/tutorial/CalculatorBean?wsdl" packageName="org.jboss.tutorial.webservice.generated"/>
+</configuration>

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/webservice/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/webservice/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice)

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.webservice.bean;
-
-import javax.jws.WebService;
-import javax.jws.WebMethod;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-
- at WebService
- at SOAPBinding(style=Style.RPC)
-public interface Calculator extends Remote
-{
-   @WebMethod int add(int x, int y);
-
-   @WebMethod int subtract(int x, int y);
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.webservice.bean;
+
+import javax.jws.WebService;
+import javax.jws.WebMethod;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+ at WebService
+ at SOAPBinding(style=Style.RPC)
+public interface Calculator extends Remote
+{
+   @WebMethod int add(int x, int y);
+
+   @WebMethod int subtract(int x, int y);
+}

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.webservice.bean;
-
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-
- at Stateless
- at WebService(endpointInterface="org.jboss.tutorial.webservice.bean.Calculator")
-public class CalculatorBean
-{
-   public int add(int x, int y)
-   {
-      return x + y;
-   }
-
-   public int subtract(int x, int y)
-   {
-      return x - y;
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/bean/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.webservice.bean;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+ at Stateless
+ at WebService(endpointInterface="org.jboss.tutorial.webservice.bean.Calculator")
+public class CalculatorBean
+{
+   public int add(int x, int y)
+   {
+      return x + y;
+   }
+
+   public int subtract(int x, int y)
+   {
+      return x - y;
+   }
+}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client)

Deleted: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.tutorial.webservice.client;
-
-import org.jboss.tutorial.webservice.bean.Calculator;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-import java.net.URL;
-import java.io.File;
-
-public class Client
-{
-   public static void main(String[] args) throws Exception
-   {
-      URL url = new URL("http://localhost:8080/tutorial/CalculatorBean?wsdl");
-      QName qname = new QName("http://bean.webservice.tutorial.jboss.org/jaws",
-              "CalculatorService");
-
-      ServiceFactory factory = ServiceFactory.newInstance();
-      Service service = factory.createService(url, qname);
-
-      Calculator calculator = (Calculator) service.getPort(Calculator.class);
-
-      System.out.println("1 + 1 = " + calculator.add(1, 1));
-      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
-   }
-}

Copied: branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java)
===================================================================
--- branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/docs/tutorial/webservice/src/org/jboss/tutorial/webservice/client/Client.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tutorial.webservice.client;
+
+import org.jboss.tutorial.webservice.bean.Calculator;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import java.net.URL;
+import java.io.File;
+
+public class Client
+{
+   public static void main(String[] args) throws Exception
+   {
+      URL url = new URL("http://localhost:8080/tutorial/CalculatorBean?wsdl");
+      QName qname = new QName("http://bean.webservice.tutorial.jboss.org/jaws",
+              "CalculatorService");
+
+      ServiceFactory factory = ServiceFactory.newInstance();
+      Service service = factory.createService(url, qname);
+
+      Calculator calculator = (Calculator) service.getPort(Calculator.class);
+
+      System.out.println("1 + 1 = " + calculator.add(1, 1));
+      System.out.println("1 - 1 = " + calculator.subtract(1, 1));
+   }
+}

Copied: branches/Branch_4_2/ejb3/jbossbuild.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/jbossbuild.xml)
===================================================================
--- branches/Branch_4_2/ejb3/jbossbuild.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/jbossbuild.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,246 @@
+<?xml version="1.0"?>
+
+<!--
+ JBoss, the OpenSource J2EE webOS
+ 
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
+
+<!-- ================================================================== -->
+<!-- ejb3  component definition                                        -->
+<!-- ================================================================== -->
+
+<project name="project" 
+         default="build" 
+         basedir="."
+>
+   <!-- The main build -->
+   <import file="../tools/etc/jbossbuild/tasks.xml"/>
+   <import file="component-info.xml"/>
+
+   <!-- =============================================================== -->
+   <!-- The component definition                                        -->
+   <!-- =============================================================== -->
+
+   <componentdef component="ejb3" 
+                 description="ejb3 Integration Module">
+
+      <!-- ============================================================ -->
+      <!-- The main source                                              -->
+      <!-- ============================================================ -->
+
+      <source id="main" requiredJDK="1.5" jvmSource="1.5" jvmTarget="1.5">
+         <include component="sun-jaf"/>
+         <include component="sun-servlet"/>
+         <include component="javassist"/>
+         <include component="qdox"/>         
+         <include component="jgroups"/>
+         <include component="hibernate"/>
+         <include component="hibernate-entitymanager"/>
+         <include component="hibernate-annotations"/>
+         <include component="trove"/>
+         <include component="xdoclet"/>         
+         <include component="oswego-concurrent"/>
+         <include component="j2ee"/>
+         <include component="j2se"/>
+         <include component="aop"/>
+         <include component="jboss/cache"/>
+         <include component="aspects"/>
+         <include component="ejb3x"/>
+         <include component="common"/>         
+         <include component="cluster"/>
+         <include component="dependency"/>
+         <include component="system"/>         
+         <include component="naming"/>         
+         <include component="transaction"/>         
+         <include component="security"/>
+         <include component="server"/>         
+         <include component="messaging"/>         
+         <include component="kernel"/> 
+         <include component="connector"/>
+         <include component="container"/>     
+         <include component="jboss/remoting"/>
+         <include component="apache-logging"/>
+         <include component="antlr"/>         
+         <include component="asm"/>                  
+         <include component="cglib"/>   
+         <include component="apache-beanutils"/>    
+         <include component="apache-codec"/>   
+         <include component="apache-collections"/> 
+         <include component="apache-digester"/>    
+         <include component="apache-discovery"/> 
+         <include component="apache-fileupload"/>  
+         <include component="apache-httpclient"/>     
+         <include component="apache-lang"/>     
+         <include component="apache-logging"/> 
+         <include component="apache-logging-api"/> 
+         <include component="apache-pool"/>  
+         <include component="apache-validator"/>  
+         <include component="apache-vfs"/> 
+         <include component="apache-log4j"/>          
+         <include component="apache-xerces"/>          
+         <include component="dom4j"/> 
+         <include component="hsqldb"/>
+         <include component="jaxen"/>
+      </source>
+      
+      <resource id="ejb3-clustered-sfsbcache-service" path="ejb3-clustered-sfsbcache-service.xml"/>
+      <resource id="ejb3-entity-cache-service" path="ejb3-entity-cache-service.xml"/>
+      <resource id="ejb3-interceptors-aop" path="ejb3-interceptors-aop.xml"/>
+      <resource id="ejb3-all-resources" path="."/>
+      <resource id="ejb3-standalone-resources" path="./standalone"/>
+      <resource id="ejb3-META-INF-resources" path="./META-INF"/>
+
+      <artifactdef artifact="default.persistence.properties" toname="default.persistence.properties">
+        <include input="persistence.properties"/>
+      </artifactdef>
+      
+
+      <!-- ============================================================ -->
+      <!-- jboss-ejb3.jar                                                -->
+      <!-- ============================================================ -->
+      <artifactdef artifact="jboss-ejb3.jar" requiredJDK="1.5">
+         <include input="main">
+            <include pattern="org/jboss/**"/>
+            <exclude pattern="org/jboss/ejb3/test/**"/>
+            <exclude pattern="org/jboss/annotation/**"/>
+         </include>
+      </artifactdef>
+
+
+      <!-- ============================================================ -->
+      <!-- jboss-annotations-ejb3.jar                                   -->
+      <!-- ============================================================ -->
+      <artifactdef artifact="jboss-annotations-ejb3.jar" requiredJDK="1.5">
+         <include input="main">
+           <include pattern="org/jboss/annotation/**"/>
+         </include>
+      </artifactdef>
+
+      <!-- ============================================================ -->
+      <!-- ejb3.deployer                                                -->
+      <!-- ============================================================ -->
+      <artifactdef artifact="ejb3.deployer" requiredJDK="1.5">
+         <include input="jboss-ejb3.jar"/>
+         <include input="antlr-2.7.5H3.jar" />
+         <include input="asm-attrs.jar" />
+         <include input="asm.jar" />
+         <include input="cglib-2.1.1.jar" />
+         <include input="commons-beanutils.jar" />
+         <include input="commons-codec-1.2.jar" />
+         <include input="commons-collections.jar" />
+         <include input="commons-digester-1.6.jar" />
+         <include input="commons-discovery.jar" />
+         <include input="commons-fileupload.jar" />
+         <include input="commons-httpclient.jar" />
+         <include input="commons-lang-2.0.jar" />
+         <include input="commons-logging.jar" />
+         <include input="commons-logging-api.jar" />
+         <include input="commons-pool.jar" />
+         <include input="commons-validator-1.1.3.jar" />
+         <include input="commons-vfs.jar" />
+         <include input="dom4j.jar" />
+         <include input="ejb3-persistence.jar" />
+         <include input="hibernate-annotations.jar" />
+         <include input="hibernate-entitymanager.jar" />
+         <include input="hibernate3.jar" />         
+	 <include input="jaxen-1.1-beta-4.jar" />                                    
+	 <include input="jboss-annotations-ejb3.jar" /> 
+	 <include input="jboss-ejb3x.jar" />
+         <include input ="ejb3-META-INF-resources" prefix="META-INF">
+            <include pattern="persistence.properties"/>            
+            <include pattern="jboss-service.xml"/>            
+         </include>	 
+      </artifactdef>
+      
+      <!-- ============================================================ -->
+      <!-- embeddable                                                   -->
+      <!-- ============================================================ -->
+      <artifactdef artifact="embeddable" requiredJDK="1.5" >
+         <include input="ejb3-all-resources" prefix="conf">
+            <include pattern="ejb3-interceptors-aop.xml"/>
+         </include>
+         <include input="ejb3-standalone-resources" prefix="conf">
+            <include pattern="embedded-jboss-beans.xml"/>
+            <include pattern="jboss-jms-beans.xml"/>
+            <include pattern="log4j.xml"/>
+         </include>
+         <include input ="default.persistence.properties" prefix="conf">
+            
+          </include>
+         <include input="jboss-ejb3.jar" prefix="lib"/>
+         <include input="antlr-2.7.5H3.jar" prefix="lib"/>
+         <include input="asm-attrs.jar" prefix="lib"/>
+         <include input="asm.jar" prefix="lib"/>
+         <include input="cglib-2.1.1.jar" prefix="lib"/>
+         <include input="commons-beanutils.jar" prefix="lib"/>
+         <include input="commons-codec-1.2.jar" prefix="lib"/>
+         <include input="commons-collections.jar" prefix="lib"/>
+         <include input="commons-digester-1.6.jar" prefix="lib"/>
+         <include input="commons-discovery.jar" prefix="lib"/>
+         <include input="commons-fileupload.jar" prefix="lib"/>
+         <include input="commons-httpclient.jar" prefix="lib"/>
+         <include input="commons-lang-2.0.jar" prefix="lib"/>
+         <include input="commons-logging.jar" prefix="lib"/>
+         <include input="commons-logging-api.jar" prefix="lib"/>
+         <include input="commons-pool.jar" prefix="lib"/>
+         <include input="commons-validator-1.1.3.jar" prefix="lib"/>
+         <include input="commons-vfs.jar" prefix="lib"/>
+         <include input="concurrent.jar" prefix="lib"/>
+         <include input="dom4j.jar" prefix="lib"/>
+         <include input="ejb3-persistence.jar" prefix="lib"/>
+         <include input="hibernate-annotations.jar" prefix="lib"/>
+         <include input="hibernate-entitymanager.jar" prefix="lib"/>
+         <include input="hibernate3.jar" prefix="lib"/>         
+         <include input="hsqldb.jar" prefix="lib"/>                  
+	 <include input="jaxen-1.1-beta-4.jar" prefix="lib"/>                           
+	 <include input="jboss-annotations-ejb3.jar" prefix="lib"/>                           
+	 <include input="jboss-aop-jdk50.jar" prefix="lib"/>                           
+	 <include input="jboss-aspect-library-jdk50.jar" prefix="lib"/>                           
+	 <include input="jboss-boot.jar" prefix="lib"/>                           
+	 <include input="jboss-common-jdbc-wrapper.jar" prefix="lib"/>                           
+	 <include input="jboss-common.jar" prefix="lib"/>                           
+	 <include input="jboss-ejb3x.jar" prefix="lib"/>                           
+	 <include input="jboss-ha-local-jdbc.jar" prefix="lib"/>                           	 
+	 <include input="jboss-ha-xa-jdbc.jar" prefix="lib"/>                           	 
+	 <include input="jboss-j2ee.jar" prefix="lib"/>                           	 
+	 <include input="jboss-j2se.jar" prefix="lib"/>                           	 
+	 <include input="jboss-jaxrpc.jar" prefix="lib"/>                           	 
+	 <include input="jboss-jca.jar" prefix="lib"/>                           	 
+	 <include input="jboss-local-jdbc.jar" prefix="lib"/>                           	 
+	 <include input="jboss-microcontainer.jar" prefix="lib"/>                           	 
+	 <include input="jboss-remoting.jar" prefix="lib"/>                           	 
+	 <include input="jboss-saaj.jar" prefix="lib"/>                           	 
+	 <include input="jboss-system-client.jar" prefix="lib"/>                           	 
+	 <include input="jboss-system.jar" prefix="lib"/>                           	 
+	 <include input="jboss-transaction.jar" prefix="lib"/>                           	 
+	 <include input="jboss-xa-jdbc.jar" prefix="lib"/>                           	 
+	 <include input="jboss.jar" prefix="lib"/>                           	 
+	 <include input="jbosscx-client.jar" prefix="lib"/>                           	 
+	 <include input="jbossmq.jar" prefix="lib"/>                           	 
+	 <include input="jbosssx.jar" prefix="lib"/>                           	 
+	 <include input="jms-ra.jar" prefix="lib"/>                           	 
+	 <include input="jnpserver.jar" prefix="lib"/>                           	 
+	 <include input="log4j-boot.jar" prefix="lib"/>                           	 
+	 <include input="log4j.jar" prefix="lib"/>                           	 
+	 <include input="mail-ra.jar" prefix="lib"/>                           	 
+	 <include input="resolver.jar" prefix="lib"/>                           	 	 
+	 <include input="run.jar" prefix="lib"/>                           	 	 
+	 <include input="testsuite-support.jar" prefix="lib"/>                           	 
+	 <include input="trove.jar" prefix="lib"/>                           	 
+	 <include input="xercesImpl.jar" prefix="lib"/>                           	 
+	 <include input="xml-apis.jar" prefix="lib"/> 
+	 <include input="javassist.jar" prefix="lib"/> 	 
+ 	 <include input="jboss-dependency.jar" prefix="lib"/>      
+ 	 <include input="jboss-container.jar" prefix="lib"/>                           	 	 
+      </artifactdef>      
+
+
+
+   </componentdef>
+
+   <!-- Generate the targets -->   
+   <generate generate="ejb3"/>
+
+</project>


Property changes on: branches/Branch_4_2/ejb3/jbossbuild.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/local.properties
===================================================================
--- branches/Branch_4_2/ejb3/local.properties	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/local.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -8,11 +8,12 @@
 # (even at the same machine). Actually what we needed are just node0 and node1
 # ips and the rest are optional. 
 #
+node0=127.0.0.1
 #node0=${env.MYTESTIP_1}
 #node0.http.url=http://192.168.1.103:8080
-#node0.jndiurl=jnp://192.168.1.103:1099
+#node0.jndi.url=jnp://127.0.0.1:1099
 
-#node1=${env.MYTESTIP_2}
+node1=${env.MYTESTIP_2}
 #node1.http.url=http://192.168.1.113:8080
 #node1.jndiurl=jnp://192.168.1.113:1099
 

Deleted: branches/Branch_4_2/ejb3/src/etc/component-info.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/etc/component-info.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/etc/component-info.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-<project name="jboss/ejb3-component-info">
-
-   <component id="jboss/ejb3"
-              licenseType="lgpl"
-              version="1.0.0.CR7-jboss4"
-              description="The EJB3 deployer for integration with jboss-4.0.x">
-
-      <artifact id="ejb3-clustered-sfsbcache-service.xml"/>
-      <artifact id="ejb3-entity-cache-service.xml"/>
-      <artifact id="ejb3-interceptors-aop.xml"/>
-      <artifact id="ejb3.deployer" />
-      <artifact id="hibernate-client.jar"/>
-      <artifact id="jboss-ejb3-client.jar"/>
-
-      <import componentref="javassist">
-        <compatible version="3.2.0.CR1"/>
-        <compatible version="3.2.0.CR2"/>
-      </import>
-      <import componentref="hibernate-annotations">
-        <compatible version="3.2.0.GA"/>
-      </import>
-      <import componentref="hibernate-entitymanager">
-        <compatible version="3.2.0.GA"/>
-      </import>
-      <import componentref="jboss/remoting">
-        <compatible version="1.4.1_final"/>
-        <compatible version="1.4.2.GA"/>
-      </import>
-      <import componentref="jboss/aop">
-        <compatible version="1.5.0.GA"/>
-      </import>
-
-      <export>
-         <include input="hibernate-client.jar"/>
-         <include input="jboss-ejb3-client.jar"/>
-      </export>
-
-   </component>
-
-</project>

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Ignore the dependency created by an injection annotation applied
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
-public @interface IgnoreDependency
-{
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Ignore the dependency created by an injection annotation applied
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface IgnoreDependency
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependency.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class IgnoreDependencyImpl implements IgnoreDependency
-{
-   public IgnoreDependencyImpl()
-   {
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return IgnoreDependency.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class IgnoreDependencyImpl implements IgnoreDependency
+{
+   public IgnoreDependencyImpl()
+   {
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return IgnoreDependency.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for specifying the aspect domain for a bean. The aspect domain contains the interceptor
- * stack and bindings
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target(ElementType.TYPE)
- at Retention(RetentionPolicy.RUNTIME)
-public @interface AspectDomain
-{
-   String value();
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for specifying the aspect domain for a bean. The aspect domain contains the interceptor
+ * stack and bindings
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Target(ElementType.TYPE)
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface AspectDomain
+{
+   String value();
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomain.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class AspectDomainImpl implements AspectDomain
-{
-   String value = "";
-
-   public AspectDomainImpl(String value)
-   {
-      this.value = value;
-   }
-   
-   public String value()
-   {
-      return value;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return AspectDomain.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class AspectDomainImpl implements AspectDomain
+{
+   String value = "";
+
+   public AspectDomainImpl(String value)
+   {
+      this.value = value;
+   }
+   
+   public String value()
+   {
+      return value;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return AspectDomain.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Clustered.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Clustered.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Clustered.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -40,5 +40,5 @@
 {
    Class loadBalancePolicy() default LoadBalancePolicy.class;
 
-   String partition() default "DefaultPartition";
+   String partition() default "${jboss.partition.name:DefaultPartition}";;
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -32,7 +32,7 @@
 public class ClusteredImpl implements Clustered
 {
    private Class loadBalancePolicy = LoadBalancePolicy.class;
-   private String partition = "DefaultPartition";
+   private String partition = null;
    
 
    public Class loadBalancePolicy()

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.ejb.ActivationConfigProperty;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ConsumerImpl implements Consumer
-{
-   private String name = "";
-   private HashMap<String, ActivationConfigProperty> activationConfig = new HashMap<String, ActivationConfigProperty>();
-   
-   public ConsumerImpl(Consumer consumer)
-   {
-      if (consumer != null)
-      {
-         name = consumer.name();
-         if (consumer.activationConfig() != null)
-         {
-            for (ActivationConfigProperty prop : consumer.activationConfig())
-            {
-               activationConfig.put(prop.propertyName(), prop);
-            }
-         }
-      }
-   }
-   
-   public String name()
-   {
-      return name;
-   }
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-   
-   public ActivationConfigProperty[] activationConfig()
-   {
-      ActivationConfigProperty[] result = new ActivationConfigProperty[activationConfig.size()];
-      int i = 0;
-      for (Iterator<ActivationConfigProperty> it = activationConfig.values().iterator() ; it.hasNext() ; )
-      {
-         result[i++] = it.next(); 
-      }
-      return result;
-   }
-   
-   public void addActivationConfig(ActivationConfigProperty config)
-   {
-      activationConfig.put(config.propertyName(), config);
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.ejb.ActivationConfigProperty;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ConsumerImpl implements Consumer
+{
+   private String name = "";
+   private HashMap<String, ActivationConfigProperty> activationConfig = new HashMap<String, ActivationConfigProperty>();
+   
+   public ConsumerImpl(Consumer consumer)
+   {
+      if (consumer != null)
+      {
+         name = consumer.name();
+         if (consumer.activationConfig() != null)
+         {
+            for (ActivationConfigProperty prop : consumer.activationConfig())
+            {
+               activationConfig.put(prop.propertyName(), prop);
+            }
+         }
+      }
+   }
+   
+   public String name()
+   {
+      return name;
+   }
+   
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   public ActivationConfigProperty[] activationConfig()
+   {
+      ActivationConfigProperty[] result = new ActivationConfigProperty[activationConfig.size()];
+      int i = 0;
+      for (Iterator<ActivationConfigProperty> it = activationConfig.values().iterator() ; it.hasNext() ; )
+      {
+         result[i++] = it.next(); 
+      }
+      return result;
+   }
+   
+   public void addActivationConfig(ActivationConfigProperty config)
+   {
+      activationConfig.put(config.propertyName(), config);
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Inject the current message of a @Consumer invocation
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.FIELD})
- at Retention(RetentionPolicy.RUNTIME)
-public @interface CurrentMessage
-{
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Inject the current message of a @Consumer invocation
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Target({ElementType.METHOD, ElementType.FIELD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface CurrentMessage
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessage.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class CurrentMessageImpl implements CurrentMessage
-{
-   
-   public CurrentMessageImpl()
-   {
-      
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class CurrentMessageImpl implements CurrentMessage
+{
+   
+   public CurrentMessageImpl()
+   {
+      
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-
-/**
- * @version <tt>$Revision: 45143 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DefaultActivationSpecsImpl implements DefaultActivationSpecs
-{
-   private HashMap activationConfigProperties = new HashMap();
-   
-   public DefaultActivationSpecsImpl()
-   {
-   }
-   
-   public ActivationConfigProperty[] value()
-   {
-      ActivationConfigProperty[] value = new ActivationConfigProperty[activationConfigProperties.size()];
-      activationConfigProperties.values().toArray(value);
-      return value;
-   }
-   
-   public void addActivationConfigProperty(ActivationConfigProperty property)
-   {
-      activationConfigProperties.put(property.propertyName(), property);
-   }
-   
-   public void merge(DefaultActivationSpecs annotation)
-   {   
-      for (ActivationConfigProperty property : annotation.value())
-      {
-         if (!activationConfigProperties.containsKey(property.propertyName()))
-         {
-            activationConfigProperties.put(property.propertyName(), property);
-         }
-      }
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return DefaultActivationSpecs.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DefaultActivationSpecsImpl implements DefaultActivationSpecs
+{
+   private HashMap activationConfigProperties = new HashMap();
+   
+   public DefaultActivationSpecsImpl()
+   {
+   }
+   
+   public ActivationConfigProperty[] value()
+   {
+      ActivationConfigProperty[] value = new ActivationConfigProperty[activationConfigProperties.size()];
+      activationConfigProperties.values().toArray(value);
+      return value;
+   }
+   
+   public void addActivationConfigProperty(ActivationConfigProperty property)
+   {
+      activationConfigProperties.put(property.propertyName(), property);
+   }
+   
+   public void merge(DefaultActivationSpecs annotation)
+   {   
+      for (ActivationConfigProperty property : annotation.value())
+      {
+         if (!activationConfigProperties.containsKey(property.propertyName()))
+         {
+            activationConfigProperties.put(property.propertyName(), property);
+         }
+      }
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return DefaultActivationSpecs.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DependsImpl implements Depends
-{
-   private ArrayList<String> dependencies = new ArrayList();
-   
-   public DependsImpl()
-   {
-   }
-   
-   public String[] value()
-   {
-      String[] value = new String[dependencies.size()];
-      dependencies.toArray(value);
-      return value;
-   }
-   
-   public void addDependency(String dependency)
-   {
-      dependencies.add(dependency);
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return Depends.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DependsImpl implements Depends
+{
+   private ArrayList<String> dependencies = new ArrayList();
+   
+   public DependsImpl()
+   {
+   }
+   
+   public String[] value()
+   {
+      String[] value = new String[dependencies.size()];
+      dependencies.toArray(value);
+      return value;
+   }
+   
+   public void addDependency(String dependency)
+   {
+      dependencies.add(dependency);
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return Depends.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-import javax.interceptor.ExcludeClassInterceptors;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeClassInterceptorsImpl implements ExcludeClassInterceptors
-{
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return ExcludeClassInterceptors.class;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+
+import javax.interceptor.ExcludeClassInterceptors;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ExcludeClassInterceptorsImpl implements ExcludeClassInterceptors
+{
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return ExcludeClassInterceptors.class;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-import javax.interceptor.ExcludeDefaultInterceptors;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeDefaultInterceptorsImpl implements ExcludeDefaultInterceptors
-{
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return ExcludeDefaultInterceptors.class;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+
+import javax.interceptor.ExcludeDefaultInterceptors;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ExcludeDefaultInterceptorsImpl implements ExcludeDefaultInterceptors
+{
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return ExcludeDefaultInterceptors.class;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation binds a bean into Corba.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: 46552 $
- */
- at Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
- at Retention(RetentionPolicy.RUNTIME)
-public @interface IIOP {
-   final String POA_SHARED = "shared";
-   final String POA_PER_SERVANT = "per-servant";
-   
-   boolean interfaceRepositorySupported() default false;
-   
-   /**
-    * per-servant or shared portable object adapter
-    */
-   String poa() default POA_PER_SERVANT;
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation binds a bean into Corba.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface IIOP {
+   final String POA_SHARED = "shared";
+   final String POA_PER_SERVANT = "per-servant";
+   
+   boolean interfaceRepositorySupported() default false;
+   
+   /**
+    * per-servant or shared portable object adapter
+    */
+   String poa() default POA_PER_SERVANT;
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/IIOP.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import javax.ejb.LocalHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class LocalHomeImpl implements LocalHome
-{
-   private Class value;
-
-   public LocalHomeImpl(Class value)
-   {
-      this.value = value;
-   }
-
-   public Class value()
-   {
-      return value;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return LocalHome.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import javax.ejb.LocalHome;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class LocalHomeImpl implements LocalHome
+{
+   private Class value;
+
+   public LocalHomeImpl(Class value)
+   {
+      this.value = value;
+   }
+
+   public Class value()
+   {
+      return value;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return LocalHome.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ManagementImpl implements Management
-{
-   private Class value;
-
-   public ManagementImpl(Class value)
-   {
-      this.value = value;
-   }
-   
-   public void setObjectName(Class value)
-   {
-      this.value = value;
-   }
-   
-   public Class value()
-   {
-      return value;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ManagementImpl implements Management
+{
+   private Class value;
+
+   public ManagementImpl(Class value)
+   {
+      this.value = value;
+   }
+   
+   public void setObjectName(Class value)
+   {
+      this.value = value;
+   }
+   
+   public Class value()
+   {
+      return value;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -26,6 +26,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.jboss.ejb3.Pool;
+
 /**
  * Annotation for specifying the pool class to manage thread pooling for a bean
  *
@@ -36,7 +38,7 @@
 @Target({ElementType.TYPE})
 public @interface PoolClass
 {
-   Class value();
+   Class<? extends Pool> value();
    int maxSize() default 30;
    long timeout()default Long.MAX_VALUE;
 }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @version <tt>$Revision: 55512 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class PoolClassImpl implements PoolClass
-{
-   public Class value;
-   public int maxSize = 30;
-   public long timeout = Long.MAX_VALUE;
-
-   public PoolClassImpl()
-   {
-   }
-   
-   public Class value()
-   {
-      return value;
-   }
-   
-   public void setValue(Class value)
-   {
-      this.value = value;
-   }
-
-   public int maxSize()
-   {
-      return maxSize;
-   }
-   
-   public void setMaxSize(int maxSize)
-   {
-      this.maxSize = maxSize;
-   }
-
-   public long timeout()
-   {
-      return timeout;
-   }
-   
-   public void setTimeout(long timeout)
-   {
-      this.timeout = timeout;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return PoolClass.class;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[PoolClassImpl:");
-      sb.append("value=").append(value);
-      sb.append(", maxSize=").append(maxSize);
-      sb.append(", timeout=").append(timeout);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class PoolClassImpl implements PoolClass
+{
+   public Class value;
+   public int maxSize = 30;
+   public long timeout = Long.MAX_VALUE;
+
+   public PoolClassImpl()
+   {
+   }
+   
+   public Class value()
+   {
+      return value;
+   }
+   
+   public void setValue(Class value)
+   {
+      this.value = value;
+   }
+
+   public int maxSize()
+   {
+      return maxSize;
+   }
+   
+   public void setMaxSize(int maxSize)
+   {
+      this.maxSize = maxSize;
+   }
+
+   public long timeout()
+   {
+      return timeout;
+   }
+   
+   public void setTimeout(long timeout)
+   {
+      this.timeout = timeout;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return PoolClass.class;
+   }
+   
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[PoolClassImpl:");
+      sb.append("value=").append(value);
+      sb.append(", maxSize=").append(maxSize);
+      sb.append(", timeout=").append(timeout);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClassImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import javax.ejb.RemoteHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class RemoteHomeImpl implements RemoteHome
-{
-   private Class value;
-
-   public RemoteHomeImpl(Class value)
-   {
-      this.value = value;
-   }
-
-   public Class value()
-   {
-      return value;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return RemoteHome.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import javax.ejb.RemoteHome;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class RemoteHomeImpl implements RemoteHome
+{
+   private Class value;
+
+   public RemoteHomeImpl(Class value)
+   {
+      this.value = value;
+   }
+
+   public Class value()
+   {
+      return value;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return RemoteHome.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Identifies RAR you want to use for the MDB.  This is message inflow.
- * The RAR is identified by the basename of the jar file it resides in,
- * for example @ResourceAdapter("jms-ra.rar").
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target(ElementType.TYPE)
- at Retention(RetentionPolicy.RUNTIME)
-public @interface ResourceAdapter
-{
-   String value();
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Identifies RAR you want to use for the MDB.  This is message inflow.
+ * The RAR is identified by the basename of the jar file it resides in,
+ * for example @ResourceAdapter("jms-ra.rar").
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Target(ElementType.TYPE)
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface ResourceAdapter
+{
+   String value();
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapter.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ResourceAdapterImpl implements ResourceAdapter
-{
-   private String adapter;
-
-   public ResourceAdapterImpl(String adapter)
-   {
-      this.adapter = adapter;
-   }
-
-   public String value() { return adapter; }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return ResourceAdapter.class;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ResourceAdapterImpl implements ResourceAdapter
+{
+   private String adapter;
+
+   public ResourceAdapterImpl(String adapter)
+   {
+      this.adapter = adapter;
+   }
+
+   public String value() { return adapter; }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return ResourceAdapter.class;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Set on a stateful bean.  Instead of throwing an exception on concurrent access to the stateful bean,
- * block/serialize access.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target(ElementType.TYPE)
- at Retention(RetentionPolicy.RUNTIME)
-public @interface SerializedConcurrentAccess
-{
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Set on a stateful bean.  Instead of throwing an exception on concurrent access to the stateful bean,
+ * block/serialize access.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Target(ElementType.TYPE)
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface SerializedConcurrentAccess
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccess.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-
-/**
- * @version <tt>$Revision: 45088 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class SerializedConcurrentAccessImpl implements SerializedConcurrentAccess
-{
-   public SerializedConcurrentAccessImpl()
-   {
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return SerializedConcurrentAccess.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class SerializedConcurrentAccessImpl implements SerializedConcurrentAccess
+{
+   public SerializedConcurrentAccessImpl()
+   {
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return SerializedConcurrentAccess.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Service.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Service.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/Service.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -38,4 +38,5 @@
 {
    String objectName() default "";
    String name() default "";
+   String xmbean() default "";
 }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ServiceImpl implements Service
-{
-   private String objectName = "";
-   private String name = "";
-   
-   public ServiceImpl(Service service)
-   {
-      if (service != null)
-      {
-         objectName = service.objectName();
-         name = service.name();
-      }
-   }
-
-   public ServiceImpl(String objectName)
-   {
-      this.objectName = objectName;
-   }
-   
-   public void setObjectName(String objectName)
-   {
-         this.objectName = objectName;
-   }
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-   
-   public String objectName()
-   {
-      return objectName;
-   }
-
-   public String name()
-   {
-      return name;
-   }
-   
-   public Class<? extends Annotation> annotationType()
-   {
-      return null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ServiceImpl implements Service
+{
+   private String objectName = "";
+   private String name = "";
+   private String xmbean = "";
+   
+   public ServiceImpl(Service service)
+   {
+      if (service != null)
+      {
+         objectName = service.objectName();
+         name = service.name();
+      }
+   }
+
+   public ServiceImpl(String objectName)
+   {
+      this.objectName = objectName;
+   }
+   
+   public void setObjectName(String objectName)
+   {
+         this.objectName = objectName;
+   }
+   
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   public String objectName()
+   {
+      return objectName;
+   }
+
+   public String name()
+   {
+      return name;
+   }
+   
+   public void setXMBean(String xmbean)
+   {
+      this.xmbean = xmbean;
+   }
+   
+   public String xmbean()
+   {
+      return xmbean;
+   }
+   
+   public Class<? extends Annotation> annotationType()
+   {
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for specifying the transaction timeout of an EJB business method
- * 
- * @author <a href="mailto:bill.decoste at jboss.org">William DeCoste</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.TYPE})
- at Retention(RetentionPolicy.RUNTIME)
-public @interface TransactionTimeout
-{
-   int value() default 0;   
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for specifying the transaction timeout of an EJB business method
+ * 
+ * @author <a href="mailto:bill.decoste at jboss.org">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Target({ElementType.METHOD, ElementType.TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface TransactionTimeout
+{
+   int value() default 0;   
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeout.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class TransactionTimeoutImpl implements TransactionTimeout
-{
-   private int value = 0;
-   
-   public TransactionTimeoutImpl()
-   {
-      
-   }
-
-   public TransactionTimeoutImpl(int value)
-   {
-      this.value = value;
-   }
-   
-   public void setValue(int value)
-   {
-      this.value = value;
-   }
-   
-   public int value()
-   {
-      return value;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return TransactionTimeout.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class TransactionTimeoutImpl implements TransactionTimeout
+{
+   private int value = 0;
+   
+   public TransactionTimeoutImpl()
+   {
+      
+   }
+
+   public TransactionTimeoutImpl(int value)
+   {
+      this.value = value;
+   }
+   
+   public void setValue(int value)
+   {
+      this.value = value;
+   }
+   
+   public int value()
+   {
+      return value;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return TransactionTimeout.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb.cache;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class CacheImpl implements Cache
-{
-   private Class val;
-
-   public CacheImpl(Class val)
-   {
-      this.val = val;
-   }
-
-   public Class value() { return val; }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return Cache.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb.cache;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class CacheImpl implements Cache
+{
+   private Class val;
+
+   public CacheImpl(Class val)
+   {
+      this.val = val;
+   }
+
+   public Class value() { return val; }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return Cache.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb.cache.simple;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @version <tt>$Revision: 45045 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class CacheConfigImpl implements CacheConfig
-{
-   private int maxSize = 100000;
-   private long idleTimeoutSeconds = 300;
-
-   public CacheConfigImpl()
-   {
-   }
-   
-   public int maxSize()
-   {
-      return maxSize;
-   }
-   
-   public void setMaxSize(int maxSize)
-   {
-      this.maxSize = maxSize;
-   }
-
-   public long idleTimeoutSeconds()
-   {
-      return idleTimeoutSeconds;
-   }
-   
-   public void setIdleTimeoutSeconds(long idleTimeoutSeconds)
-   {
-      this.idleTimeoutSeconds = idleTimeoutSeconds;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return CacheConfig.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb.cache.simple;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class CacheConfigImpl implements CacheConfig
+{
+   private int maxSize = 100000;
+   private long idleTimeoutSeconds = 300;
+
+   public CacheConfigImpl()
+   {
+   }
+   
+   public int maxSize()
+   {
+      return maxSize;
+   }
+   
+   public void setMaxSize(int maxSize)
+   {
+      this.maxSize = maxSize;
+   }
+
+   public long idleTimeoutSeconds()
+   {
+      return idleTimeoutSeconds;
+   }
+   
+   public void setIdleTimeoutSeconds(long idleTimeoutSeconds)
+   {
+      this.idleTimeoutSeconds = idleTimeoutSeconds;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return CacheConfig.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb.cache.simple;
-
-import java.lang.annotation.Annotation;
-
-import org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager;
-
-/**
- * @version <tt>$Revision: 45045 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class PersistenceManagerImpl implements PersistenceManager
-{
-   private Class value = StatefulSessionFilePersistenceManager.class;
-
-   public PersistenceManagerImpl()
-   {
-   }
-   
-   public Class value()
-   {
-      return value;
-   }
-   
-   public void setValue(Class value)
-   {
-      this.value = value;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return PersistenceManager.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb.cache.simple;
+
+import java.lang.annotation.Annotation;
+
+import org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class PersistenceManagerImpl implements PersistenceManager
+{
+   private Class value = StatefulSessionFilePersistenceManager.class;
+
+   public PersistenceManagerImpl()
+   {
+   }
+   
+   public Class value()
+   {
+      return value;
+   }
+   
+   public void setValue(Class value)
+   {
+      this.value = value;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return PersistenceManager.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/PersistenceManagerImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb.cache.tree;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @version <tt>$Revision: 45045 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class CacheConfigImpl implements CacheConfig
-{
-   private String name = "jboss.cache:service=EJB3SFSBClusteredCache";
-   private int maxSize = 100000;
-   private long idleTimeoutSeconds = 300;
-
-   public CacheConfigImpl()
-   {
-   }
-   
-   public String name()
-   {
-      return name;
-   }
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-   
-   public int maxSize()
-   {
-      return maxSize;
-   }
-   
-   public void setMaxSize(int maxSize)
-   {
-      this.maxSize = maxSize;
-   }
-
-   public long idleTimeoutSeconds()
-   {
-      return idleTimeoutSeconds;
-   }
-   
-   public void setIdleTimeoutSeconds(long idleTimeoutSeconds)
-   {
-      this.idleTimeoutSeconds = idleTimeoutSeconds;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return CacheConfig.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.annotation.ejb.cache.tree;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class CacheConfigImpl implements CacheConfig
+{
+   private String name = "jboss.cache:service=EJB3SFSBClusteredCache";
+   private int maxSize = 100000;
+   private long idleTimeoutSeconds = 300;
+
+   public CacheConfigImpl()
+   {
+   }
+   
+   public String name()
+   {
+      return name;
+   }
+   
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   public int maxSize()
+   {
+      return maxSize;
+   }
+   
+   public void setMaxSize(int maxSize)
+   {
+      this.maxSize = maxSize;
+   }
+
+   public long idleTimeoutSeconds()
+   {
+      return idleTimeoutSeconds;
+   }
+   
+   public void setIdleTimeoutSeconds(long idleTimeoutSeconds)
+   {
+      this.idleTimeoutSeconds = idleTimeoutSeconds;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return CacheConfig.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/internal)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.annotation.internal;
-
-/**
- * Annotation for internal use. We need an annotation to match for in ejb3-interceptors-aop.xml to trigger
- * the EJB3InterceptorsFactory, in case an ejb only has default interceptors. Users should not use this 
- * annotation directly, it is used internally by JBoss EJB3.
- * 
- * 
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public @interface DefaultInterceptorMarker {
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.annotation.internal;
+
+/**
+ * Annotation for internal use. We need an annotation to match for in ejb3-interceptors-aop.xml to trigger
+ * the EJB3InterceptorsFactory, in case an ejb only has default interceptors. Users should not use this 
+ * annotation directly, it is used internally by JBoss EJB3.
+ * 
+ * 
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public @interface DefaultInterceptorMarker {
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarker.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.annotation.internal;
-
-import java.lang.annotation.Annotation;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class DefaultInterceptorMarkerImpl implements DefaultInterceptorMarker
-{
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return DefaultInterceptorMarker.class;
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.annotation.internal;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class DefaultInterceptorMarkerImpl implements DefaultInterceptorMarker
+{
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return DefaultInterceptorMarker.class;
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/internal/DefaultInterceptorMarkerImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb;
-
-
-/**
- * // *
- *
- * @author <a href="mailto:bill at jboss.org">William DeCoste</a>
- * @version $Revision$
- */
-public class ApplicationExceptionImpl implements javax.ejb.ApplicationException
-{
-   private boolean rollback ;
-   
-   public ApplicationExceptionImpl(boolean rollback)
-   {
-      this.rollback = rollback;
-   }
-
-   public boolean rollback()
-   {
-      return rollback;
-   }
-
-   public Class annotationType()
-   {
-      return javax.ejb.ApplicationException.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb;
+
+
+/**
+ * // *
+ *
+ * @author <a href="mailto:bill at jboss.org">William DeCoste</a>
+ * @version $Revision$
+ */
+public class ApplicationExceptionImpl implements javax.ejb.ApplicationException
+{
+   private boolean rollback ;
+   
+   public ApplicationExceptionImpl(boolean rollback)
+   {
+      this.rollback = rollback;
+   }
+
+   public boolean rollback()
+   {
+      return rollback;
+   }
+
+   public Class annotationType()
+   {
+      return javax.ejb.ApplicationException.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/ApplicationExceptionImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb;
-
-
-/**
- * // *
- *
- * @author <a href="mailto:bill at jboss.org">William DeCoste</a>
- * @version $Revision: 45726 $
- */
-public class DeclareRolesImpl implements javax.annotation.security.DeclareRoles
-{
-   private String[] v;
-
-   public DeclareRolesImpl(String[] v)
-   {
-      this.v = v;
-   }
-
-   public String[] value()
-   {
-      return v;
-   }
-
-   public Class annotationType()
-   {
-      return javax.annotation.security.DeclareRoles.class;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb;
+
+
+/**
+ * // *
+ *
+ * @author <a href="mailto:bill at jboss.org">William DeCoste</a>
+ * @version $Revision$
+ */
+public class DeclareRolesImpl implements javax.annotation.security.DeclareRoles
+{
+   private String[] v;
+
+   public DeclareRolesImpl(String[] v)
+   {
+      this.v = v;
+   }
+
+   public String[] value()
+   {
+      return v;
+   }
+
+   public Class annotationType()
+   {
+      return javax.annotation.security.DeclareRoles.class;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/DeclareRolesImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb;
 
 import java.util.ArrayList;

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb;
-
-import java.lang.annotation.Annotation;
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class LocalImpl implements Local
-{
-   private Class[] classes;
-
-   public LocalImpl(Class[] classes)
-   {
-      this.classes = classes;
-   }
-
-
-   public Class[] value()
-   {
-      return classes;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return javax.ejb.Local.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb/LocalImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb;
+
+import java.lang.annotation.Annotation;
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class LocalImpl implements Local
+{
+   private Class[] classes;
+
+   public LocalImpl(Class[] classes)
+   {
+      this.classes = classes;
+   }
+
+
+   public Class[] value()
+   {
+      return classes;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return javax.ejb.Local.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/LocalImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb;
-
-import java.lang.annotation.Annotation;
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class RemoteImpl implements Remote
-{
-   private Class[] classes;
-
-   public RemoteImpl(Class[] classes)
-   {
-      this.classes = classes;
-   }
-
-
-   public Class[] value()
-   {
-      return classes;
-   }
-
-   public Class<? extends Annotation> annotationType()
-   {
-      return Remote.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb/RemoteImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb;
+
+import java.lang.annotation.Annotation;
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class RemoteImpl implements Remote
+{
+   private Class[] classes;
+
+   public RemoteImpl(Class[] classes)
+   {
+      this.classes = classes;
+   }
+
+
+   public Class[] value()
+   {
+      return classes;
+   }
+
+   public Class<? extends Annotation> annotationType()
+   {
+      return Remote.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RemoteImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RolesReferencedImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RolesReferencedImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/RolesReferencedImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb;
-
-
-/**
- * // *
- *
- * @author <a href="mailto:bill at jboss.org">William DeCoste</a>
- * @version $Revision$
- */
-public class RolesReferencedImpl implements javax.annotation.security.RolesReferenced
-{
-   private String[] v;
-
-   public RolesReferencedImpl(String[] v)
-   {
-      this.v = v;
-   }
-
-   public String[] value()
-   {
-      return v;
-   }
-
-   public Class annotationType()
-   {
-      return javax.annotation.security.RolesReferenced.class;
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb;
-
-import javax.ejb.TransactionManagementType;
-
-/**
- * // *
- *
- * @author <a href="mailto:bill at jboss.org">William DeCoste</a>
- * @version $Revision$
- */
-public class TransactionManagementImpl implements javax.ejb.TransactionManagement
-{
-   private TransactionManagementType value = TransactionManagementType.CONTAINER;
-
-   public TransactionManagementImpl()
-   {
-   }
-
-   public TransactionManagementType value()
-   {
-      return value;
-   }
-
-   public void setValue(TransactionManagementType value)
-   {
-      this.value = value;
-   }
-
-   public Class annotationType()
-   {
-      return javax.ejb.TransactionManagement.class;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb;
+
+import javax.ejb.TransactionManagementType;
+
+/**
+ * // *
+ *
+ * @author <a href="mailto:bill at jboss.org">William DeCoste</a>
+ * @version $Revision$
+ */
+public class TransactionManagementImpl implements javax.ejb.TransactionManagement
+{
+   private TransactionManagementType value = TransactionManagementType.CONTAINER;
+
+   public TransactionManagementImpl()
+   {
+   }
+
+   public TransactionManagementType value()
+   {
+      return value;
+   }
+
+   public void setValue(TransactionManagementType value)
+   {
+      this.value = value;
+   }
+
+   public Class annotationType()
+   {
+      return javax.ejb.TransactionManagement.class;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb/TransactionManagementImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AbstractPool.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AbstractPool.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AbstractPool.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -166,9 +166,16 @@
 
    public void remove(BeanContext ctx)
    {
-      container.invokePreDestroy(ctx);
-      ctx.remove();
+      try
+      {
+         container.invokePreDestroy(ctx);
+      }
+      finally
+      {
+         ctx.remove();
+      }
    }
+
    public void discard(BeanContext ctx)
    {
       remove(ctx);

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.ejb.AllowedOperationsAssociation;
-import org.jboss.ejb.AllowedOperationsFlags;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class AllowedOperationsInterceptor implements Interceptor
-{
-
-   public String getName()
-   {
-      return "AllowedOperationsInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      try
-      {
-         AllowedOperationsAssociation.pushInMethodFlag(AllowedOperationsFlags.IN_EJB_TIMEOUT);
-         return invocation.invokeNext();
-      }
-      finally
-      {
-         AllowedOperationsAssociation.popInMethodFlag();
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.ejb.AllowedOperationsAssociation;
+import org.jboss.ejb.AllowedOperationsFlags;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AllowedOperationsInterceptor implements Interceptor
+{
+
+   public String getName()
+   {
+      return "AllowedOperationsInterceptor";
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      try
+      {
+         AllowedOperationsAssociation.pushInMethodFlag(AllowedOperationsFlags.IN_EJB_TIMEOUT);
+         return invocation.invokeNext();
+      }
+      finally
+      {
+         AllowedOperationsAssociation.popInMethodFlag();
+      }
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/AllowedOperationsInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3;
 
 import java.util.HashMap;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -25,11 +25,12 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.lang.reflect.InvocationHandler;
 import java.security.Identity;
 import java.security.Principal;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Properties;
+
 import javax.ejb.EJBException;
 import javax.ejb.EJBHome;
 import javax.ejb.EJBLocalHome;
@@ -46,16 +47,19 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 import javax.xml.rpc.handler.MessageContext;
+
 import org.jboss.annotation.security.SecurityDomain;
 import org.jboss.aop.Advisor;
+import org.jboss.ejb3.security.SecurityDomainManager;
+import org.jboss.ejb3.stateless.StatelessBeanContext;
 import org.jboss.ejb3.tx.TxUtil;
 import org.jboss.ejb3.tx.UserTransactionImpl;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.security.RealmMapping;
 import org.jboss.security.RunAsIdentity;
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
-import org.jboss.util.NestedRuntimeException;
 
 /**
  * Comment
@@ -65,6 +69,8 @@
  */
 public class BaseSessionContext implements SessionContext, MessageDrivenContext, Externalizable
 {
+   private static final long serialVersionUID = -2485139227124937217L;
+   
    private static final Logger log = Logger.getLogger(BaseSessionContext.class);
    protected transient Container container;
    protected transient RealmMapping rm;
@@ -103,7 +109,7 @@
    {
       SecurityDomain securityAnnotation = (SecurityDomain) ((Advisor) container).resolveAnnotation(SecurityDomain.class);
       if (securityAnnotation == null) return;
-      Object domain = ctx.lookup("java:/jaas/" + securityAnnotation.value());
+      Object domain = SecurityDomainManager.getSecurityManager(securityAnnotation.value(), ctx);
       rm = (RealmMapping) domain;
    }
 
@@ -140,15 +146,15 @@
       String newName;
       if (name.startsWith("/"))
       {
-         newName = Container.ENC_CTX_NAME + "/env" + name;
+         newName = "env" + name;
       }
       else
       {
-         newName = Container.ENC_CTX_NAME + "/env/" + name;
+         newName = "env/" + name;
       }
       try
       {
-         return getContainer().getInitialContext().lookup(newName);
+         return getContainer().getEnc().lookup(newName);
       }
       catch (NamingException ignored)
       {
@@ -206,6 +212,19 @@
                       + "Check that a security-domain has been set for the application.";
          throw new IllegalStateException(msg);
       }
+      
+      //Ensure that you go through the security role references that may be configured
+      EJBContainer ejbc = (EJBContainer)container;
+      if(ejbc.getXml() != null)
+      {
+         List<SecurityRoleRefMetaData> securityRoleRefs = ejbc.getXml().getSecurityRoleReferences();
+         for(SecurityRoleRefMetaData srmd: securityRoleRefs)
+         {
+            String rname = srmd.getName(); 
+            if(roleName.equals(rname))
+               roleName = srmd.getLink();
+         } 
+      } 
 
       HashSet set = new HashSet();
       set.add(new SimplePrincipal(roleName));
@@ -332,7 +351,15 @@
 
    public MessageContext getMessageContext() throws IllegalStateException
    {
-      throw new RuntimeException("NOT IMPLEMENTED");
+      // disallowed for stateful session beans (EJB3 FR 4.4.1 p 81)
+      if(baseContext instanceof StatelessBeanContext)
+      {
+         MessageContext ctx = ((StatelessBeanContext) baseContext).getMessageContextJAXRPC();
+         if(ctx == null)
+            throw new IllegalStateException("No message context found");
+         return ctx;
+      }
+      throw new UnsupportedOperationException("Only stateless beans can have a message context");
    }
 
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3;
 
 import javax.ejb.EJBContext;

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContextLifecycleCallback.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/BeanContextLifecycleCallback.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContextLifecycleCallback.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/BeanContextLifecycleCallback.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+/**
+ * The EJBContextLifecycleCallback provides a way to modify the
+ * EJBContext prior to use by the bean.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface BeanContextLifecycleCallback<T extends BeanContext>
+{
+   /**
+    * The context has been attached to a bean instance.
+    * 
+    * @param ctx
+    */
+   void attached(T ctx);
+   
+   /**
+    * The context has been released from a bean instance.
+    * 
+    * @param ctx
+    */
+   void released(T ctx);
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javax.management.ObjectName;
-
-import javax.management.MBeanServer;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ClientKernelAbstraction
-{
-   Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws Exception;
-
-   public Object getAttribute(ObjectName name, String attribute) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ClientKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import javax.management.ObjectName;
+
+import javax.management.MBeanServer;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ClientKernelAbstraction
+{
+   Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws Exception;
+
+   public Object getAttribute(ObjectName name, String attribute) throws Exception;
+}

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Container.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Container.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Container.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3;
 
 import java.util.Hashtable;
@@ -27,6 +27,8 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
+import org.jboss.ejb3.statistics.InvocationStatistics;
+
 /**
  * Comment
  *
@@ -35,7 +37,7 @@
  */
 public interface Container
 {
-   String ENC_CTX_NAME = "java:comp.ejb3";
+   String ENC_CTX_NAME = "java:comp";
 
    Class getBeanClass();
 
@@ -83,4 +85,6 @@
    void processMetadata(DependencyPolicy dependencyPolicy);
 
    DependencyPolicy getDependencyPolicy();
+   
+   InvocationStatistics getInvokeStats();
 }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import org.jboss.system.Service;
-
-import org.jboss.ejb.AllowedOperationsFlags;
-
-/**
- * This is a superinterface for all Container plugins.
- * 
- * <p>All plugin interfaces must extend this interface.
- *      
- * @see Service
- * @author <a href="mailto:rickard.oberg at telkel.com">Rickard �berg</a>
- * @version $Revision$
- */
-public interface ContainerPlugin
-   extends Service, AllowedOperationsFlags
-{
-   /**
-    * This callback is set by the container so that the plugin may access it
-    *
-    * @param con The container using this plugin. This may be null if the
-    plugin is being disassociated from a container.
-    */
-   void setContainer(Container con);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import org.jboss.system.Service;
+
+import org.jboss.ejb.AllowedOperationsFlags;
+
+/**
+ * This is a superinterface for all Container plugins.
+ * 
+ * <p>All plugin interfaces must extend this interface.
+ *      
+ * @see Service
+ * @author <a href="mailto:rickard.oberg at telkel.com">Rickard �berg</a>
+ * @version $Revision$
+ */
+public interface ContainerPlugin
+   extends Service, AllowedOperationsFlags
+{
+   /**
+    * This callback is set by the container so that the plugin may access it
+    *
+    * @param con The container using this plugin. This may be null if the
+    plugin is being disassociated from a container.
+    */
+   void setContainer(Container con);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ContainerPlugin.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultEjbEncFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/DefaultEjbEncFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultEjbEncFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultEjbEncFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import org.jboss.ejb.EjbUtil;
+import org.jboss.naming.ENCFactory;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public class DefaultEjbEncFactory implements EjbEncFactory
+{
+
+   public Context getEnc(EJBContainer container)
+   {
+      pushEnc(container);
+      InitialContext ctx = container.getInitialContext();
+      try
+      {
+         return (Context)ctx.lookup("java:comp");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      finally
+      {
+         popEnc(container);   
+      }
+   }
+
+   public void pushEnc(EJBContainer container)
+   {
+      // FIXME: NYI
+      throw new RuntimeException("NYI");
+//      ENCFactory.pushContextId(container.getObjectName());
+   }
+
+   public void popEnc(EJBContainer container)
+   {
+      // FIXME: NYI
+      throw new RuntimeException("NYI");
+//      ENCFactory.popContextId();
+   }
+
+
+   public void cleanupEnc(EJBContainer container)
+   {
+      // FIXME: NYI
+      throw new RuntimeException("NYI");
+//      ENCFactory.getEncById().remove(container.getObjectName());
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultPersistenceProperties.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/DefaultPersistenceProperties.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultPersistenceProperties.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DefaultPersistenceProperties.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import java.util.Properties;
+import java.net.URL;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 55144 $
+ */
+public class DefaultPersistenceProperties
+{
+   private Properties properties;
+
+   public DefaultPersistenceProperties() throws Exception
+   {
+      URL propsUrl = this.getClass().getClassLoader().getResource("META-INF/persistence.properties");
+      properties = new Properties();
+      properties.load(propsUrl.openStream());
+      /* Current hack to establish the hibernate bytecode provider from the
+      externalized persistence.properties
+      */
+      String bcprovider = properties.getProperty("hibernate.bytecode.provider", "javassist");
+      System.setProperty("hibernate.bytecode.provider", bcprovider);
+
+   }
+
+   public Properties getProperties()
+   {
+      return properties;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-/**
- * Abstraction for JMX Kernel vs. 5.0 MC to log dependencies
- * on persistence contexts, datasources, queues, topics, etc.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface DependencyPolicy
-{
-   public void addDependency(String dependency);
-   public void addDatasource(String jndiName);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+/**
+ * Abstraction for JMX Kernel vs. 5.0 MC to log dependencies
+ * on persistence contexts, datasources, queues, topics, etc.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface DependencyPolicy
+{
+   public void addDependency(String dependency);
+   public void addDatasource(String jndiName);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DependencyPolicy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentScope.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/DeploymentScope.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentScope.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentScope.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.Collection;
+
+/**
+ * Abstraction for accessing contents of an EAR
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface DeploymentScope
+{
+   public Collection<Ejb3Deployment> getEjbDeployments();
+   void register(Ejb3Deployment deployment);
+   void unregister(Ejb3Deployment deployment);
+
+   /**
+    *  Find a deployment based on its relative deployment name
+    *
+    * @param relativeName expects "../foo.jar"  so expects the .. in front
+    * @return
+    */
+   Ejb3Deployment findRelativeDeployment(String relativeName);
+   String getShortName();
+   String getBaseName();
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentScope.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Hashtable;
-import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface DeploymentUnit
-{
-   ClassLoader getClassLoader();
-
-   ClassLoader getResourceLoader();
-
-   String getShortName();
-
-   URL getUrl();
-
-   URL getPersistenceXml();
-
-   URL getEjbJarXml();
-
-   URL getJbossXml();
-
-   List<Class> getClasses();
-
-   String getDefaultEntityManagerName();
-
-   Map getDefaultPersistenceProperties();
-
-   Hashtable getJndiProperties();
-
-   InterceptorInfoRepository getInterceptorInfoRepository();
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.Hashtable;
+import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
+//import org.jboss.virtual.VirtualFile;
+//import org.jboss.virtual.VirtualFileFilter;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface DeploymentUnit
+{
+   ClassLoader getClassLoader();
+
+   ClassLoader getResourceLoader();
+
+   String getShortName();
+
+//   List<VirtualFile> getResources(VirtualFileFilter filter);
+
+   URL getUrl();
+
+   URL getPersistenceXml();
+
+   URL getEjbJarXml();
+
+   URL getJbossXml();
+
+   List<Class> getClasses();
+
+   String getDefaultEntityManagerName();
+
+   Map getDefaultPersistenceProperties();
+
+   Hashtable getJndiProperties();
+
+   InterceptorInfoRepository getInterceptorInfoRepository();
+
+   URL getRelativeURL(String path);
+
+//   VirtualFile getMetaDataFile(String string);
+//   
+//   VirtualFile getRootFile();
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/DeploymentUnit.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EAR.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EAR.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EAR.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.Collection;
-
-/**
- * Abstraction for accessing contents of an EAR
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface EAR
-{
-   public Collection<Ejb3Deployment> getEjbDeployments();
-   void register(Ejb3Deployment deployment);
-   void unregister(Ejb3Deployment deployment);
-
-   /**
-    *  Find a deployment based on its relative deployment name
-    *
-    * @param relativeName expects "../foo.jar"  so expects the .. in front
-    * @return
-    */
-   Ejb3Deployment findRelativeDeployment(String relativeName);
-   String getShortName();
-   String getBaseName();
-}

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.BufferedInputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -37,13 +38,13 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
+import javax.naming.LinkRef;
+
 import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.deployment.SubDeployer;
 import org.jboss.deployment.SubDeployerSupport;
+import org.jboss.logging.Logger;
 import org.jboss.metadata.MetaData;
 import org.jboss.metadata.XmlFileLoader;
 import org.jboss.mx.loading.LoaderRepositoryFactory;
@@ -66,6 +67,8 @@
 public class EJB3Deployer extends SubDeployerSupport
    implements SubDeployer, EJB3DeployerMBean
 {
+   private final static Logger log = Logger.getLogger(EJB3Deployer.class);
+   
    private ServiceControllerMBean serviceController;
 
    /** A map of current deployments */
@@ -77,6 +80,7 @@
    private Properties DefaultProperties;
 
    private HashSet ignoredJarsSet;
+   private HashMap<DeploymentInfo, String> jmxNames = new HashMap();
 
    /**
     * Default CTOR used to set default values to the Suffixes and RelativeOrder
@@ -89,7 +93,7 @@
       setRelativeOrder(400); // before old EJB 2.1 deployer
    }
 
-   protected boolean hasFile(DeploymentInfo di, String filePath)
+   public static boolean hasFile(DeploymentInfo di, String filePath)
    {
       String urlStr = di.url.getFile();
       try
@@ -119,20 +123,25 @@
       return false;
    }
 
-   protected boolean hasPersistenceXml(DeploymentInfo di)
+   public static boolean hasPersistenceXml(DeploymentInfo di)
    {
       return hasFile(di, "META-INF/persistence.xml");
    }
 
-   protected boolean has30EjbJarXml(DeploymentInfo di)
+   public static boolean has30EjbJarXml(DeploymentInfo di)
    {
       if (!hasFile(di, "META-INF/ejb-jar.xml")) return false;
+      InputStream ddStream = di.localCl.getResourceAsStream("META-INF/ejb-jar.xml");
 
+      return has30EjbJarXml(ddStream);
+   }
+
+   public static boolean has30EjbJarXml(InputStream ddStream)
+   {
       try
       {
          // look for version="3.0" in the file
          byte[] stringToFind = "version=\"3.0\"".getBytes();
-         InputStream ddStream = di.localCl.getResourceAsStream("META-INF/ejb-jar.xml");
          InputStreamReader reader = new InputStreamReader(ddStream);
          try
          {
@@ -192,7 +201,7 @@
          while (it.hasNext())
          {
             InputStream stream = (InputStream) it.next();
-            DataInputStream dstream = new DataInputStream(stream);
+            DataInputStream dstream = new DataInputStream(new BufferedInputStream(stream));
             ClassFile cf = null;
             try
             {
@@ -308,10 +317,8 @@
    public static void initializeJavaComp(InitialContext iniCtx)
            throws NamingException
    {
-      RefAddr refAddr = new StringRefAddr("nns", "ENC-EJB3");
-      Reference envRef = new Reference("javax.naming.Context", refAddr, ThreadLocalENCFactory.class.getName(), null);
       Context ctx = (Context) iniCtx.lookup("java:");
-      ctx.rebind("comp.ejb3", envRef);
+      ctx.rebind("comp.ejb3", new LinkRef("java:comp"));
    }
 
    /**
@@ -380,6 +387,12 @@
                         LoaderRepositoryFactory.parseRepositoryConfig(loader);
                   di.setRepositoryInfo(config);
                }
+               
+               Element jmxNameElement = MetaData.getOptionalChild(jboss, "jmx-name");
+               if (jmxNameElement != null)
+               {
+                  jmxNames.put(di, jmxNameElement.getChildNodes().item(0).getNodeValue());
+               }
             }
             finally
             {
@@ -411,7 +424,9 @@
          di.annotationsCl = new URLClassLoader(new URL[]{loaderURL}, di.ucl);
 
          Ejb3Module ejbModule = new Ejb3Module(di);
-         String name = Ejb3Module.BASE_EJB3_JMX_NAME + ",module=" + di.shortName;
+         String name = jmxNames.get(di);
+         if (name == null)
+            name = Ejb3Module.BASE_EJB3_JMX_NAME + ",module=" + di.shortName;
          // Build an escaped JMX name including deployment shortname
          ObjectName ejbModuleName = ObjectNameConverter.convert(name);
          // Check that the name is not registered
@@ -473,6 +488,7 @@
          throw new DeploymentException("problem stopping ejb module: " +
                                        di.url, e);
       }
+      
       super.stop(di);
    }
 
@@ -491,6 +507,9 @@
          throw new DeploymentException("problem destroying ejb module: " +
                                        di.url, e);
       }
+      
+      jmxNames.remove(di);
+      
       super.destroy(di);
    }
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,10 +21,39 @@
  */
 package org.jboss.ejb3;
 
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Timeout;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+
 import org.jboss.annotation.ejb.PoolClass;
 import org.jboss.aop.AspectManager;
-import org.jboss.aop.ClassAdvisor;
 import org.jboss.aop.ClassContainer;
+import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.annotation.AnnotationElement;
 import org.jboss.aop.joinpoint.ConstructorInvocation;
@@ -37,6 +66,7 @@
 import org.jboss.ejb3.metamodel.AssemblyDescriptor;
 import org.jboss.ejb3.metamodel.EnterpriseBean;
 import org.jboss.ejb3.security.JaccHelper;
+import org.jboss.ejb3.statistics.InvocationStatistics;
 import org.jboss.ejb3.tx.UserTransactionImpl;
 import org.jboss.injection.DependsHandler;
 import org.jboss.injection.EJBHandler;
@@ -49,40 +79,12 @@
 import org.jboss.injection.PersistenceContextHandler;
 import org.jboss.injection.PersistenceUnitHandler;
 import org.jboss.injection.ResourceHandler;
-import org.jboss.injection.WebServiceHandler;
+import org.jboss.injection.WebServiceRefHandler;
 import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.PersistenceContextRef;
 import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
 import org.jboss.naming.Util;
+//import org.jboss.virtual.VirtualFile;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Timeout;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.LinkRef;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Comment
  *
@@ -94,6 +96,8 @@
 
    private static final Logger log = Logger.getLogger(EJBContainer.class);
 
+//   protected EjbEncFactory encFactory = new DefaultEjbEncFactory();
+
    protected Pool pool;
 
    protected String ejbName;
@@ -110,7 +114,6 @@
    protected List<Injector> injectors = new ArrayList<Injector>();
 
    protected Context enc;
-   protected Context encEnv;
 
    protected Class beanContextClass;
 
@@ -142,7 +145,8 @@
 
    protected HashMap invokedMethod = new HashMap();
 
-
+   protected InvocationStatistics invokeStats = new InvocationStatistics();
+   
    /**
     * @param name                  Advisor name
     * @param manager               Domain to get interceptor bindings from
@@ -162,6 +166,9 @@
       this.deployment = deployment;
       this.beanClassName = beanClassName;
       this.classloader = cl;
+         
+      super.setChainOverridingForInheritedMethods( true );
+      
       try
       {
          clazz = classloader.loadClass(beanClassName);
@@ -178,15 +185,15 @@
       }
       catch (MalformedObjectNameException e)
       {
-         throw new RuntimeException(e); // To change body of catch statement
-         // use Options | File Templates.
+         throw new RuntimeException("failed to create object name for: " + on, e);
       }
       initialContextProperties = ctxProperties;
+      // Setting up enc the old (AS 4.2) way
       Context ctx = getInitialContext();
       try
       {
          enc = ThreadLocalENCFactory.create(ctx);
-         encEnv = Util.createSubcontext(enc, "env");
+         Util.createSubcontext(enc, "env");
       }
       catch (Exception e)
       {
@@ -195,6 +202,41 @@
       this.interceptorRepository = interceptorRepository;
       this.interceptorRepository.addBeanClass(clazz.getName());
    }
+
+
+//   public EjbEncFactory getEncFactory()
+//   {
+//      return encFactory;
+//   }
+//
+//   public void setEncFactory(EjbEncFactory encFactory)
+//   {
+//      this.encFactory = encFactory;
+//   }
+
+   /**
+    * Makes sure that EJB's ENC is available
+    * Delegates to whatever implementation is used to push the ENC of the EJB
+    * onto the stack
+    *
+    */
+   public void pushEnc()
+   {
+      ThreadLocalENCFactory.push(enc);
+//      encFactory.pushEnc(this);
+   }
+
+
+   /**
+    * Pops EJB's ENC from the stack.  Delegates to whatever implementation
+    * is used to pop the EJB's ENC from the stock
+    *
+    */
+   public void popEnc()
+   {
+      ThreadLocalENCFactory.pop();
+//      encFactory.popEnc(this);
+   }
    
    public EnvironmentRefGroup getEnvironmentRefGroup()
    {
@@ -216,6 +258,16 @@
    {
       this.jaccContextId = jaccContextId;
    }
+   
+//   public VirtualFile getRootFile()
+//   {
+//      return getDeploymentUnit().getRootFile();
+//   }
+   
+   public DeploymentUnit getDeploymentUnit()
+   {
+      return deployment.getDeploymentUnit();
+   }
 
    public Ejb3Deployment getDeployment()
    {
@@ -258,7 +310,7 @@
       handlers.add(new PersistenceContextHandler());
       handlers.add(new PersistenceUnitHandler());
       handlers.add(new ResourceHandler());
-      handlers.add(new WebServiceHandler());
+      handlers.add(new WebServiceRefHandler());
 
       ClassLoader old = Thread.currentThread().getContextClassLoader();
       Thread.currentThread().setContextClassLoader(classloader);
@@ -367,14 +419,13 @@
 
    public Context getEnc()
    {
+//      if (enc == null)
+//      {
+//         enc = encFactory.getEnc(this);
+//      }
       return enc;
    }
 
-   public Context getEncEnv()
-   {
-      return enc;
-   }
-
    public Hashtable getInitialContextProperties()
    {
       return initialContextProperties;
@@ -445,11 +496,7 @@
 
    public void create() throws Exception
    {
-   }
-
-   // Everything must be done in start to make sure all dependencies have been satisfied
-   public void start() throws Exception
-   {
+      // EJBTHREE-655: we need an instance after create
       initializeClassContainer();
       for (int i = 0; i < constructors.length; i++)
       {
@@ -459,6 +506,11 @@
             break;
          }
       }
+   }
+
+   // Everything must be done in start to make sure all dependencies have been satisfied
+   public void start() throws Exception
+   {
       initializePool();
 
       for (EncInjector injector : encInjectors.values())
@@ -481,6 +533,7 @@
 
    public void stop() throws Exception
    {
+//      encFactory.cleanupEnc(this);
    }
 
    public void destroy() throws Exception
@@ -490,10 +543,10 @@
    public void initializePool() throws Exception
    {
       PoolClass poolClass = (PoolClass) resolveAnnotation(PoolClass.class);
-      Class poolClazz = poolClass.value();
+      Class<? extends Pool> poolClazz = poolClass.value();
       int maxSize = poolClass.maxSize();
       long timeout = poolClass.timeout();
-      pool = (Pool) poolClazz.newInstance();
+      pool = poolClazz.newInstance();
       pool.initialize(this, beanContextClass, clazz, maxSize, timeout);
 
       resolveInjectors();
@@ -517,7 +570,7 @@
 
    public void invokePrePassivate(BeanContext beanContext)
    {
-      throw new RuntimeException("PostActivate not implemented for container");
+      throw new RuntimeException("PrePassivate not implemented for container");
    }
 
    public void invokeInit(Object bean)
@@ -537,24 +590,24 @@
 
    protected void resolveInjectors() throws Exception
    {
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          Thread.currentThread().setContextClassLoader(classloader);
          try
          {
-            Util.rebind(enc, "UserTransaction", new UserTransactionImpl());
+            Util.rebind(getEnc(), "UserTransaction", new UserTransactionImpl());
          }
          catch (NamingException e)
          {
-            NamingException namingException = new NamingException("Could not bind user transaction for ejb name " + ejbName + " into JNDI under jndiName: " + enc.getNameInNamespace() + "/" + "UserTransaction");
+            NamingException namingException = new NamingException("Could not bind user transaction for ejb name " + ejbName + " into JNDI under jndiName: " + getEnc().getNameInNamespace() + "/" + "UserTransaction");
             namingException.setRootCause(e);
             throw namingException;
          }
       }
       finally
       {
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
    }
 
@@ -751,45 +804,44 @@
       return deployment.getEjbContainer(businessIntf);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz)
    {
       if (clazz == this.getBeanClass())
       {
          return (T) resolveAnnotation(annotationType);
       }
-      return (T) clazz.getAnnotation(annotationType);
+      return clazz.getAnnotation(annotationType);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz, Method method)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method)
    {
       if (clazz == this.getBeanClass())
       {
          return (T) resolveAnnotation(method, annotationType);
       }
-      Class aclass = annotationType;
-      return (T) method.getAnnotation(aclass);
+      return method.getAnnotation(annotationType);
    }
    
-   public <T> T getAnnotation(Class<T> annotationType, Method method)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method)
    {
       return (T) resolveAnnotation(method, annotationType);
    }
 
-   public <T> T getAnnotation(Class<T> annotationType, Class clazz, Field field)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field)
    {
       if (clazz == this.getBeanClass())
       {
          return (T) resolveAnnotation(field, annotationType);
       }
-      Class aclass = annotationType;
-      return (T) field.getAnnotation(aclass);
+      return field.getAnnotation(annotationType);
    }
    
-   public <T> T getAnnotation(Class<T> annotationType, Field field)
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field)
    {
       return (T) resolveAnnotation(field, annotationType);
    }
    
+   @Override
    public Object resolveAnnotation(Method m, Class annotation)
    {
       Object value = super.resolveAnnotation(m, annotation);
@@ -864,4 +916,21 @@
    {
       return deployment.getEjbJndiName(link, businessInterface);
    }
+   
+   public InvocationStatistics getInvokeStats()
+   {
+      return invokeStats;
+   }
+
+
+   public MethodInfo getMethodInfo(Method method)
+   {
+      long hash = MethodHashing.calculateHash(method);
+      MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
+      if (info == null)
+      {
+         throw new RuntimeException("Could not resolve beanClass method from proxy call: " + method.toString());
+      }
+      return info;
+   }
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -34,13 +34,16 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
-public class EJBContainerInvocation extends MethodInvocation
+public class EJBContainerInvocation<A extends EJBContainer, T extends BeanContext> extends MethodInvocation
 {
-   protected BeanContext ctx;
+   private static final long serialVersionUID = 4941832732679380382L;
+   
+   protected T ctx;
+   private BeanContextLifecycleCallback<T> callback;
 
-   public EJBContainerInvocation(MethodInfo info, Interceptor[] interceptors)
+   public EJBContainerInvocation(MethodInfo info)
    {
-      super(info, interceptors);
+      super(info, info.getInterceptors());
    }
 
    public EJBContainerInvocation(Interceptor[] interceptors, long methodHash, Method advisedMethod, Method unadvisedMethod, Advisor advisor)
@@ -53,30 +56,54 @@
       super(null, null);
    }
 
-   public BeanContext getBeanContext()
+   @SuppressWarnings("unchecked")
+   public A getAdvisor()
    {
+      return (A) super.getAdvisor();
+   }
+   
+   public T getBeanContext()
+   {
       return ctx;
    }
 
-   public void setBeanContext(BeanContext ctx)
+   public void setBeanContext(T beanCtx)
    {
-      this.ctx = ctx;
+      if(beanCtx != null)
+      {
+         ctx = beanCtx;
+         
+         if(callback != null)
+            callback.attached(beanCtx);
+      }
+      else
+      {
+         if(callback != null)
+            callback.released(ctx);
+         
+         ctx = null;
+      }
    }
 
    public Invocation getWrapper(Interceptor[] newchain)
    {
-      return new EJBContainerInvocationWrapper(this, newchain);
+      return new EJBContainerInvocationWrapper<A, T>(this, newchain);
    }
 
    public Invocation copy()
    {
-      EJBContainerInvocation wrapper = new EJBContainerInvocation(interceptors, methodHash, advisedMethod, unadvisedMethod, advisor);
+      EJBContainerInvocation<A, T> wrapper = new EJBContainerInvocation<A, T>(interceptors, methodHash, advisedMethod, unadvisedMethod, advisor);
       wrapper.metadata = this.metadata;
       wrapper.currentInterceptor = this.currentInterceptor;
       wrapper.setTargetObject(this.getTargetObject());
       wrapper.setArguments(this.getArguments());
       wrapper.setBeanContext(this.ctx);
+      wrapper.callback = this.callback;
       return wrapper;
    }
-
+   
+   public void setContextCallback(BeanContextLifecycleCallback<T> callback)
+   {
+      this.callback = callback;
+   }
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocationWrapper.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocationWrapper.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocationWrapper.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -23,7 +23,6 @@
 
 import java.lang.reflect.Method;
 import java.util.Map;
-import org.jboss.aop.Advisor;
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.metadata.SimpleMetaData;
@@ -35,13 +34,15 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
-public class EJBContainerInvocationWrapper extends EJBContainerInvocation
+public class EJBContainerInvocationWrapper<A extends EJBContainer, T extends BeanContext> extends EJBContainerInvocation<A, T>
 {
+   private static final long serialVersionUID = 5402917625526438235L;
+
    private static final Logger log = Logger.getLogger(EJBContainerInvocationWrapper.class);
    
-   protected EJBContainerInvocation wrapped;
+   protected EJBContainerInvocation<A, T> wrapped;
 
-   public EJBContainerInvocationWrapper(EJBContainerInvocation wrapped, Interceptor[] interceptors)
+   public EJBContainerInvocationWrapper(EJBContainerInvocation<A, T> wrapped, Interceptor[] interceptors)
    {
       this.wrapped = wrapped;
       this.interceptors = interceptors;
@@ -166,7 +167,7 @@
       return wrapped.invokeNext(newInterceptors);
    }
 
-   public Advisor getAdvisor()
+   public A getAdvisor()
    {
       return wrapped.getAdvisor();
    }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,132 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.Collection;
-
-import javax.ejb.EJBMetaData;
-
-import org.jboss.invocation.Invocation;
-import org.jboss.metadata.InvokerProxyBindingMetaData;
-
-import org.jboss.ejb.GenericEntityObjectFactory;
-
-/**
- * This is an interface for Container plugins. Implementations of this
- * interface are responsible for receiving remote invocations of EJB's
- * and to forward these requests to the Container it is being used with.
- *
- * <p>It is responsible for providing any EJBObject and EJBHome 
- *    implementations (which may be statically or dynamically created). 
- *
- * <p>Before forwarding a call to the container it must call
- *    Thread.setContextClassLoader() with the classloader of the container.
- *    It must also handle any propagated transaction and security contexts
- *    properly. It may acquire the TransactionManager from JNDI.
- *
- * @see Container
- * 
- * @author <a href="mailto:rickard.oberg at telkel.com">Rickard �berg</a>
- * @author <a href="mailto:marc.fleury at telkel.com">Marc Fleury</a>
- * @version $Revision$
- *
- *<p><b>20011219 marc fleury:</b>
-* <ul>
-*  <li>Moved from typed return to Object to allow for optimizations in creation
-*  <li>Per Dain Sundstrom requests removed the Remote Exception.
-*  <li>The Container Invoker is going to be replaced by the ProxyFactory 
-*</ul>
- */
-public interface EJBProxyFactory
-extends GenericEntityObjectFactory, ContainerPlugin
-{
-   /**
-    * Set the invoker meta data so that the ProxyFactory can initialize properly
-    */
-   void setInvokerMetaData(InvokerProxyBindingMetaData imd);
-   /**
-    * Set the invoker jndi binding
-    */
-   void setInvokerBinding(String binding);
-   /**
-    * Protocol specific isIdentical implementation
-    *
-    * @param container the container
-    * @param mi the invocation 
-    * @return true when identical, false otherwise
-    */
-   boolean isIdentical(Container container, Invocation mi);
-   /**
-    * This method is called whenever the metadata for this container is
-    * needed.
-    *
-    * @return    An implementation of the EJBMetaData interface.
-    */
-   EJBMetaData getEJBMetaData();
-
-   /**
-    * This method is called whenever the EJBHome implementation for this
-    * container is needed.
-    *
-    * @return    An implementation of the home interface for this container.
-    */
-   Object getEJBHome();
-
-   /**
-    * This method is called whenever an EJBObject implementation for a
-    * stateless session bean is needed.
-    *
-    * @return    An implementation of the remote interface for this container.
-    */
-   Object getStatelessSessionEJBObject();
-
-   /**
-    * This method is called whenever an EJBObject implementation for a stateful
-    * session bean is needed.
-    *
-    * @param id    The id of the session.
-    * @return      An implementation of the remote interface for this
-    *              container.
-    */
-   Object getStatefulSessionEJBObject(Object id);
-
-   /**
-    * This method is called whenever an EJBObject implementation for an 
-    * entitybean is needed.
-    *
-    * @param id    The primary key of the entity.
-    * @return      An implementation of the remote interface for this
-    *              container.
-    */
-   Object getEntityEJBObject(Object id);
-
-   /**
-    * This method is called whenever a collection of EJBObjects for a
-    * collection of primary keys is needed.
-    *
-    * @param en      Enumeration of primary keys.
-    * @return        A collection of EJBObjects implementing the remote
-    *                interface for this container.
-    */
-   Collection getEntityCollection(Collection en);
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,132 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.Collection;
+
+import javax.ejb.EJBMetaData;
+
+import org.jboss.invocation.Invocation;
+import org.jboss.metadata.InvokerProxyBindingMetaData;
+
+import org.jboss.ejb.GenericEntityObjectFactory;
+
+/**
+ * This is an interface for Container plugins. Implementations of this
+ * interface are responsible for receiving remote invocations of EJB's
+ * and to forward these requests to the Container it is being used with.
+ *
+ * <p>It is responsible for providing any EJBObject and EJBHome 
+ *    implementations (which may be statically or dynamically created). 
+ *
+ * <p>Before forwarding a call to the container it must call
+ *    Thread.setContextClassLoader() with the classloader of the container.
+ *    It must also handle any propagated transaction and security contexts
+ *    properly. It may acquire the TransactionManager from JNDI.
+ *
+ * @see Container
+ * 
+ * @author <a href="mailto:rickard.oberg at telkel.com">Rickard �berg</a>
+ * @author <a href="mailto:marc.fleury at telkel.com">Marc Fleury</a>
+ * @version $Revision$
+ *
+ *<p><b>20011219 marc fleury:</b>
+* <ul>
+*  <li>Moved from typed return to Object to allow for optimizations in creation
+*  <li>Per Dain Sundstrom requests removed the Remote Exception.
+*  <li>The Container Invoker is going to be replaced by the ProxyFactory 
+*</ul>
+ */
+public interface EJBProxyFactory
+extends GenericEntityObjectFactory, ContainerPlugin
+{
+   /**
+    * Set the invoker meta data so that the ProxyFactory can initialize properly
+    */
+   void setInvokerMetaData(InvokerProxyBindingMetaData imd);
+   /**
+    * Set the invoker jndi binding
+    */
+   void setInvokerBinding(String binding);
+   /**
+    * Protocol specific isIdentical implementation
+    *
+    * @param container the container
+    * @param mi the invocation 
+    * @return true when identical, false otherwise
+    */
+   boolean isIdentical(Container container, Invocation mi);
+   /**
+    * This method is called whenever the metadata for this container is
+    * needed.
+    *
+    * @return    An implementation of the EJBMetaData interface.
+    */
+   EJBMetaData getEJBMetaData();
+
+   /**
+    * This method is called whenever the EJBHome implementation for this
+    * container is needed.
+    *
+    * @return    An implementation of the home interface for this container.
+    */
+   Object getEJBHome();
+
+   /**
+    * This method is called whenever an EJBObject implementation for a
+    * stateless session bean is needed.
+    *
+    * @return    An implementation of the remote interface for this container.
+    */
+   Object getStatelessSessionEJBObject();
+
+   /**
+    * This method is called whenever an EJBObject implementation for a stateful
+    * session bean is needed.
+    *
+    * @param id    The id of the session.
+    * @return      An implementation of the remote interface for this
+    *              container.
+    */
+   Object getStatefulSessionEJBObject(Object id);
+
+   /**
+    * This method is called whenever an EJBObject implementation for an 
+    * entitybean is needed.
+    *
+    * @param id    The primary key of the entity.
+    * @return      An implementation of the remote interface for this
+    *              container.
+    */
+   Object getEntityEJBObject(Object id);
+
+   /**
+    * This method is called whenever a collection of EJBObjects for a
+    * collection of primary keys is needed.
+    *
+    * @param en      Enumeration of primary keys.
+    * @return        A collection of EJBObjects implementing the remote
+    *                interface for this container.
+    */
+   Collection getEntityCollection(Collection en);
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBProxyFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-
-/**
- * This interceptor is needed so that the ENC is propagated in asynchronous calls.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ENCPropagationInterceptor implements Interceptor
-{
-   public String getName()
-   {
-      return this.getClass().getName();
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      try
-      {
-         Container container = (Container) invocation.getAdvisor();
-         ThreadLocalENCFactory.push(container.getEnc());
-
-         return invocation.invokeNext();
-      }
-      finally
-      {
-         ThreadLocalENCFactory.pop();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+
+/**
+ * This interceptor is needed so that the ENC is propagated in asynchronous calls.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ENCPropagationInterceptor implements Interceptor
+{
+   public String getName()
+   {
+      return this.getClass().getName();
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      EJBContainer container = (EJBContainer) invocation.getAdvisor();
+      try
+      {
+         container.pushEnc();
+         return invocation.invokeNext();
+      }
+      finally
+      {
+         container.popEnc();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ENCPropagationInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -127,7 +127,7 @@
          String ejbName = ejbNames.get(ejbIndex);
          if (ejbType == EJB_TYPE.STATELESS)
          {
-            StatelessContainer container = getStatelessContainer(ejbIndex);
+            EJBContainer container = getStatelessContainer(ejbIndex);
             container.setJaccContextId(getJaccContextId());
             containers.add(container);
          }
@@ -211,7 +211,7 @@
 
    }
 
-   protected StatelessContainer getStatelessContainer(int ejbIndex) throws Exception
+   protected EJBContainer getStatelessContainer(int ejbIndex) throws Exception
    {
       String containerName = getAspectDomain(ejbIndex, defaultSLSBDomain);
       

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,527 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javassist.bytecode.ClassFile;
-import org.hibernate.cfg.EJB3DTDEntityResolver;
-import org.hibernate.ejb.packaging.PersistenceMetadata;
-import org.hibernate.ejb.packaging.PersistenceXmlLoader;
-import org.jboss.ejb3.enc.EjbModuleEjbResolver;
-import org.jboss.ejb3.enc.EjbModulePersistenceUnitResolver;
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.logging.Logger;
-import org.jboss.util.file.ArchiveBrowser;
-import org.jboss.util.file.ClassFileFilter;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.persistence.Entity;
-import javax.security.jacc.PolicyConfiguration;
-import javax.security.jacc.PolicyConfigurationFactory;
-import java.io.DataInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-/**
- * An EjbModule represents a collection of beans that are deployed as a unit.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public abstract class Ejb3Deployment
-{
-
-   private static final Logger log = Logger.getLogger(Ejb3Deployment.class);
-   public static final String ACTUAL_ENTITY_MANAGER_FACTORY_CONTEXT = "java:/ActualEntityManagerFactories";
-   public static final String MANAGED_ENTITY_FACTORY_CONTEXT = "java:/managedEntityFactories";
-
-   protected DeploymentUnit unit;
-
-   protected LinkedHashMap<ObjectName, Container> ejbContainers = new LinkedHashMap<ObjectName, Container>();
-
-   protected boolean hasEntities;
-   protected List<String> explicitEntityClasses = new ArrayList<String>();
-
-   protected List<PersistenceUnitDeployment> persistenceUnitDeployments = new ArrayList<PersistenceUnitDeployment>();
-;
-
-   protected String defaultSLSBDomain = "Stateless Bean";
-   protected String defaultSFSBDomain = "Stateful Bean";
-   protected String defaultMDBDomain = "Message Driven Bean";
-   protected String defaultConsumerDomain = "Consumer Bean";
-   protected String defaultServiceDomain = "Service Bean";
-   protected InitialContext initialContext;
-
-   protected KernelAbstraction kernelAbstraction;
-
-   // used for @Management interfaces
-   protected MBeanServer mbeanServer;
-
-   protected EAR ear;
-   protected EjbModuleEjbResolver ejbRefResolver;
-   protected EjbModulePersistenceUnitResolver persistenceUnitResolver;
-
-   //The JACC PolicyConfiguration
-   PolicyConfiguration pc;
-
-   public Ejb3Deployment(DeploymentUnit unit, EAR ear)
-   {
-      this.unit = unit;
-      this.ear = ear;
-      try
-      {
-         initialContext = EJB3Util.getInitialContext(unit.getJndiProperties());
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      ejbRefResolver = new EjbModuleEjbResolver(ear, unit.getShortName(), ejbContainers, this);
-      persistenceUnitResolver = new EjbModulePersistenceUnitResolver(persistenceUnitDeployments, ear, ejbContainers);
-   }
-
-   public EAR getEar()
-   {
-      return ear;
-   }
-
-   public KernelAbstraction getKernelAbstraction()
-   {
-      return kernelAbstraction;
-   }
-
-   public MBeanServer getMbeanServer()
-   {
-      return mbeanServer;
-   }
-
-   public void setMbeanServer(MBeanServer mbeanServer)
-   {
-      this.mbeanServer = mbeanServer;
-   }
-
-   public DeploymentUnit getDeploymentUnit()
-   {
-      return unit;
-   }
-
-   public String getDefaultSLSBDomain()
-   {
-      return defaultSLSBDomain;
-   }
-
-
-   /**
-    * Returns a partial MBean attribute name of the form
-    * ",ear=foo.ear,jar=foo.jar"
-    *
-    * @return
-    */
-   public String getScopeKernelName()
-   {
-      String scopedKernelName = "";
-      if (ear != null) scopedKernelName += ",ear=" + ear.getShortName();
-      scopedKernelName += ",jar=" + unit.getShortName();
-      return scopedKernelName;
-   }
-
-   /**
-    * The default AOP domain for stateless session beans
-    *
-    * @param defaultSLSBDomain
-    */
-   public void setDefaultSLSBDomain(String defaultSLSBDomain)
-   {
-      this.defaultSLSBDomain = defaultSLSBDomain;
-   }
-
-   public String getDefaultSFSBDomain()
-   {
-      return defaultSFSBDomain;
-   }
-
-   public String getDefaultConsumerDomain()
-   {
-      return defaultConsumerDomain;
-   }
-
-   /**
-    * The default stateful session bean aspect domain
-    *
-    * @param defaultSFSBDomain
-    */
-   public void setDefaultSFSBDomain(String defaultSFSBDomain)
-   {
-      this.defaultSFSBDomain = defaultSFSBDomain;
-   }
-
-   public String getDefaultMDBDomain()
-   {
-      return defaultMDBDomain;
-   }
-
-   /**
-    * The default AOP domain for message driven beans.
-    *
-    * @param defaultMDBDomain
-    */
-   public void setDefaultMDBDomain(String defaultMDBDomain)
-   {
-      this.defaultMDBDomain = defaultMDBDomain;
-   }
-
-   public String getDefaultServiceDomain()
-   {
-      return defaultServiceDomain;
-   }
-
-   /**
-    * default AOP domain for service beans.
-    *
-    * @param defaultServiceDomain
-    */
-   public void setDefaultServiceDomain(String defaultServiceDomain)
-   {
-      this.defaultServiceDomain = defaultServiceDomain;
-   }
-
-   protected String getJaccContextId()
-   {
-      return unit.getShortName();
-   }
-
-   public Container getContainer(ObjectName name)
-   {
-      return (Container) ejbContainers.get(name);
-   }
-
-   public java.util.Map getEjbContainers()
-   {
-      return ejbContainers;
-   }
-
-
-   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
-   {
-      return persistenceUnitResolver.getPersistenceUnitDeployment(unitName);
-   }
-
-   public PersistenceUnitDeployment getPersistenceUnitDeploymentInternal(String unitName)
-   {
-      return persistenceUnitResolver.getPersistenceUnitDeploymentInternal(unitName);
-   }
-
-
-   public EJBContainer getEjbContainer(String ejbLink, Class businessIntf)
-   {
-      return ejbRefResolver.getEjbContainer(ejbLink, businessIntf);
-   }
-
-   public String getEjbJndiName(String ejbLink, Class businessIntf)
-   {
-      return ejbRefResolver.getEjbJndiName(ejbLink, businessIntf);
-   }
-
-   public EJBContainer getEjbContainer(Ejb3Deployment deployment, Class businessIntf) throws NameNotFoundException
-   {
-      return ejbRefResolver.getEjbContainer(deployment, businessIntf);
-   }
-
-   public EJBContainer getEjbContainer(Class businessIntf) throws NameNotFoundException
-   {
-      return ejbRefResolver.getEjbContainer(businessIntf);
-   }
-
-   public String getEjbJndiName(Class businessIntf) throws NameNotFoundException
-   {
-      return ejbRefResolver.getEjbJndiName(businessIntf);
-   }
-
-   protected void processEJBContainerMetadata(Container container)
-           throws Exception
-   {
-      ObjectName on = container.getObjectName();
-      ejbContainers.put(on, container);
-      DependencyPolicy policy = createDependencyPolicy();
-      container.processMetadata(policy);
-
-   }
-
-   protected void registerEJBContainer(Container container)
-           throws Exception
-   {
-      ObjectName on = container.getObjectName();
-      kernelAbstraction.install(on.getCanonicalName(), container.getDependencyPolicy(), container);
-      log.debug("Bound ejb3 container " + on);
-   }
-
-   protected abstract PolicyConfiguration createPolicyConfiguration() throws Exception;
-
-   protected abstract void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit);
-
-
-   /**
-    * Create all EJB containers and Persistence Units
-    * The only things that should be initialized is metadata that does not need access to any
-    * other deployment.  This is because we want the entire EAR to be initialized so that we do not
-    * have to guess on dependencies MBean names.  This is because of the silly scoping rules for persistence units
-    * and EJBs.
-    *
-    * @throws Exception
-    */
-   public void create() throws Exception
-   {
-      long start = System.currentTimeMillis();
-
-      pc = createPolicyConfiguration();
-
-      deploy();
-
-      initializePersistenceUnits();
-
-      log.info("EJB3 deployment time took: "
-              + (System.currentTimeMillis() - start));
-   }
-
-   public void start() throws Exception
-   {
-      try
-      {
-         startPersistenceUnits();
-
-         for (Object o : ejbContainers.values())
-         {
-            Container con = (Container) o;
-            processEJBContainerMetadata(con);
-         }
-
-         for (Object o : ejbContainers.values())
-         {
-            Container con = (Container) o;
-            registerEJBContainer(con);
-         }
-
-         putJaccInService(pc, unit);
-      }
-      catch (Exception ex)
-      {
-         try
-         {
-            stop();
-            destroy();
-         }
-         catch (Exception ignored)
-         {
-         }
-         throw ex;
-      }
-   }
-
-   protected void deploy() throws Exception
-   {
-      Ejb3HandlerFactory factory = Ejb3HandlerFactory.getInstance(this);
-      if (unit.getUrl() != null) deployUrl(factory);
-
-      if (unit.getClasses() != null)
-      {
-         for (Class explicit : unit.getClasses())
-         {
-            if (explicit.isAnnotationPresent(Entity.class))
-            {
-               continue;
-            }
-            String name = explicit.getName().replace('.', '/') + ".class";
-            InputStream stream = explicit.getClassLoader().getResourceAsStream(name);
-            deployElement(stream, factory, initialContext);
-         }
-      }
-   }
-
-   protected void deployUrl(Ejb3HandlerFactory factory)
-           throws Exception
-   {
-      Iterator it = ArchiveBrowser.getBrowser(unit.getUrl(), new ClassFileFilter());
-
-      InitialContext ctx = initialContext;
-      // need to look into every entry in the archive to see if anybody has tags
-      // defined.
-      while (it.hasNext())
-      {
-         InputStream stream = (InputStream) it.next();
-         deployElement(stream, factory, ctx);
-      }
-   }
-
-   protected void deployElement(InputStream stream, Ejb3HandlerFactory factory, InitialContext ctx)
-           throws Exception
-   {
-      DataInputStream dstream = new DataInputStream(stream);
-      ClassFile cf = null;
-      try
-      {
-         cf = new ClassFile(dstream);
-      }
-      finally
-      {
-         dstream.close();
-         stream.close();
-      }
-
-      deployElement(factory, cf, ctx);
-
-   }
-
-   protected void deployElement(Ejb3HandlerFactory factory, ClassFile cf, InitialContext ctx)
-           throws Exception
-   {
-      Ejb3Handler handler = factory.createHandler(cf);
-      handler.setCtxProperties(unit.getJndiProperties());
-
-      if (handler.isEjb() || handler.isJBossBeanType())
-      {
-         List<Container> containers = handler.getContainers(cf, this);
-         for (Container con : containers)
-         {
-            // EJBContainer has finished with all metadata initialization from XML files and such.
-            // this is really a hook to do some processing after XML has been set up and before
-            // and processing of dependencies and such.
-            ((EJBContainer) con).instantiated();
-            this.ejbContainers.put(con.getObjectName(), con);
-            Ejb3Registry.register(con);
-         }
-      }
-   }
-
-   protected void initializePersistenceUnits()
-           throws Exception
-   {
-      URL persistenceXmlUrl = null;
-      persistenceXmlUrl = unit.getPersistenceXml();
- 
-      hasEntities = persistenceXmlUrl != null;
-
-      if (!hasEntities) return;
-
-      if (unit.getClasses() != null)
-      {
-         for (Class explicit : unit.getClasses())
-         {
-            if (explicit.isAnnotationPresent(Entity.class))
-            {
-               explicitEntityClasses.add(explicit.getName());
-            }
-         }
-      }
-
-      // scope the unitName if this is an ejb archive
-      List<PersistenceMetadata> persistenceMetadata = PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap(), new EJB3DTDEntityResolver());
-      for (PersistenceMetadata metadata : persistenceMetadata)
-      {
-         String earShortName = ear == null ? null : ear.getShortName();
-         boolean isScoped = ejbContainers.size() > 0;
-         PersistenceUnitDeployment deployment = new PersistenceUnitDeployment(initialContext, this, explicitEntityClasses, persistenceXmlUrl, metadata, earShortName, unit.getShortName(), isScoped);
-         PersistenceUnitRegistry.register(deployment);
-         persistenceUnitDeployments.add(deployment);
-      }
-   }
-
-   public abstract DependencyPolicy createDependencyPolicy();
-
-   protected void startPersistenceUnits()
-   {
-      if (persistenceUnitDeployments == null) return;
-
-      for (PersistenceUnitDeployment entityDeployment : persistenceUnitDeployments)
-      {
-         if (entityDeployment != null)
-         {
-            DependencyPolicy policy = createDependencyPolicy();
-            entityDeployment.addDependencies(policy);
-            kernelAbstraction.install(entityDeployment.getKernelName(), policy, entityDeployment);
-         }
-      }
-   }
-
-   protected void stopPersistenceUnits()
-   {
-      if (persistenceUnitDeployments == null) return;
-
-      for (PersistenceUnitDeployment entityDeployment : persistenceUnitDeployments)
-      {
-         try
-         {
-            PersistenceUnitRegistry.unregister(entityDeployment);
-            if (entityDeployment != null)
-            {
-               kernelAbstraction.uninstall(entityDeployment.getKernelName());
-            }
-         }
-         catch (Exception e)
-         {
-            log.debug("error trying to shut down persistence unit", e);
-         }
-      }
-
-   }
-
-   public void stop() throws Exception
-   {
-      for (Object o : ejbContainers.keySet())
-      {
-         try
-         {
-            ObjectName on = (ObjectName) o;
-            kernelAbstraction.uninstall(on.getCanonicalName());
-         }
-         catch (Exception e)
-         {
-            log.debug("error trying to shut down ejb container", e);
-         }
-      }
-      stopPersistenceUnits();
-   }
-
-   public void destroy() throws Exception
-   {
-      undeploy();
-      
-      PolicyConfigurationFactory pcFactory = PolicyConfigurationFactory.getPolicyConfigurationFactory();
-      PolicyConfiguration pc = pcFactory.getPolicyConfiguration(getJaccContextId(), true);
-      pc.delete();
-   }
-   
-   private void undeploy()
-   {
-      for(Container container : ejbContainers.values())
-      {
-         Ejb3Registry.unregister(container);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,548 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import javassist.bytecode.ClassFile;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.persistence.Entity;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyConfigurationFactory;
+
+import org.hibernate.cfg.EJB3DTDEntityResolver;
+import org.hibernate.ejb.packaging.PersistenceMetadata;
+import org.jboss.ejb3.enc.EjbModuleEjbResolver;
+import org.jboss.ejb3.enc.EjbModulePersistenceUnitResolver;
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.ejb3.entity.PersistenceXmlLoader;
+import org.jboss.logging.Logger;
+//import org.jboss.virtual.VirtualFile;
+import org.jboss.util.file.ArchiveBrowser;
+import org.jboss.util.file.ClassFileFilter;
+
+/**
+ * An EjbModule represents a collection of beans that are deployed as a unit.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public abstract class Ejb3Deployment
+{
+
+   private static final Logger log = Logger.getLogger(Ejb3Deployment.class);
+   public static final String ACTUAL_ENTITY_MANAGER_FACTORY_CONTEXT = "java:/ActualEntityManagerFactories";
+   public static final String MANAGED_ENTITY_FACTORY_CONTEXT = "java:/managedEntityFactories";
+
+   protected DeploymentUnit unit;
+
+   protected LinkedHashMap<ObjectName, Container> ejbContainers = new LinkedHashMap<ObjectName, Container>();
+
+   protected boolean hasEntities;
+   protected List<String> explicitEntityClasses = new ArrayList<String>();
+
+   protected List<PersistenceUnitDeployment> persistenceUnitDeployments = new ArrayList<PersistenceUnitDeployment>();
+;
+
+   protected String defaultSLSBDomain = "Stateless Bean";
+   protected String defaultSFSBDomain = "Stateful Bean";
+   protected String defaultMDBDomain = "Message Driven Bean";
+   protected String defaultConsumerDomain = "Consumer Bean";
+   protected String defaultServiceDomain = "Service Bean";
+   protected InitialContext initialContext;
+
+   protected KernelAbstraction kernelAbstraction;
+
+   // used for @Management interfaces
+   protected MBeanServer mbeanServer;
+
+   protected DeploymentScope deploymentScope;
+   protected EjbModuleEjbResolver ejbRefResolver;
+   protected EjbModulePersistenceUnitResolver persistenceUnitResolver;
+
+   //The JACC PolicyConfiguration
+   PolicyConfiguration pc;
+
+   public Ejb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope)
+   {
+      this.unit = unit;
+      this.deploymentScope = deploymentScope;
+      try
+      {
+         initialContext = EJB3Util.getInitialContext(unit.getJndiProperties());
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      ejbRefResolver = new EjbModuleEjbResolver(deploymentScope, unit.getShortName(), ejbContainers, this);
+      persistenceUnitResolver = new EjbModulePersistenceUnitResolver(persistenceUnitDeployments, deploymentScope, ejbContainers);
+   }
+
+   public DeploymentScope getEar()
+   {
+      return deploymentScope;
+   }
+
+   public KernelAbstraction getKernelAbstraction()
+   {
+      return kernelAbstraction;
+   }
+
+   public MBeanServer getMbeanServer()
+   {
+      return mbeanServer;
+   }
+
+   public void setMbeanServer(MBeanServer mbeanServer)
+   {
+      this.mbeanServer = mbeanServer;
+   }
+
+   public DeploymentUnit getDeploymentUnit()
+   {
+      return unit;
+   }
+
+   public String getDefaultSLSBDomain()
+   {
+      return defaultSLSBDomain;
+   }
+
+
+   /**
+    * Returns a partial MBean attribute name of the form
+    * ",ear=foo.ear,jar=foo.jar"
+    *
+    * @return
+    */
+   public String getScopeKernelName()
+   {
+      String scopedKernelName = "";
+      if (deploymentScope != null) scopedKernelName += ",ear=" + deploymentScope.getShortName();
+      scopedKernelName += ",jar=" + unit.getShortName();
+      return scopedKernelName;
+   }
+
+   /**
+    * The default AOP domain for stateless session beans
+    *
+    * @param defaultSLSBDomain
+    */
+   public void setDefaultSLSBDomain(String defaultSLSBDomain)
+   {
+      this.defaultSLSBDomain = defaultSLSBDomain;
+   }
+
+   public String getDefaultSFSBDomain()
+   {
+      return defaultSFSBDomain;
+   }
+
+   public String getDefaultConsumerDomain()
+   {
+      return defaultConsumerDomain;
+   }
+
+   /**
+    * The default stateful session bean aspect domain
+    *
+    * @param defaultSFSBDomain
+    */
+   public void setDefaultSFSBDomain(String defaultSFSBDomain)
+   {
+      this.defaultSFSBDomain = defaultSFSBDomain;
+   }
+
+   public String getDefaultMDBDomain()
+   {
+      return defaultMDBDomain;
+   }
+
+   /**
+    * The default AOP domain for message driven beans.
+    *
+    * @param defaultMDBDomain
+    */
+   public void setDefaultMDBDomain(String defaultMDBDomain)
+   {
+      this.defaultMDBDomain = defaultMDBDomain;
+   }
+
+   public String getDefaultServiceDomain()
+   {
+      return defaultServiceDomain;
+   }
+
+   /**
+    * default AOP domain for service beans.
+    *
+    * @param defaultServiceDomain
+    */
+   public void setDefaultServiceDomain(String defaultServiceDomain)
+   {
+      this.defaultServiceDomain = defaultServiceDomain;
+   }
+
+   protected String getJaccContextId()
+   {
+      return unit.getShortName();
+   }
+
+   public Container getContainer(ObjectName name)
+   {
+      return (Container) ejbContainers.get(name);
+   }
+
+   public java.util.Map getEjbContainers()
+   {
+      return ejbContainers;
+   }
+
+
+   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
+   {
+      return persistenceUnitResolver.getPersistenceUnitDeployment(unitName);
+   }
+
+   public PersistenceUnitDeployment getPersistenceUnitDeploymentInternal(String unitName)
+   {
+      return persistenceUnitResolver.getPersistenceUnitDeploymentInternal(unitName);
+   }
+
+   public List<PersistenceUnitDeployment> getPersistenceUnitDeployments()
+   {
+      return persistenceUnitDeployments;
+   }
+
+
+   public EJBContainer getEjbContainer(String ejbLink, Class businessIntf)
+   {
+      return ejbRefResolver.getEjbContainer(ejbLink, businessIntf);
+   }
+
+   public String getEjbJndiName(String ejbLink, Class businessIntf)
+   {
+      return ejbRefResolver.getEjbJndiName(ejbLink, businessIntf);
+   }
+
+   public EJBContainer getEjbContainer(Ejb3Deployment deployment, Class businessIntf) throws NameNotFoundException
+   {
+      return ejbRefResolver.getEjbContainer(deployment, businessIntf);
+   }
+
+   public EJBContainer getEjbContainer(Class businessIntf) throws NameNotFoundException
+   {
+      return ejbRefResolver.getEjbContainer(businessIntf);
+   }
+
+   public String getEjbJndiName(Class businessIntf) throws NameNotFoundException
+   {
+      return ejbRefResolver.getEjbJndiName(businessIntf);
+   }
+
+   protected void processEJBContainerMetadata(Container container)
+           throws Exception
+   {
+      ObjectName on = container.getObjectName();
+      ejbContainers.put(on, container);
+      DependencyPolicy policy = createDependencyPolicy();
+      container.processMetadata(policy);
+
+   }
+
+   protected void registerEJBContainer(Container container)
+           throws Exception
+   {
+      ObjectName on = container.getObjectName();
+      String name = on.getCanonicalName();
+      kernelAbstraction.install(name, container.getDependencyPolicy(), container);
+      log.debug("Bound ejb3 container " + name);
+   }
+
+   protected abstract PolicyConfiguration createPolicyConfiguration() throws Exception;
+
+   protected abstract void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit);
+
+
+   /**
+    * Create all EJB containers and Persistence Units
+    * The only things that should be initialized is metadata that does not need access to any
+    * other deployment.  This is because we want the entire EAR to be initialized so that we do not
+    * have to guess on dependencies MBean names.  This is because of the silly scoping rules for persistence units
+    * and EJBs.
+    *
+    * @throws Exception
+    */
+   public void create() throws Exception
+   {
+      long start = System.currentTimeMillis();
+
+      pc = createPolicyConfiguration();
+
+      deploy();
+
+      initializePersistenceUnits();
+
+      log.debug("EJB3 deployment time took: "
+              + (System.currentTimeMillis() - start));
+   }
+
+   public void start() throws Exception
+   {
+      try
+      {
+         startPersistenceUnits();
+
+         for (Object o : ejbContainers.values())
+         {
+            Container con = (Container) o;
+            processEJBContainerMetadata(con);
+         }
+
+         for (Object o : ejbContainers.values())
+         {
+            Container con = (Container) o;
+            registerEJBContainer(con);
+         }
+
+         putJaccInService(pc, unit);
+      }
+      catch (Exception ex)
+      {
+         try
+         {
+            stop();
+            destroy();
+         }
+         catch (Exception ignored)
+         {
+         }
+         throw ex;
+      }
+   }
+
+   protected void deploy() throws Exception
+   {
+      Ejb3HandlerFactory factory = Ejb3HandlerFactory.getInstance(this);
+      if (unit.getUrl() != null) deployUrl(factory);
+
+      if (unit.getClasses() != null)
+      {
+         for (Class explicit : unit.getClasses())
+         {
+            if (explicit.isAnnotationPresent(Entity.class))
+            {
+               continue;
+            }
+            String name = explicit.getName().replace('.', '/') + ".class";
+            InputStream stream = explicit.getClassLoader().getResourceAsStream(name);
+            deployElement(stream, factory, initialContext);
+         }
+      }
+   }
+
+   protected void deployUrl(Ejb3HandlerFactory factory)
+           throws Exception
+   {
+//      InitialContext ctx = initialContext;
+//      // need to look into every entry in the archive to see if anybody has tags
+//      // defined.
+//      List<VirtualFile> classes = unit.getResources(new org.jboss.ejb3.ClassFileFilter());
+//      for (VirtualFile classFile : classes)
+//      {
+//         InputStream stream = classFile.openStream();
+//         deployElement(stream, factory, ctx);
+//      }
+        Iterator<?> it = ArchiveBrowser.getBrowser(unit.getUrl(), new ClassFileFilter());
+
+        InitialContext ctx = initialContext;
+        // need to look into every entry in the archive to see if anybody has tags
+        // defined.
+        while (it.hasNext())
+        {
+           InputStream stream = (InputStream) it.next();
+           deployElement(stream, factory, ctx);
+        }
+   }
+
+   protected void deployElement(InputStream stream, Ejb3HandlerFactory factory, InitialContext ctx)
+           throws Exception
+   {
+      DataInputStream dstream = new DataInputStream(new BufferedInputStream(stream));
+      ClassFile cf = null;
+      try
+      {
+         cf = new ClassFile(dstream);
+      }
+      finally
+      {
+         dstream.close();
+         stream.close();
+      }
+
+      deployElement(factory, cf, ctx);
+
+   }
+
+   protected void deployElement(Ejb3HandlerFactory factory, ClassFile cf, InitialContext ctx)
+           throws Exception
+   {
+      Ejb3Handler handler = factory.createHandler(cf);
+      handler.setCtxProperties(unit.getJndiProperties());
+
+      if (handler.isEjb() || handler.isJBossBeanType())
+      {
+         List<Container> containers = handler.getContainers(cf, this);
+         for (Container con : containers)
+         {
+            // EJBContainer has finished with all metadata initialization from XML files and such.
+            // this is really a hook to do some processing after XML has been set up and before
+            // and processing of dependencies and such.
+            ((EJBContainer) con).instantiated();
+            this.ejbContainers.put(con.getObjectName(), con);
+            Ejb3Registry.register(con);
+         }
+      }
+   }
+
+   protected void initializePersistenceUnits()
+           throws Exception
+   {
+      URL persistenceXmlUrl = null;
+      persistenceXmlUrl = unit.getPersistenceXml();
+ 
+      hasEntities = persistenceXmlUrl != null;
+
+      if (!hasEntities) return;
+
+      if (unit.getClasses() != null)
+      {
+         for (Class explicit : unit.getClasses())
+         {
+            if (explicit.isAnnotationPresent(Entity.class))
+            {
+               explicitEntityClasses.add(explicit.getName());
+            }
+         }
+      }
+
+      // scope the unitName if this is an ejb archive
+      // todo revert to this: List<PersistenceMetadata> persistenceMetadata = PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap(), new EJB3DTDEntityResolver());
+      List<PersistenceMetadata> persistenceMetadata = PersistenceXmlLoader.deploy(persistenceXmlUrl, new HashMap(), new EJB3DTDEntityResolver(), PersistenceUnitTransactionType.JTA);
+      for (PersistenceMetadata metadata : persistenceMetadata)
+      {
+         String earShortName = deploymentScope == null ? null : deploymentScope.getShortName();
+         boolean isScoped = ejbContainers.size() > 0;
+         PersistenceUnitDeployment deployment = new PersistenceUnitDeployment(initialContext, this, explicitEntityClasses, persistenceXmlUrl, metadata, earShortName, unit.getShortName(), isScoped);
+         PersistenceUnitRegistry.register(deployment);
+         persistenceUnitDeployments.add(deployment);
+      }
+   }
+
+   public abstract DependencyPolicy createDependencyPolicy();
+
+   protected void startPersistenceUnits()
+   {
+      if (persistenceUnitDeployments == null) return;
+
+      for (PersistenceUnitDeployment entityDeployment : persistenceUnitDeployments)
+      {
+         if (entityDeployment != null)
+         {
+            DependencyPolicy policy = createDependencyPolicy();
+            entityDeployment.addDependencies(policy);
+            kernelAbstraction.install(entityDeployment.getKernelName(), policy, entityDeployment);
+         }
+      }
+   }
+
+   protected void stopPersistenceUnits()
+   {
+      if (persistenceUnitDeployments == null) return;
+
+      for (PersistenceUnitDeployment entityDeployment : persistenceUnitDeployments)
+      {
+         try
+         {
+            PersistenceUnitRegistry.unregister(entityDeployment);
+            if (entityDeployment != null)
+            {
+               kernelAbstraction.uninstall(entityDeployment.getKernelName());
+            }
+         }
+         catch (Exception e)
+         {
+            log.debug("error trying to shut down persistence unit", e);
+         }
+      }
+
+   }
+
+   public void stop() throws Exception
+   {
+      for (Object o : ejbContainers.keySet())
+      {
+         try
+         {
+            ObjectName on = (ObjectName) o;
+            kernelAbstraction.uninstall(on.getCanonicalName());
+         }
+         catch (Exception e)
+         {
+            log.debug("error trying to shut down ejb container", e);
+         }
+      }
+      stopPersistenceUnits();
+   }
+
+   public void destroy() throws Exception
+   {
+      undeploy();
+      
+      PolicyConfigurationFactory pcFactory = PolicyConfigurationFactory.getPolicyConfigurationFactory();
+      PolicyConfiguration pc = pcFactory.getPolicyConfiguration(getJaccContextId(), true);
+      pc.delete();
+   }
+      
+   private void undeploy()
+   {
+      for(Container container : ejbContainers.values())
+      {
+         Ejb3Registry.unregister(container);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -121,7 +121,6 @@
 import org.jboss.ejb3.metamodel.XmlAnnotation;
 import org.jboss.ejb3.service.ServiceContainer;
 import org.jboss.ejb3.stateful.StatefulContainer;
-import org.jboss.ejb3.stateless.StatelessContainer;
 import org.jboss.logging.Logger;
 import org.jboss.metamodel.descriptor.InjectionTarget;
 import org.jboss.metamodel.descriptor.MessageDestinationRef;
@@ -287,14 +286,14 @@
       }
    }
 
-   protected StatelessContainer getStatelessContainer(int ejbIndex)
+   protected EJBContainer getStatelessContainer(int ejbIndex)
          throws Exception
    {
       String ejbName = ejbNames.get(ejbIndex);
 
       EnterpriseBean enterpriseBean = ejbs.get(ejbIndex);
 
-      StatelessContainer container = super.getStatelessContainer(ejbIndex);
+      EJBContainer container = super.getStatelessContainer(ejbIndex);
 
       container.setAssemblyDescriptor(dd.getAssemblyDescriptor());
 
@@ -331,6 +330,8 @@
             annotation.setObjectName(service.getObjectName());
          if (service.getEjbName() != null)
             annotation.setName(service.getEjbName());
+         if (service.getXMBean() != null)
+            annotation.setXMBean(service.getXMBean());
          addClassAnnotation(container, Service.class, annotation);
       }
 
@@ -894,10 +895,13 @@
             .getInterceptorBindings();
       for (InterceptorBinding binding : interceptorBindings)
       {
+         // Wolf: why ignore ordered binding?
+         /*
          if (binding.isOrdered())
          {
             continue;
          }
+         */
          if (binding.getEjbName().equals(ejbName))
          {
             if (binding.getMethodName() == null
@@ -1725,9 +1729,6 @@
                   log.debug("adding " + annotationClass.getName()
                         + " method annotation to " + ejbClass.getName() + "."
                         + methodName);
-                  log.debug("adding " + annotationClass.getName()
-                        + " method annotation to " + ejbClass.getName() + "."
-                        + methodName);
                   annotations.addAnnotation(methods[methodIndex],
                         annotationClass, annotation);
                   overrideAnnotations(container, methods[methodIndex],

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3HandlerFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3HandlerFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3HandlerFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3;
 
 import java.net.URL;

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javax.security.jacc.PolicyConfiguration;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.ejb3.security.JaccHelper;
-import org.jboss.logging.Logger;
-
-/**
- * JBoss 4.0 Microkernel specific implementation
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Ejb3JmxDeployment extends Ejb3Deployment
-{
-   private DeploymentInfo deploymentInfo;
-
-   private static final Logger log = Logger.getLogger(Ejb3JmxDeployment.class);
-
-   public Ejb3JmxDeployment(DeploymentInfo di, EAR ear)
-   {
-      super(new JmxDeploymentUnit(di), ear);
-      this.deploymentInfo = di;
-      kernelAbstraction = new JmxKernelAbstraction(di);
-
-      // todo maybe mbeanServer should be injected?
-      mbeanServer = di.getServer();
-   }
-
-   protected PolicyConfiguration createPolicyConfiguration() throws Exception
-   {
-      return JaccHelper.initialiseJacc(getJaccContextId());
-
-   }
-
-   protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit)
-   {
-      try
-      {
-         JaccHelper.putJaccInService(pc, deploymentInfo);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-
-   }
-
-   public DependencyPolicy createDependencyPolicy()
-   {
-      return new JmxDependencyPolicy();
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import javax.security.jacc.PolicyConfiguration;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.ejb3.security.JaccHelper;
+import org.jboss.logging.Logger;
+
+/**
+ * JBoss 4.0 Microkernel specific implementation
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Ejb3JmxDeployment extends Ejb3Deployment
+{
+   private DeploymentInfo deploymentInfo;
+
+   private static final Logger log = Logger.getLogger(Ejb3JmxDeployment.class);
+
+   public Ejb3JmxDeployment(DeploymentInfo di, DeploymentScope deploymentScope)
+   {
+      super(new JmxDeploymentUnit(di), deploymentScope);
+      this.deploymentInfo = di;
+      kernelAbstraction = new JmxKernelAbstraction(di);
+
+      // todo maybe mbeanServer should be injected?
+      mbeanServer = di.getServer();
+   }
+
+   protected PolicyConfiguration createPolicyConfiguration() throws Exception
+   {
+      return JaccHelper.initialiseJacc(getJaccContextId());
+
+   }
+
+   protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit)
+   {
+      try
+      {
+         JaccHelper.putJaccInService(pc, deploymentInfo);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+
+   }
+
+   public DependencyPolicy createDependencyPolicy()
+   {
+      return new JmxDependencyPolicy();
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Module.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Module.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Module.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -43,26 +43,26 @@
 
     public Ejb3Module(DeploymentInfo di)
     {
-       EAR ear = null;
+       DeploymentScope deploymentScope = null;
        if (di.parent != null)
        {
           if (di.parent.shortName.endsWith(".ear") || di.parent.shortName.endsWith(".ear/"))
           {
              synchronized(di.parent.context)
              {
-                ear = (EAR)di.parent.context.get("EJB3_EAR_METADATA");
-                if (ear == null)
+                deploymentScope = (DeploymentScope)di.parent.context.get("EJB3_EAR_METADATA");
+                if (deploymentScope == null)
                 {
-                   ear = new JmxEARImpl(di.parent.shortName);
-                   di.parent.context.put("EJB3_EAR_METADATA", ear);
+                   deploymentScope = new JmxDeploymentScopeImpl(di.parent.shortName);
+                   di.parent.context.put("EJB3_EAR_METADATA", deploymentScope);
                 }
              }
           }
        }
-       deployment = new Ejb3JmxDeployment(di, ear);
-       if (ear != null)
+       deployment = new Ejb3JmxDeployment(di, deploymentScope);
+       if (deploymentScope != null)
        {
-          ear.register(deployment);
+          deploymentScope.register(deployment);
        }
        this.di = di;
     }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,120 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Ejb3Registry
-{
-	private static final Logger log = Logger.getLogger(Ejb3Registry.class);
-
-    private static Map<String, Container> containers = new HashMap<String, Container>();
-
-    /**
-     * Find a potential container.
-     * 
-     * @param oid    the canonical object name of the container
-     * @return       the container or null if not found
-     */
-    public static Container findContainer(String oid)
-    {
-       return containers.get(oid);
-    }
-
-    /**
-     * Reports the existance of a container.
-     * 
-     * @param oid    the canonical object name of the container
-     * @return       true if found, false otherwise
-     */
-    public static boolean hasContainer(String oid)
-    {
-       return containers.containsKey(oid);
-    }
-   
-    private static final String oid(Container container)
-    {
-       return container.getObjectName().getCanonicalName();
-    }
-   
-    /**
-     * Registers a container.
-     * 
-     * @param container              the container to register
-     * @throws IllegalStateException if the container is already registered
-     */
-    public static void register(Container container)
-    {
-       String oid = oid(container);
-       if(hasContainer(oid))
-          throw new IllegalStateException("Container " + oid + " + is already registered");
-       containers.put(oid, container);
-    }
-
-    /**
-     * Unregisters a container.
-     * 
-     * @param container              the container to unregister
-     * @throws IllegalStateException if the container is not registered
-     */
-    public static void unregister(Container container)
-    {
-       String oid = oid(container);
-       if(!hasContainer(oid))
-          throw new IllegalStateException("Container " + oid + " + is not registered");
-       containers.remove(oid);
-    }
-
-    /**
-     * Returns the container specified by the given canocical object name.
-     * Never returns null.
-     * 
-     * @param oid                    the canonical object name of the container
-     * @return                       the container
-     * @throws IllegalStateException if the container is not registered
-     */
-    public static Container getContainer(String oid)
-    {
-       if(!hasContainer(oid))
-          throw new IllegalStateException("Container " + oid + " is not registered");
-       return containers.get(oid);
-    }
-
-    /**
-     * Returns an unmodifiable collection of the registered containers.
-     * 
-     * @return   the containers
-     */
-    public static Collection<Container> getContainers()
-    {
-       return Collections.unmodifiableCollection(containers.values());
-    }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Maintains an administration of all EJB3 container available.
+ * 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Ejb3Registry
+{
+   private static final Logger log = Logger.getLogger(Ejb3Registry.class);
+
+   private static Map<String, Container> containers = new HashMap<String, Container>();
+
+   /**
+    * Find a potential container.
+    * 
+    * @param oid    the canonical object name of the container
+    * @return       the container or null if not found
+    */
+   public static Container findContainer(String oid)
+   {
+      return containers.get(oid);
+   }
+
+   /**
+    * Reports the existance of a container.
+    * 
+    * @param oid    the canonical object name of the container
+    * @return       true if found, false otherwise
+    */
+   public static boolean hasContainer(String oid)
+   {
+      return containers.containsKey(oid);
+   }
+   
+   private static final String oid(Container container)
+   {
+      return container.getObjectName().getCanonicalName();
+   }
+   
+   /**
+    * Registers a container.
+    * 
+    * @param container              the container to register
+    * @throws IllegalStateException if the container is already registered
+    */
+   public static void register(Container container)
+   {
+      String oid = oid(container);
+      if(hasContainer(oid))
+         throw new IllegalStateException("Container " + oid + " + is already registered");
+      containers.put(oid, container);
+   }
+
+   /**
+    * Unregisters a container.
+    * 
+    * @param container              the container to unregister
+    * @throws IllegalStateException if the container is not registered
+    */
+   public static void unregister(Container container)
+   {
+      String oid = oid(container);
+      if(!hasContainer(oid))
+         throw new IllegalStateException("Container " + oid + " + is not registered");
+      containers.remove(oid);
+   }
+
+   /**
+    * Returns the container specified by the given canocical object name.
+    * Never returns null.
+    * 
+    * @param oid                    the canonical object name of the container
+    * @return                       the container
+    * @throws IllegalStateException if the container is not registered
+    */
+   public static Container getContainer(String oid)
+   {
+      if(!hasContainer(oid))
+         throw new IllegalStateException("Container " + oid + " is not registered");
+      return containers.get(oid);
+   }
+
+   /**
+    * Returns an unmodifiable collection of the registered containers.
+    * 
+    * @return   the containers
+    */
+   public static Collection<Container> getContainers()
+   {
+      return Collections.unmodifiableCollection(containers.values());
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbEncFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/EjbEncFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbEncFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbEncFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import javax.naming.Context;
+
+/**
+ * ENC Abstraction for EJB Container
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public interface EjbEncFactory
+{
+   Context getEnc(EJBContainer container);
+
+   /**
+    * Push the EJB's ENC onto the current thread
+    *
+    * @param container
+    */
+   void pushEnc(EJBContainer container);
+
+   /**
+    * pop the EJB's ENC from the current thread
+    *
+    * @param container
+    */
+   void popEnc(EJBContainer container);
+
+   /**
+    * 
+    * @param container
+    */
+   void cleanupEnc(EJBContainer container);
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbTimerUtil.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbTimerUtil.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EjbTimerUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javax.ejb.TimerService;
-
-import org.jboss.ejb.txtimer.EJBTimerService;
-import org.jboss.ejb.txtimer.TimedObjectInvoker;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EjbTimerUtil
-{
-   private static final Logger log = Logger.getLogger(EjbTimerUtil.class);
-
-   public static TimerService getTimerService(Container container, TimedObjectInvoker invoker)
-   {
-      TimerService timerService = null;
-      try
-      {
-         EJBTimerService service = (EJBTimerService) MBeanProxyExt.create(EJBTimerService.class, EJBTimerService.OBJECT_NAME, MBeanServerLocator.locateJBoss());
-         timerService = service.createTimerService(container.getObjectName(), null, invoker);
-      }
-      catch (Exception e)
-      {
-         //throw new EJBException("Could not create timer service", e);
-         if (log.isTraceEnabled())
-         {
-            log.trace("Unable to initialize timer service", e);
-         }
-         else
-         {
-            log.trace("Unable to initialize timer service");
-         }
-      }
-      return timerService;
-   }
-
-   public static void removeTimerService(Container container)
-   {
-      try
-      {
-         EJBTimerService service = (EJBTimerService) MBeanProxyExt.create(EJBTimerService.class, EJBTimerService.OBJECT_NAME, MBeanServerLocator.locateJBoss());
-         service.removeTimerService(container.getObjectName(), null);
-      }
-      catch (Exception e)
-      {
-         //throw new EJBException("Could not remove timer service", e);
-         if (log.isTraceEnabled())
-         {
-            log.trace("Unable to initialize timer service", e);
-         }
-         else
-         {
-            log.trace("Unable to initialize timer service");
-         }
-      }
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * @version <tt>$Revision: 54985 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class InitialContextFactory
-{
-   private static Properties props = null;
-   private static Properties securityProperties = null;
-   
-   public static InitialContext getInitialContext() throws NamingException
-   {
-      InitialContext jndiContext;
-      
-      if (props == null)
-         jndiContext = new InitialContext();
-      else
-      {
-         if (securityProperties != null)
-         {
-            Properties combinedProps = new Properties();
-            combinedProps.putAll(props);
-            combinedProps.putAll(securityProperties);
-            jndiContext = new InitialContext(combinedProps);
-         }
-         else
-            jndiContext = new InitialContext(props);
-      }
-      
-      return jndiContext;
-   }
-   
-   public static void setProperties(Properties properties)
-   {
-      props = properties;
-   }
-   
-   public static void setSecurity(String user, String password)
-   {
-      if (props != null)
-      {
-         securityProperties = new Properties();
-         securityProperties.put(Context.SECURITY_PRINCIPAL, user);
-         securityProperties.put(Context.SECURITY_CREDENTIALS, password);
-         securityProperties.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
-      }
-   }
-   
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class InitialContextFactory
+{
+   private static Properties props = null;
+   private static Properties securityProperties = null;
+   
+   public static InitialContext getInitialContext() throws NamingException
+   {
+      InitialContext jndiContext;
+      
+      if (props == null)
+         jndiContext = new InitialContext();
+      else
+      {
+         if (securityProperties != null)
+         {
+            Properties combinedProps = new Properties();
+            combinedProps.putAll(props);
+            combinedProps.putAll(securityProperties);
+            jndiContext = new InitialContext(combinedProps);
+         }
+         else
+            jndiContext = new InitialContext(props);
+      }
+      
+      return jndiContext;
+   }
+   
+   public static void setProperties(Properties properties)
+   {
+      props = properties;
+   }
+   
+   public static void setSecurity(String user, String password)
+   {
+      if (props != null)
+      {
+         securityProperties = new Properties();
+         securityProperties.put(Context.SECURITY_PRINCIPAL, user);
+         securityProperties.put(Context.SECURITY_CREDENTIALS, password);
+         securityProperties.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      }
+   }
+   
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/InitialContextFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.HashSet;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Simple service that lists jars that will be ignored for scanning for annotations to deploy
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JarsIgnoredForScanning extends ServiceMBeanSupport implements JarsIgnoredForScanningMBean
-{
-   String[] ignoredJars;
-   HashSet ignoredJarsSet = new HashSet();
-
-   public String[] getIgnoredJars()
-   {
-      return ignoredJars;
-   }
-
-   public void setIgnoredJars(String[] ignoredJars)
-   {
-      this.ignoredJars = ignoredJars;
-      for (String jar : ignoredJars)
-      {
-         ignoredJarsSet.add(jar.trim());
-      }
-   }
-
-   public HashSet getIgnoredJarsSet()
-   {
-      return ignoredJarsSet;
-   }
-
-   public void setIgnoredJarsSet(HashSet ignoredJarsSet)
-   {
-      this.ignoredJarsSet = ignoredJarsSet;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.HashSet;
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * Simple service that lists jars that will be ignored for scanning for annotations to deploy
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JarsIgnoredForScanning extends ServiceMBeanSupport implements JarsIgnoredForScanningMBean
+{
+   String[] ignoredJars;
+   HashSet ignoredJarsSet = new HashSet();
+
+   public String[] getIgnoredJars()
+   {
+      return ignoredJars;
+   }
+
+   public void setIgnoredJars(String[] ignoredJars)
+   {
+      this.ignoredJars = ignoredJars;
+      for (String jar : ignoredJars)
+      {
+         ignoredJarsSet.add(jar.trim());
+      }
+   }
+
+   public HashSet getIgnoredJarsSet()
+   {
+      return ignoredJarsSet;
+   }
+
+   public void setIgnoredJarsSet(HashSet ignoredJarsSet)
+   {
+      this.ignoredJarsSet = ignoredJarsSet;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanning.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.HashSet;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface JarsIgnoredForScanningMBean
-{
-   String[] getIgnoredJars();
-
-   void setIgnoredJars(String[] ignoredJars);
-
-   HashSet getIgnoredJarsSet();
-
-   void setIgnoredJarsSet(HashSet ignoredJarsSet);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.HashSet;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface JarsIgnoredForScanningMBean
+{
+   String[] getIgnoredJars();
+
+   void setIgnoredJars(String[] ignoredJars);
+
+   HashSet getIgnoredJarsSet();
+
+   void setIgnoredJarsSet(HashSet ignoredJarsSet);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JarsIgnoredForScanningMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class JmxClientKernelAbstraction implements ClientKernelAbstraction
-{
-   private static final Logger log = Logger.getLogger(JmxKernelAbstraction.class);
-
-   private MBeanServerConnection server;
-
-   public JmxClientKernelAbstraction(MBeanServerConnection server)
-   {
-      this.server = server;
-   }
-   
-   public Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws Exception
-   {
-      return server.invoke(name, operationName, params, signature);
-   }
-   
-   public Object getAttribute(ObjectName name, String attribute) throws Exception
-   {
-      return server.getAttribute(name, attribute);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxClientKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class JmxClientKernelAbstraction implements ClientKernelAbstraction
+{
+   private static final Logger log = Logger.getLogger(JmxKernelAbstraction.class);
+
+   private MBeanServerConnection server;
+
+   public JmxClientKernelAbstraction(MBeanServerConnection server)
+   {
+      this.server = server;
+   }
+   
+   public Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws Exception
+   {
+      return server.invoke(name, operationName, params, signature);
+   }
+   
+   public Object getAttribute(ObjectName name, String attribute) throws Exception
+   {
+      return server.getAttribute(name, attribute);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.Collection;
-import java.util.HashSet;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-/**
- * Old JMX Kernel dependency registry
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JmxDependencyPolicy implements DependencyPolicy
-{
-   protected HashSet<ObjectName> dependencies = new HashSet<ObjectName>();
-
-   public void addDependency(String dependency)
-   {
-      ObjectName on = null;
-      try
-      {
-         on = new ObjectName(dependency);
-      }
-      catch (MalformedObjectNameException e)
-      {
-         throw new RuntimeException(dependency, e);
-      }
-      dependencies.add(on);
-   }
-
-   public Collection getDependencies()
-   {
-      return dependencies;
-   }
-
-   public Collection getDependencies(Collection currentDependencies)
-   {
-      dependencies.addAll(currentDependencies);
-      return dependencies;
-   }
-
-   public void addDatasource(String jndiName)
-   {
-      String ds = jndiName;
-      if (ds.startsWith("java:/"))
-      {
-         ds = ds.substring(6);
-
-      }
-      else if (ds.startsWith("java:"))
-      {
-         ds = ds.substring(5);
-      }
-      //tring onStr = "jboss.jca:name=" + ds + ",service=ManagedConnectionFactory";
-      String onStr = "jboss.jca:name=" + ds + ",service=DataSourceBinding";
-
-      try
-      {
-         dependencies.add(new ObjectName(onStr));
-      }
-      catch (MalformedObjectNameException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.Collection;
+import java.util.HashSet;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+/**
+ * Old JMX Kernel dependency registry
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JmxDependencyPolicy implements DependencyPolicy
+{
+   protected HashSet<ObjectName> dependencies = new HashSet<ObjectName>();
+
+   public void addDependency(String dependency)
+   {
+      ObjectName on = null;
+      try
+      {
+         on = new ObjectName(dependency);
+      }
+      catch (MalformedObjectNameException e)
+      {
+         throw new RuntimeException(dependency, e);
+      }
+      dependencies.add(on);
+   }
+
+   public Collection getDependencies()
+   {
+      return dependencies;
+   }
+
+   public Collection getDependencies(Collection currentDependencies)
+   {
+      dependencies.addAll(currentDependencies);
+      return dependencies;
+   }
+
+   public void addDatasource(String jndiName)
+   {
+      String ds = jndiName;
+      if (ds.startsWith("java:/"))
+      {
+         ds = ds.substring(6);
+
+      }
+      else if (ds.startsWith("java:"))
+      {
+         ds = ds.substring(5);
+      }
+      //tring onStr = "jboss.jca:name=" + ds + ",service=ManagedConnectionFactory";
+      String onStr = "jboss.jca:name=" + ds + ",service=DataSourceBinding";
+
+      try
+      {
+         dependencies.add(new ObjectName(onStr));
+      }
+      catch (MalformedObjectNameException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentScopeImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/JmxDeploymentScopeImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentScopeImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentScopeImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,77 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Collection;
+
+/**
+ * JMX JBoss 4.x Kernel abstraction for an ear.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 1.17 $
+ */
+public class JmxDeploymentScopeImpl implements DeploymentScope
+{
+   private ConcurrentHashMap<String, Ejb3Deployment> deployments = new ConcurrentHashMap<String, Ejb3Deployment>();
+   private String shortName;
+   private String baseName;
+
+   public JmxDeploymentScopeImpl(String shortName)
+   {
+      this.shortName = shortName;
+      int idx = shortName.lastIndexOf('.');
+      baseName = shortName.substring(0, idx);
+   }
+
+   public Collection<Ejb3Deployment> getEjbDeployments()
+   {
+      return deployments.values();
+   }
+
+   public void register(Ejb3Deployment deployment)
+   {
+      deployments.put(deployment.getDeploymentUnit().getShortName(), deployment);
+   }
+
+   public void unregister(Ejb3Deployment deployment)
+   {
+      deployments.remove(deployment.getDeploymentUnit().getShortName());
+   }
+
+   public Ejb3Deployment findRelativeDeployment(String relativeName)
+   {
+      String relativeShortName = relativeName.substring(3);
+      return deployments.get(relativeShortName);
+   }
+
+   public String getShortName()
+   {
+      return shortName;
+   }
+
+   public String getBaseName()
+   {
+      return baseName;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,170 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.mx.util.MBeanProxyExt;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JmxDeploymentUnit implements DeploymentUnit
-{
-   private DeploymentInfo deploymentInfo;
-   InterceptorInfoRepository interceptorInfoRepository = new InterceptorInfoRepository();
-
-   URL extractDescriptorUrl(String resource)
-   {
-      String urlStr = deploymentInfo.url.getFile();
-      // However the jar must also contain at least one ejb-jar.xml
-      try
-      {
-         URL dd = deploymentInfo.localCl.findResource(resource);
-         if (dd == null)
-         {
-            return null;
-         }
-
-         // If the DD url is not a subset of the urlStr then this is coming
-         // from a jar referenced by the deployment jar manifest and the
-         // this deployment jar it should not be treated as an ejb-jar
-         if (deploymentInfo.localUrl != null)
-         {
-            urlStr = deploymentInfo.localUrl.toString();
-         }
-
-         String ddStr = dd.toString();
-         if (ddStr.indexOf(urlStr) >= 0)
-         {
-            return dd;
-         }
-      }
-      catch (Exception ignore)
-      {
-      }
-      return null;
-   }
-
-   public URL getPersistenceXml()
-   {
-      return extractDescriptorUrl("META-INF/persistence.xml");
-   }
-
-   public URL getEjbJarXml()
-   {
-      return extractDescriptorUrl("META-INF/ejb-jar.xml");
-   }
-
-   public URL getJbossXml()
-   {
-      return extractDescriptorUrl("META-INF/jboss.xml");
-   }
-
-/*
-      public URL getPersistenceXml()
-      {
-         return getResourceLoader().getResource("META-INF/persistence.xml");
-      }
-
-      public URL getEjbJarXml()
-      {
-         return getResourceLoader().getResource("META-INF/ejb-jar.xml");
-      }
-
-      public URL getJbossXml()
-      {
-         return getResourceLoader().getResource("META-INF/jboss.xml");
-      }
-*/
-
-   public List<Class> getClasses()
-   {
-      return null;
-   }
-
-   public JmxDeploymentUnit(DeploymentInfo deploymentInfo)
-   {
-      this.deploymentInfo = deploymentInfo;
-   }
-
-   public ClassLoader getClassLoader()
-   {
-      return deploymentInfo.ucl;
-   }
-
-   public ClassLoader getResourceLoader()
-   {
-      return deploymentInfo.localCl;
-   }
-
-   public String getShortName()
-   {
-      return deploymentInfo.shortName;
-   }
-
-   public URL getUrl()
-   {
-      return deploymentInfo.url;
-   }
-
-   public String getDefaultEntityManagerName()
-   {
-      String url = getUrl().toString();
-      String name = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
-      return name;
-   }
-
-   public Map getDefaultPersistenceProperties()
-   {
-      try
-      {
-         EJB3DeployerMBean deployer = (EJB3DeployerMBean) MBeanProxyExt.create(EJB3DeployerMBean.class, EJB3DeployerMBean.OBJECT_NAME,
-                                                                         deploymentInfo.getServer());
-
-         return deployer.getDefaultProperties();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-
-   public Hashtable getJndiProperties()
-   {
-      return null;
-   }
-
-   public InterceptorInfoRepository getInterceptorInfoRepository()
-   {
-      return interceptorInfoRepository;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,254 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+//import org.jboss.virtual.VFS;
+//import org.jboss.virtual.VirtualFile;
+//import org.jboss.virtual.VirtualFileFilter;
+//import org.jboss.virtual.VisitorAttributes;
+//import org.jboss.virtual.plugins.context.jar.JarUtils;
+//import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
+//import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JmxDeploymentUnit implements DeploymentUnit
+{
+   protected static final Logger log = Logger.getLogger(JmxDeploymentUnit.class);
+
+   private DeploymentInfo deploymentInfo;
+   InterceptorInfoRepository interceptorInfoRepository = new InterceptorInfoRepository();
+//   private VirtualFile vfsRoot;
+
+   public JmxDeploymentUnit(DeploymentInfo deploymentInfo)
+   {
+      this.deploymentInfo = deploymentInfo;
+//      try
+//      {
+//         VFS vfs = VFS.getVFS(deploymentInfo.url);
+//         vfsRoot = vfs.getRoot();
+//      }
+//      catch (IOException e)
+//      {
+//         throw new RuntimeException();
+//      }
+   }
+
+//   public VirtualFile getRootFile()
+//   {
+//      return vfsRoot;
+//   }
+   
+   public URL getRelativeURL(String jar)
+   {
+      URL url = null;
+      try
+      {
+         url = new URL(jar);
+      }
+      catch (MalformedURLException e)
+      {
+         try
+         {
+            if (jar.startsWith(".."))
+            {
+               if (getUrl() == null)
+                  throw new RuntimeException("relative <jar-file> not allowed when standalone deployment unit is used");
+               String base = getUrl().toString();
+               jar = jar.replaceAll("\\.\\./", "+");
+               int idx = jar.lastIndexOf('+');
+               jar = jar.substring(idx + 1);
+               for (int i = 0; i < idx + 1; i++)
+               {
+                  int slash = base.lastIndexOf('/');
+                  base = base.substring(0, slash + 1);
+               }
+               url = new URL(base + jar.substring(idx));
+            }
+            else
+            {
+               File fp = new File(jar);
+               url = fp.toURL();
+            }
+         }
+         catch (MalformedURLException e1)
+         {
+            throw new RuntimeException("Unable to find relative url: " + jar, e1);
+         }
+      }
+      return url;
+   }
+
+   URL extractDescriptorUrl(String resource)
+   {
+      String urlStr = deploymentInfo.url.getFile();
+      // However the jar must also contain at least one ejb-jar.xml
+      try
+      {
+         URL dd = deploymentInfo.localCl.findResource(resource);
+         if (dd == null)
+         {
+            return null;
+         }
+
+         // If the DD url is not a subset of the urlStr then this is coming
+         // from a jar referenced by the deployment jar manifest and the
+         // this deployment jar it should not be treated as an ejb-jar
+         if (deploymentInfo.localUrl != null)
+         {
+            urlStr = deploymentInfo.localUrl.toString();
+         }
+
+         String ddStr = dd.toString();
+         if (ddStr.indexOf(urlStr) >= 0)
+         {
+            return dd;
+         }
+      }
+      catch (Exception ignore)
+      {
+      }
+      return null;
+   }
+
+   public URL getPersistenceXml()
+   {
+      return extractDescriptorUrl("META-INF/persistence.xml");
+   }
+
+   public URL getEjbJarXml()
+   {
+      return extractDescriptorUrl("META-INF/ejb-jar.xml");
+   }
+
+   public URL getJbossXml()
+   {
+      return extractDescriptorUrl("META-INF/jboss.xml");
+   }
+
+   public List<Class> getClasses()
+   {
+      return null;
+   }
+
+   public ClassLoader getClassLoader()
+   {
+      return deploymentInfo.ucl;
+   }
+
+   public ClassLoader getResourceLoader()
+   {
+      return deploymentInfo.localCl;
+   }
+
+   public String getShortName()
+   {
+      return deploymentInfo.shortName;
+   }
+
+   public URL getUrl()
+   {
+      return deploymentInfo.url;
+   }
+
+   public String getDefaultEntityManagerName()
+   {
+      String url = getUrl().toString();
+      String name = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
+      return name;
+   }
+
+   public Map getDefaultPersistenceProperties()
+   {
+      try
+      {
+         EJB3DeployerMBean deployer = (EJB3DeployerMBean) MBeanProxyExt.create(EJB3DeployerMBean.class, EJB3DeployerMBean.OBJECT_NAME,
+                 deploymentInfo.getServer());
+
+         return deployer.getDefaultProperties();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+
+   public Hashtable getJndiProperties()
+   {
+      return null;
+   }
+
+   public InterceptorInfoRepository getInterceptorInfoRepository()
+   {
+      return interceptorInfoRepository;
+   }
+
+
+//   public List<VirtualFile> getResources(VirtualFileFilter filter)
+//   {
+//      VisitorAttributes va = new VisitorAttributes();
+//      va.setLeavesOnly(true);
+//      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+//      va.setRecurseFilter(noJars);
+//      FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
+//      try
+//      {
+//         vfsRoot.visit(visitor);
+//      }
+//      catch (IOException e)
+//      {
+//         throw new RuntimeException(e);
+//      }
+//      return visitor.getMatched();
+//
+//   }
+//
+//   public VirtualFile getMetaDataFile(String path)
+//   {
+//      try
+//      {
+//         return vfsRoot.findChild(path);
+//      }
+//      catch (IOException e)
+//      {
+//         log.debug("Cannot get meta data file: " + path);
+//         return null;
+//      }
+//   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxEARImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxEARImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxEARImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Collection;
-
-/**
- * JMX JBoss 4.x Kernel abstraction for an ear.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.17 $
- */
-public class JmxEARImpl implements EAR
-{
-   private ConcurrentHashMap<String, Ejb3Deployment> deployments = new ConcurrentHashMap<String, Ejb3Deployment>();
-   private String shortName;
-   private String baseName;
-
-   public JmxEARImpl(String shortName)
-   {
-      this.shortName = shortName;
-      int idx = shortName.lastIndexOf('.');
-      baseName = shortName.substring(0, idx);
-   }
-
-   public Collection<Ejb3Deployment> getEjbDeployments()
-   {
-      return deployments.values();
-   }
-
-   public void register(Ejb3Deployment deployment)
-   {
-      deployments.put(deployment.getDeploymentUnit().getShortName(), deployment);
-   }
-
-   public void unregister(Ejb3Deployment deployment)
-   {
-      deployments.remove(deployment.getDeploymentUnit().getShortName());
-   }
-
-   public Ejb3Deployment findRelativeDeployment(String relativeName)
-   {
-      String relativeShortName = relativeName.substring(3);
-      return deployments.get(relativeShortName);
-   }
-
-   public String getShortName()
-   {
-      return shortName;
-   }
-
-   public String getBaseName()
-   {
-      return baseName;
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,194 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javax.management.DynamicMBean;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.system.ServiceControllerMBean;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.logging.Logger;
-
-import org.jboss.ejb3.stateless.StatelessContainer;
-import org.jboss.ejb3.stateless.StatelessDelegateWrapper;
-
-import org.jboss.ejb3.stateful.StatefulContainer;
-import org.jboss.ejb3.stateful.StatefulDelegateWrapper;
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JmxKernelAbstraction
-   extends JmxClientKernelAbstraction
-   implements KernelAbstraction
-{
-   private static final Logger log = Logger.getLogger(JmxKernelAbstraction.class);
-
-   private MBeanServer server;
-   private ServiceControllerMBean serviceController;
-   private DeploymentInfo di;
-
-   public JmxKernelAbstraction(DeploymentInfo di)
-   {
-      super(di.getServer());
-      this.server = di.getServer();
-      serviceController = (ServiceControllerMBean) MBeanProxyExt.create(ServiceControllerMBean.class, ServiceControllerMBean.OBJECT_NAME,
-            di.getServer());
-      this.di = di;
-   }
-   
-   public JmxKernelAbstraction(MBeanServer server)
-   {
-      super(server);
-      serviceController = (ServiceControllerMBean) MBeanProxyExt.create(ServiceControllerMBean.class, ServiceControllerMBean.OBJECT_NAME,
-                                                                        server);
-   }
-   
-   public void setMbeanServer(MBeanServer server)
-   {
-      this.server = server;
-   }
-
-
-   public void install(String name, DependencyPolicy dependencies, Object service)
-   {
-      if (!(service instanceof ServiceMBeanSupport) && !(service instanceof DynamicMBean))
-      {
-         log.info("creating wrapper delegate for: " + service.getClass().getName());
-         
-         // create mbean delegate.
-         if (service instanceof StatelessContainer)
-         {
-        	 service = new StatelessDelegateWrapper(service);
-         }
-         else if (service instanceof StatefulContainer)
-         {
-        	 service = new StatefulDelegateWrapper(service);
-         }
-         else
-         {
-        	 service = new ServiceDelegateWrapper(service);
-         }
-      }
-      JmxDependencyPolicy policy = (JmxDependencyPolicy)dependencies;
-      try
-      {
-         log.info("installing MBean: " + name + " with dependencies:");
-         for (Object obj : policy.getDependencies())
-         {
-            log.info("\t" + obj);
-         }
-         ObjectName on = new ObjectName(name);
-         
-         if(policy.getDependencies().contains(on))
-            throw new IllegalStateException("circular dependencies detected");
-         
-         server.registerMBean(service, on);
-         addParentDependency(on);
-
-         serviceController.create(on, policy.getDependencies());
-         serviceController.start(on);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   private void addParentDependency(ObjectName on)
-   {
-      //di.mbeans.add(on);
-
-      // this is done so that we can get dependency error messages.
-      // and this is the only reason this is done.
-      // if you don't put add to the top DI mbean list, then no dependency
-      // error message is printed out if there is one.
-      DeploymentInfo parent = di;
-      while (parent.parent != null)
-      {
-         parent = parent.parent;
-      }
-      parent.mbeans.add(on);
-
-   }
-   
-   private void removeParentDependency(ObjectName on)
-   {
-      DeploymentInfo parent = di;
-      while (parent.parent != null)
-      {
-         parent = parent.parent;
-      }
-      parent.mbeans.remove(on);
-   }
-
-   public void installMBean(ObjectName on, DependencyPolicy dependencies, Object service)
-   {
-      JmxDependencyPolicy policy = (JmxDependencyPolicy)dependencies;
-      try
-      {
-         server.registerMBean(service, on);
-         addParentDependency(on);
-         serviceController.create(on, policy.getDependencies());
-         serviceController.start(on);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void uninstallMBean(ObjectName on)
-   {
-      try
-      {
-         serviceController.stop(on);
-         serviceController.destroy(on);
-         serviceController.remove(on);
-         removeParentDependency(on);
-         server.unregisterMBean(on);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void uninstall(String name)
-   {
-      ObjectName on;
-      try
-      {
-         on = new ObjectName(name);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-      
-      uninstallMBean(on);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,197 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import javax.management.DynamicMBean;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.system.ServiceControllerMBean;
+import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.logging.Logger;
+
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.ejb3.stateless.StatelessDelegateWrapper;
+
+import org.jboss.ejb3.stateful.StatefulContainer;
+import org.jboss.ejb3.stateful.StatefulDelegateWrapper;
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JmxKernelAbstraction
+   extends JmxClientKernelAbstraction
+   implements KernelAbstraction
+{
+   private static final Logger log = Logger.getLogger(JmxKernelAbstraction.class);
+
+   private MBeanServer server;
+   private ServiceControllerMBean serviceController;
+   private DeploymentInfo di;
+
+   public JmxKernelAbstraction(DeploymentInfo di)
+   {
+      super(di.getServer());
+      this.server = di.getServer();
+      serviceController = (ServiceControllerMBean) MBeanProxyExt.create(ServiceControllerMBean.class, ServiceControllerMBean.OBJECT_NAME,
+            di.getServer());
+      this.di = di;
+   }
+   
+   public JmxKernelAbstraction(MBeanServer server)
+   {
+      super(server);
+      serviceController = (ServiceControllerMBean) MBeanProxyExt.create(ServiceControllerMBean.class, ServiceControllerMBean.OBJECT_NAME,
+                                                                        server);
+   }
+   
+   public void setMbeanServer(MBeanServer server)
+   {
+      this.server = server;
+   }
+
+
+   public void install(String name, DependencyPolicy dependencies, Object service)
+   {
+      if (!(service instanceof ServiceMBeanSupport) && !(service instanceof DynamicMBean))
+      {
+         log.info("creating wrapper delegate for: " + service.getClass().getName());
+         
+         // create mbean delegate.
+         if (service instanceof StatelessContainer)
+         {
+        	 service = new StatelessDelegateWrapper(service);
+         }
+         else if (service instanceof StatefulContainer)
+         {
+        	 service = new StatefulDelegateWrapper(service);
+         }
+         else
+         {
+        	 service = new ServiceDelegateWrapper(service);
+         }
+      }
+      JmxDependencyPolicy policy = (JmxDependencyPolicy)dependencies;
+      try
+      {
+         log.info("installing MBean: " + name + " with dependencies:");
+         for (Object obj : policy.getDependencies())
+         {
+            log.info("\t" + obj);
+         }
+         ObjectName on = new ObjectName(name);
+         
+         if(policy.getDependencies().contains(on))
+            throw new IllegalStateException("circular dependencies detected");
+         
+         server.registerMBean(service, on);
+         addParentDependency(on);
+
+         serviceController.create(on, policy.getDependencies());
+         serviceController.start(on);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   private void addParentDependency(ObjectName on)
+   {
+      //di.mbeans.add(on);
+
+      // this is done so that we can get dependency error messages.
+      // and this is the only reason this is done.
+      // if you don't put add to the top DI mbean list, then no dependency
+      // error message is printed out if there is one.
+      DeploymentInfo parent = di;
+      while (parent.parent != null)
+      {
+         parent = parent.parent;
+      }
+      parent.mbeans.add(on);
+
+   }
+   
+   private void removeParentDependency(ObjectName on)
+   {
+      DeploymentInfo parent = di;
+      while (parent.parent != null)
+      {
+         parent = parent.parent;
+      }
+      parent.mbeans.remove(on);
+   }
+
+   public void installMBean(ObjectName on, DependencyPolicy dependencies, Object service)
+   {
+      JmxDependencyPolicy policy = (JmxDependencyPolicy)dependencies;
+      try
+      {
+         server.registerMBean(service, on);
+         addParentDependency(on);
+         serviceController.create(on, policy.getDependencies());
+         serviceController.start(on);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void uninstallMBean(ObjectName on)
+   {
+      try
+      {
+         serviceController.stop(on);
+         serviceController.destroy(on);
+         serviceController.remove(on);
+         removeParentDependency(on);
+         if(server.isRegistered(on))
+            server.unregisterMBean(on);
+         else
+            log.warn(on + " is not registered");
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void uninstall(String name)
+   {
+      ObjectName on;
+      try
+      {
+         on = new ObjectName(name);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+      
+      uninstallMBean(on);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javax.management.ObjectName;
-
-import javax.management.MBeanServer;
-
-/**
- * Abstraction for the underlying kernel (microcontainer or jmx kernel)
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface KernelAbstraction extends ClientKernelAbstraction
-{
-   public void install(String name, DependencyPolicy dependencies, Object service);
-
-   public void uninstall(String name);
-
-   void installMBean(ObjectName on, DependencyPolicy dependencies, Object service);
-
-   void uninstallMBean(ObjectName on);
-   
-   void setMbeanServer(MBeanServer server);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import javax.management.ObjectName;
+
+import javax.management.MBeanServer;
+
+/**
+ * Abstraction for the underlying kernel (microcontainer or jmx kernel)
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface KernelAbstraction extends ClientKernelAbstraction
+{
+   public void install(String name, DependencyPolicy dependencies, Object service);
+
+   public void uninstall(String name);
+
+   void installMBean(ObjectName on, DependencyPolicy dependencies, Object service);
+
+   void uninstallMBean(ObjectName on);
+   
+   void setMbeanServer(MBeanServer server);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/KernelAbstraction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -28,6 +28,7 @@
 import java.io.ObjectOutput;
 import java.lang.reflect.InvocationHandler;
 import org.jboss.ejb3.remoting.Proxy;
+import org.jboss.logging.Logger;
 
 /**
  * Comment
@@ -37,26 +38,41 @@
  */
 public abstract class LocalProxy implements InvocationHandler, Externalizable, Proxy
 {
-   protected Container container;
+   private static Logger log = Logger.getLogger(LocalProxy.class);
+   
+   // FIXME: should be private
+   protected transient Container container = null;
+   private String containerId;
 
-   public LocalProxy()
+   protected LocalProxy()
    {
    }
 
-   public LocalProxy(Container container)
+   protected LocalProxy(Container container)
    {
       this.container = container;
+      this.containerId = container.getObjectName().getCanonicalName();
    }
 
+   protected Container getContainer()
+   {
+      if(container == null)
+         container = Ejb3Registry.findContainer(containerId);
+      if(container == null)
+         log.warn("Container " + containerId + " is not yet available");
+      return container;
+   }
+   
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
-      String containerId = in.readUTF();
-      this.container = Ejb3Registry.getContainer(containerId);
+      this.containerId = in.readUTF();
+      // TODO: one container is private, this won't have to be done anymore
+      this.container = Ejb3Registry.findContainer(containerId);
    }
 
    public void writeExternal(ObjectOutput out) throws IOException
    {
-      out.writeUTF(container.getObjectName().getCanonicalName());
+      out.writeUTF(containerId);
    }
 
    public abstract String toString();

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCClientKernelAbstraction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/MCClientKernelAbstraction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCClientKernelAbstraction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCClientKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import org.jboss.ejb3.embedded.resource.RARDeployment;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.logging.Logger;
+
+import javax.management.ObjectName;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class MCClientKernelAbstraction implements ClientKernelAbstraction
+{
+   private static final Logger log = Logger.getLogger(MCClientKernelAbstraction.class);
+
+   protected Kernel kernel;
+
+   public MCClientKernelAbstraction(Kernel kernel)
+   {
+      this.kernel = kernel;
+   }
+
+   public Object invoke(ObjectName objectName, String operationName, Object[] params, String[] signature) throws Exception
+   {
+      String name = objectName.getCanonicalName();
+      KernelRegistryEntry entry = kernel.getRegistry().getEntry(name);
+      if (entry != null)
+      {
+         Object target = entry.getTarget();
+         if (target instanceof RARDeployment)
+         {
+            RARDeployment deployment = (RARDeployment) target;
+            return deployment.invoke(operationName, params, signature);
+         }
+         else
+         {
+            Class[] types = new Class[signature.length];
+            for (int i = 0; i < signature.length; ++i)
+            {
+               types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
+            }
+            Method method = target.getClass().getMethod(operationName, types);
+            return method.invoke(target, params);
+         }
+      }
+      return null;
+   }
+
+   public Object getAttribute(ObjectName objectName, String attribute) throws Exception
+   {
+      String name = objectName.getCanonicalName();
+      KernelRegistryEntry entry = kernel.getRegistry().getEntry(name);
+      if (entry != null)
+      {
+         Object target = entry.getTarget();
+         Field field = target.getClass().getField(attribute);
+         return field.get(target);
+      }
+      return null;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.HashSet;
+
+import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
+import org.jboss.beans.metadata.spi.DemandMetaData;
+
+/**
+ * dependency registry for Microcontainer
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class MCDependencyPolicy implements DependencyPolicy
+{
+   protected HashSet dependencies = new HashSet();
+
+   public void addDependency(String dependency)
+   {
+      dependencies.add(dependency);
+   }
+
+   public void addDatasource(String jndiName)
+   {
+      String ds = jndiName;
+      if (ds.startsWith("java:/"))
+      {
+         ds = ds.substring(6);
+
+      }
+      else if (ds.startsWith("java:"))
+      {
+         ds = ds.substring(5);
+      }
+      addDependency(ds);
+   }
+
+   public HashSet<DemandMetaData> getDependencies()
+   {
+      HashSet<DemandMetaData> set = new HashSet<DemandMetaData>();
+      for (Object depends : dependencies)
+      {
+         set.add(new AbstractDemandMetaData(depends));
+      }
+      return set;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,231 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.lang.reflect.Method;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+
+import org.jboss.ejb3.embedded.resource.RARDeployment;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Abstraction layer for installing beans into the micro container.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class MCKernelAbstraction
+   extends MCClientKernelAbstraction
+   implements KernelAbstraction
+{
+   private static final Logger log = Logger.getLogger(MCKernelAbstraction.class);
+
+   public static class AlreadyInstantiated extends AbstractConstructorMetaData
+   {
+      private Object bean;
+
+      public class Factory
+      {
+
+         public Object create()
+         {
+            return bean;
+         }
+      }
+
+      public AlreadyInstantiated(Object bean)
+      {
+         this.bean = bean;
+         this.setFactory(new AbstractValueMetaData(new Factory()));
+         this.setFactoryClass(Factory.class.getName());
+         this.setFactoryMethod("create");
+      }
+   }
+   
+   private MBeanServer server;
+
+   public MCKernelAbstraction(Kernel kernel, MBeanServer server)
+   {
+      super(kernel);
+      this.server = server;
+   }
+   
+   public void setMbeanServer(MBeanServer server)
+   {
+      this.server = server;
+   }
+
+   private boolean hasOperation(MBeanInfo info, String operationName)
+   {
+      for(MBeanOperationInfo operationInfo : info.getOperations())
+      {
+         if(operationInfo.getName().equals(operationName) == false)
+            continue;
+         
+         // void return type
+         if(operationInfo.getReturnType().equals("void") == false)
+            continue;
+         
+         // no parameters
+         if(operationInfo.getSignature().length != 0)
+            continue;
+         
+         return true;
+      }
+      
+      return false;
+   }
+   
+   public void install(String name, DependencyPolicy dependencies, Object service)
+   {
+      AbstractBeanMetaData bean = new AbstractBeanMetaData(name, service.getClass().getName());
+      bean.setConstructor(new AlreadyInstantiated(service));
+      MCDependencyPolicy policy = (MCDependencyPolicy) dependencies;
+      bean.setDemands(policy.getDependencies());
+      log.info("installing bean: " + name + " with dependencies:");
+      for (Object obj : policy.getDependencies())
+      {
+         String msg;
+         if (obj instanceof AbstractDemandMetaData)
+         {
+            msg = ((AbstractDemandMetaData)obj).getDemand().toString();
+         }
+         else
+         {
+            msg = obj.toString();
+         }
+         log.info("\t" + msg);
+      }
+      try
+      {
+         try 
+         {
+            kernel.getController().uninstall(name);
+         }
+         catch (IllegalStateException e){}
+               
+         kernel.getController().install(bean);
+      }
+      catch (Throwable throwable)
+      {
+         throw new RuntimeException(throwable);
+      }
+   }
+
+   public void installMBean(ObjectName on, DependencyPolicy dependencies, Object service)
+   {
+      try
+      {
+         server.registerMBean(service, on);
+         install(on.getCanonicalName(), dependencies, service);
+         
+         // EJBTHREE-606: emulate the ServiceController calls
+         MBeanInfo info = server.getMBeanInfo(on); // redundant call for speed
+         invokeOptionalMethod(on, info, "create");
+         invokeOptionalMethod(on, info, "start");
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         throw new RuntimeException(e);
+      }
+   }
+
+   private void invokeOptionalMethod(ObjectName on, MBeanInfo info, String operationName) throws InstanceNotFoundException, MBeanException, ReflectionException
+   {
+      Object params[] = { };
+      String signature[] = { };
+      if(hasOperation(info, operationName))
+         server.invoke(on, operationName, params, signature);
+   }
+   
+   public void uninstallMBean(ObjectName on)
+   {
+      try
+      {
+         // EJBTHREE-606: emulate the ServiceController calls
+         MBeanInfo info = server.getMBeanInfo(on); // redundant call for speed
+         invokeOptionalMethod(on, info, "stop");
+         invokeOptionalMethod(on, info, "destroy");
+         
+         server.unregisterMBean(on);
+         kernel.getController().uninstall(on.toString());
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void uninstall(String name)
+   {
+      try
+      {
+         kernel.getController().uninstall(name);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   public Object invoke(ObjectName objectName, String operationName, Object[] params, String[] signature) throws Exception
+   {
+      String name = objectName.getCanonicalName();
+      KernelRegistryEntry entry = kernel.getRegistry().getEntry(name);
+      if (entry != null)
+      {
+         Object target = entry.getTarget();
+         if (target instanceof RARDeployment)
+         {
+            RARDeployment deployment = (RARDeployment)target;
+            return deployment.invoke(operationName, params, signature);
+         } 
+         else
+         {
+            Class[] types = new Class[signature.length];
+            for (int i = 0; i < signature.length; ++i)
+            {
+               types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
+            }
+            Method method = target.getClass().getMethod(operationName, types);
+            return method.invoke(target, params);
+         }
+      }
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Collection;
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class PersistenceUnitRegistry
-{
-   private static final Logger log = Logger.getLogger(PersistenceUnitRegistry.class);
-
-   private static ConcurrentHashMap<String, PersistenceUnitDeployment> persistenceUnits = new ConcurrentHashMap<String, PersistenceUnitDeployment>();
-
-   public static void register(PersistenceUnitDeployment container)
-   {
-      if (persistenceUnits.contains(container.getKernelName())) throw new RuntimeException("Persistence Unit is already registered: " + container.getKernelName());
-      persistenceUnits.put(container.getKernelName(), container);
-   }
-
-   public static void unregister(PersistenceUnitDeployment container)
-   {
-      persistenceUnits.remove(container.getKernelName());
-   }
-
-   public static PersistenceUnitDeployment getPersistenceUnit(String kernelName)
-   {
-      return persistenceUnits.get(kernelName);
-   }
-
-   public static Collection<PersistenceUnitDeployment> getPersistenceUnits()
-   {
-      return persistenceUnits.values();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Collection;
+import org.jboss.logging.Logger;
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class PersistenceUnitRegistry
+{
+   private static final Logger log = Logger.getLogger(PersistenceUnitRegistry.class);
+
+   private static ConcurrentHashMap<String, PersistenceUnitDeployment> persistenceUnits = new ConcurrentHashMap<String, PersistenceUnitDeployment>();
+
+   public static void register(PersistenceUnitDeployment container)
+   {
+      if (persistenceUnits.contains(container.getKernelName())) throw new RuntimeException("Persistence Unit is already registered: " + container.getKernelName());
+      persistenceUnits.put(container.getKernelName(), container);
+   }
+
+   public static void unregister(PersistenceUnitDeployment container)
+   {
+      persistenceUnits.remove(container.getKernelName());
+   }
+
+   public static PersistenceUnitDeployment getPersistenceUnit(String kernelName)
+   {
+      return persistenceUnits.get(kernelName);
+   }
+
+   public static Collection<PersistenceUnitDeployment> getPersistenceUnits()
+   {
+      return persistenceUnits.values();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/PersistenceUnitRegistry.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -90,9 +90,9 @@
 
          ArrayList list = getBusinessInterfaces(container.getBeanClass());
          if (list.size() == 0)
-            throw new RuntimeException("Use of empty @Local on bean class and there are no valid business interfaces");
+            throw new RuntimeException("Use of empty @Local on bean class and there are no valid business interfaces: " + container.getEjbName());
          if (list.size() > 1)
-            throw new RuntimeException("Use of empty @Local on bean class and there are more than one default interface");
+            throw new RuntimeException("Use of empty @Local on bean class and there are more than one default interface: " + container.getEjbName());
          Class[] rtn = {(Class) list.get(0)};
          li = new LocalImpl(rtn);
          ((EJBContainer) container).getAnnotations().addClassAnnotation(javax.ejb.Local.class, li);
@@ -104,7 +104,7 @@
       Class[] ri = getRemoteInterfaces(container);
 
       if (li == null && ri == null && endpoint == null && (beanClass.getInterfaces() == null || beanClass.getInterfaces().length == 0))
-         throw new RuntimeException("bean class has no local, webservice, or remote interfaces defined and does not implement at least one business interface");
+         throw new RuntimeException("bean class has no local, webservice, or remote interfaces defined and does not implement at least one business interface: " + container.getEjbName());
 
       // introspect implemented interfaces.
       if (li == null)
@@ -123,7 +123,7 @@
             intfs = locals.toArray(new Class[locals.size()]);
             li = new LocalImpl(intfs);
             ((Advisor) container).getAnnotations().addClassAnnotation(javax.ejb.Local.class, li);
-            return li.value();
+            //return li.value(); ALR Removed (EJBTHREE-751)
          }
       }
       // no @Local interfaces implemented
@@ -151,6 +151,25 @@
          ((EJBContainer) container).getAnnotations().addClassAnnotation(javax.ejb.Local.class, li);
          return rtn;
       }
+      
+
+      // Check to ensure @Local and @Remote are not defined on the same interface
+      // JIRA EJBTHREE-751
+      if(ri != null)
+      {
+         for (Class remoteInterface : ri)
+         {
+            for (Class localInterface : li.value())
+            {
+               if (localInterface.equals(remoteInterface))
+               {
+                  throw new RuntimeException("@Remote and @Local may not both be specified on the same interface \""
+                        + remoteInterface.toString() + "\" per EJB3 Spec 4.6.7, Bullet 5.4");
+               }
+            }
+         }
+      }
+      
       return li.value();
    }
 
@@ -296,8 +315,8 @@
       if (localBinding == null)
       {
          String name = container.getEjbName() + "/local";
-         EAR ear = ((EJBContainer) container).getDeployment().getEar();
-         if (ear != null) return ear.getBaseName() + "/" + name;
+         DeploymentScope deploymentScope = ((EJBContainer) container).getDeployment().getEar();
+         if (deploymentScope != null) return deploymentScope.getBaseName() + "/" + name;
 
          if (conflictCheck)
             checkForRemoteJndiConflict(container);
@@ -353,9 +372,9 @@
 
       ArrayList list = getBusinessInterfaces(container.getBeanClass());
       if (list.size() == 0)
-         throw new RuntimeException("Use of empty @Remote on bean class and there are no valid business interfaces");
+         throw new RuntimeException("Use of empty @Remote on bean class and there are no valid business interfaces: " + container.getEjbName());
       if (list.size() > 1)
-         throw new RuntimeException("Use of empty @Remote on bean class and there are more than one default interface");
+         throw new RuntimeException("Use of empty @Remote on bean class and there are more than one default interface: " + container.getEjbName());
       Class[] rtn = {(Class) list.get(0)};
       ri = new RemoteImpl(rtn);
       ((EJBContainer) container).getAnnotations().addClassAnnotation(javax.ejb.Remote.class, ri);
@@ -414,8 +433,8 @@
    public static String getDefaultRemoteJndiName(Container container)
    {
       String name = container.getEjbName() + "/remote";
-      EAR ear = ((EJBContainer) container).getDeployment().getEar();
-      if (ear != null) return ear.getBaseName() + "/" + name;
+      DeploymentScope deploymentScope = ((EJBContainer) container).getDeployment().getEar();
+      if (deploymentScope != null) return deploymentScope.getBaseName() + "/" + name;
       return name;
    }
    

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,160 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.aop.util.MethodHashing;
-import org.jboss.aop.util.PayloadKey;
-import org.jboss.aspects.asynch.AsynchMixin;
-import org.jboss.aspects.asynch.AsynchProvider;
-import org.jboss.aspects.asynch.AsynchProxyInterceptor;
-import org.jboss.aspects.asynch.FutureHolder;
-import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
-import org.jboss.ejb3.remoting.Proxy;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class ProxyUtils
-{
-   public final static Class ASYNCH_PROVIDER_CLASS = AsynchProvider.class;
-   public final static long GET_ASYNCHRONOUS;
-   public static final long TO_STRING;
-   public static final long EQUALS;
-   public static final long HASHCODE;
-   public static final Method GET_PRIMARY_KEY;
-   public static final Method GET_HANDLE;
-   public static final Method GET_EJB_HOME;
-   public static final Method IS_IDENTICAL;
-   public static final Method GET_HOME_HANDLE;
-   public static final Method GET_EJB_METADATA;
-   public static final Method REMOVE;
-
-   static
-   {
-      try
-      {
-         Class[] empty = {};
-         
-         Method method = JBossProxy.class.getMethod("getAsynchronousProxy", empty);
-         GET_ASYNCHRONOUS = MethodHashing.calculateHash(method);
-         TO_STRING = MethodHashing.calculateHash(Object.class.getDeclaredMethod("toString", empty));
-         EQUALS = MethodHashing.calculateHash(Object.class.getDeclaredMethod("equals", new Class[]{Object.class}));
-         HASHCODE = MethodHashing.calculateHash(Object.class.getDeclaredMethod("hashCode", empty));
-               
-         GET_PRIMARY_KEY = EJBObject.class.getMethod("getPrimaryKey", empty);
-         GET_HANDLE = EJBObject.class.getMethod("getHandle", empty);
-         GET_EJB_HOME = EJBObject.class.getMethod("getEJBHome", empty);
-         IS_IDENTICAL = EJBObject.class.getMethod("isIdentical", new Class[] { EJBObject.class });
-         REMOVE = EJBObject.class.getMethod("remove", empty);
-                 
-         GET_HOME_HANDLE = EJBHome.class.getMethod("getHomeHandle", empty);
-         GET_EJB_METADATA = EJBHome.class.getMethod("getEJBMetaData", empty);
-      }
-      catch (NoSuchMethodException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public static boolean isAsynchronous(Class[] infs)
-   {
-      for (int i = 0; i < infs.length; i++)
-      {
-         if (infs[i] == ASYNCH_PROVIDER_CLASS)
-         {
-            return true;
-         }
-      }
-      return false;
-   }
-
-   public static Class[] addAsynchProviderInterface(Class[] infs)
-   {
-      ArrayList interfaces = new ArrayList();
-
-      for (int i = 0; i < infs.length; i++)
-      {
-         if (infs[i] == ASYNCH_PROVIDER_CLASS)
-         {
-            //This should not happen
-            continue;
-         }
-         interfaces.add(infs[i]);
-      }
-
-      interfaces.add(ASYNCH_PROVIDER_CLASS);
-      return (Class[]) interfaces.toArray(new Class[interfaces.size()]);
-   }
-
-   public static Interceptor[] addAsynchProxyInterceptor(AsynchMixin mixin, Interceptor[] interceptors)
-   {
-      AsynchProxyInterceptor interceptor = new AsynchProxyInterceptor(mixin);
-      Interceptor[] newInterceptors = null;
-      newInterceptors = new Interceptor[interceptors.length + 1];
-      newInterceptors[0] = interceptor;
-      System.arraycopy(interceptors, 0, newInterceptors, 1, interceptors.length);
-      return newInterceptors;
-   }
-
-   public static void addLocalAsynchronousInfo(MethodInvocation invocation, FutureHolder provider)
-   {
-      if (provider != null)
-      {
-         invocation.getMetaData().addMetaData(AsynchronousInterceptor.ASYNCH, AsynchronousInterceptor.INVOKE_ASYNCH, "YES", PayloadKey.AS_IS);
-         invocation.getMetaData().addMetaData(AsynchronousInterceptor.ASYNCH, AsynchronousInterceptor.FUTURE_HOLDER, provider, PayloadKey.AS_IS);
-      }
-   }
-
-   public static Object handleCallLocally(Object jbproxy, Proxy ih, Method m, Object[] args)
-   {
-      long hash = MethodHashing.calculateHash(m);
-      return handleCallLocally(hash, jbproxy, ih, m, args);
-   }
-
-   public static Object handleCallLocally(long hash, Object jbproxy, Proxy ih, Method m, Object[] args)
-   {
-      if (hash == ProxyUtils.GET_ASYNCHRONOUS)
-      {
-         return ih.getAsynchronousProxy((JBossProxy)jbproxy);
-      }
-      else if (hash == TO_STRING)
-      {
-         return ih.toString();
-      }
-      else if (hash == HASHCODE)
-      {
-         return new Integer(ih.toString().hashCode());
-      }
-      else if (hash == EQUALS)
-      {
-         return new Boolean(ih.toString().equals(args[0].toString()));
-      } 
-      return null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,160 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBObject;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.MethodInvocation;
+import org.jboss.aop.util.MethodHashing;
+import org.jboss.aop.util.PayloadKey;
+import org.jboss.aspects.asynch.AsynchMixin;
+import org.jboss.aspects.asynch.AsynchProvider;
+import org.jboss.aspects.asynch.AsynchProxyInterceptor;
+import org.jboss.aspects.asynch.FutureHolder;
+import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
+import org.jboss.ejb3.remoting.Proxy;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ProxyUtils
+{
+   public final static Class ASYNCH_PROVIDER_CLASS = AsynchProvider.class;
+   public final static long GET_ASYNCHRONOUS;
+   public static final long TO_STRING;
+   public static final long EQUALS;
+   public static final long HASHCODE;
+   public static final Method GET_PRIMARY_KEY;
+   public static final Method GET_HANDLE;
+   public static final Method GET_EJB_HOME;
+   public static final Method IS_IDENTICAL;
+   public static final Method GET_HOME_HANDLE;
+   public static final Method GET_EJB_METADATA;
+   public static final Method REMOVE;
+
+   static
+   {
+      try
+      {
+         Class[] empty = {};
+         
+         Method method = JBossProxy.class.getMethod("getAsynchronousProxy", empty);
+         GET_ASYNCHRONOUS = MethodHashing.calculateHash(method);
+         TO_STRING = MethodHashing.calculateHash(Object.class.getDeclaredMethod("toString", empty));
+         EQUALS = MethodHashing.calculateHash(Object.class.getDeclaredMethod("equals", new Class[]{Object.class}));
+         HASHCODE = MethodHashing.calculateHash(Object.class.getDeclaredMethod("hashCode", empty));
+               
+         GET_PRIMARY_KEY = EJBObject.class.getMethod("getPrimaryKey", empty);
+         GET_HANDLE = EJBObject.class.getMethod("getHandle", empty);
+         GET_EJB_HOME = EJBObject.class.getMethod("getEJBHome", empty);
+         IS_IDENTICAL = EJBObject.class.getMethod("isIdentical", new Class[] { EJBObject.class });
+         REMOVE = EJBObject.class.getMethod("remove", empty);
+                 
+         GET_HOME_HANDLE = EJBHome.class.getMethod("getHomeHandle", empty);
+         GET_EJB_METADATA = EJBHome.class.getMethod("getEJBMetaData", empty);
+      }
+      catch (NoSuchMethodException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public static boolean isAsynchronous(Class[] infs)
+   {
+      for (int i = 0; i < infs.length; i++)
+      {
+         if (infs[i] == ASYNCH_PROVIDER_CLASS)
+         {
+            return true;
+         }
+      }
+      return false;
+   }
+
+   public static Class[] addAsynchProviderInterface(Class[] infs)
+   {
+      ArrayList interfaces = new ArrayList();
+
+      for (int i = 0; i < infs.length; i++)
+      {
+         if (infs[i] == ASYNCH_PROVIDER_CLASS)
+         {
+            //This should not happen
+            continue;
+         }
+         interfaces.add(infs[i]);
+      }
+
+      interfaces.add(ASYNCH_PROVIDER_CLASS);
+      return (Class[]) interfaces.toArray(new Class[interfaces.size()]);
+   }
+
+   public static Interceptor[] addAsynchProxyInterceptor(AsynchMixin mixin, Interceptor[] interceptors)
+   {
+      AsynchProxyInterceptor interceptor = new AsynchProxyInterceptor(mixin);
+      Interceptor[] newInterceptors = null;
+      newInterceptors = new Interceptor[interceptors.length + 1];
+      newInterceptors[0] = interceptor;
+      System.arraycopy(interceptors, 0, newInterceptors, 1, interceptors.length);
+      return newInterceptors;
+   }
+
+   public static void addLocalAsynchronousInfo(MethodInvocation invocation, FutureHolder provider)
+   {
+      if (provider != null)
+      {
+         invocation.getMetaData().addMetaData(AsynchronousInterceptor.ASYNCH, AsynchronousInterceptor.INVOKE_ASYNCH, "YES", PayloadKey.AS_IS);
+         invocation.getMetaData().addMetaData(AsynchronousInterceptor.ASYNCH, AsynchronousInterceptor.FUTURE_HOLDER, provider, PayloadKey.AS_IS);
+      }
+   }
+
+   public static Object handleCallLocally(Object jbproxy, Proxy ih, Method m, Object[] args)
+   {
+      long hash = MethodHashing.calculateHash(m);
+      return handleCallLocally(hash, jbproxy, ih, m, args);
+   }
+
+   public static Object handleCallLocally(long hash, Object jbproxy, Proxy ih, Method m, Object[] args)
+   {
+      if (hash == ProxyUtils.GET_ASYNCHRONOUS)
+      {
+         return ih.getAsynchronousProxy((JBossProxy)jbproxy);
+      }
+      else if (hash == TO_STRING)
+      {
+         return ih.toString();
+      }
+      else if (hash == HASHCODE)
+      {
+         return new Integer(ih.toString().hashCode());
+      }
+      else if (hash == EQUALS)
+      {
+         return new Boolean(ih.toString().equals(args[0].toString()));
+      } 
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,149 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.ejb.TimerService;
-
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ServiceDelegateWrapper extends ServiceMBeanSupport implements ServiceDelegateWrapperMBean
-{
-   protected Object delegate;
-   private Method createMethod;
-   private Method startMethod;
-   private Method stopMethod;
-   private Method destroyMethod;
-
-   public ServiceDelegateWrapper(Object delegate)
-   {
-      this.delegate = delegate;
-      try
-      {
-         createMethod = delegate.getClass().getMethod("create");
-      }
-      catch (NoSuchMethodException ignored)
-      {
-      }
-      try
-      {
-         startMethod = delegate.getClass().getMethod("start");
-      }
-      catch (NoSuchMethodException ignored)
-      {
-      }
-      try
-      {
-         stopMethod = delegate.getClass().getMethod("stop");
-      }
-      catch (NoSuchMethodException ignored)
-      {
-      }
-      try
-      {
-         destroyMethod = delegate.getClass().getMethod("destroy");
-      }
-      catch (NoSuchMethodException ignored)
-      {
-      }
-
-   }
-
-   @Override
-   protected void createService() throws Exception
-   {
-      super.createService();
-      try
-      {
-         if (createMethod != null) createMethod.invoke(delegate);
-      }
-      catch (InvocationTargetException e)
-      {
-         Throwable t = e.getCause();
-         if (t instanceof Exception) throw (Exception)t;
-         else throw new RuntimeException(t);
-      }
-   }
-
-   @Override
-   protected void startService() throws Exception
-   {
-      super.startService();
-      try
-      {
-         if (startMethod != null) startMethod.invoke(delegate);
-      }
-      catch (InvocationTargetException e)
-      {
-         Throwable t = e.getCause();
-         if (t instanceof Exception) throw (Exception)t;
-         else throw new RuntimeException(t);
-      }
-   }
-
-   @Override
-   protected void stopService() throws Exception
-   {
-      super.stopService();
-      try
-      {
-         if (stopMethod != null) stopMethod.invoke(delegate);
-      }
-      catch (InvocationTargetException e)
-      {
-         Throwable t = e.getCause();
-         if (t instanceof Exception) throw (Exception)t;
-         else throw new RuntimeException(t);
-      }
-
-   }
-
-   @Override
-   protected void destroyService() throws Exception
-   {
-      super.destroyService();
-      try
-      {
-         if (destroyMethod != null) destroyMethod.invoke(delegate);
-      }
-      catch (InvocationTargetException e)
-      {
-         Throwable t = e.getCause();
-         if (t instanceof Exception) throw (Exception)t;
-         else throw new RuntimeException(t);
-      }
-   }
-   
-   // FIXME: this is here for EJBTHREE-630, re-establishing timers
-   public TimerService getTimerService(Object pKey)
-   {
-      return ((Container) delegate).getTimerService(pKey);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.ejb.TimerService;
+
+import org.jboss.ejb3.statistics.InvocationStatistics;
+
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ServiceDelegateWrapper extends ServiceMBeanSupport implements ServiceDelegateWrapperMBean
+{
+   protected Object delegate;
+   private Method createMethod;
+   private Method startMethod;
+   private Method stopMethod;
+   private Method destroyMethod;
+
+   public ServiceDelegateWrapper(Object delegate)
+   {
+      this.delegate = delegate;
+      try
+      {
+         createMethod = delegate.getClass().getMethod("create");
+      }
+      catch (NoSuchMethodException ignored)
+      {
+      }
+      try
+      {
+         startMethod = delegate.getClass().getMethod("start");
+      }
+      catch (NoSuchMethodException ignored)
+      {
+      }
+      try
+      {
+         stopMethod = delegate.getClass().getMethod("stop");
+      }
+      catch (NoSuchMethodException ignored)
+      {
+      }
+      try
+      {
+         destroyMethod = delegate.getClass().getMethod("destroy");
+      }
+      catch (NoSuchMethodException ignored)
+      {
+      }
+
+   }
+
+   @Override
+   protected void createService() throws Exception
+   {
+      super.createService();
+      try
+      {
+         if (createMethod != null) createMethod.invoke(delegate);
+      }
+      catch (InvocationTargetException e)
+      {
+         Throwable t = e.getCause();
+         if (t instanceof Exception) throw (Exception)t;
+         else throw new RuntimeException(t);
+      }
+   }
+
+   @Override
+   protected void startService() throws Exception
+   {
+      super.startService();
+      try
+      {
+         if (startMethod != null) startMethod.invoke(delegate);
+      }
+      catch (InvocationTargetException e)
+      {
+         Throwable t = e.getCause();
+         if (t instanceof Exception) throw (Exception)t;
+         else throw new RuntimeException(t);
+      }
+   }
+
+   @Override
+   protected void stopService() throws Exception
+   {
+      super.stopService();
+      try
+      {
+         if (stopMethod != null) stopMethod.invoke(delegate);
+      }
+      catch (InvocationTargetException e)
+      {
+         Throwable t = e.getCause();
+         if (t instanceof Exception) throw (Exception)t;
+         else throw new RuntimeException(t);
+      }
+
+   }
+
+   @Override
+   protected void destroyService() throws Exception
+   {
+      super.destroyService();
+      try
+      {
+         if (destroyMethod != null) destroyMethod.invoke(delegate);
+      }
+      catch (InvocationTargetException e)
+      {
+         Throwable t = e.getCause();
+         if (t instanceof Exception) throw (Exception)t;
+         else throw new RuntimeException(t);
+      }
+   }
+   
+   // FIXME: this is here for EJBTHREE-630, re-establishing timers
+   public TimerService getTimerService(Object pKey)
+   {
+      return ((Container) delegate).getTimerService(pKey);
+   }
+   
+   public InvocationStatistics getInvokeStats()
+   {
+      return ((Container) delegate).getInvokeStats();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapper.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import javax.ejb.TimerService;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface ServiceDelegateWrapperMBean extends ServiceMBean
-{
-   // FIXME: this is here to re-establish timers (EJBTHREE-630), do not use for other purposes
-   TimerService getTimerService(Object pKey);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import javax.ejb.TimerService;
+
+import org.jboss.ejb3.statistics.InvocationStatistics;
+import org.jboss.system.ServiceMBean;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface ServiceDelegateWrapperMBean extends ServiceMBean
+{
+   // FIXME: this is here to re-establish timers (EJBTHREE-630), do not use for other purposes
+   TimerService getTimerService(Object pKey);
+   
+   InvocationStatistics getInvokeStats();
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ServiceDelegateWrapperMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/SessionContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/SessionContainer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/SessionContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -264,7 +264,7 @@
    public Object invoke(ProxyFactory factory, Object id, Method method, Object args[], FutureHolder provider) throws Throwable
    {
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          long hash = MethodHashing.calculateHash(method);
@@ -287,9 +287,8 @@
             return invokeEJBObjectMethod(factory, id, info, args);
          }
 
-         Interceptor[] aspects = info.getInterceptors();
          // FIXME: Ahem, stateful container invocation works on all.... (violating contract though)
-         EJBContainerInvocation nextInvocation = new StatefulContainerInvocation(info, aspects, id);
+         EJBContainerInvocation nextInvocation = new StatefulContainerInvocation(info, id);
          nextInvocation.setAdvisor(this);
          nextInvocation.setArguments(args);
          
@@ -310,7 +309,7 @@
       finally
       {
          Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
    }
    

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ThreadLocalStack<T>
-{
-   private ThreadLocal<ArrayList<T>> stack = new ThreadLocal<ArrayList<T>>();
-
-   public void push(T obj)
-   {
-      ArrayList<T> list = stack.get();
-      if (list == null)
-      {
-         list = new ArrayList<T>(1);
-         stack.set(list);
-      }
-      list.add(obj);
-   }
-
-   public T pop()
-   {
-      ArrayList<T> list = stack.get();
-      if (list == null)
-      {
-         return null;
-      }
-      T rtn = list.remove(list.size() - 1);
-      if (list.size() == 0)
-      {
-         stack.set(null);
-         list.clear();
-      }
-      return rtn;
-   }
-
-   public T get()
-   {
-      ArrayList<T> list = (ArrayList<T>)stack.get();
-      if (list == null)
-      {
-         return null;
-      }
-      return list.get(list.size() - 1);
-   }
-
-   public List<T> getList()
-   {
-      return stack.get();     
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ThreadLocalStack<T>
+{
+   private ThreadLocal<ArrayList<T>> stack = new ThreadLocal<ArrayList<T>>();
+
+   public void push(T obj)
+   {
+      ArrayList<T> list = stack.get();
+      if (list == null)
+      {
+         list = new ArrayList<T>(1);
+         stack.set(list);
+      }
+      list.add(obj);
+   }
+
+   public T pop()
+   {
+      ArrayList<T> list = stack.get();
+      if (list == null)
+      {
+         return null;
+      }
+      T rtn = list.remove(list.size() - 1);
+      if (list.size() == 0)
+      {
+         stack.set(null);
+         list.clear();
+      }
+      return rtn;
+   }
+
+   public T get()
+   {
+      ArrayList<T> list = (ArrayList<T>)stack.get();
+      if (list == null)
+      {
+         return null;
+      }
+      return list.get(list.size() - 1);
+   }
+
+   public List<T> getList()
+   {
+      return stack.get();     
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ThreadLocalStack.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.asynchronous;
-
-import org.jboss.ejb3.JBossProxy;
-import org.jboss.aspects.asynch.Future;
-import org.jboss.aspects.asynch.AsynchProvider;
-
-/**
- * Helper class to make getting a asynch proxy and future easier.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Asynch
-{
-   public static Object getAsynchronousProxy(Object ejbRef)
-   {
-      JBossProxy proxy = (JBossProxy)ejbRef;
-      return proxy.getAsynchronousProxy();
-   }
-
-   public static Future getFutureResult(Object asynchProxy)
-   {
-      AsynchProvider provider = (AsynchProvider)asynchProxy;
-      return provider.getFuture();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.asynchronous;
+
+import org.jboss.ejb3.JBossProxy;
+import org.jboss.aspects.asynch.Future;
+import org.jboss.aspects.asynch.AsynchProvider;
+
+/**
+ * Helper class to make getting a asynch proxy and future easier.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Asynch
+{
+   public static Object getAsynchronousProxy(Object ejbRef)
+   {
+      JBossProxy proxy = (JBossProxy)ejbRef;
+      return proxy.getAsynchronousProxy();
+   }
+
+   public static Future getFutureResult(Object asynchProxy)
+   {
+      AsynchProvider provider = (AsynchProvider)asynchProxy;
+      return provider.getFuture();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/asynchronous/Asynch.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,163 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-import java.util.HashMap;
-import javax.ejb.EJBException;
-import javax.ejb.EJBNoSuchObjectException;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.Pool;
-import org.jboss.ejb3.stateful.StatefulBeanContext;
-import org.jboss.util.id.GUID;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class NoPassivationCache implements StatefulCache
-{
-   private Pool pool;
-   private HashMap cacheMap;
-   protected int createCount = 0;
-
-   public void initialize(Container container) throws Exception
-   {
-      this.pool = container.getPool();
-      cacheMap = new HashMap();
-   }
-
-   public NoPassivationCache()
-   {
-   }
-
-   public void start()
-   {
-   }
-
-   public void stop()
-   {
-      synchronized (cacheMap)
-      {
-         cacheMap.clear();
-      }
-   }
-
-   public StatefulBeanContext create()
-   {
-      StatefulBeanContext ctx = null;
-      try
-      {
-         ctx = (StatefulBeanContext) pool.get();
-         ++createCount;
-         synchronized (cacheMap)
-         {
-            cacheMap.put(ctx.getId(), ctx);
-         }
-      }
-      catch (EJBException e)
-      {
-         e.printStackTrace();
-         throw e;
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         throw new EJBException(e);
-      }
-      return ctx;
-   }
-
-   public StatefulBeanContext create(Class[] initTypes, Object[] initValues)
-   {
-      StatefulBeanContext ctx = null;
-      try
-      {
-         ctx = (StatefulBeanContext) pool.get(initTypes, initValues);
-         synchronized (cacheMap)
-         {
-            cacheMap.put(ctx.getId(), ctx);
-         }
-      }
-      catch (EJBException e)
-      {
-         throw e;
-      }
-      catch (Exception e)
-      {
-         throw new EJBException(e);
-      }
-      return ctx;
-   }
-
-   public StatefulBeanContext get(Object key) throws EJBException
-   {
-      StatefulBeanContext entry = null;
-      synchronized (cacheMap)
-      {
-         entry = (StatefulBeanContext) cacheMap.get(key);
-      }
-      if (entry == null)
-      {
-         throw new EJBNoSuchObjectException("Could not find Stateful bean: " + key);
-      }
-      entry.inUse = true;
-      entry.lastUsed = System.currentTimeMillis();
-      return entry;
-   }
-
-   public void finished(StatefulBeanContext ctx)
-   {
-      synchronized (ctx)
-      {
-         ctx.inUse = false;
-         ctx.lastUsed = System.currentTimeMillis();
-      }
-   }
-
-   public void remove(Object key)
-   {
-      StatefulBeanContext ctx = null;
-      synchronized (cacheMap)
-      {
-         ctx = (StatefulBeanContext) cacheMap.remove(key);
-      }
-      if (ctx != null) pool.remove(ctx);
-   }
-
-   public int getCacheSize()
-   {
-	   return cacheMap.size();
-   }
-   
-   public int getCreateCount()
-   {
-	   return createCount;
-   }
-   
-   public int getPassivatedCount()
-   {
-	   return 0;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache;
+
+import java.util.HashMap;
+import javax.ejb.EJBException;
+import javax.ejb.NoSuchEJBException;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.Pool;
+import org.jboss.ejb3.stateful.StatefulBeanContext;
+import org.jboss.util.id.GUID;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class NoPassivationCache implements StatefulCache
+{
+   private Pool pool;
+   private HashMap cacheMap;
+   protected int createCount = 0;
+
+   public void initialize(Container container) throws Exception
+   {
+      this.pool = container.getPool();
+      cacheMap = new HashMap();
+   }
+
+   public NoPassivationCache()
+   {
+   }
+
+   public void start()
+   {
+   }
+
+   public void stop()
+   {
+      synchronized (cacheMap)
+      {
+         cacheMap.clear();
+      }
+   }
+
+   public StatefulBeanContext create()
+   {
+      StatefulBeanContext ctx = null;
+      try
+      {
+         ctx = (StatefulBeanContext) pool.get();
+         ++createCount;
+         synchronized (cacheMap)
+         {
+            cacheMap.put(ctx.getId(), ctx);
+         }
+      }
+      catch (EJBException e)
+      {
+         e.printStackTrace();
+         throw e;
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         throw new EJBException(e);
+      }
+      return ctx;
+   }
+
+   public StatefulBeanContext create(Class[] initTypes, Object[] initValues)
+   {
+      StatefulBeanContext ctx = null;
+      try
+      {
+         ctx = (StatefulBeanContext) pool.get(initTypes, initValues);
+         synchronized (cacheMap)
+         {
+            cacheMap.put(ctx.getId(), ctx);
+         }
+      }
+      catch (EJBException e)
+      {
+         throw e;
+      }
+      catch (Exception e)
+      {
+         throw new EJBException(e);
+      }
+      return ctx;
+   }
+
+   public StatefulBeanContext get(Object key) throws EJBException
+   {
+      StatefulBeanContext entry = null;
+      synchronized (cacheMap)
+      {
+         entry = (StatefulBeanContext) cacheMap.get(key);
+      }
+      if (entry == null)
+      {
+         throw new NoSuchEJBException("Could not find Stateful bean: " + key);
+      }
+      entry.inUse = true;
+      entry.lastUsed = System.currentTimeMillis();
+      return entry;
+   }
+
+   public void finished(StatefulBeanContext ctx)
+   {
+      synchronized (ctx)
+      {
+         ctx.inUse = false;
+         ctx.lastUsed = System.currentTimeMillis();
+      }
+   }
+
+   public void remove(Object key)
+   {
+      StatefulBeanContext ctx = null;
+      synchronized (cacheMap)
+      {
+         ctx = (StatefulBeanContext) cacheMap.remove(key);
+      }
+      if (ctx != null) pool.remove(ctx);
+   }
+
+   public int getCacheSize()
+   {
+	   return cacheMap.size();
+   }
+   
+   public int getCreateCount()
+   {
+	   return createCount;
+   }
+   
+   public int getPassivatedCount()
+   {
+	   return 0;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -25,7 +25,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.ejb.EJBException;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import org.jboss.annotation.ejb.cache.simple.CacheConfig;
 import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
 import org.jboss.aop.Advisor;
@@ -156,7 +156,7 @@
       CacheConfig config = (CacheConfig) advisor.resolveAnnotation(CacheConfig.class);
       maxSize = config.maxSize();
       sessionTimeout = config.idleTimeoutSeconds();
-      log.info("Initializing SimpleStatefulCache with maxSize: " +maxSize + " timeout: " +sessionTimeout +
+      log.debug("Initializing SimpleStatefulCache with maxSize: " +maxSize + " timeout: " +sessionTimeout +
               " for " +container.getObjectName().getCanonicalName() );
       timeoutTask = new SessionTimeoutTask("SFSB Passivation Thread - " + container.getObjectName().getCanonicalName());
    }
@@ -270,7 +270,7 @@
          Object bean = pm.activateSession(key);
          if (bean == null)
          {
-            throw new EJBNoSuchObjectException("Could not find Stateful bean: " + key);
+            throw new NoSuchEJBException("Could not find Stateful bean: " + key);
          }
          --passivatedCount;
          entry = (StatefulBeanContext) bean;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManager.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManager.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -273,11 +273,12 @@
 
       // Load state
       File file = getFile(id);
+      if (!file.exists()) return null;
+      
       if (debug)
       {
          log.debug("Reading session state from: " + file);
       }
-      if (!file.exists()) return null;
 
       StatefulBeanContext bean = null;
       try

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationEvictionPolicy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationEvictionPolicy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationEvictionPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -38,7 +38,7 @@
    
    public void evict(Fqn fqn) throws Exception
    {
-      log.info("EVICTING: " + fqn.toString() + " size: " + fqn.size() + " 0: " + fqn.get(0));
+      log.debug("EVICTING: " + fqn.toString() + " size: " + fqn.size() + " 0: " + fqn.get(0));
       super.evict(fqn);
    }
 }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationTreeCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationTreeCache.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/PassivationTreeCache.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache.tree;
-
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.eviction.EvictionPolicy;
-import org.jboss.cache.eviction.LRUAlgorithm;
-import org.jboss.cache.eviction.LRUConfiguration;
-import org.jboss.cache.eviction.LRUPolicy;
-import org.jboss.cache.eviction.Region;
-import org.jboss.cache.eviction.RegionManager;
-import org.jboss.cache.eviction.RegionNameConflictException;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @deprecated Use direct JBossCache passivation now.
- * @version $Revision$
- */
-public class PassivationTreeCache extends TreeCache
-{
-   public PassivationTreeCache()
-           throws Exception
-   {
-      super();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/SFSBFileCacheLoader.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/cache/tree/SFSBFileCacheLoader.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/SFSBFileCacheLoader.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/SFSBFileCacheLoader.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.cache.tree;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.loader.FileCacheLoader;
+
+public class SFSBFileCacheLoader extends FileCacheLoader
+{
+   Log log = LogFactory.getLog(SFSBFileCacheLoader.class);
+   
+   protected boolean isCharacterPortableTree(Fqn fqn)
+   {
+      /* For fqn, check '*' '<' '>' '|' '"' '?' and also '\' '/' and ':' */
+      Pattern fqnPattern = Pattern.compile("[\\\\\\/:*<>|\"?]");
+
+      List elements = fqn.peekElements();
+      for (Object anElement : elements)
+      {
+         Matcher matcher = fqnPattern.matcher(anElement.toString());
+         if (matcher.find())
+         {
+            log.warn("One of the Fqn ( " + fqn + " ) elements contains one of these characters: '*' '<' '>' '|' '\"' '?' '\\' '/' ':' ");
+            log.warn("Directories containing these characters are illegal in some operative systems and could lead to portability issues");
+            return false;
+         }
+      }
+
+      return true;
+   }
+   
+}

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulCacheLoader.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulCacheLoader.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulCacheLoader.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3.cache.tree;
 
 import java.util.Map;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulEvictionPolicy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulEvictionPolicy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulEvictionPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3.cache.tree;
 
 import java.util.Map;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 
 import javax.ejb.EJBException;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -131,7 +131,7 @@
       }
       if (entry == null)
       {
-         throw new EJBNoSuchObjectException("Could not find Stateful bean: " + key);
+         throw new NoSuchEJBException("Could not find Stateful bean: " + key);
       }
       entry.inUse = true;
       // Mark it to eviction thread that don't passivate it yet.

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/client)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,420 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.client;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
-
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.metamodel.LifecycleCallback;
-import org.jboss.injection.DependsHandler;
-import org.jboss.injection.EJBHandler;
-import org.jboss.injection.EncInjector;
-import org.jboss.injection.InjectionContainer;
-import org.jboss.injection.InjectionHandler;
-import org.jboss.injection.InjectionUtil;
-import org.jboss.injection.Injector;
-import org.jboss.injection.JndiInjectHandler;
-import org.jboss.injection.PersistenceContextHandler;
-import org.jboss.injection.PersistenceUnitHandler;
-import org.jboss.injection.ResourceHandler;
-import org.jboss.injection.WebServiceRefHandler;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.util.NotImplementedException;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * Injection of the application client main class is handled from here.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ClientContainer implements InjectionContainer
-{
-   private static final Logger log = Logger.getLogger(ClientContainer.class);
-   
-   private Class<?> mainClass;
-   private ApplicationClientDD xml;
-   private String applicationClientName;
-   
-   // for performance there is an array.
-   private List<Injector> injectors = new ArrayList<Injector>();
-   private Map<String, Map<AccessibleObject, Injector>> encInjections = new HashMap<String, Map<AccessibleObject, Injector>>();
-   private Map<String, EncInjector> encInjectors = new HashMap<String, EncInjector>();
-   
-   private Context enc;
-   private Context encEnv;
-   
-   private List<Method> postConstructs = new ArrayList<Method>();
-
-   public ClientContainer(ApplicationClientDD xml, Class<?> mainClass, String applicationClientName) throws Exception
-   {
-      this.xml = xml;
-      this.mainClass = mainClass;
-      this.applicationClientName = applicationClientName;
-      
-      //Context ctx = getInitialContext();
-      Context ctx = new InitialContext();
-      enc = (Context) ctx.lookup(applicationClientName);
-      NamingEnumeration<NameClassPair> e = enc.list("");
-      while(e.hasMore())
-      {
-         NameClassPair ncp = e.next();
-         log.debug("  " + ncp);
-      }
-      encEnv = (Context) enc.lookup("env");
-//      enc = ThreadLocalENCFactory.create(ctx);
-//      encEnv = Util.createSubcontext(enc, "env");
-      
-      processMetadata(null);
-      
-//      for (EncInjector injector : encInjectors.values())
-//      {
-//         log.trace("encInjector: " + injector);
-//         injector.inject(this);
-//      }
-      
-      for(Injector injector : injectors)
-      {
-         log.trace("injector: " + injector);
-         injector.inject((Object) null);
-      }
-      
-      postConstruct();
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.Class)
-    */
-   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Class<?> clazz)
-   {
-      return clazz.getAnnotation(annotationClass);
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.Class, java.lang.reflect.Method)
-    */
-   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Class<?> clazz, Method method)
-   {
-      return method.getAnnotation(annotationClass);
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.reflect.Method)
-    */
-   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Method method)
-   {
-      return method.getAnnotation(annotationClass);
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.Class, java.lang.reflect.Field)
-    */
-   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Class<?> clazz, Field field)
-   {
-      return field.getAnnotation(annotationClass);
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.reflect.Field)
-    */
-   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Field field)
-   {
-      return field.getAnnotation(annotationClass);
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getClassloader()
-    */
-   public ClassLoader getClassloader()
-   {
-      //throw new RuntimeException("NYI");
-      return Thread.currentThread().getContextClassLoader();
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getDependencyPolicy()
-    */
-   public DependencyPolicy getDependencyPolicy()
-   {
-      throw new RuntimeException("NYI");
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getDeploymentDescriptorType()
-    */
-   public String getDeploymentDescriptorType()
-   {
-      return "application-client.xml";
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getEjbJndiName(java.lang.Class)
-    */
-   public String getEjbJndiName(Class businessInterface) throws NameNotFoundException
-   {
-      throw new RuntimeException("NYI");
-      //return null;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getEjbJndiName(java.lang.String, java.lang.Class)
-    */
-   public String getEjbJndiName(String link, Class businessInterface)
-   {
-      throw new NotImplementedException();
-      //return "java:comp/env/" + link + "/remote";
-      //return applicationClientName + "/" + link + "/remote";
-      //return null;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getEnc()
-    */
-   public Context getEnc()
-   {
-      return enc;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getEncInjections()
-    */
-   public Map<String, Map<AccessibleObject, Injector>> getEncInjections()
-   {
-      return encInjections;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getEncInjectors()
-    */
-   public Map<String, EncInjector> getEncInjectors()
-   {
-      return encInjectors;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getEnvironmentRefGroup()
-    */
-   public EnvironmentRefGroup getEnvironmentRefGroup()
-   {
-      return xml;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getIdentifier()
-    */
-   public String getIdentifier()
-   {
-//      throw new NotImplementedException;
-      // FIXME: return the real identifier
-      //return "client-identifier";
-      return applicationClientName;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getInjectors()
-    */
-   public List<Injector> getInjectors()
-   {
-      throw new NotImplementedException();
-   }
-
-   public Class<?> getMainClass()
-   {
-      return mainClass;
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#getPersistenceUnitDeployment(java.lang.String)
-    */
-   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
-   {
-      throw new NotImplementedException();
-   }
-
-   public void invokeMain(String args[]) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
-   {
-      Class parameterTypes[] = { args.getClass() };
-      Method method = mainClass.getDeclaredMethod("main", parameterTypes);
-      method.invoke(null, (Object) args);
-   }
-   
-   /**
-    * Call post construct methods.
-    * @throws IllegalAccessException  
-    * @throws InstantiationException 
-    * @throws InvocationTargetException 
-    * @throws IllegalArgumentException 
-    *
-    */
-   private void postConstruct() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
-   {
-      log.info("postConstructs = " + postConstructs);
-      for(Method method : postConstructs)
-      {
-         method.setAccessible(true);
-         Object instance;
-         if(Modifier.isStatic(method.getModifiers()))
-            instance = null;
-         else
-            instance = method.getDeclaringClass().newInstance();
-         Object args[] = null;
-         method.invoke(instance, args);
-      }
-   }
-   
-   private void processMetadata(DependencyPolicy dependencyPolicy) throws Exception
-   {
-      processPostConstructs();
-      
-      // TODO: check which handlers a client container should support
-      Collection<InjectionHandler> handlers = new ArrayList<InjectionHandler>();
-      handlers.add(new EJBHandler());
-      //handlers.add(new ClientEJBHandler());
-      handlers.add(new DependsHandler());
-      handlers.add(new JndiInjectHandler());
-      handlers.add(new PersistenceContextHandler());
-      handlers.add(new PersistenceUnitHandler());
-      handlers.add(new ResourceHandler());
-      handlers.add(new WebServiceRefHandler());
-      
-      // TODO: we're going to use a jar class loader
-//      ClassLoader old = Thread.currentThread().getContextClassLoader();
-//      Thread.currentThread().setContextClassLoader(classloader);
-      try
-      {
-         // EJB container's XML must be processed before interceptor's as it may override interceptor's references
-         for (InjectionHandler handler : handlers) handler.loadXml(xml, this);
-
-         Map<AccessibleObject, Injector> tmp = InjectionUtil.processAnnotations(this, handlers, getMainClass());
-         injectors.addAll(tmp.values());
-
-//         initialiseInterceptors();
-//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
-//         {
-//            for (InjectionHandler handler : handlers)
-//            {
-//               handler.loadXml(interceptorInfo.getXml(), this);
-//            }
-//         }
-//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
-//         {
-//            Map<AccessibleObject, Injector> tmpInterceptor = InjectionUtil.processAnnotations(this, handlers, interceptorInfo.getClazz());
-//            InterceptorInjector injector = new InterceptorInjector(this, interceptorInfo, tmpInterceptor);
-//            interceptorInjectors.put(interceptorInfo.getClazz(), injector);
-//         }
-      }
-      finally
-      {
-//         Thread.currentThread().setContextClassLoader(old);
-      }
-   }
-   
-   /**
-    * Create dummy dd for PostConstruct annotations.
-    * @throws ClassNotFoundException 
-    * @throws NoSuchMethodException 
-    * @throws SecurityException 
-    *
-    */
-   private void processPostConstructs() throws ClassNotFoundException, SecurityException, NoSuchMethodException
-   {
-      processPostConstructs(mainClass);
-      
-      for(LifecycleCallback callback : xml.getPostConstructs())
-      {
-         String className = callback.getLifecycleCallbackClass();
-         String methodName = callback.getLifecycleCallbackMethod();
-         Class lifecycleClass;
-         if(className == null)
-            lifecycleClass = mainClass;
-         else
-            lifecycleClass = Thread.currentThread().getContextClassLoader().loadClass(className);
-         Class parameterTypes[] = new Class[0];
-         Method method = lifecycleClass.getDeclaredMethod(methodName, parameterTypes);
-         postConstructs.add(method);
-      }
-   }
-   
-   private void processPostConstructs(Class<?> cls)
-   {
-      if(cls == null)
-         return;
-      
-      for(Method method : cls.getDeclaredMethods())
-      {
-         PostConstruct postConstruct = method.getAnnotation(PostConstruct.class);
-         if(postConstruct != null)
-         {
-            // TODO: sure?
-            // http://java.sun.com/javase/6/docs/api/javax/annotation/PostConstruct.html
-            if(postConstructs.size() > 0)
-               throw new IllegalStateException("only one @PostConstruct allowed");
-            postConstructs.add(method);
-         }
-      }
-      
-      processPostConstructs(cls.getSuperclass());
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#resolveEjbContainer(java.lang.String, java.lang.Class)
-    */
-   public Container resolveEjbContainer(String link, Class businessIntf)
-   {
-      log.warn("resolveEjbContainer(" + link + ", " + businessIntf + ") not implemented");
-      return null;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.injection.InjectionContainer#resolveEjbContainer(java.lang.Class)
-    */
-   public Container resolveEjbContainer(Class businessIntf) throws NameNotFoundException
-   {
-      return null;
-   }
-
-   public VirtualFile getRootFile()
-   {
-      throw new NotImplementedException();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,420 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.client;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingEnumeration;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.metamodel.LifecycleCallback;
+import org.jboss.injection.DependsHandler;
+import org.jboss.injection.EJBHandler;
+import org.jboss.injection.EncInjector;
+import org.jboss.injection.InjectionContainer;
+import org.jboss.injection.InjectionHandler;
+import org.jboss.injection.InjectionUtil;
+import org.jboss.injection.Injector;
+import org.jboss.injection.JndiInjectHandler;
+import org.jboss.injection.PersistenceContextHandler;
+import org.jboss.injection.PersistenceUnitHandler;
+import org.jboss.injection.ResourceHandler;
+import org.jboss.injection.WebServiceRefHandler;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+import org.jboss.util.NotImplementedException;
+//import org.jboss.virtual.VirtualFile;
+
+/**
+ * Injection of the application client main class is handled from here.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ClientContainer implements InjectionContainer
+{
+   private static final Logger log = Logger.getLogger(ClientContainer.class);
+   
+   private Class<?> mainClass;
+   private ApplicationClientDD xml;
+   private String applicationClientName;
+   
+   // for performance there is an array.
+   private List<Injector> injectors = new ArrayList<Injector>();
+   private Map<String, Map<AccessibleObject, Injector>> encInjections = new HashMap<String, Map<AccessibleObject, Injector>>();
+   private Map<String, EncInjector> encInjectors = new HashMap<String, EncInjector>();
+   
+   private Context enc;
+   private Context encEnv;
+   
+   private List<Method> postConstructs = new ArrayList<Method>();
+
+   public ClientContainer(ApplicationClientDD xml, Class<?> mainClass, String applicationClientName) throws Exception
+   {
+      this.xml = xml;
+      this.mainClass = mainClass;
+      this.applicationClientName = applicationClientName;
+      
+      //Context ctx = getInitialContext();
+      Context ctx = new InitialContext();
+      enc = (Context) ctx.lookup(applicationClientName);
+      NamingEnumeration<NameClassPair> e = enc.list("");
+      while(e.hasMore())
+      {
+         NameClassPair ncp = e.next();
+         log.debug("  " + ncp);
+      }
+      encEnv = (Context) enc.lookup("env");
+//      enc = ThreadLocalENCFactory.create(ctx);
+//      encEnv = Util.createSubcontext(enc, "env");
+      
+      processMetadata(null);
+      
+//      for (EncInjector injector : encInjectors.values())
+//      {
+//         log.trace("encInjector: " + injector);
+//         injector.inject(this);
+//      }
+      
+      for(Injector injector : injectors)
+      {
+         log.trace("injector: " + injector);
+         injector.inject((Object) null);
+      }
+      
+      postConstruct();
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.Class)
+    */
+   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Class<?> clazz)
+   {
+      return clazz.getAnnotation(annotationClass);
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.Class, java.lang.reflect.Method)
+    */
+   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Class<?> clazz, Method method)
+   {
+      return method.getAnnotation(annotationClass);
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.reflect.Method)
+    */
+   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Method method)
+   {
+      return method.getAnnotation(annotationClass);
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.Class, java.lang.reflect.Field)
+    */
+   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Class<?> clazz, Field field)
+   {
+      return field.getAnnotation(annotationClass);
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getAnnotation(java.lang.Class, java.lang.reflect.Field)
+    */
+   public <T extends Annotation> T getAnnotation(Class<T> annotationClass, Field field)
+   {
+      return field.getAnnotation(annotationClass);
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getClassloader()
+    */
+   public ClassLoader getClassloader()
+   {
+      //throw new RuntimeException("NYI");
+      return Thread.currentThread().getContextClassLoader();
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getDependencyPolicy()
+    */
+   public DependencyPolicy getDependencyPolicy()
+   {
+      throw new RuntimeException("NYI");
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getDeploymentDescriptorType()
+    */
+   public String getDeploymentDescriptorType()
+   {
+      return "application-client.xml";
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getEjbJndiName(java.lang.Class)
+    */
+   public String getEjbJndiName(Class businessInterface) throws NameNotFoundException
+   {
+      throw new RuntimeException("NYI");
+      //return null;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getEjbJndiName(java.lang.String, java.lang.Class)
+    */
+   public String getEjbJndiName(String link, Class businessInterface)
+   {
+      throw new NotImplementedException();
+      //return "java:comp/env/" + link + "/remote";
+      //return applicationClientName + "/" + link + "/remote";
+      //return null;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getEnc()
+    */
+   public Context getEnc()
+   {
+      return enc;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getEncInjections()
+    */
+   public Map<String, Map<AccessibleObject, Injector>> getEncInjections()
+   {
+      return encInjections;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getEncInjectors()
+    */
+   public Map<String, EncInjector> getEncInjectors()
+   {
+      return encInjectors;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getEnvironmentRefGroup()
+    */
+   public EnvironmentRefGroup getEnvironmentRefGroup()
+   {
+      return xml;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getIdentifier()
+    */
+   public String getIdentifier()
+   {
+//      throw new NotImplementedException;
+      // FIXME: return the real identifier
+      //return "client-identifier";
+      return applicationClientName;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getInjectors()
+    */
+   public List<Injector> getInjectors()
+   {
+      throw new NotImplementedException();
+   }
+
+   public Class<?> getMainClass()
+   {
+      return mainClass;
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#getPersistenceUnitDeployment(java.lang.String)
+    */
+   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
+   {
+      throw new NotImplementedException();
+   }
+
+   public void invokeMain(String args[]) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
+   {
+      Class parameterTypes[] = { args.getClass() };
+      Method method = mainClass.getDeclaredMethod("main", parameterTypes);
+      method.invoke(null, (Object) args);
+   }
+   
+   /**
+    * Call post construct methods.
+    * @throws IllegalAccessException  
+    * @throws InstantiationException 
+    * @throws InvocationTargetException 
+    * @throws IllegalArgumentException 
+    *
+    */
+   private void postConstruct() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
+   {
+      log.info("postConstructs = " + postConstructs);
+      for(Method method : postConstructs)
+      {
+         method.setAccessible(true);
+         Object instance;
+         if(Modifier.isStatic(method.getModifiers()))
+            instance = null;
+         else
+            instance = method.getDeclaringClass().newInstance();
+         Object args[] = null;
+         method.invoke(instance, args);
+      }
+   }
+   
+   private void processMetadata(DependencyPolicy dependencyPolicy) throws Exception
+   {
+      processPostConstructs();
+      
+      // TODO: check which handlers a client container should support
+      Collection<InjectionHandler> handlers = new ArrayList<InjectionHandler>();
+      handlers.add(new EJBHandler());
+      //handlers.add(new ClientEJBHandler());
+      handlers.add(new DependsHandler());
+      handlers.add(new JndiInjectHandler());
+      handlers.add(new PersistenceContextHandler());
+      handlers.add(new PersistenceUnitHandler());
+      handlers.add(new ResourceHandler());
+      handlers.add(new WebServiceRefHandler());
+      
+      // TODO: we're going to use a jar class loader
+//      ClassLoader old = Thread.currentThread().getContextClassLoader();
+//      Thread.currentThread().setContextClassLoader(classloader);
+      try
+      {
+         // EJB container's XML must be processed before interceptor's as it may override interceptor's references
+         for (InjectionHandler handler : handlers) handler.loadXml(xml, this);
+
+         Map<AccessibleObject, Injector> tmp = InjectionUtil.processAnnotations(this, handlers, getMainClass());
+         injectors.addAll(tmp.values());
+
+//         initialiseInterceptors();
+//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
+//         {
+//            for (InjectionHandler handler : handlers)
+//            {
+//               handler.loadXml(interceptorInfo.getXml(), this);
+//            }
+//         }
+//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
+//         {
+//            Map<AccessibleObject, Injector> tmpInterceptor = InjectionUtil.processAnnotations(this, handlers, interceptorInfo.getClazz());
+//            InterceptorInjector injector = new InterceptorInjector(this, interceptorInfo, tmpInterceptor);
+//            interceptorInjectors.put(interceptorInfo.getClazz(), injector);
+//         }
+      }
+      finally
+      {
+//         Thread.currentThread().setContextClassLoader(old);
+      }
+   }
+   
+   /**
+    * Create dummy dd for PostConstruct annotations.
+    * @throws ClassNotFoundException 
+    * @throws NoSuchMethodException 
+    * @throws SecurityException 
+    *
+    */
+   private void processPostConstructs() throws ClassNotFoundException, SecurityException, NoSuchMethodException
+   {
+      processPostConstructs(mainClass);
+      
+      for(LifecycleCallback callback : xml.getPostConstructs())
+      {
+         String className = callback.getLifecycleCallbackClass();
+         String methodName = callback.getLifecycleCallbackMethod();
+         Class lifecycleClass;
+         if(className == null)
+            lifecycleClass = mainClass;
+         else
+            lifecycleClass = Thread.currentThread().getContextClassLoader().loadClass(className);
+         Class parameterTypes[] = new Class[0];
+         Method method = lifecycleClass.getDeclaredMethod(methodName, parameterTypes);
+         postConstructs.add(method);
+      }
+   }
+   
+   private void processPostConstructs(Class<?> cls)
+   {
+      if(cls == null)
+         return;
+      
+      for(Method method : cls.getDeclaredMethods())
+      {
+         PostConstruct postConstruct = method.getAnnotation(PostConstruct.class);
+         if(postConstruct != null)
+         {
+            // TODO: sure?
+            // http://java.sun.com/javase/6/docs/api/javax/annotation/PostConstruct.html
+            if(postConstructs.size() > 0)
+               throw new IllegalStateException("only one @PostConstruct allowed");
+            postConstructs.add(method);
+         }
+      }
+      
+      processPostConstructs(cls.getSuperclass());
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#resolveEjbContainer(java.lang.String, java.lang.Class)
+    */
+   public Container resolveEjbContainer(String link, Class businessIntf)
+   {
+      log.warn("resolveEjbContainer(" + link + ", " + businessIntf + ") not implemented");
+      return null;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.injection.InjectionContainer#resolveEjbContainer(java.lang.Class)
+    */
+   public Container resolveEjbContainer(Class businessIntf) throws NameNotFoundException
+   {
+      return null;
+   }
+
+//   public VirtualFile getRootFile()
+//   {
+//      throw new NotImplementedException();
+//   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,177 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.client;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.client.AppClientLauncher;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
-import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
-import org.jboss.util.NotImplementedException;
-import org.jboss.xb.binding.JBossXBException;
-
-/**
- * This class launches a JavaEE 5 application client.
- * 
- * The first argument is either a jar file containing the client deployment files or the application client class name.
- * The manifest file Main-Class attribute must point to the application client class.
- * It must also contain an application client deployment descriptor file (META-INF/application-client.xml).
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ClientLauncher
-   implements AppClientLauncher
-{
-   private static URL findResource(String resourceName)
-   {
-      URL url;
-      if(Thread.currentThread().getContextClassLoader() instanceof URLClassLoader)
-         url = ((URLClassLoader) Thread.currentThread().getContextClassLoader()).findResource(resourceName);
-      else
-         url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
-      return url;
-   }
-   
-   /**
-    * Convenience method for launching a client container.
-    * 
-    * @param xml
-    * @param mainClassName
-    * @param applicationClientName
-    * @param args
-    * @throws Exception
-    */
-   public static void launch(ApplicationClientDD xml, String mainClassName, String applicationClientName, String args[]) throws Exception
-   {
-      Class mainClass = Class.forName(mainClassName);
-      
-      ClientContainer container = new ClientContainer(xml, mainClass, applicationClientName);
-      
-      // TODO: postContruct
-      
-      container.invokeMain(args);
-      
-      // TODO: preDestroy
-   }
-
-   /**
-    * Convenience method to load the XML descriptor.
-    * 
-    * @return
-    * @throws IOException 
-    * @throws JBossXBException 
-    */
-   public static ApplicationClientDD loadXML() throws JBossXBException, IOException
-   {
-      URL url = findResource("META-INF/application-client.xml");
-      URL jbossClientURL = findResource("META-INF/jboss-client.xml");
-      return loadXML(url, jbossClientURL);
-   }
-   
-   @Deprecated
-   public static ApplicationClientDD loadXML(String urlSpec) throws JBossXBException, IOException
-   {
-      URL url = new URL(urlSpec);
-      return loadXML(url, null);
-   }
-   
-   public static ApplicationClientDD loadXML(URL url, URL jbossClientURL) throws JBossXBException, IOException
-   {
-      ApplicationClientDD dd = ApplicationClientDDObjectFactory.parse(url);
-      dd = JBossClientDDObjectFactory.parse(jbossClientURL, dd);
-      return dd;
-   }
-   
-   /**
-    * Work in progress.
-    * 
-    * @param args   the arguments for the launcher
-    */
-   public static void main(String[] args)
-   {
-      try
-      {
-         if(args.length < 1)
-            throw new IllegalArgumentException("expected a jar filename as argument");
-         
-         Class<?> mainClass;
-         
-         String name = args[0];
-         if(name.endsWith(".jar"))
-         {
-            throw new NotImplementedException();
-//            JarFile jarFile = new JarFile(jarName);
-         }
-         else
-         {
-            String mainClassName = name;
-            mainClass = Class.forName(mainClassName);
-         }
-         
-         URL appXmlURL = mainClass.getClassLoader().getResource("META-INF/application-client.xml");
-         if(appXmlURL == null)
-            throw new RuntimeException("Can't find META-INF/application-client.xml");
-         
-         ApplicationClientDD xml = ApplicationClientDDObjectFactory.parse(appXmlURL);
-         
-         // FIXME: j2ee.clientName
-         
-         List<String> newArgs = new ArrayList<String>();
-         for(int i = 1; i < args.length; i++)
-         {
-            newArgs.add(args[i]);
-         }
-         args = newArgs.toArray(args);
-         
-         // FIXME: when jar gets implemented this won't work anymore
-         String mainClassName = name;
-         launch(xml, mainClassName, "FIXME", args);
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         System.exit(1);
-      }
-   }
-
-   /**
-    * The AppClientLauncher method for launching a client container.
-    * 
-    * @param mainClassName - the class whose main(String[]) will be invoked
-    * @param clientName - the client name that maps to the server side JNDI ENC
-    * @param args - the args to pass to main method
-    * @throws Throwable
-    */
-   public void launch(String mainClassName, String clientName, String args[])
-      throws Throwable
-   {
-      ApplicationClientDD xml = loadXML();
-      launch(xml, mainClassName, clientName, args);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,177 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.client;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+//import org.jboss.client.AppClientLauncher;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
+import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
+import org.jboss.util.NotImplementedException;
+import org.jboss.xb.binding.JBossXBException;
+
+/**
+ * This class launches a JavaEE 5 application client.
+ * 
+ * The first argument is either a jar file containing the client deployment files or the application client class name.
+ * The manifest file Main-Class attribute must point to the application client class.
+ * It must also contain an application client deployment descriptor file (META-INF/application-client.xml).
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ClientLauncher
+//   implements AppClientLauncher
+{
+   private static URL findResource(String resourceName)
+   {
+      URL url;
+      if(Thread.currentThread().getContextClassLoader() instanceof URLClassLoader)
+         url = ((URLClassLoader) Thread.currentThread().getContextClassLoader()).findResource(resourceName);
+      else
+         url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
+      return url;
+   }
+   
+   /**
+    * Convenience method for launching a client container.
+    * 
+    * @param xml
+    * @param mainClassName
+    * @param applicationClientName
+    * @param args
+    * @throws Exception
+    */
+   public static void launch(ApplicationClientDD xml, String mainClassName, String applicationClientName, String args[]) throws Exception
+   {
+      Class mainClass = Class.forName(mainClassName);
+      
+      ClientContainer container = new ClientContainer(xml, mainClass, applicationClientName);
+      
+      // TODO: postContruct
+      
+      container.invokeMain(args);
+      
+      // TODO: preDestroy
+   }
+
+   /**
+    * Convenience method to load the XML descriptor.
+    * 
+    * @return
+    * @throws IOException 
+    * @throws JBossXBException 
+    */
+   public static ApplicationClientDD loadXML() throws JBossXBException, IOException
+   {
+      URL url = findResource("META-INF/application-client.xml");
+      URL jbossClientURL = findResource("META-INF/jboss-client.xml");
+      return loadXML(url, jbossClientURL);
+   }
+   
+   @Deprecated
+   public static ApplicationClientDD loadXML(String urlSpec) throws JBossXBException, IOException
+   {
+      URL url = new URL(urlSpec);
+      return loadXML(url, null);
+   }
+   
+   public static ApplicationClientDD loadXML(URL url, URL jbossClientURL) throws JBossXBException, IOException
+   {
+      ApplicationClientDD dd = ApplicationClientDDObjectFactory.parse(url);
+      dd = JBossClientDDObjectFactory.parse(jbossClientURL, dd);
+      return dd;
+   }
+   
+   /**
+    * Work in progress.
+    * 
+    * @param args   the arguments for the launcher
+    */
+   public static void main(String[] args)
+   {
+      try
+      {
+         if(args.length < 1)
+            throw new IllegalArgumentException("expected a jar filename as argument");
+         
+         Class<?> mainClass;
+         
+         String name = args[0];
+         if(name.endsWith(".jar"))
+         {
+            throw new NotImplementedException();
+//            JarFile jarFile = new JarFile(jarName);
+         }
+         else
+         {
+            String mainClassName = name;
+            mainClass = Class.forName(mainClassName);
+         }
+         
+         URL appXmlURL = mainClass.getClassLoader().getResource("META-INF/application-client.xml");
+         if(appXmlURL == null)
+            throw new RuntimeException("Can't find META-INF/application-client.xml");
+         
+         ApplicationClientDD xml = ApplicationClientDDObjectFactory.parse(appXmlURL);
+         
+         // FIXME: j2ee.clientName
+         
+         List<String> newArgs = new ArrayList<String>();
+         for(int i = 1; i < args.length; i++)
+         {
+            newArgs.add(args[i]);
+         }
+         args = newArgs.toArray(args);
+         
+         // FIXME: when jar gets implemented this won't work anymore
+         String mainClassName = name;
+         launch(xml, mainClassName, "FIXME", args);
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         System.exit(1);
+      }
+   }
+
+   /**
+    * The AppClientLauncher method for launching a client container.
+    * 
+    * @param mainClassName - the class whose main(String[]) will be invoked
+    * @param clientName - the client name that maps to the server side JNDI ENC
+    * @param args - the args to pass to main method
+    * @throws Throwable
+    */
+   public void launch(String mainClassName, String clientName, String args[])
+      throws Throwable
+   {
+      ApplicationClientDD xml = loadXML();
+      launch(xml, mainClassName, clientName, args);
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/package.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/client/package.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<html>
-	<head>
-		<title>org.jboss.ejb3.client</title>
-	</head>
-	<body>
-		This package contains all classes needed for running a client container.
-		(Java EE 5 Chapter 9, EJB3 Chapter 15)
-	</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/package.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/client/package.html)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/package.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/client/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<html>
+	<head>
+		<title>org.jboss.ejb3.client</title>
+	</head>
+	<body>
+		This package contains all classes needed for running a client container.
+		(Java EE 5 Chapter 9, EJB3 Chapter 15)
+	</body>
+</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/clientmodule)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,347 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.clientmodule;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.Ejb3Module;
-import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
-import org.jboss.ejb3.deployers.JBoss5DeploymentScope;
-import org.jboss.ejb3.deployers.JBoss5DeploymentUnit;
-import org.jboss.ejb3.enc.DeploymentEjbResolver;
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.injection.DependsHandler;
-import org.jboss.injection.EJBHandler;
-import org.jboss.injection.EncInjector;
-import org.jboss.injection.InjectionContainer;
-import org.jboss.injection.InjectionHandler;
-import org.jboss.injection.InjectionUtil;
-import org.jboss.injection.Injector;
-import org.jboss.injection.JndiInjectHandler;
-import org.jboss.injection.PersistenceContextHandler;
-import org.jboss.injection.PersistenceUnitHandler;
-import org.jboss.injection.ResourceHandler;
-import org.jboss.injection.WebServiceRefHandler;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * This class builds up the java:comp namespace for JavaEE 5 application clients.
- * It uses the existing injection framework to get this done.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class ClientENCInjectionContainer implements InjectionContainer
-{
-   private static final Logger log = Logger.getLogger(ClientENCInjectionContainer.class);
-   
-   private DeploymentUnit ejb3Unit;
-   private ApplicationClientDD xml;
-   private Class<?> mainClass;
-   private String applicationClientName;
-   private ClassLoader classLoader;
-   
-   // TODO: remove injectors, these are not supported
-   private List<Injector> injectors = new ArrayList<Injector>();
-   private Map<String, Map<AccessibleObject, Injector>> encInjections = new HashMap<String, Map<AccessibleObject, Injector>>();
-   private Map<String, EncInjector> encInjectors = new HashMap<String, EncInjector>();
-   
-   private Context enc;
-   
-   private DeploymentEjbResolver ejbResolver;
-   private ObjectName objectName;
-   private DependencyPolicy dependencyPolicy = new JBoss5DependencyPolicy();
-
-   public ClientENCInjectionContainer(org.jboss.deployers.spi.deployer.DeploymentUnit unit, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
-   {
-      if(mainClass == null)
-         throw new NullPointerException("mainClass is mandatory");
-      if(applicationClientName == null)
-         throw new NullPointerException("applicationClientName is mandatory");
-      if(classLoader == null)
-         throw new NullPointerException("classLoader is mandatory");
-      
-      this.ejb3Unit = new JBoss5DeploymentUnit(unit);
-      this.xml = xml;
-      this.mainClass = mainClass;
-      this.applicationClientName = applicationClientName;
-      this.classLoader = classLoader;
-      
-      this.enc = encCtx;
-      
-      /*
-      EAR ear = null;
-
-      if (di.parent != null)
-      {
-         if (di.parent.shortName.endsWith(".ear") || di.parent.shortName.endsWith(".ear/"))
-         {
-            synchronized (di.parent.context)
-            {
-               ear = (EAR) di.parent.context.get("EJB3_EAR_METADATA");
-               if (ear == null)
-               {
-                  ear = new JmxEARImpl(di.parent.shortName);
-                  di.parent.context.put("EJB3_EAR_METADATA", ear);
-               }
-            }
-         }
-      }
-      */
-      
-      DeploymentScope scope = null;
-      if (unit.getDeploymentContext().getParent() != null)
-      {
-         scope = new JBoss5DeploymentScope(unit.getDeploymentContext().getParent());
-      }
-      
-      ejbResolver = new ClientEjbResolver(scope, unit.getDeploymentContext().getRoot().getName());
-      
-      String on = Ejb3Module.BASE_EJB3_JMX_NAME + createScopeKernelName(unit, scope) + ",name=" + applicationClientName;
-      try
-      {
-         this.objectName = new ObjectName(on);
-      }
-      catch(MalformedObjectNameException e)
-      {
-         // should not happen
-         throw new RuntimeException(e);
-      }
-      
-      processMetaData();
-   }
-   
-   private String createScopeKernelName(org.jboss.deployers.spi.deployer.DeploymentUnit unit, DeploymentScope ear)
-   {
-      String scopedKernelName = "";
-      if (ear != null) scopedKernelName += ",ear=" + ear.getShortName();
-      scopedKernelName += ",jar=" + unit.getDeploymentContext().getRoot().getName();
-      return scopedKernelName;
-   }
-   
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz)
-   {
-      return clazz.getAnnotation(annotationType);
-   }
-
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method)
-   {
-      return method.getAnnotation(annotationType);
-   }
-
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method)
-   {
-      return method.getAnnotation(annotationType);
-   }
-
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field)
-   {
-      return field.getAnnotation(annotationType);
-   }
-
-   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field)
-   {
-      return field.getAnnotation(annotationType);
-   }
-
-   public VirtualFile getRootFile()
-   {
-      return ejb3Unit.getRootFile();
-   }
-
-   public ClassLoader getClassloader()
-   {
-      return classLoader;
-   }
-
-   public DependencyPolicy getDependencyPolicy()
-   {
-      return dependencyPolicy;
-   }
-
-   public String getDeploymentDescriptorType()
-   {
-      return "application-client.xml";
-   }
-
-   public String getEjbJndiName(Class businessInterface) throws NameNotFoundException
-   {
-      return ejbResolver.getEjbJndiName(businessInterface);
-   }
-
-   public String getEjbJndiName(String link, Class businessInterface)
-   {
-      return ejbResolver.getEjbJndiName(link, businessInterface);
-   }
-
-   public Context getEnc()
-   {
-      return enc;
-   }
-
-   public Map<String, Map<AccessibleObject, Injector>> getEncInjections()
-   {
-      return encInjections;
-   }
-
-   public Map<String, EncInjector> getEncInjectors()
-   {
-      return encInjectors;
-   }
-
-   public EnvironmentRefGroup getEnvironmentRefGroup()
-   {
-      return xml;
-   }
-
-   public String getIdentifier()
-   {
-      return applicationClientName;
-   }
-
-   /**
-    * A client enc injection container doesn't support injectors, because
-    * these must be run client side.
-    */
-   public List<Injector> getInjectors()
-   {
-      //throw new RuntimeException("not supported");
-      return injectors;
-   }
-
-   public Class<?> getMainClass()
-   {
-      return mainClass;
-   }
-   
-   public ObjectName getObjectName()
-   {
-      return objectName;
-   }
-   
-   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
-   {
-      throw new RuntimeException("NYI");
-   }
-
-   private void populateEnc()
-   {
-      for (EncInjector injector : encInjectors.values())
-      {
-         log.trace("encInjector: " + injector);
-         injector.inject(this);
-      }
-   }
-   
-   private void processMetaData()
-   {
-      for(String dependency : xml.getDependencies())
-      {
-         getDependencyPolicy().addDependency(dependency);
-      }
-      
-      // TODO: check which handlers an application client should support
-      Collection<InjectionHandler> handlers = new ArrayList<InjectionHandler>();
-      handlers.add(new EJBHandler());
-      handlers.add(new DependsHandler());
-      handlers.add(new JndiInjectHandler());
-      handlers.add(new PersistenceContextHandler());
-      handlers.add(new PersistenceUnitHandler());
-      handlers.add(new ResourceHandler());
-      handlers.add(new WebServiceRefHandler());
-      
-      ClassLoader old = Thread.currentThread().getContextClassLoader();
-      Thread.currentThread().setContextClassLoader(classLoader);
-      try
-      {
-         // EJB container's XML must be processed before interceptor's as it may override interceptor's references
-         for (InjectionHandler handler : handlers) handler.loadXml(xml, this);
-
-         Map<AccessibleObject, Injector> tmp = InjectionUtil.processAnnotations(this, handlers, getMainClass());
-         injectors.addAll(tmp.values());
-
-//         initialiseInterceptors();
-//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
-//         {
-//            for (InjectionHandler handler : handlers)
-//            {
-//               handler.loadXml(interceptorInfo.getXml(), this);
-//            }
-//         }
-//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
-//         {
-//            Map<AccessibleObject, Injector> tmpInterceptor = InjectionUtil.processAnnotations(this, handlers, interceptorInfo.getClazz());
-//            InterceptorInjector injector = new InterceptorInjector(this, interceptorInfo, tmpInterceptor);
-//            interceptorInjectors.put(interceptorInfo.getClazz(), injector);
-//         }
-      }
-      finally
-      {
-         Thread.currentThread().setContextClassLoader(old);
-      }
-   }
-   
-   public Container resolveEjbContainer(String link, Class businessIntf)
-   {
-      return ejbResolver.getEjbContainer(link, businessIntf);
-   }
-
-   public Container resolveEjbContainer(Class businessIntf) throws NameNotFoundException
-   {
-      return ejbResolver.getEjbContainer(businessIntf);
-   }
-
-   public void start()
-   {
-      log.trace("start");
-      
-      populateEnc();
-      
-      // Don't run any injectors, they must be run client side
-   }
-   
-   public void stop()
-   {
-      log.trace("stop");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,347 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.clientmodule;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.Ejb3Module;
+import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
+import org.jboss.ejb3.deployers.JBoss5DeploymentScope;
+import org.jboss.ejb3.deployers.JBoss5DeploymentUnit;
+import org.jboss.ejb3.enc.DeploymentEjbResolver;
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.injection.DependsHandler;
+import org.jboss.injection.EJBHandler;
+import org.jboss.injection.EncInjector;
+import org.jboss.injection.InjectionContainer;
+import org.jboss.injection.InjectionHandler;
+import org.jboss.injection.InjectionUtil;
+import org.jboss.injection.Injector;
+import org.jboss.injection.JndiInjectHandler;
+import org.jboss.injection.PersistenceContextHandler;
+import org.jboss.injection.PersistenceUnitHandler;
+import org.jboss.injection.ResourceHandler;
+import org.jboss.injection.WebServiceRefHandler;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+//import org.jboss.virtual.VirtualFile;
+
+/**
+ * This class builds up the java:comp namespace for JavaEE 5 application clients.
+ * It uses the existing injection framework to get this done.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class ClientENCInjectionContainer implements InjectionContainer
+{
+   private static final Logger log = Logger.getLogger(ClientENCInjectionContainer.class);
+   
+   private DeploymentUnit ejb3Unit;
+   private ApplicationClientDD xml;
+   private Class<?> mainClass;
+   private String applicationClientName;
+   private ClassLoader classLoader;
+   
+   // TODO: remove injectors, these are not supported
+   private List<Injector> injectors = new ArrayList<Injector>();
+   private Map<String, Map<AccessibleObject, Injector>> encInjections = new HashMap<String, Map<AccessibleObject, Injector>>();
+   private Map<String, EncInjector> encInjectors = new HashMap<String, EncInjector>();
+   
+   private Context enc;
+   
+   private DeploymentEjbResolver ejbResolver;
+   private ObjectName objectName;
+   private DependencyPolicy dependencyPolicy = new JBoss5DependencyPolicy();
+
+   public ClientENCInjectionContainer(org.jboss.deployers.spi.deployer.DeploymentUnit unit, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
+   {
+      if(mainClass == null)
+         throw new NullPointerException("mainClass is mandatory");
+      if(applicationClientName == null)
+         throw new NullPointerException("applicationClientName is mandatory");
+      if(classLoader == null)
+         throw new NullPointerException("classLoader is mandatory");
+      
+      this.ejb3Unit = new JBoss5DeploymentUnit(unit);
+      this.xml = xml;
+      this.mainClass = mainClass;
+      this.applicationClientName = applicationClientName;
+      this.classLoader = classLoader;
+      
+      this.enc = encCtx;
+      
+      /*
+      EAR ear = null;
+
+      if (di.parent != null)
+      {
+         if (di.parent.shortName.endsWith(".ear") || di.parent.shortName.endsWith(".ear/"))
+         {
+            synchronized (di.parent.context)
+            {
+               ear = (EAR) di.parent.context.get("EJB3_EAR_METADATA");
+               if (ear == null)
+               {
+                  ear = new JmxEARImpl(di.parent.shortName);
+                  di.parent.context.put("EJB3_EAR_METADATA", ear);
+               }
+            }
+         }
+      }
+      */
+      
+      DeploymentScope scope = null;
+      if (unit.getDeploymentContext().getParent() != null)
+      {
+         scope = new JBoss5DeploymentScope(unit.getDeploymentContext().getParent());
+      }
+      
+      ejbResolver = new ClientEjbResolver(scope, unit.getDeploymentContext().getRoot().getName());
+      
+      String on = Ejb3Module.BASE_EJB3_JMX_NAME + createScopeKernelName(unit, scope) + ",name=" + applicationClientName;
+      try
+      {
+         this.objectName = new ObjectName(on);
+      }
+      catch(MalformedObjectNameException e)
+      {
+         // should not happen
+         throw new RuntimeException(e);
+      }
+      
+      processMetaData();
+   }
+   
+   private String createScopeKernelName(org.jboss.deployers.spi.deployer.DeploymentUnit unit, DeploymentScope ear)
+   {
+      String scopedKernelName = "";
+      if (ear != null) scopedKernelName += ",ear=" + ear.getShortName();
+      scopedKernelName += ",jar=" + unit.getDeploymentContext().getRoot().getName();
+      return scopedKernelName;
+   }
+   
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz)
+   {
+      return clazz.getAnnotation(annotationType);
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method)
+   {
+      return method.getAnnotation(annotationType);
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method)
+   {
+      return method.getAnnotation(annotationType);
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field)
+   {
+      return field.getAnnotation(annotationType);
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field)
+   {
+      return field.getAnnotation(annotationType);
+   }
+
+//   public VirtualFile getRootFile()
+//   {
+//      return ejb3Unit.getRootFile();
+//   }
+
+   public ClassLoader getClassloader()
+   {
+      return classLoader;
+   }
+
+   public DependencyPolicy getDependencyPolicy()
+   {
+      return dependencyPolicy;
+   }
+
+   public String getDeploymentDescriptorType()
+   {
+      return "application-client.xml";
+   }
+
+   public String getEjbJndiName(Class businessInterface) throws NameNotFoundException
+   {
+      return ejbResolver.getEjbJndiName(businessInterface);
+   }
+
+   public String getEjbJndiName(String link, Class businessInterface)
+   {
+      return ejbResolver.getEjbJndiName(link, businessInterface);
+   }
+
+   public Context getEnc()
+   {
+      return enc;
+   }
+
+   public Map<String, Map<AccessibleObject, Injector>> getEncInjections()
+   {
+      return encInjections;
+   }
+
+   public Map<String, EncInjector> getEncInjectors()
+   {
+      return encInjectors;
+   }
+
+   public EnvironmentRefGroup getEnvironmentRefGroup()
+   {
+      return xml;
+   }
+
+   public String getIdentifier()
+   {
+      return applicationClientName;
+   }
+
+   /**
+    * A client enc injection container doesn't support injectors, because
+    * these must be run client side.
+    */
+   public List<Injector> getInjectors()
+   {
+      //throw new RuntimeException("not supported");
+      return injectors;
+   }
+
+   public Class<?> getMainClass()
+   {
+      return mainClass;
+   }
+   
+   public ObjectName getObjectName()
+   {
+      return objectName;
+   }
+   
+   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
+   {
+      throw new RuntimeException("NYI");
+   }
+
+   private void populateEnc()
+   {
+      for (EncInjector injector : encInjectors.values())
+      {
+         log.trace("encInjector: " + injector);
+         injector.inject(this);
+      }
+   }
+   
+   private void processMetaData()
+   {
+      for(String dependency : xml.getDependencies())
+      {
+         getDependencyPolicy().addDependency(dependency);
+      }
+      
+      // TODO: check which handlers an application client should support
+      Collection<InjectionHandler> handlers = new ArrayList<InjectionHandler>();
+      handlers.add(new EJBHandler());
+      handlers.add(new DependsHandler());
+      handlers.add(new JndiInjectHandler());
+      handlers.add(new PersistenceContextHandler());
+      handlers.add(new PersistenceUnitHandler());
+      handlers.add(new ResourceHandler());
+      handlers.add(new WebServiceRefHandler());
+      
+      ClassLoader old = Thread.currentThread().getContextClassLoader();
+      Thread.currentThread().setContextClassLoader(classLoader);
+      try
+      {
+         // EJB container's XML must be processed before interceptor's as it may override interceptor's references
+         for (InjectionHandler handler : handlers) handler.loadXml(xml, this);
+
+         Map<AccessibleObject, Injector> tmp = InjectionUtil.processAnnotations(this, handlers, getMainClass());
+         injectors.addAll(tmp.values());
+
+//         initialiseInterceptors();
+//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
+//         {
+//            for (InjectionHandler handler : handlers)
+//            {
+//               handler.loadXml(interceptorInfo.getXml(), this);
+//            }
+//         }
+//         for (InterceptorInfo interceptorInfo : applicableInterceptors)
+//         {
+//            Map<AccessibleObject, Injector> tmpInterceptor = InjectionUtil.processAnnotations(this, handlers, interceptorInfo.getClazz());
+//            InterceptorInjector injector = new InterceptorInjector(this, interceptorInfo, tmpInterceptor);
+//            interceptorInjectors.put(interceptorInfo.getClazz(), injector);
+//         }
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(old);
+      }
+   }
+   
+   public Container resolveEjbContainer(String link, Class businessIntf)
+   {
+      return ejbResolver.getEjbContainer(link, businessIntf);
+   }
+
+   public Container resolveEjbContainer(Class businessIntf) throws NameNotFoundException
+   {
+      return ejbResolver.getEjbContainer(businessIntf);
+   }
+
+   public void start()
+   {
+      log.trace("start");
+      
+      populateEnc();
+      
+      // Don't run any injectors, they must be run client side
+   }
+   
+   public void stop()
+   {
+      log.trace("stop");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.clientmodule;
-
-import javax.naming.NameNotFoundException;
-
-//import org.jboss.ejb3.EAR;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.enc.DeploymentEjbResolver;
-
-// based on WarEjbResolver
-/**
- * Resolves ejb references within an application client.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class ClientEjbResolver extends DeploymentEjbResolver
-{
-
-   protected ClientEjbResolver(DeploymentScope ear, String errorName)
-   {
-      super(ear, errorName);
-   }
-
-   @Override
-   protected EJBContainer searchDeploymentInternally(String ejbLink, Class businessIntf)
-   {
-      return null;
-   }
-
-   @Override
-   protected EJBContainer searchForEjbContainerInternally(Class businessIntf) throws NameNotFoundException
-   {
-      return null;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.clientmodule;
+
+import javax.naming.NameNotFoundException;
+
+//import org.jboss.ejb3.EAR;
+import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.enc.DeploymentEjbResolver;
+
+// based on WarEjbResolver
+/**
+ * Resolves ejb references within an application client.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class ClientEjbResolver extends DeploymentEjbResolver
+{
+
+   protected ClientEjbResolver(DeploymentScope ear, String errorName)
+   {
+      super(ear, errorName);
+   }
+
+   @Override
+   protected EJBContainer searchDeploymentInternally(String ejbLink, Class businessIntf)
+   {
+      return null;
+   }
+
+   @Override
+   protected EJBContainer searchForEjbContainerInternally(Class businessIntf) throws NameNotFoundException
+   {
+      return null;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<html>
-	<head>
-		<title>org.jboss.ejb3.clientmodule</title>
-	</head>
-	<body>
-		The client module is a deployment container which supports injection. All injected
-		attributes are made available in JNDI under a context with the application client jndi name.
-		This jndi name can be configured in META-INF/jboss-client.xml.
-		The package forms a connector with the org.jboss.ejb3.client which runs in the client JVM.
-		(Java EE 5 Chapter 9, EJB3 Chapter 15)
-	</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/clientmodule/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<html>
+	<head>
+		<title>org.jboss.ejb3.clientmodule</title>
+	</head>
+	<body>
+		The client module is a deployment container which supports injection. All injected
+		attributes are made available in JNDI under a context with the application client jndi name.
+		This jndi name can be configured in META-INF/jboss-client.xml.
+		The package forms a connector with the org.jboss.ejb3.client which runs in the client JVM.
+		(Java EE 5 Chapter 9, EJB3 Chapter 15)
+	</body>
+</html>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd
___________________________________________________________________
Name: svn:ignore
   + Callback.java


Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/.cvsignore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/dd/.cvsignore)
===================================================================
(Binary files differ)


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/.cvsignore
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfig.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfig.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a activation-config element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ActivationConfig
-{
-   private static final Logger log = Logger.getLogger(ActivationConfig.class);
-
-   // ejb-jar.xml
-   private List properties = new ArrayList();
-
-   public List getActivationConfigProperties()
-   {
-      return properties;
-   }
-
-   public void addActivationConfigProperty(ActivationConfigProperty property)
-   {
-      properties.add(property);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("activationConfigProperties=").append(properties);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfigProperty.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfigProperty.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ActivationConfigProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a activation-config-property element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ActivationConfigProperty
-{
-   private static final Logger log = Logger.getLogger(ActivationConfigProperty.class);
-
-   // ejb-jar.xml
-   private String name;
-   private String value;
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-   
-   public String getValue()
-   {
-      return value;
-   }
-
-   public void setValue(String value)
-   {
-      this.value = value;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("name=").append(name);
-      sb.append(", value=").append(value);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ApplicationExceptionList.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ApplicationExceptionList.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ApplicationExceptionList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <application-exception> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ApplicationExceptionList
-{
-   private static final Logger log = Logger.getLogger(ApplicationExceptionList.class);
-
-   private List classList = new ArrayList();
-   private List<Boolean> rollbackList = new ArrayList();
-
-   public List getClassList()
-   {
-      return classList;
-   }
-   
-   public List getRollbackList()
-   {
-      return rollbackList;
-   }
-
-   public void addClass(String className)
-   {
-      classList.add(className);
-   }
-   
-   public void addRollback(boolean rollback)
-   {
-      rollbackList.add(rollback);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("classes=").append(classList);
-      sb.append("rollbacks=").append(rollbackList);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/AssemblyDescriptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/AssemblyDescriptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/AssemblyDescriptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,188 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents <assembly-descriptor> elements of the ejb-jar.xml deployment descriptor for the 1.4
- * schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class AssemblyDescriptor
-{
-   private static final Logger log = Logger.getLogger(AssemblyDescriptor.class);
-
-   private List securityRoles = new ArrayList();
-
-   private List methodPermissions = new ArrayList();
-
-   private List containerTransactions = new ArrayList();
-   
-   private HashMap<String, MessageDestination> messageDestinations = new HashMap();
-
-   private ExcludeList excludeList;
-
-   private ApplicationExceptionList applicationExceptionList;
-
-   private InitList initList;
-
-   private List injects = new ArrayList();
-   
-   public Collection getMessageDestinations()
-   {
-      return messageDestinations.values();
-   }
-
-   public void addMessageDestination(MessageDestination messageDestination)
-   {
-      messageDestinations.put(messageDestination.getMessageDestinationName(), messageDestination);
-   }
-   
-   public MessageDestination findMessageDestination(String name)
-   {
-      return messageDestinations.get(name);
-   }
-
-   private List interceptorBindings = new ArrayList();
-
-   public InitList getInitList()
-   {
-      return initList;
-   }
-
-   public void setInitList(InitList initList)
-   {
-      this.initList = initList;
-   }
-
-   public ExcludeList getExcludeList()
-   {
-      return excludeList;
-   }
-
-   public void setExcludeList(ExcludeList excludeList)
-   {
-      this.excludeList = excludeList;
-   }
-   
-   public ApplicationExceptionList getApplicationExceptionList()
-   {
-      return applicationExceptionList;
-   }
-
-   public void setApplicationExceptionList(ApplicationExceptionList applicationExceptionList)
-   {
-      this.applicationExceptionList = applicationExceptionList;
-   }
-
-   public List getSecurityRoles()
-   {
-      return securityRoles;
-   }
-
-   public void setSecurityRoles(List securityRoles)
-   {
-      this.securityRoles = securityRoles;
-   }
-
-   public void addSecurityRole(SecurityRole securityRole)
-   {
-      securityRoles.add(securityRole);
-   }
-
-//   public List getCallbacks()
-//   {
-//      return callbacks;
-//   }
-//
-//   public void addCallback(Callback callback)
-//   {
-//      callbacks.add(callback);
-//   }
-
-   public List<InterceptorBinding> getInterceptorBindings()
-   {
-      return interceptorBindings;
-   }
-
-   public void addInterceptorBinding(InterceptorBinding binding)
-   {
-      interceptorBindings.add(binding);
-   }
-
-   public List getInjects()
-   {
-      return injects;
-   }
-
-   public void addInject(Inject inject)
-   {
-      injects.add(inject);
-   }
-
-   public List getMethodPermissions()
-   {
-      return methodPermissions;
-   }
-
-   public void setMethodPermissions(List methodPermissions)
-   {
-      this.methodPermissions = methodPermissions;
-   }
-
-   public void addMethodPermission(MethodPermission methodPermission)
-   {
-      methodPermissions.add(methodPermission);
-   }
-
-   public List getContainerTransactions()
-   {
-      return containerTransactions;
-   }
-
-   public void setContainerTransactions(List containerTransactions)
-   {
-      this.containerTransactions = containerTransactions;
-   }
-
-   public void addContainerTransaction(ContainerTransaction containerTransaction)
-   {
-      containerTransactions.add(containerTransaction);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("securityRoles=").append(securityRoles);
-      sb.append(", applicationExceptionList=").append(applicationExceptionList);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ClusterConfig.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ClusterConfig.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ClusterConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-
-/**
- * Represents an <cluster-config> element of the jboss.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ClusterConfig
-{
-   private String loadBalancePolicy = null;
-
-   private String partition = null;
-
-   public String getLoadBalancePolicy()
-   {
-      return loadBalancePolicy;
-   }
-
-   public void setLoadBalancePolicy(String loadBalancePolicy)
-   {
-      this.loadBalancePolicy = loadBalancePolicy;
-   }
-
-   public String getPartition()
-   {
-      return partition;
-   }
-
-   public void setPartition(String partition)
-   {
-      this.partition = partition;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("loadBalancePolicy=").append(loadBalancePolicy);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmpField.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmpField.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmpField.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an cmp-field element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class CmpField
-{
-
-   private String fieldName;
-
-   public String getFieldName()
-   {
-      return fieldName;
-   }
-
-   public void setFieldName(String fieldName)
-   {
-      this.fieldName = fieldName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("fieldName=").append(fieldName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmrField.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmrField.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CmrField.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an <cmr-field> element of the ejb-jar.xml deployment
- * descriptor for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class CmrField
-{
-
-   private String cmrFieldName;
-
-   private String cmrFieldType;
-
-   public String getCmrFieldName()
-   {
-      return cmrFieldName;
-   }
-
-   public void setCmrFieldName(String cmrFieldName)
-   {
-      this.cmrFieldName = cmrFieldName;
-   }
-
-   public String getCmrFieldType()
-   {
-      return cmrFieldType;
-   }
-
-   public void setCmrFieldType(String cmrFieldType)
-   {
-      this.cmrFieldType = cmrFieldType;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("cmrFieldName=").append(cmrFieldName);
-      sb.append(",cmrFieldType=").append(cmrFieldType);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Consumer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Consumer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Consumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import org.jboss.logging.Logger;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Consumer extends EnterpriseBean
-{
-   private static final Logger log = Logger.getLogger(Consumer.class);
-   
-   private String destination = null;
-   private String destinationType = null;
-   private CurrentMessage currentMessage = null;
-   private MessageProperties messageProperties = null;
-   private List producers = new ArrayList();
-   private List localProducers = new ArrayList();
-   
-   public String getDestination()
-   {
-      return destination;
-   }
-   
-   public void setDestination(String destination)
-   {
-      this.destination = destination;
-   }
-   
-   public String getDestinationType()
-   {
-      return destinationType;
-   }
-   
-   public void setDestinationType(String destinationType)
-   {
-      this.destinationType = destinationType;
-   }
-   
-   public CurrentMessage getCurrentMessage()
-   {
-      return currentMessage;
-   }
-   
-   public void setCurrentMessage(CurrentMessage currentMessage)
-   {
-      this.currentMessage = currentMessage;
-   }
-   
-   public MessageProperties getMessageProperties()
-   {
-      return messageProperties;
-   }
-   
-   public void setMessageProperties(MessageProperties messageProperties)
-   {
-      this.messageProperties = messageProperties;
-   }
-   
-   public List getProducers()
-   {
-      return producers;
-   }
-   
-   public void addProducer(Producer producer)
-   {
-      producers.add(producer);
-   }
-   
-   public List getLocalProducers()
-   {
-      return localProducers;
-   }
-   
-   public void addLocalProducer(Producer producer)
-   {
-      localProducers.add(producer);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[Consumer:");
-      sb.append(super.toString());
-      sb.append(", destination=" + destination);
-      sb.append(", destinationType=" + destinationType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ContainerTransaction.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ContainerTransaction.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ContainerTransaction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-
-/**
- * Represents an <container-transaction> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ContainerTransaction
-{
-
-   private String transAttribute;
-
-   private Method method;
-
-   public String getTransAttribute()
-   {
-      return transAttribute;
-   }
-
-   public void setTransAttribute(String transAttribute)
-   {
-      this.transAttribute = transAttribute;
-   }
-
-   public Method getMethod()
-   {
-      return method;
-   }
-
-   public void setMethod(Method method)
-   {
-      this.method = method;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRelationName=").append(transAttribute);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CurrentMessage.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CurrentMessage.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/CurrentMessage.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class CurrentMessage
-{
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-   
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDD.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDD.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDD.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,169 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * Represents the ejb-jar.xml deployment descriptor for the 2.1 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbJarDD
-{
-   private static final Logger log = Logger.getLogger(EjbJarDD.class);
-   
-   // ejb-jar.xml
-   private String version;
-
-   private String displayName;
-
-   private Relationships relationships;
-
-   private AssemblyDescriptor assemblyDescriptor;
-   
-   private Interceptors interceptors;
-
-   // jboss.xml
-   private String securityDomain;
-   
-   private String unauthenticatedPrincipal;
-
-   
-   private HashMap<String, ResourceManager> resourceManagers = new HashMap();
-
-   // both
-   private EnterpriseBeans enterpriseBeans;
-   
-   public void addResourceManager(ResourceManager manager)
-   {
-      resourceManagers.put(manager.getResourceName(), manager);
-   }
-   
-   public String resolveResourceManager(String resourceName)
-   {
-      ResourceManager manager = resourceManagers.get(resourceName);
-      if (manager != null)
-         return manager.getResourceJndiName();
-      
-      return null;
-   }
-
-   public String getSecurityDomain()
-   {
-      return securityDomain;
-   }
-
-   public void setSecurityDomain(String securityDomain)
-   {
-      this.securityDomain = securityDomain;
-   }
-   
-   public String getUnauthenticatedPrincipal()
-   {
-      return unauthenticatedPrincipal;
-   }
-
-   public void setUnauthenticatedPrincipal(String unauthenticatedPrincipal)
-   {
-      this.unauthenticatedPrincipal = unauthenticatedPrincipal;
-   }
-
-   public String getVersion()
-   {
-      return version;
-   }
-
-   public void setVersion(String version)
-   {
-      this.version = version;
-   }
-
-   public String getDisplayName()
-   {
-      return displayName;
-   }
-
-   public void setDisplayName(String displayName)
-   {
-      this.displayName = displayName;
-   }
-
-   public EnterpriseBeans getEnterpriseBeans()
-   {
-      return enterpriseBeans;
-   }
-
-   public void setEnterpriseBeans(EnterpriseBeans enterpriseBeans)
-   {
-      this.enterpriseBeans = enterpriseBeans;
-   }
-   
-   public Interceptors getInterceptors()
-   {
-      return interceptors;
-   }
-
-   public void setInterceptors(Interceptors interceptors)
-   {
-      this.interceptors = interceptors;
-   }
-
-   public Relationships getRelationships()
-   {
-      return relationships;
-   }
-
-   public void setRelationships(Relationships relationships)
-   {
-      this.relationships = relationships;
-   }
-
-   public AssemblyDescriptor getAssemblyDescriptor()
-   {
-      return assemblyDescriptor;
-   }
-
-   public void setAssemblyDescriptor(AssemblyDescriptor assemblyDescriptor)
-   {
-      this.assemblyDescriptor = assemblyDescriptor;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("version=").append(version);
-      sb.append(",");
-      sb.append("displayName=").append(displayName);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDDObjectFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDDObjectFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbJarDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2063 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import javax.persistence.PersistenceContextType;
-import org.jboss.logging.Logger;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * org.jboss.xb.binding.ObjectModelFactory implementation that accepts data
- * chuncks from unmarshaller and assembles them into an EjbJarDD instance.
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbJarDDObjectFactory implements ObjectModelFactory
-{
-
-   private static final Logger log = Logger
-           .getLogger(EjbJarDDObjectFactory.class);
-
-   /**
-    * Return the root.
-    */
-   public Object newRoot(Object root, UnmarshallingContext navigator,
-                         String namespaceURI, String localName, Attributes attrs)
-   {
-
-      final EjbJarDD dd;
-      if (root == null)
-      {
-         root = dd = new EjbJarDD();
-      }
-      else
-      {
-         dd = (EjbJarDD) root;
-      }
-
-      if (attrs.getLength() > 0)
-      {
-         for (int i = 0; i < attrs.getLength(); ++i)
-         {
-            if (attrs.getLocalName(i).equals("version"))
-            {
-               dd.setVersion(attrs.getValue(i));
-            }
-         }
-      }
-
-      return root;
-   }
-
-   public Object completeRoot(Object root, UnmarshallingContext ctx,
-                              String uri, String name)
-   {
-      return root;
-   }
-
-   // Methods discovered by introspection
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbJarDD dd, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("enterprise-beans"))
-      {
-         child = new EnterpriseBeans();
-      }
-      if (localName.equals("interceptors"))
-      {
-         child = new Interceptors();
-      }
-      else if (localName.equals("relationships"))
-      {
-         child = new Relationships();
-      }
-      else if (localName.equals("assembly-descriptor"))
-      {
-         child = new AssemblyDescriptor();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("session"))
-      {
-         child = new SessionEnterpriseBean();
-      }
-      else if (localName.equals("entity"))
-      {
-         child = new EntityEnterpriseBean();
-      }
-      else if (localName.equals("message-driven"))
-      {
-         child = new MessageDrivenBean();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbRef ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ejbs.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(PersistenceContextRef ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ejbs.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(PersistenceUnitRef ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ejbs.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbLocalRef ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ejbs.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MessageDestinationRef ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ejbs.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EnvEntry ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ejbs.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ResourceRef ref, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(WebServiceRef ref, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ResourceEnvRef ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ejbs.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   private Object newEjbChild(EnterpriseBean parent, String localName)
-   {
-      Object child = null;
-
-      if (localName.equals("ejb-local-ref"))
-      {
-         child = new EjbLocalRef();
-      }
-      else if (localName.equals("ejb-ref"))
-      {
-         child = new EjbRef();
-      }
-      else if (localName.equals("resource-ref"))
-      {
-         child = new ResourceRef();
-      }
-      else if (localName.equals("resource-env-ref"))
-      {
-         child = new ResourceEnvRef();
-      }
-      else if (localName.equals("env-entry"))
-      {
-         child = new EnvEntry();
-      }
-      else if (localName.equals("message-destination-ref"))
-      {
-         child = new MessageDestinationRef();
-      }
-      else if (localName.equals("persistence-unit-ref"))
-      {
-         child = new PersistenceUnitRef();
-      }
-      else if (localName.equals("persistence-context-ref"))
-      {
-         child = new PersistenceContextRef();
-      }
-      else if (localName.equals("service-ref"))
-      {
-         child = new WebServiceRef();
-      }
-      return child;
-   }
-   
-
-   private Object newEjbHasInterceptorsChild(EnterpriseBean parent, String localName)
-   {
-      Object child = null;
-      
-      if (localName.equals("around-invoke"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("post-construct"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("post-activate"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         child = new Method();
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MessageDrivenBean parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = newEjbChild(parent, localName);
-      if (child != null) return child;
-      
-      child = newEjbHasInterceptorsChild(parent, localName);
-      if (child != null) return child;
-      
-      if (localName.equals("message-driven-destination"))
-      {
-         child = new MessageDrivenDestination();
-      }
-      else if (localName.equals("activation-config"))
-      {
-         child = new ActivationConfig();
-      }
-
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ActivationConfig parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (child == null)
-      {
-        if (localName.equals("activation-config-property"))
-         {
-            child = new ActivationConfigProperty();
-         }
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(SessionEnterpriseBean parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = newEjbChild(parent, localName);
-      if (child != null) return child;
-      
-      child = newEjbHasInterceptorsChild(parent, localName);
-      if (child != null) return child;
-
-      if (localName.equals("security-identity"))
-      {
-         child = new SecurityIdentity();
-      }
-      else if (localName.equals("remove-method"))
-      {
-         RemoveMethod method = new RemoveMethod();
-         parent.addRemoveMethod(method);
-         child = method;
-      }
-      else if (localName.equals("init-method"))
-      {
-         InitMethod method = new InitMethod();
-         parent.addInitMethod(method);
-         child = method;
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EntityEnterpriseBean parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      child = newEjbChild(parent, localName);
-      if (child == null)
-      {
-         if (localName.equals("cmp-field"))
-         {
-            child = new CmpField();
-         }
-         else if (localName.equals("query"))
-         {
-            child = new Query();
-         }
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(SecurityIdentity parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("use-caller-identity"))
-      {
-         parent.setUseCallerIdentity(true);
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(RemoveMethod parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("bean-method"))
-      {
-         parent.setBeanMethod(new Method());
-         child = parent.getBeanMethod();
-      }
-
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(InitMethod parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("bean-method"))
-      {
-         parent.setBeanMethod(new Method());
-         child = parent.getBeanMethod();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(RemoveMethod dd, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("retain-if-exception"))
-      {
-         dd.setRetainIfException(Boolean.parseBoolean(value));
-      }
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Relationships relationships,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("ejb-relation"))
-      {
-         child = new EjbRelation();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbRelation relation, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("ejb-relationship-role"))
-      {
-         child = new EjbRelationshipRole();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbRelationshipRole parent,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("cascade-delete"))
-      {
-         parent.setCascadeDelete(true);
-      }
-      else if (localName.equals("relationship-role-source"))
-      {
-         child = new RelationshipRoleSource();
-      }
-      else if (localName.equals("cmr-field"))
-      {
-         child = new CmrField();
-      }
-
-      return child;
-   }
-
-   public Object newChild(Interceptors interceptors,                          
-         UnmarshallingContext navigator, String namespaceURI, String localName,
-         Attributes attrs)
-   {
-      Object child = null;
-      
-      if (localName.equals("interceptor"))
-      {
-         return new Interceptor();
-      }
-      
-      return child;
-   }
-   
-   public Object newChild(Interceptor interceptor,                          
-         UnmarshallingContext navigator, String namespaceURI, String localName,
-         Attributes attrs)
-   {
-      Object child = null;
-      
-      if (localName.equals("around-invoke"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("post-construct"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("post-activate"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("ejb-local-ref"))
-      {
-         child = new EjbLocalRef();
-      }
-      else if (localName.equals("ejb-ref"))
-      {
-         child = new EjbRef();
-      }
-      else if (localName.equals("persistence-unit-ref"))
-      {
-         child = new PersistenceUnitRef();
-      }
-      else if (localName.equals("persistence-context-ref"))
-      {
-         child = new PersistenceContextRef();
-      }
-      else if (localName.equals("resource-ref"))
-      {
-         child = new ResourceRef();
-      }
-      else if (localName.equals("resource-env-ref"))
-      {
-         child = new ResourceEnvRef();
-      }
-      else if (localName.equals("env-entry"))
-      {
-         child = new EnvEntry();
-      }
-      else if (localName.equals("message-destination-ref"))
-      {
-         child = new MessageDestinationRef();
-      }
-      else if (localName.equals("service-ref"))
-      {
-         child = new WebServiceRef();
-      }
-      
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(AssemblyDescriptor relationships,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("security-role"))
-      {
-         child = new SecurityRole();
-      }
-      else if (localName.equals("method-permission"))
-      {
-         child = new MethodPermission();
-      }
-      if (localName.equals("container-transaction"))
-      {
-         child = new ContainerTransaction();
-      }
-      else if (localName.equals("inject"))
-      {
-         child = new Inject();
-      }
-      else if (localName.equals("exclude-list"))
-      {
-         child = new ExcludeList();
-      }
-      else if (localName.equals("application-exception"))
-      {
-         child = new ApplicationExceptionList();
-      }
-      else if (localName.equals("interceptor-binding"))
-      {
-         child = new InterceptorBinding();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Inject inject,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MethodPermission permission,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("unchecked"))
-      {
-         permission.setUnchecked(true);
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ExcludeList list,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(InitList list,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ContainerTransaction transaction,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   public Object newChild(Method method,
-         UnmarshallingContext navigator, String namespaceURI, String localName,
-         Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method-params"))
-      {
-         method.setHasParameters();
-      }
-      
-      return child;
-   }
-
-   
-   public Object newChild(InterceptorBinding binding,
-         UnmarshallingContext navigator, String namespaceURI, String localName,
-         Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("interceptor-order"))
-      {
-         child = new InterceptorOrder();
-      }
-      else if (localName.equals("exclude-default-interceptors"))
-      {
-         child = new ExcludeDefaultInterceptors();
-      }
-      else if (localName.equals("exclude-class-interceptors"))
-      {
-         child = new ExcludeClassInterceptors();
-      }
-      else if (localName.equals("method-params"))
-      {
-         binding.setHasParameters();
-      }
-       
-      
-      return child;
-   }
-
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, ActivationConfig config,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setActivationConfig(config);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, EjbRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, EjbLocalRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, EnvEntry entry,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnvEntry(entry);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, ResourceEnvRef envRef,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(envRef);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, ResourceRef envRef,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(envRef);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, WebServiceRef envRef,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addWebServiceRef(envRef);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(ActivationConfig parent, ActivationConfigProperty property,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addActivationConfigProperty(property);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbJarDD parent, EnterpriseBeans ejbs,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setEnterpriseBeans(ejbs);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EnterpriseBean ejb,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnterpriseBean(ejb);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, SecurityIdentity si,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setSecurityIdentity(si);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, EjbLocalRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, EjbRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, PersistenceContextRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceContextRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, PersistenceUnitRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceUnitRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, MessageDestinationRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestinationRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, EnvEntry entry,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnvEntry(entry);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, ResourceEnvRef envRef,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(envRef);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, ResourceRef envRef,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(envRef);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, WebServiceRef envRef,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addWebServiceRef(envRef);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (localName.equals("around-invoke"))
-      {
-         parent.setAroundInvoke(method);
-      }
-      else if (localName.equals("post-construct"))
-      {
-         parent.setPostConstruct(method);
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         parent.setPreDestroy(method);
-      }
-      else if (localName.equals("post-activate"))
-      {
-         parent.setPostActivate(method);
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         parent.setPrePassivate(method);
-      }
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EntityEnterpriseBean parent, CmpField field,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addCmpField(field);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EntityEnterpriseBean parent, Query query,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addQuery(query);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbJarDD parent, Relationships relationships,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setRelationships(relationships);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Relationships parent, EjbRelation relation,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRelation(relation);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbRelation parent, EjbRelationshipRole role,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRelationshipRole(role);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbRelationshipRole parent,
-                        RelationshipRoleSource source, UnmarshallingContext navigator,
-                        String namespaceURI, String localName)
-   {
-      parent.setRelationshipRoleSource(source);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbRelationshipRole parent, CmrField field,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setCmrField(field);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbJarDD parent, AssemblyDescriptor descriptor,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setAssemblyDescriptor(descriptor);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, SecurityRole role,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addSecurityRole(role);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, MethodPermission permission,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethodPermission(permission);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, ExcludeList list,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setExcludeList(list);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, ApplicationExceptionList list,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setApplicationExceptionList(list);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, InitList list,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInitList(list);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, Inject inject,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addInject(inject);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, InterceptorBinding binding,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addInterceptorBinding(binding);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(ExcludeList parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InitList parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MethodPermission parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Inject parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   public void addChild(EjbJarDD parent, Interceptors interceptors,                           
-         UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInterceptors(interceptors);
-   }
-
-   public void addChild(Interceptors parent, Interceptor interceptor,                           
-         UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addInterceptor(interceptor);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, EjbLocalRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, EjbRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, PersistenceContextRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceContextRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, PersistenceUnitRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceUnitRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, MessageDestinationRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestinationRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, EnvEntry entry,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnvEntry(entry);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, ResourceEnvRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, ResourceRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, WebServiceRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addWebServiceRef(ref);
-   }
-   
-   public void addChild(Interceptor parent, Method method,                           
-         UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (localName.equals("around-invoke"))
-      {
-         parent.setAroundInvoke(method);
-      }
-      else if (localName.equals("post-construct"))
-      {
-         parent.setPostConstruct(method);
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         parent.setPreDestroy(method);
-      }
-      else if (localName.equals("post-activate"))
-      {
-         parent.setPostActivate(method);
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         parent.setPrePassivate(method);
-      }
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InterceptorBinding parent,
-                        InterceptorOrder order, UnmarshallingContext navigator,
-                        String namespaceURI, String localName)
-   {
-      parent.setOrderedInterceptorClasses(order);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InterceptorBinding parent,
-                        ExcludeDefaultInterceptors exclude, UnmarshallingContext navigator,
-                        String namespaceURI, String localName)
-   {
-      parent.setExcludeDefaultInterceptors(true);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InterceptorBinding parent,
-                        ExcludeClassInterceptors exclude, UnmarshallingContext navigator,
-                        String namespaceURI, String localName)
-   {
-      parent.setExcludeClassInterceptors(true);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(ContainerTransaction parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, MessageDrivenDestination destination,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMessageDrivenDestination(destination);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (localName.equals("around-invoke"))
-      {
-         parent.setAroundInvoke(method);
-      }
-      else if (localName.equals("post-construct"))
-      {
-         parent.setPostConstruct(method);
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         parent.setPreDestroy(method);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbJarDD dd, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("display-name"))
-      {
-         dd.setDisplayName(value);
-      }
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent,
-                        ContainerTransaction transaction, UnmarshallingContext navigator,
-                        String namespaceURI, String localName)
-   {
-      parent.addContainerTransaction(transaction);
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ActivationConfigProperty property, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("activation-config-property-name"))
-      {
-         property.setName(value);
-      }
-      else if (localName.equals("activation-config-property-value"))
-      {
-         property.setValue(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   private boolean isEjbParentName(EnterpriseBean ejb, String localName,
-                                   String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         ejb.setEjbName(value);
-         return true;
-      }
-      else if (localName.equals("home"))
-      {
-         ejb.setHome(value);
-         return true;
-      }
-      else if (localName.equals("remote"))
-      {
-         ejb.setRemote(value);
-         return true;
-      }
-      else if (localName.equals("local-home"))
-      {
-         ejb.setLocalHome(value);
-         return true;
-      }
-      else if (localName.equals("local"))
-      {
-         ejb.setLocal(value);
-         return true;
-      }
-      else if (localName.equals("ejb-class"))
-      {
-         ejb.setEjbClass(value);
-         return true;
-      }
-
-      return false;
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDrivenBean ejb,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (!isEjbParentName(ejb, localName, value))
-      {
-         if (localName.equals("acknowledge-mode"))
-         {
-            ejb.setAcknowledgeMode(value);
-         }
-         else if (localName.equals("transaction-type"))
-         {
-            ejb.setTransactionType(value);
-         }
-         else if (localName.equals("messaging-type"))
-         {
-            ejb.setMessagingType(value);
-         }
-         else if (localName.equals("message-destination-type"))
-         {
-            MessageDrivenDestination destination = ejb.getMessageDrivenDestination();
-            if (destination == null)
-            {
-               destination = new MessageDrivenDestination();
-               ejb.setMessageDrivenDestination(destination);
-            }
-            
-            destination.setDestinationType(value);
-         }
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDrivenDestination destination,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (localName.equals("destination-type"))
-      {
-         destination.setDestinationType(value);
-      }
-      else if (localName.equals("subscription-durability"))
-      {
-         destination.setSubscriptionDurability(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(SessionEnterpriseBean ejb,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (!isEjbParentName(ejb, localName, value))
-      {
-         if (localName.equals("session-type"))
-         {
-            ejb.setSessionType(value);
-         }
-         else if (localName.equals("transaction-type"))
-         {
-            ejb.setTransactionManagementType(value);
-         }
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ApplicationExceptionList list,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (localName.equals("exception-class"))
-      {
-         list.addClass(value);
-      }
-      else if (localName.equals("rollback"))
-      {
-         list.addRollback(Boolean.valueOf(value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EntityEnterpriseBean ejb,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (!isEjbParentName(ejb, localName, value))
-      {
-         if (localName.equals("persistence-type"))
-         {
-            ejb.setPersistenceType(value);
-         }
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(SecurityIdentity si, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("use-caller-identity"))
-      {
-         si.setUseCallerIdentity(true);
-      }
-      else if (localName.equals("role-name"))
-      {
-         si.setRunAs(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(PersistenceUnitRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("persistence-unit-ref-name"))
-      {
-         ref.setRefName(value);
-      }
-      else if (localName.equals("persistence-unit-name"))
-      {
-         ref.setUnitName(value);
-      }
-      else
-      {
-         throw new RuntimeException("INVALID element<" + localName + "> in <persistence-unit-ref>");
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(PersistenceContextRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("persistence-context-ref-name"))
-      {
-         ref.setRefName(value);
-      }
-      else if (localName.equals("persistence-unit-name"))
-      {
-         ref.setUnitName(value);
-      }
-      else if(localName.equals("persistence-context-type"))
-      {
-         if (value.toLowerCase().equals("transaction"))
-         {
-            ref.setPersistenceContextType(PersistenceContextType.TRANSACTION);
-         }
-         else
-         {
-            ref.setPersistenceContextType(PersistenceContextType.EXTENDED);
-         }
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbLocalRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-ref-name"))
-      {
-         ref.setEjbRefName(value);
-      }
-      else if (localName.equals("ejb-ref-type"))
-      {
-         ref.setEjbRefType(value);
-      }
-      else if (localName.equals("local-home"))
-      {
-         ref.setLocalHome(value);
-      }
-      else if (localName.equals("local"))
-      {
-         ref.setLocal(value);
-      }
-      else if (localName.equals("ejb-link"))
-      {
-         ref.setEjbLink(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-ref-name"))
-      {
-         ref.setEjbRefName(value);
-      }
-      else if (localName.equals("ejb-ref-type"))
-      {
-         ref.setEjbRefType(value);
-      }
-      else if (localName.equals("home"))
-      {
-         ref.setHome(value);
-      }
-      else if (localName.equals("remote"))
-      {
-         ref.setRemote(value);
-      }
-      else if (localName.equals("ejb-link"))
-      {
-         ref.setEjbLink(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(InjectionTarget target, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("injection-target-class"))
-      {
-         target.setTargetClass(value);
-      }
-      else if (localName.equals("injection-target-name"))
-      {
-         target.setTargetName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDestinationRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("description"))
-      {
-         ref.setDescription(value);
-      }
-      else if (localName.equals("message-destination-ref-name"))
-      {
-         ref.setMessageDestinationRefName(value);
-      }
-      else if (localName.equals("message-destination-type"))
-      {
-         ref.setMessageDestinationType(value);
-      }
-      else if (localName.equals("message-destination-usage"))
-      {
-         ref.setMessageDestinationUsage(value);
-      }
-      else if (localName.equals("message-destination-link"))
-      {
-         ref.setMessageDestinationLink(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EnvEntry entry, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("description"))
-      {
-         entry.setDescription(value);
-      }
-      else if (localName.equals("env-entry-name"))
-      {
-         entry.setEnvEntryName(value);
-      }
-      else if (localName.equals("env-entry-type"))
-      {
-         entry.setEnvEntryType(value);
-      }
-      else if (localName.equals("env-entry-value"))
-      {
-         entry.setEnvEntryValue(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ResourceEnvRef envRef, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-ref-name")
-              || localName.equals("resource-env-ref-name"))
-      {
-         envRef.setResRefName(value);
-      }
-      else if (localName.equals("res-type")
-              || localName.equals("resource-env-ref-type"))
-      {
-         envRef.setResType(value);
-      }
-      else if (localName.equals("res-auth"))
-      {
-         envRef.setResAuth(value);
-      }
-      else if (localName.equals("res-sharing-scope"))
-      {
-         envRef.setResSharingScope(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         envRef.setMappedName(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ResourceRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-ref-name")
-              || localName.equals("resource-env-ref-name"))
-      {
-         ref.setResRefName(value);
-      }
-      else if (localName.equals("res-type")
-              || localName.equals("resource-env-ref-type"))
-      {
-         ref.setResType(value);
-      }
-      else if (localName.equals("res-auth"))
-      {
-         ref.setResAuth(value);
-      }
-      else if (localName.equals("res-sharing-scope"))
-      {
-         ref.setResSharingScope(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(WebServiceRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("service-ref-name"))
-      {
-         ref.setServiceRefName(value);
-      }
-      else if (localName.equals("service-res-type"))
-      {
-         ref.setResType(value);
-      }
-      else if (localName.equals("service-interface"))
-      {
-         ref.setServiceInterface(value);
-      }
-      else if (localName.equals("wsdl-file"))
-      {
-         ref.setWsdlFile(value);
-      }
-      else if (localName.equals("jaxrpc-mapping-file"))
-      {
-         ref.setJaxRpcMappingFile(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(value);
-      }
-   }
-
-   public void setValue(Interceptor interceptor, UnmarshallingContext navigator,
-         String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("interceptor-class"))
-      {
-         interceptor.setInterceptorClass(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbRelation relation, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-relation-name"))
-      {
-         relation.setEjbRelationName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbRelationshipRole role,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (localName.equals("ejb-relationship-role-name"))
-      {
-         role.setEjbRelationshipRoleName(value);
-      }
-      else if (localName.equals("multiplicity"))
-      {
-         role.setMultiplicity(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(RelationshipRoleSource source,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         source.setEjbName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(CmrField field, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("cmr-field-name"))
-      {
-         field.setCmrFieldName(value);
-      }
-      else if (localName.equals("cmr-field-type"))
-      {
-         field.setCmrFieldType(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(SecurityRole role, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         role.setRoleName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MethodPermission permission,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         permission.addRoleName(value);
-      }
-      else if (localName.equals("unchecked"))
-      {
-         permission.setUnchecked(true);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ContainerTransaction transaction,
-                        UnmarshallingContext navigator, String namespaceURI, String localName,
-                        String value)
-   {
-      if (localName.equals("trans-attribute"))
-      {
-         transaction.setTransAttribute(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Method method, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         method.setEjbName(value);
-      }
-      else if (localName.equals("method-name"))
-      {
-         method.setMethodName(value);
-      }
-      else if (localName.equals("method-param"))
-      {
-         method.addMethodParam(value);
-      }
-      else if (localName.equals("lifecycle-callback-method"))
-      {
-         method.setMethodName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Inject inject, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("jndi-name"))
-      {
-         inject.setJndiName(value);
-      }
-   }
-
-   public void setValue(InterceptorBinding binding, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         binding.setEjbName(value);
-      }
-      else if (localName.equals("interceptor-class"))
-      {
-         binding.addInterceptorClass(value);
-      }
-      else if (localName.equals("method-name"))
-      {
-         binding.setMethodName(value);
-      }
-      else if (localName.equals("method-param"))
-      {
-         binding.addMethodParam(value);
-      }
-      else if (localName.equals("exclude-default-interceptors"))
-      {
-         binding.setExcludeDefaultInterceptors(true);
-      }
-      else if (localName.equals("exclude-class-interceptors"))
-      {
-         binding.setExcludeClassInterceptors(true);
-      }
-   }
-
-   public void setValue(InterceptorOrder order, UnmarshallingContext navigator,
-         String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("interceptor-class"))
-      {
-         order.addInterceptorClass(value);
-      }
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbLocalRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbLocalRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbLocalRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,139 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an ejb-local-ref element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbLocalRef
-{
-
-   private String ejbRefName;
-
-   private String ejbRefType;
-
-   private String localHome;
-
-   private String local;
-
-   private String ejbLink;
-
-   private InjectionTarget injectionTarget;
-
-   private String mappedName;
-
-   private boolean ignoreDependency;
-
-   public boolean isIgnoreDependency()
-   {
-      return ignoreDependency;
-   }
-
-   public void setIgnoreDependency(boolean ignoreDependency)
-   {
-      this.ignoreDependency = ignoreDependency;
-   }
-
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String getEjbRefName()
-   {
-      return ejbRefName;
-   }
-
-   public void setEjbRefName(String ejbRefName)
-   {
-      this.ejbRefName = ejbRefName;
-   }
-
-   public String getEjbRefType()
-   {
-      return ejbRefType;
-   }
-
-   public void setEjbRefType(String ejbRefType)
-   {
-      this.ejbRefType = ejbRefType;
-   }
-
-   public String getLocalHome()
-   {
-      return localHome;
-   }
-
-   public void setLocalHome(String localHome)
-   {
-      this.localHome = localHome;
-   }
-
-   public String getLocal()
-   {
-      return local;
-   }
-
-   public void setLocal(String local)
-   {
-      this.local = local;
-   }
-
-   public String getEjbLink()
-   {
-      return ejbLink;
-   }
-
-   public void setEjbLink(String ejbLink)
-   {
-      this.ejbLink = ejbLink;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRefName=").append(ejbRefName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,140 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an ejb-ref element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbRef
-{
-   private String ejbRefName;
-
-   private String ejbRefType;
-
-   private String home;
-   
-   private String remote;
-
-   private String ejbLink;
-
-   private String mappedName;
-
-   private InjectionTarget injectionTarget;
-   private boolean ignoreDependency;
-
-   public boolean isIgnoreDependency()
-   {
-      return ignoreDependency;
-   }
-
-   public void setIgnoreDependency(boolean ignoreDependency)
-   {
-      this.ignoreDependency = ignoreDependency;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String getEjbRefName()
-   {
-      return ejbRefName;
-   }
-
-   public void setEjbRefName(String ejbRefName)
-   {
-      this.ejbRefName = ejbRefName;
-   }
-
-   public String getEjbRefType()
-   {
-      return ejbRefType;
-   }
-
-   public void setEjbRefType(String ejbRefType)
-   {
-      this.ejbRefType = ejbRefType;
-   }
-
-   public String getHome()
-   {
-      return home;
-   }
-
-   public void setHome(String home)
-   {
-      this.home = home;
-   }
-
-   public String getRemote()
-   {
-      return remote;
-   }
-
-   public void setRemote(String remote)
-   {
-      this.remote = remote;
-   }
-
-   public String getEjbLink()
-   {
-      return ejbLink;
-   }
-
-   public void setEjbLink(String ejbLink)
-   {
-      this.ejbLink = ejbLink;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRefName=").append(ejbRefName);
-      sb.append(", ejbRefType=").append(ejbRefType);
-      sb.append(", injectionTarget=").append(injectionTarget);
-      sb.append(", remote=").append(remote);
-      sb.append(", jndiName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelation.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelation.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an ejb-relation element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbRelation
-{
-
-   private String ejbRelationName = null;
-
-   private List ejbRelationshipRoles = new ArrayList();
-
-   public String getEjbRelationName()
-   {
-      return ejbRelationName;
-   }
-
-   public void setEjbRelationName(String ejbRelationName)
-   {
-      this.ejbRelationName = ejbRelationName;
-   }
-
-   public List getEjbRelationshipRoles()
-   {
-      return ejbRelationshipRoles;
-   }
-
-   public void setEjbRelationshipRoles(List ejbRelationshipRoles)
-   {
-      this.ejbRelationshipRoles = ejbRelationshipRoles;
-   }
-
-   public void addEjbRelationshipRole(EjbRelationshipRole role)
-   {
-      ejbRelationshipRoles.add(role);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRelationName=").append(ejbRelationName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelationshipRole.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelationshipRole.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EjbRelationshipRole.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,120 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an ejb-relationship-role element of the ejb-jar.xml deployment
- * descriptor for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbRelationshipRole
-{
-
-   private String ejbRelationshipRoleName;
-
-   private String multiplicity;
-
-   private boolean cascadeDelete = false;
-
-   private List ejbRelationshipRoles = new ArrayList();
-
-   private RelationshipRoleSource relationshipRoleSource;;
-
-   private CmrField cmrField;
-
-   public String getEjbRelationshipRoleName()
-   {
-      return ejbRelationshipRoleName;
-   }
-
-   public void setEjbRelationshipRoleName(String ejbRelationName)
-   {
-      this.ejbRelationshipRoleName = ejbRelationName;
-   }
-
-   public String getMultiplicity()
-   {
-      return multiplicity;
-   }
-
-   public void setMultiplicity(String multiplicity)
-   {
-      this.multiplicity = multiplicity;
-   }
-
-   public boolean isCascadeDelete()
-   {
-      return cascadeDelete;
-   }
-
-   public void setCascadeDelete(boolean cascadeDelete)
-   {
-      this.cascadeDelete = cascadeDelete;
-   }
-
-   public List getEjbRelationshipRoles()
-   {
-      return ejbRelationshipRoles;
-   }
-
-   public void setEjbRelationshipRoles(List ejbRelationshipRoles)
-   {
-      this.ejbRelationshipRoles = ejbRelationshipRoles;
-   }
-
-   public void addEjbRelationshipRole(EjbRelationshipRole role)
-   {
-      ejbRelationshipRoles.add(role);
-   }
-
-   public RelationshipRoleSource getRelationshipRoleSource()
-   {
-      return relationshipRoleSource;
-   }
-
-   public void setRelationshipRoleSource(RelationshipRoleSource relationshipRoleSource)
-   {
-      this.relationshipRoleSource = relationshipRoleSource;
-   }
-
-   public CmrField getCmrField()
-   {
-      return cmrField;
-   }
-
-   public void setCmrField(CmrField cmrField)
-   {
-      this.cmrField = cmrField;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("ejbRelationshipRoleName=").append(ejbRelationshipRoleName);
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,494 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Collection;
-import java.util.HashSet;
-import javax.ejb.TransactionManagementType;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an EJB element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public abstract class EnterpriseBean implements Injectable 
-{
-   private static final Logger log = Logger.getLogger(EnterpriseBean.class);
-   
-   public static final String BEAN = "Bean";
-
-   public static final String CONTAINER = "Container";
-
-   // ejb-jar.xml
-   private String ejbName = null;
-
-   private String home = null;
-
-   private String remote = null;
-
-   private String localHome = null;
-
-   private String local = null;
-
-   private String ejbClass = null;
-
-   private HashMap<String, EjbLocalRef> ejbLocalRefs = new HashMap();
-
-   private HashMap<String, EjbRef> ejbRefs = new HashMap();
-
-   private HashMap<String, EnvEntry> envEntries = new HashMap();
-
-   private HashMap<String, ResourceEnvRef> resourceEnvRefs = new HashMap();
-   
-   private HashMap<String, ResourceRef> resourceRefs = new HashMap();
-   
-   private HashMap<String, WebServiceRef> webServiceRefs = new HashMap();
-
-   private SecurityIdentity securityIdentity;
-
-   protected TransactionManagementType tmType = null;
-
-   private HashMap<String, MessageDestinationRef> messageDestinationRefs = new HashMap();
-
-   // jboss.xml
-   private String jndiName;
-
-   private String localJndiName;
-
-   private String securityDomain;
-
-   private boolean callByValue = false;
-
-   private ClusterConfig clusterConfig = null;
-
-   private String aopDomainName = null;
-   
-   private MethodAttributes methodAttributes = null;
-
-   private Collection<String> dependencies = new HashSet<String>();
-   
-   private Collection<InjectionTarget> ignoreDependencies = new HashSet<InjectionTarget>();
-   
-   private String interceptorStack;
-   
-   private String proxyFactory;
-   
-   public void addDependency(String depends)
-   {
-      dependencies.add(depends);
-   }
-
-   public Collection<String> getDependencies()
-   {
-      return dependencies;
-   }
-   
-   public void addIgnoreDependency(InjectionTarget ignore)
-   {
-      ignoreDependencies.add(ignore);
-   }
-   
-   public Collection<InjectionTarget> getIgnoreDependencies()
-   {
-      return ignoreDependencies;
-   }
-
-   public void mergeMessageDestinationRef(MessageDestinationRef ref)
-   {
-      MessageDestinationRef tmpRef = messageDestinationRefs.get(ref.getMessageDestinationRefName());
-      if (tmpRef != null)
-         tmpRef.merge(ref);
-   }
-
-   public void mergeResourceRef(ResourceRef ref)
-   {
-      ResourceRef tmpRef = resourceRefs.get(ref.getResRefName());
-      if (tmpRef != null)
-         tmpRef.merge(ref);
-   }
-   
-   public void mergeResourceEnvRef(ResourceEnvRef ref)
-   {
-      ResourceEnvRef tmpRef = resourceEnvRefs.get(ref.getResRefName());
-      if (tmpRef != null)
-         tmpRef.merge(ref);
-   }
-   
-   public void setMethodAttributes(MethodAttributes methodAttributes)
-   {
-      this.methodAttributes = methodAttributes;
-   }
-   
-   public MethodAttributes getMethodAttributes()
-   {
-      return methodAttributes;
-   }
-   
-   public String getInterceptorStack()
-   {
-      return interceptorStack;
-   }
-   
-   public void setInterceptorStack(String interceptorStack)
-   {
-      this.interceptorStack = interceptorStack;
-   }
-   
-   public String getProxyFactory()
-   {
-      return proxyFactory;
-   }
-   
-   public void setProxyFactory(String proxyFactory)
-   {
-      this.proxyFactory = proxyFactory;
-   }
-
-   public void updateEjbRef(EjbRef updatedRef)
-   {
-      EjbRef ref = ejbRefs.get(updatedRef.getEjbRefName());
-      if (ref != null)
-      {
-         ref.setMappedName(updatedRef.getMappedName());
-         ref.setIgnoreDependency(updatedRef.isIgnoreDependency());
-      }
-      else
-      {
-         ejbRefs.put(updatedRef.getEjbRefName(), updatedRef);
-      }
-   }
-
-   public void updateEjbLocalRef(EjbLocalRef updatedRef)
-   {
-      EjbLocalRef ref = ejbLocalRefs.get(updatedRef.getEjbRefName());
-      if (ref != null)
-      {
-         ref.setMappedName(updatedRef.getMappedName());
-         ref.setIgnoreDependency(updatedRef.isIgnoreDependency());
-      }
-      else
-      {
-         ejbLocalRefs.put(updatedRef.getEjbRefName(), updatedRef);
-      }
-
-   }
-
-   public void setAopDomainName(String aopDomainName)
-   {
-      this.aopDomainName = aopDomainName;
-   }
-
-   public String getAopDomainName()
-   {
-      return aopDomainName;
-   }
-
-   public void setClusterConfig(ClusterConfig clusterConfig)
-   {
-      this.clusterConfig = clusterConfig;
-   }
-
-   public boolean isClustered()
-   {
-      return clusterConfig != null;
-   }
-
-   public ClusterConfig getClusterConfig()
-   {
-      return clusterConfig;
-   }
-
-   public void setRunAsPrincipal(String principal)
-   {
-      if (securityIdentity != null)
-         securityIdentity.setRunAsPrincipal(principal);
-   }
-
-   public void setCallByValue(boolean callByValue)
-   {
-      this.callByValue = callByValue;
-   }
-
-   public boolean isCallByValue()
-   {
-      return callByValue;
-   }
-
-   public String getSecurityDomain()
-   {
-      return securityDomain;
-   }
-
-   public void setSecurityDomain(String securityDomain)
-   {
-      this.securityDomain = securityDomain;
-   }
-
-   public Collection<MessageDestinationRef> getMessageDestinationRefs()
-   {
-      return messageDestinationRefs.values();
-   }
-
-   public void addMessageDestinationRef(MessageDestinationRef messageDestinationRef)
-   {
-      messageDestinationRefs.put(messageDestinationRef.getMessageDestinationRefName(), messageDestinationRef);
-   }
-
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getLocalJndiName()
-   {
-      return localJndiName;
-   }
-
-   public void setLocalJndiName(String localJndiName)
-   {
-      this.localJndiName = localJndiName;
-   }
-
-   public TransactionManagementType getTransactionManagementType()
-   {
-      return tmType;
-   }
-   
-   public void setTransactionManagementType(String transactionType)
-   {
-      if (transactionType.equals(BEAN))
-         tmType = TransactionManagementType.BEAN;
-      else if (transactionType.equals(CONTAINER))
-         tmType = TransactionManagementType.CONTAINER;
-   }
-
-   public boolean isSessionBean()
-   {
-      return this instanceof SessionEnterpriseBean;
-   }
-   
-   public boolean isConsumer()
-   {
-      return this instanceof Consumer;
-   }
-
-   public boolean isEntityBean()
-   {
-      return this instanceof EntityEnterpriseBean;
-   }
-
-   public boolean isMessageDrivenBean()
-   {
-      return this instanceof MessageDrivenBean;
-   }
-   
-   public boolean isService()
-   {
-      return this instanceof Service;
-   }
-
-   public String getEjbName()
-   {
-      return ejbName;
-   }
-
-   public void setEjbName(String ejbName)
-   {
-      this.ejbName = ejbName;
-   }
-
-   public String getHome()
-   {
-      return home;
-   }
-
-   public void setHome(String home)
-   {
-      this.home = home;
-   }
-
-   public String getRemote()
-   {
-      return remote;
-   }
-
-   public void setRemote(String remote)
-   {
-      this.remote = remote;
-   }
-
-   public String getLocalHome()
-   {
-      return localHome;
-   }
-
-   public void setLocalHome(String localHome)
-   {
-      this.localHome = localHome;
-   }
-
-   public String getLocal()
-   {
-      return local;
-   }
-
-   public void setLocal(String local)
-   {
-      this.local = local;
-   }
-
-   public String getEjbClass()
-   {
-      return ejbClass;
-   }
-
-   public void setEjbClass(String ejbClass)
-   {
-      this.ejbClass = ejbClass;
-   }
-
-   public Collection<EjbLocalRef> getEjbLocalRefs()
-   {
-      return ejbLocalRefs.values();
-   }
-
-   public void addEjbLocalRef(EjbLocalRef ref)
-   {
-      ejbLocalRefs.put(ref.getEjbRefName(), ref);
-   }
-
-   public Collection<EjbRef> getEjbRefs()
-   {
-      return ejbRefs.values();
-   }
-
-   public void addEjbRef(EjbRef ref)
-   {
-      ejbRefs.put(ref.getEjbRefName(), ref);
-   }
-
-   public Collection<EnvEntry> getEnvEntries()
-   {
-      return envEntries.values();
-   }
-
-   public void addEnvEntry(EnvEntry entry)
-   {
-      envEntries.put(entry.getEnvEntryName(), entry);
-   }
-
-   public Collection<ResourceEnvRef> getResourceEnvRefs()
-   {
-      return resourceEnvRefs.values();
-   }
-
-   public void addResourceEnvRef(ResourceEnvRef envRef)
-   {
-      resourceEnvRefs.put(envRef.getResRefName(), envRef);
-   }
-   
-   public Collection<ResourceRef> getResourceRefs()
-   {
-      return resourceRefs.values();
-   }
-
-   public void addResourceRef(ResourceRef envRef)
-   {
-      resourceRefs.put(envRef.getResRefName(), envRef);
-   }
-   
-   public Collection<WebServiceRef> getWebServiceRefs()
-   {
-      return webServiceRefs.values();
-   }
-
-   public void addWebServiceRef(WebServiceRef ref)
-   {
-      webServiceRefs.put(ref.getServiceRefName(), ref);
-   }
-
-   public SecurityIdentity getSecurityIdentity()
-   {
-      return securityIdentity;
-   }
-
-   public void setSecurityIdentity(SecurityIdentity securityIdentity)
-   {
-      this.securityIdentity = securityIdentity;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("ejbName=").append(ejbName);
-      sb.append(",jndiName=").append(jndiName);
-      sb.append(",local=").append(local);
-      sb.append(",remote=").append(remote);
-      sb.append(",home=").append(home);
-      sb.append(",localHome=").append(localHome);
-      sb.append(",ejbClass=").append(ejbClass);
-      sb.append(",ejbRefs=").append(ejbRefs);
-      sb.append(",ejbLocalRefs=").append(ejbLocalRefs);
-      sb.append(",resourceRefs=").append(resourceRefs);
-      sb.append(",resourceEnvRefs=").append(resourceEnvRefs);
-      sb.append(",methodAttributes=").append(methodAttributes);
-      sb.append(",aopDomainName=").append(aopDomainName);
-      sb.append(",dependencies=").append(dependencies);
-      return sb.toString();
-   }
-
-   private List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
-   private List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
-
-   public List<PersistenceContextRef> getPersistenceContextRefs()
-   {
-      return persistenceContextRefs;
-   }
-
-   public List<PersistenceUnitRef> getPersistenceUnitRefs()
-   {
-      return persistenceUnitRefs;
-   }
-
-   public void addPersistenceContextRef(PersistenceContextRef ref)
-   {
-      persistenceContextRefs.add(ref);
-   }
-
-   public void addPersistenceUnitRef(PersistenceUnitRef ref)
-   {
-      persistenceUnitRefs.add(ref);
-   }
-   
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBeans.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBeans.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnterpriseBeans.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,266 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents EJB elements of the ejb-jar.xml deployment descriptor for the 1.4
- * schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- *         ejbs.setCurrentEjbName(value); } else if
- *         (localName.equals("jndi-name")){ ejbs.setJndiName(value);
- * @version <tt>$Revision$</tt>
- */
-public class EnterpriseBeans
-{
-   private static final Logger log = Logger.getLogger(EnterpriseBeans.class);
-
-   private HashMap<String, EnterpriseBean> enterpriseBeans = new HashMap();
-
-   private EnterpriseBean currentEjb;
-   
-   public void addIgnoreDependency(InjectionTarget ignore)
-   {
-      currentEjb.addIgnoreDependency(ignore);
-   }
-   
-   public void addResourceRef(ResourceRef ref)
-   {
-      currentEjb.mergeResourceRef(ref);
-   }
-   
-   public void addResourceEnvRef(ResourceEnvRef ref)
-   {
-      currentEjb.mergeResourceEnvRef(ref);
-   }
-   
-   public void addMessageDestinationRef(MessageDestinationRef ref)
-   {
-      currentEjb.mergeMessageDestinationRef(ref);
-   }
-   
-   public void setMethodAttributes(MethodAttributes attributes)
-   {
-      currentEjb.setMethodAttributes(attributes);
-   }
-
-   public void setCurrentEjbName(String currentEjbName, Class ejbClass)
-   {
-      currentEjb = createEjbByEjbName(currentEjbName, ejbClass);
-   }
-   
-   public void setInterceptorStack(String stackName)
-   {
-      currentEjb.setInterceptorStack(stackName);
-   }
-   
-   public void setProxyFactory(String factory)
-   {
-      currentEjb.setProxyFactory(factory);
-   }
-
-   public void addDependency(String depends)
-   {
-      currentEjb.addDependency(depends);
-   }
-
-   public void updateEjbRef(EjbRef ref)
-   {
-      currentEjb.updateEjbRef(ref);
-   }
-
-   public void updateEjbLocalRef(EjbLocalRef ref)
-   {
-      currentEjb.updateEjbLocalRef(ref);
-   }
-   
-   public void setResourceAdapterName(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setResourceAdaptorName(name);
-   }
-
-   public void setDestinationJndiName(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setDestinationJndiName(name);
-   }
-
-   public void setMdbUser(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setMdbUser(name);
-   }
-
-   public void setMdbPassword(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setMdbPassword(name);
-   }
-
-   public void setAopDomainName(String aopDomainName)
-   {
-      currentEjb.setAopDomainName(aopDomainName);
-   }
-
-   public void setRunAsPrincipal(String principal)
-   {
-      currentEjb.setRunAsPrincipal(principal);
-   }
-
-   public void setClusterConfig(ClusterConfig config)
-   {
-      currentEjb.setClusterConfig(config);
-   }
-
-   public void setCallByValue(boolean callByValue)
-   {
-      currentEjb.setCallByValue(callByValue);
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      currentEjb.setJndiName(jndiName);
-   }
-
-   public void setSecurityDomain(String securityDomain)
-   {
-      currentEjb.setSecurityDomain(securityDomain);
-   }
-
-   public void setLocalJndiName(String jndiName)
-   {
-      currentEjb.setLocalJndiName(jndiName);
-   }
-
-   public EnterpriseBean createEjbByEjbName(String ejbName, Class ejbClass)
-   {
-      EnterpriseBean ejb = (EnterpriseBean) enterpriseBeans.get(ejbName);
-      if (ejb != null)
-         return ejb;
-      
-      try 
-      {
-         ejb = (EnterpriseBean)ejbClass.newInstance();
-         ejb.setEjbName(ejbName);
-         enterpriseBeans.put(ejbName, ejb);
-      }
-      catch (Exception e){}
-      
-      return ejb;
-   }
-   
-   public EnterpriseBean findEjbByEjbName(String ejbName)
-   {
-      return enterpriseBeans.get(ejbName);
-   }
-
-   public List<EnterpriseBean> findEjbsByClass(String className)
-   {
-      ArrayList<EnterpriseBean> result = new ArrayList<EnterpriseBean>();
-
-      Iterator ejbs = enterpriseBeans.values().iterator();
-      while (ejbs.hasNext())
-      {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
-         String ejbClassName = ejb.getEjbClass();
-         if (ejbClassName != null && ejbClassName.equals(className))
-            result.add(ejb);
-      }
-      return result;
-   }
-
-   public EnterpriseBean findEjbByRemote(String remote)
-   {
-      Iterator ejbs = enterpriseBeans.values().iterator();
-      while (ejbs.hasNext())
-      {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
-         if (ejb.getRemote() != null && ejb.getRemote().equals(remote))
-            return ejb;
-      }
-      return null;
-   }
-
-   public EnterpriseBean findEjbByLocal(String local)
-   {
-      Iterator ejbs = enterpriseBeans.values().iterator();
-      while (ejbs.hasNext())
-      {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
-         if (ejb.getLocal() != null && ejb.getLocal().equals(local))
-            return ejb;
-      }
-      return null;
-   }
-
-   public Collection<EnterpriseBean> getEnterpriseBeans()
-   {
-      return enterpriseBeans.values();
-   }
-
-/*   public void setEnterpriseBeans(List enterpriseBeans)
-   {
-      this.enterpriseBeans = enterpriseBeans;
-   }*/
-
-   public void addEnterpriseBean(EnterpriseBean ejb)
-   {
-      enterpriseBeans.put(ejb.getEjbName(), ejb);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("enterpriseBeans=").append(enterpriseBeans);
-      sb.append("]");
-      return sb.toString();
-   }
-
-   public boolean equals(Object o)
-   {
-      if (this == o)
-         return true;
-      if (!(o instanceof EnterpriseBeans))
-         return false;
-
-      final EnterpriseBeans ejbs = (EnterpriseBeans) o;
-
-      if (enterpriseBeans != null ? !enterpriseBeans
-              .equals(ejbs.enterpriseBeans) : ejbs.enterpriseBeans != null)
-         return false;
-
-      return true;
-   }
-
-   public int hashCode()
-   {
-      int result;
-      result = (enterpriseBeans != null ? enterpriseBeans.hashCode() : 0);
-      // result = 29 * result + (version != null ? version.hashCode() : 0);
-      return result;
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EntityEnterpriseBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EntityEnterpriseBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EntityEnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an Entity EJB element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EntityEnterpriseBean extends EnterpriseBean
-{
-
-   private String persistenceType;
-
-   private List cmpFields = new ArrayList();
-
-   private List queries = new ArrayList();
-
-   public String getPersistenceType()
-   {
-      return persistenceType;
-   }
-
-   public void setPersistenceType(String persistenceType)
-   {
-      this.persistenceType = persistenceType;
-   }
-
-   public List getCmpFields()
-   {
-      return cmpFields;
-   }
-
-   public void setCmpFields(List cmpFields)
-   {
-      this.cmpFields = cmpFields;
-   }
-
-   public void addCmpField(CmpField cmpField)
-   {
-      cmpFields.add(cmpField);
-   }
-
-   public List getQueries()
-   {
-      return queries;
-   }
-
-   public void setQueries(List queries)
-   {
-      this.queries = queries;
-   }
-
-   public void addQuery(Query query)
-   {
-      queries.add(query);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append(super.toString());
-      sb.append(",");
-      sb.append("persistenceType=").append(persistenceType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnvEntry.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnvEntry.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/EnvEntry.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an env-entry element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EnvEntry
-{
-   private String description;
-
-   private String envEntryName;
-
-   private String envEntryType;
-
-   private String envEntryValue;
-
-   private InjectionTarget injectionTarget;
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String getDescription()
-   {
-      return description;
-   }
-
-   public void setDescription(String description)
-   {
-      this.description = description;
-   }
-
-   public String getEnvEntryName()
-   {
-      return envEntryName;
-   }
-
-   public void setEnvEntryName(String envEntryName)
-   {
-      this.envEntryName = envEntryName;
-   }
-
-   public String getEnvEntryType()
-   {
-      return envEntryType;
-   }
-
-   public void setEnvEntryType(String envEntryType)
-   {
-      this.envEntryType = envEntryType;
-   }
-
-   public String getEnvEntryValue()
-   {
-      return envEntryValue;
-   }
-
-   public void setEnvEntryValue(String envEntryValue)
-   {
-      this.envEntryValue = envEntryValue;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("envEntryName=").append(envEntryName);
-      sb.append(",envEntryType=").append(envEntryType);
-      sb.append(",envEntryValue=").append(envEntryValue);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeClassInterceptors.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeClassInterceptors.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeClassInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeClassInterceptors
-{
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeDefaultInterceptors.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeDefaultInterceptors.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeDefaultInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeDefaultInterceptors
-{
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeList.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeList.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ExcludeList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <exlude-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ExcludeList
-{
-   private static final Logger log = Logger.getLogger(ExcludeList.class);
-
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitList.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitList.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <init-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class InitList
-{
-   private static final Logger log = Logger.getLogger(InitList.class);
-
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitMethod.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitMethod.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InitMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an <init-method> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class InitMethod
-{
-   private Method beanMethod;
-   private Method createMethod;
-
-   public Method getBeanMethod()
-   {
-      return beanMethod;
-   }
-
-   public void setBeanMethod(Method beanMethod)
-   {
-      this.beanMethod = beanMethod;
-   }
-
-   public Method getCreateMethod()
-   {
-      return createMethod;
-   }
-
-   public void setCreateMethod(Method createMethod)
-   {
-      this.createMethod = createMethod;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("method=").append(beanMethod);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Inject.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Inject.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Inject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <inject> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Inject
-{
-   private static final Logger log = Logger.getLogger(Inject.class);
-
-   private List methods = new ArrayList();
-   private String jndiName;
-
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("jndiName=").append(jndiName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Injectable.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Injectable.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Injectable.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface Injectable
-{
-
-   Collection<EjbLocalRef> getEjbLocalRefs();
-
-   Collection<EjbRef> getEjbRefs();
-
-   Collection<ResourceEnvRef> getResourceEnvRefs();
-
-   Collection<ResourceRef> getResourceRefs();
-   
-   Collection<WebServiceRef> getWebServiceRefs();
-
-   Collection<MessageDestinationRef> getMessageDestinationRefs();
-
-   List<PersistenceUnitRef> getPersistenceUnitRefs();
-   
-   List<PersistenceContextRef> getPersistenceContextRefs();
-}
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InjectionTarget.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InjectionTarget.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InjectionTarget.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class InjectionTarget
-{
-   private String targetClass;
-   private String targetName;
-
-   public String getTargetClass()
-   {
-      return targetClass;
-   }
-
-   public void setTargetClass(String targetClass)
-   {
-      this.targetClass = targetClass;
-   }
-
-   public String getTargetName()
-   {
-      return targetName;
-   }
-
-   public void setTargetName(String targetName)
-   {
-      this.targetName = targetName;
-   }
-   
-   public String toString()
-   {
-      StringBuffer buffer = new StringBuffer(100);
-      buffer.append("[InjectionTarget:targetClass=" + targetClass);
-      buffer.append(", targetName=" + targetName);
-      buffer.append("]");
-      
-      return buffer.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,224 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class Interceptor implements Injectable
-{
-   String interceptorClass;
-   Method aroundInvoke;
-   Method postConstruct;
-   Method postActivate;
-   Method preDestroy;
-   Method prePassivate;
-   
-   private List<EnvEntry> envEntries = new ArrayList();
-
-   private List<EjbLocalRef> ejbLocalRefs = new ArrayList();
-
-   private List<EjbRef> ejbRefs = new ArrayList();
-
-   private List<ResourceEnvRef> resourceEnvRefs = new ArrayList<ResourceEnvRef>();
-   
-   private List<ResourceRef> resourceRefs = new ArrayList<ResourceRef>();
-   
-   private List messageDestinationRefs = new ArrayList();
-   
-   private HashMap<String, WebServiceRef> webServiceRefs = new HashMap();
-
-   public Interceptor()
-   {
-   }
-
-   public Method getAroundInvoke()
-   {
-      return aroundInvoke;
-   }
-
-   public void setAroundInvoke(Method aroundInvoke)
-   {
-      this.aroundInvoke = aroundInvoke;
-   }
-
-   public String getInterceptorClass()
-   {
-      return interceptorClass;
-   }
-
-   public void setInterceptorClass(String interceptorClass)
-   {
-      this.interceptorClass = interceptorClass;
-   }
-
-   public Method getPostActivate()
-   {
-      return postActivate;
-   }
-
-   public void setPostActivate(Method postActivate)
-   {
-      this.postActivate = postActivate;
-   }
-
-   public Method getPostConstruct()
-   {
-      return postConstruct;
-   }
-
-   public void setPostConstruct(Method postConstruct)
-   {
-      this.postConstruct = postConstruct;
-   }
-
-   public Method getPreDestroy()
-   {
-      return preDestroy;
-   }
-
-   public void setPreDestroy(Method preDestroy)
-   {
-      this.preDestroy = preDestroy;
-   }
-
-   public Method getPrePassivate()
-   {
-      return prePassivate;
-   }
-
-   public void setPrePassivate(Method prePassivate)
-   {
-      this.prePassivate = prePassivate;
-   }
-
-   public List getEnvEntries()
-   {
-      return envEntries;
-   }
-
-   public void addEnvEntry(EnvEntry entry)
-   {
-      envEntries.add(entry);
-   }
-
-   public List<EjbLocalRef> getEjbLocalRefs()
-   {
-      return ejbLocalRefs;
-   }
-
-   public void setEjbLocalRefs(List ejbLocalRefs)
-   {
-      this.ejbLocalRefs = ejbLocalRefs;
-   }
-
-   public void addEjbLocalRef(EjbLocalRef ref)
-   {
-      ejbLocalRefs.add(ref);
-   }
-
-   public List<EjbRef> getEjbRefs()
-   {
-      return ejbRefs;
-   }
-
-   public void setEjbRefs(List ejbRefs)
-   {
-      this.ejbRefs = ejbRefs;
-   }
-
-   public void addEjbRef(EjbRef ref)
-   {
-      ejbRefs.add(ref);
-   }
-
-   public List<ResourceEnvRef> getResourceEnvRefs()
-   {
-      return resourceEnvRefs;
-   }
-
-   public void addResourceEnvRef(ResourceEnvRef envRef)
-   {
-      resourceEnvRefs.add(envRef);
-   }
-   
-   public List<ResourceRef> getResourceRefs()
-   {
-      return resourceRefs;
-   }
-
-   public void addResourceRef(ResourceRef envRef)
-   {
-      resourceRefs.add(envRef);
-   }
-
-   public List<MessageDestinationRef> getMessageDestinationRefs()
-   {
-      return messageDestinationRefs;
-   }
-
-   public void addMessageDestinationRef(MessageDestinationRef messageDestinationRef)
-   {
-      messageDestinationRefs.add(messageDestinationRef);
-   }
-   
-   public Collection<WebServiceRef> getWebServiceRefs()
-   {
-      return webServiceRefs.values();
-   }
-
-   public void addWebServiceRef(WebServiceRef ref)
-   {
-      webServiceRefs.put(ref.getServiceRefName(), ref);
-   }
-
-   private List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
-   private List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
-
-   public List<PersistenceContextRef> getPersistenceContextRefs()
-   {
-      return persistenceContextRefs;
-   }
-
-   public List<PersistenceUnitRef> getPersistenceUnitRefs()
-   {
-      return persistenceUnitRefs;
-   }
-
-   public void addPersistenceContextRef(PersistenceContextRef ref)
-   {
-      persistenceContextRefs.add(ref);
-   }
-
-   public void addPersistenceUnitRef(PersistenceUnitRef ref)
-   {
-      persistenceUnitRefs.add(ref);
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorBinding.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorBinding.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorBinding.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorBinding extends Method
-{
-   Boolean ordered = null;
-   private ArrayList<String> interceptorClasses = new ArrayList<String>();
-   private boolean excludeDefaultInterceptors;
-   private boolean excludeClassInterceptors;
-   
-   public InterceptorBinding()
-   {
-      super();
-   }
-
-   public boolean getExcludeClassInterceptors()
-   {
-      return excludeClassInterceptors;
-   }
-
-   public void setExcludeClassInterceptors(boolean excludeClassInterceptors)
-   {
-      this.excludeClassInterceptors = excludeClassInterceptors;
-   }
-
-   public boolean getExcludeDefaultInterceptors()
-   {
-      return excludeDefaultInterceptors;
-   }
-
-   public void setExcludeDefaultInterceptors(boolean excludeDefaultInterceptors)
-   {
-      this.excludeDefaultInterceptors = excludeDefaultInterceptors;
-   }
-
-   public ArrayList<String> getInterceptorClasses()
-   {
-      return interceptorClasses;
-   }
-
-   public void addInterceptorClass(String interceptorClass)
-   {
-      if (ordered == null)
-      {
-         ordered = false;
-      }
-      if (ordered) throw new RuntimeException("Cannot have both interceptor-class and interceptor-order in interceptor-binding");
-      this.interceptorClasses.add(interceptorClass);
-   }
-
-   public void setOrderedInterceptorClasses(InterceptorOrder order)
-   {
-      if (ordered == null)
-      {
-         ordered = true;
-      }
-      if (!ordered) throw new RuntimeException("Cannot have both interceptor-class and interceptor-order in interceptor-binding");
-      this.interceptorClasses.addAll(order.getInterceptorClasses());
-   }
-
-   public boolean isOrdered()
-   {
-      if (ordered == null) return false;
-      return ordered;
-   }
-
-   
-   
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorOrder.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorOrder.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/InterceptorOrder.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorOrder
-{
-   private ArrayList<String> interceptorClasses = new ArrayList<String>();
-
-   public InterceptorOrder()
-   {
-      // FIXME InterceptorOrder constructor
-      super();
-   }
-
-   public void addInterceptorClass(String interceptorClass)
-   {
-      this.interceptorClasses.add(interceptorClass);
-   }
-
-   public ArrayList<String> getInterceptorClasses()
-   {
-      return interceptorClasses;
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptors.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptors.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Interceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class Interceptors
-{
-   ArrayList<Interceptor> interceptors = new ArrayList<Interceptor>();
-   
-   public Interceptors()
-   {
-      // FIXME Interceptors constructor
-      super();
-   }
-   
-   public void addInterceptor(Interceptor interceptor)
-   {
-      interceptors.add(interceptor);
-   }
-
-   public ArrayList<Interceptor> getInterceptors()
-   {
-      return interceptors;
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/JBossDDObjectFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/JBossDDObjectFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/JBossDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,1144 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import org.jboss.logging.Logger;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * Represents the jboss.xml deployment descriptor for the 2.1 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class JBossDDObjectFactory implements ObjectModelFactory
-{
-   private static final Logger log = Logger
-           .getLogger(JBossDDObjectFactory.class);
-
-   private EjbJarDD dd;
-   private Class ejbClass;
-
-   public JBossDDObjectFactory(EjbJarDD dd)
-   {
-      super();
-      this.dd = dd;
-   }
-
-   /**
-    * Return the root.
-    */
-   public Object newRoot(Object root, UnmarshallingContext navigator,
-                         String namespaceURI, String localName, Attributes attrs)
-   {
-      return dd;
-   }
-
-   public Object completeRoot(Object root, UnmarshallingContext ctx,
-                              String uri, String name)
-   {
-      return root;
-   }
-
-   // Methods discovered by introspection
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbJarDD dd, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("enterprise-beans"))
-      {
-         child = dd.getEnterpriseBeans();
-         if (child == null)
-         {
-            dd.setEnterpriseBeans(new EnterpriseBeans());
-            child = dd.getEnterpriseBeans();
-         }
-      }
-      else if (localName.equals("assembly-descriptor"))
-      {
-         child = dd.getAssemblyDescriptor();
-         if (child == null)
-         {
-            dd.setAssemblyDescriptor(new AssemblyDescriptor());
-            child = dd.getAssemblyDescriptor();
-         }
-      }
-      else if (localName.equals("resource-manager"))
-      {
-         child = new ResourceManager();
-      }
-
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Consumer consumer, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-      
-      if (localName.equals("current-message"))
-      {
-         child = new CurrentMessage();
-      }
-      else if (localName.equals("message-properties"))
-      {
-         child = new MessageProperties();
-      }
-      else if (localName.equals("producer"))
-      {
-         child = new Producer(false);
-      }
-      else if (localName.equals("local-producer"))
-      {
-         child = new Producer(true);
-      }
-      else if (localName.equals("ejb-ref"))
-      {
-         child = new EjbRef();
-      }
-      else if (localName.equals("ejb-local-ref"))
-      {
-         child = new EjbLocalRef();
-      }
-      else if (localName.equals("resource-ref"))
-      {
-         child = new ResourceRef();
-      }
-      else if (localName.equals("resource-env-ref"))
-      {
-         child = new ResourceEnvRef();
-      }
-      else if (localName.equals("message-destination-ref"))
-      {
-         child = new MessageDestinationRef();
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         child = new InjectionTarget();
-      }
-      
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Service service, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-      
-      if (localName.equals("ejb-ref"))
-      {
-         child = new EjbRef();
-      }
-      else if (localName.equals("ejb-local-ref"))
-      {
-         child = new EjbLocalRef();
-      }
-      else if (localName.equals("resource-ref"))
-      {
-         child = new ResourceRef();
-      }
-      else if (localName.equals("resource-env-ref"))
-      {
-         child = new ResourceEnvRef();
-      }
-      else if (localName.equals("message-destination-ref"))
-      {
-         child = new MessageDestinationRef();
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         child = new InjectionTarget();
-      }
-
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(CurrentMessage message, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-      
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MessageProperties properties, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-      
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MethodAttributes attributes, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-      
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(AssemblyDescriptor descriptor,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("message-destination"))
-      {
-         child = new MessageDestination();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("session"))
-      {
-         ejbClass = SessionEnterpriseBean.class;
-         child = ejbs;
-      }
-      else if (localName.equals("message-driven"))
-      {
-         ejbClass = MessageDrivenBean.class;
-         child = ejbs;
-      }
-      else if (localName.equals("service"))
-      {
-         child = new Service();
-      }
-      else if (localName.equals("consumer"))
-      {
-         child = new Consumer();
-      }
-      else if (localName.equals("ejb-ref"))
-      {
-         child = new EjbRef();
-      }
-      else if (localName.equals("resource-ref"))
-      {
-         child = new ResourceRef();
-      }
-      else if (localName.equals("resource-env-ref"))
-      {
-         child = new ResourceEnvRef();
-      }
-      else if (localName.equals("env-entry"))
-      {
-         child = new EnvEntry();
-      }
-      else if (localName.equals("message-destination-ref"))
-      {
-         child = new MessageDestinationRef();
-      }
-      else if (localName.equals("method-attributes"))
-      {
-         child = new MethodAttributes();
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         child = new InjectionTarget();
-      }
-      
-      return child;
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, Producer producer,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (producer.isLocal())
-         parent.addLocalProducer(producer);
-      else
-         parent.addProducer(producer);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, MessageDestination destination,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestination(destination);
-   }
-   
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, MethodAttributes attributes,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMethodAttributes(attributes);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, InjectionTarget ignoreDependency,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addIgnoreDependency(ignoreDependency);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MethodAttributes parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, CurrentMessage message,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setCurrentMessage(message);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, MessageProperties message,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMessageProperties(message);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(CurrentMessage parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageProperties parent, Method method,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, Service service,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnterpriseBean(service);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, EjbRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, EjbLocalRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, ResourceRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, ResourceEnvRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, EjbRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, EjbLocalRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, ResourceRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, ResourceEnvRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, Consumer consumer,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnterpriseBean(consumer);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbJarDD parent, ResourceManager manager,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceManager(manager);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EnterpriseBeans ejbs,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EjbRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.updateEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EjbLocalRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.updateEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, ClusterConfig config,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setClusterConfig(config);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, ResourceRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, MessageDestinationRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestinationRef(ref);
-   }
-   
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, ResourceEnvRef ref,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(ref);
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ResourceManager manager, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-name"))
-      {
-         manager.setResourceName(value);
-      }
-      else if (localName.equals("res-jndi-name"))
-      {
-         manager.setResourceJndiName(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDestinationRef envRef, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("message-destination-ref-name"))
-      {
-         envRef.setMessageDestinationRefName(value);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         envRef.setJndiName(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDestination destination, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("message-destination-name"))
-      {
-         destination.setMessageDestinationName(value);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         destination.setJndiName(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ResourceRef envRef, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-ref-name")
-              || localName.equals("resource-env-ref-name"))
-      {
-         envRef.setResRefName(value);
-      }
-      else if (localName.equals("res-type")
-              || localName.equals("resource-env-ref-type"))
-      {
-         envRef.setResType(value);
-      }
-      else if (localName.equals("res-auth"))
-      {
-         envRef.setResAuth(value);
-      }
-      else if (localName.equals("res-sharing-scope"))
-      {
-         envRef.setResSharingScope(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         envRef.setMappedName(value);
-      }
-      else if (localName.equals("resource-name"))
-      {
-         envRef.setResourceName(value);
-         envRef.setMappedName(value);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         envRef.setJndiName(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ResourceEnvRef envRef, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-ref-name")
-              || localName.equals("resource-env-ref-name"))
-      {
-         envRef.setResRefName(value);
-      }
-      else if (localName.equals("res-type")
-              || localName.equals("resource-env-ref-type"))
-      {
-         envRef.setResType(value);
-      }
-      else if (localName.equals("res-auth"))
-      {
-         envRef.setResAuth(value);
-      }
-      else if (localName.equals("res-sharing-scope"))
-      {
-         envRef.setResSharingScope(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         envRef.setMappedName(value);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         envRef.setJndiName(value);
-      }
-   }
-   
-   public void setValue(EnterpriseBeans ejbs, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         ejbs.setCurrentEjbName(value, ejbClass);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         ejbs.setJndiName(value);
-      }
-      else if (localName.equals("local-jndi-name"))
-      {
-         ejbs.setLocalJndiName(value);
-      }
-      else if (localName.equals("security-domain"))
-      {
-         ejbs.setSecurityDomain(value);
-      }
-      else if (localName.equals("depends"))
-      {
-         ejbs.addDependency(value);
-      }
-      else if (localName.equals("run-as-principal"))
-      {
-         ejbs.setRunAsPrincipal(value);
-      }
-      else if (localName.equals("aop-domain-name"))
-      {
-         ejbs.setAopDomainName(value);
-      }
-      else if (localName.equals("resource-adapter-name"))
-      {
-         ejbs.setResourceAdapterName(value);
-      }
-      else if (localName.equals("destination-jndi-name"))
-      {
-         ejbs.setDestinationJndiName(value);
-      }
-      else if (localName.equals("mdb-user"))
-      {
-         ejbs.setMdbUser(value);
-      }
-      else if (localName.equals("mdb-passwd"))
-      {
-         ejbs.setMdbPassword(value);
-      }
-      else if (localName.equals("interceptor-stack"))
-      {
-         ejbs.setInterceptorStack(value);
-      }
-      else if (localName.equals("proxy-factory"))
-      {
-         ejbs.setProxyFactory(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Service service, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         service.setEjbName(value);
-      }
-      if (localName.equals("object-name"))
-      {
-         service.setObjectName(value);
-      }
-      else if (localName.equals("ejb-class"))
-      {
-         service.setEjbClass(value);
-      }
-      else if (localName.equals("local"))
-      {
-         service.setLocal(value);
-      }
-      else if (localName.equals("remote"))
-      {
-         service.setRemote(value);
-      }
-      else if (localName.equals("management"))
-      {
-         service.setManagement(value);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         service.setJndiName(value);
-      }
-      else if (localName.equals("local-jndi-name"))
-      {
-         service.setLocalJndiName(value);
-      }
-      else if (localName.equals("security-domain"))
-      {
-         service.setSecurityDomain(value);
-      }
-      else if (localName.equals("aop-domain-name"))
-      {
-         service.setAopDomainName(value);
-      }
-      else if (localName.equals("depends"))
-      {
-         service.addDependency(value);
-      }
-      else if (localName.equals("interceptor-stack"))
-      {
-         service.setInterceptorStack(value);
-      }
-      else if (localName.equals("proxy-factory"))
-      {
-         service.setProxyFactory(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Consumer consumer, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("message-destination"))
-      {
-         consumer.setDestination(value);
-      }
-      else if (localName.equals("message-destination-type"))
-      {
-         consumer.setDestinationType(value);
-      }
-      else if (localName.equals("ejb-class"))
-      {
-         consumer.setEjbClass(value);
-         consumer.setEjbName(value);
-      }
-      else if (localName.equals("local"))
-      {
-         consumer.setLocal(value);
-      }
-      else if (localName.equals("remote"))
-      {
-         consumer.setRemote(value);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         consumer.setJndiName(value);
-      }
-      else if (localName.equals("local-jndi-name"))
-      {
-         consumer.setLocalJndiName(value);
-      }
-      else if (localName.equals("security-domain"))
-      {
-         consumer.setSecurityDomain(value);
-      }
-      else if (localName.equals("run-as-principal"))
-      {
-         consumer.setRunAsPrincipal(value);
-      }
-      else if (localName.equals("aop-domain-name"))
-      {
-         consumer.setAopDomainName(value);
-      }
-      else if (localName.equals("depends"))
-      {
-         consumer.addDependency(value);
-      }
-      else if (localName.equals("interceptor-stack"))
-      {
-         consumer.setInterceptorStack(value);
-      }
-      else if (localName.equals("proxy-factory"))
-      {
-         consumer.setProxyFactory(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageProperties properties, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("delivery"))
-      {
-         properties.setDelivery(value);
-      }
-      else if (localName.equals("class"))
-      {
-         properties.setClassName(value);
-      }
-      else if (localName.equals("priority"))
-      {
-         properties.setPriority(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ClusterConfig config, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("load-balance-policy"))
-      {
-         config.setLoadBalancePolicy(value);
-      }
-      else if (localName.equals("partition-name"))
-      {
-         config.setPartition(value);
-      }
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("ignore-dependency"))
-      {
-         ref.setIgnoreDependency(true);
-      }
-      else if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbLocalRef ref, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("ignore-dependency"))
-      {
-         ref.setIgnoreDependency(true);
-      }
-      else if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MessageDestinationRef ref, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-     if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EnvEntry ref, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ResourceRef ref, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-     if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-   
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ResourceEnvRef ref, UnmarshallingContext navigator,
-                          String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-     if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         ref.setInjectionTarget(target);
-         child = target;
-      }
-      return child;
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(InjectionTarget target, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("injection-target-class"))
-      {
-         target.setTargetClass(value);
-      }
-      else if (localName.equals("injection-target-name"))
-      {
-         target.setTargetName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-ref-name"))
-      {
-         ref.setEjbRefName(value);
-      }
-      else if (localName.equals("ejb-ref-type"))
-      {
-         ref.setEjbRefType(value);
-      }
-      else if (localName.equals("home"))
-      {
-         ref.setHome(value);
-      }
-      else if (localName.equals("remote"))
-      {
-         ref.setRemote(value);
-      }
-      else if (localName.equals("ejb-link"))
-      {
-         ref.setEjbLink(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(value);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         ref.setMappedName(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Method method, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("method-name"))
-      {
-         method.setMethodName(value);
-      }
-      else if (localName.equals("transaction-timeout"))
-      {
-         method.setTransactionTimeout(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbLocalRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-ref-name"))
-      {
-         ref.setEjbRefName(value);
-      }
-      else if (localName.equals("local-jndi-name"))
-      {
-         ref.setMappedName(value);
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         ref.setIgnoreDependency(true);
-      }
-      else if (localName.equals("ejb-ref-type"))
-      {
-         ref.setEjbRefType(value);
-      }
-      else if (localName.equals("local-home"))
-      {
-         ref.setLocalHome(value);
-      }
-      else if (localName.equals("local"))
-      {
-         ref.setLocal(value);
-      }
-      else if (localName.equals("ejb-link"))
-      {
-         ref.setEjbLink(value);
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbJarDD dd, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("security-domain"))
-      {
-         dd.setSecurityDomain(value);
-      }
-      else if (localName.equals("unauthenticated-principal"))
-      {
-         dd.setUnauthenticatedPrincipal(value);
-      }
-   }
-   
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Producer producer, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("class"))
-      {
-         producer.setClassName(value);
-      }
-      else if (localName.equals("connection-factory"))
-      {
-         producer.setConnectionFactory(value);
-      }
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestination.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestination.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestination.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * Represents a <message-destination> element of the jboss.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageDestination
-{
-   private static final Logger log = Logger.getLogger(MessageDestination.class);
-   
-   private String messageDestinationName;
-   
-   private String jndiName;
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMessageDestinationName()
-   {
-      return messageDestinationName;
-   }
-
-   public void setMessageDestinationName(String messageDestinationName)
-   {
-      this.messageDestinationName = messageDestinationName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[MessageDestination: ");
-      sb.append("messageDestinationName=").append(messageDestinationName);
-      sb.append(", jndiName=").append(jndiName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestinationRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestinationRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDestinationRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,153 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * Represents a <message-destination-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageDestinationRef
-{
-   private static final Logger log = Logger.getLogger(MessageDestinationRef.class);
-   
-   private String description;
-
-   private String messageDestinationRefName;
-
-   private String messageDestinationType;
-
-   private String messageDestinationUsage;
-
-   private String messageDestinationLink;
-
-   private InjectionTarget injectionTarget;
-
-   private String mappedName;
-   
-   private String jndiName;
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMappedName()
-   {     
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String getDescription()
-   {
-      return description;
-   }
-
-   public void setDescription(String description)
-   {
-      this.description = description;
-   }
-
-   public String getMessageDestinationRefName()
-   {
-      return messageDestinationRefName;
-   }
-
-   public void setMessageDestinationRefName(String messageDestinationRefName)
-   {
-      this.messageDestinationRefName = messageDestinationRefName;
-   }
-
-   public String getMessageDestinationType()
-   {
-      return messageDestinationType;
-   }
-
-   public void setMessageDestinationType(String messageDestinationType)
-   {
-      this.messageDestinationType = messageDestinationType;
-   }
-
-   public String getMessageDestinationUsage()
-   {
-      return messageDestinationUsage;
-   }
-
-   public void setMessageDestinationUsage(String messageDestinationUsage)
-   {
-      this.messageDestinationUsage = messageDestinationUsage;
-   }
-
-   public String getMessageDestinationLink()
-   {
-      return messageDestinationLink;
-   }
-
-   public void setMessageDestinationLink(String messageDestinationLink)
-   {
-      this.messageDestinationLink = messageDestinationLink;
-   }
-   
-   public void merge(MessageDestinationRef ref)
-   {
-      if (ref.getJndiName() != null)
-      {
-         this.setJndiName(ref.getJndiName());
-         
-         setMappedName(ref.getJndiName());
-      }
-   }
-
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("messageDestinationRefName=").append(messageDestinationRefName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,205 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import javax.ejb.TransactionManagementType;
-import org.jboss.logging.Logger;
-
-/**
- * Represents a message-driven element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageDrivenBean extends EnterpriseBean
-{
-   private static final Logger log = Logger.getLogger(MessageDrivenBean.class);
-
-   public static final String BEAN = "Bean";
-
-   public static final String CONTAINER = "Container";
-
-   // ejb-jar.xml
-   private String acknowledgeMode;
-
-   private String transactionType;
-   
-   private String messagingType;
-   
-   private String resourceAdaptorName;
-
-   private MessageDrivenDestination messageDrivenDestination;
-   
-   private ActivationConfig activationConfig;
-   
-   private String destinationJndiName;
-   
-   private String mdbUser;
-   
-   private String mdbPassword;
-
-   private Method aroundInvoke;
-   private Method postConstruct;
-   private Method postActivate;
-   private Method preDestroy;
-   private Method prePassivate;
-   
-   public MessageDrivenDestination getMessageDrivenDestination()
-   {
-      return messageDrivenDestination;
-   }
-
-   public void setMessageDrivenDestination(MessageDrivenDestination messageDrivenDestination)
-   {
-      this.messageDrivenDestination = messageDrivenDestination;
-   }
-   
-   public ActivationConfig getActivationConfig()
-   {
-      return activationConfig;
-   }
-
-   public void setActivationConfig(ActivationConfig activationConfig)
-   {
-      this.activationConfig = activationConfig;
-   }
-   
-   public void setDestinationJndiName(String name)
-   {
-      destinationJndiName = name;
-   }
-   
-   public String getDestinationJndiName()
-   {
-      return destinationJndiName;
-   }
-
-   public String getAcknowledgeMode()
-   {
-      return acknowledgeMode;
-   }
-
-   public void setAcknowledgeMode(String acknowledgeMode)
-   {
-      this.acknowledgeMode = acknowledgeMode;
-   }
-   
-   public String getMessagingType()
-   {
-      return messagingType;
-   }
-
-   public void setMessagingType(String messagingType)
-   {
-      this.messagingType = messagingType;
-   }
-   
-   public String getResourceAdaptorName()
-   {
-      return resourceAdaptorName;
-   }
-
-   public void setResourceAdaptorName(String resourceAdaptorName)
-   {
-      this.resourceAdaptorName = resourceAdaptorName;
-   }
-
-   public String getTransactionType()
-   {
-      return transactionType;
-   }
-
-   public void setTransactionType(String transactionType)
-   {
-      if (transactionType.equals(BEAN))
-         tmType = TransactionManagementType.BEAN;
-      else if (transactionType.equals(CONTAINER))
-         tmType = TransactionManagementType.CONTAINER;
-      this.transactionType = transactionType;
-   }
-
-   
-   
-   public String getMdbPassword()
-   {
-      return mdbPassword;
-   }
-
-   public void setMdbPassword(String mdbPassword)
-   {
-      this.mdbPassword = mdbPassword;
-   }
-
-   public String getMdbUser()
-   {
-      return mdbUser;
-   }
-
-   public void setMdbUser(String mdbUser)
-   {
-      this.mdbUser = mdbUser;
-   }
-
-   public Method getAroundInvoke()
-   {
-      return aroundInvoke;
-   }
-
-   public void setAroundInvoke(Method aroundInvoke)
-   {
-      this.aroundInvoke = aroundInvoke;
-   }
-
-   public Method getPostConstruct()
-   {
-      return postConstruct;
-   }
-
-   public void setPostConstruct(Method postConstruct)
-   {
-      this.postConstruct = postConstruct;
-   }
-
-   public Method getPreDestroy()
-   {
-      return preDestroy;
-   }
-
-   public void setPreDestroy(Method preDestroy)
-   {
-      this.preDestroy = preDestroy;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[MessageDrivenBean:");
-      sb.append(super.toString());
-      sb.append(",");
-      sb.append("acknowledgeMode=").append(acknowledgeMode);
-      sb.append("destination=").append(messageDrivenDestination);
-      sb.append("messagingType=").append(messagingType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenDestination.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenDestination.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageDrivenDestination.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a message-driven-destination element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageDrivenDestination
-{
-   private static final Logger log = Logger.getLogger(MessageDrivenDestination.class);
-
-   // ejb-jar.xml
-   private String destinationType;
-
-   private String subscriptionDurability;
-
-   public String getDestinationType()
-   {
-      return destinationType;
-   }
-
-   public void setDestinationType(String destinationType)
-   {
-      this.destinationType = destinationType;
-   }
-
-   public String getSubscriptionDurability()
-   {
-      return subscriptionDurability;
-   }
-
-   public void setSubscriptionDurability(String subscriptionDurability)
-   {
-      this.subscriptionDurability = subscriptionDurability;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("destinationType=").append(destinationType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageProperties.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageProperties.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MessageProperties.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageProperties
-{
-   private List methods = new ArrayList();
-   private String delivery;
-   private String priority;
-   private String className;
-
-   public List getMethods()
-   {
-      return methods;
-   }
-   
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-   
-   public String getDelivery()
-   {
-      return delivery;
-   }
-   
-   public void setDelivery(String delivery)
-   {
-      this.delivery = delivery;
-   }
-   
-   public String getClassName()
-   {
-      return className;
-   }
-   
-   public void setClassName(String className)
-   {
-      this.className = className;
-   }
-   
-   public String getPriority()
-   {
-      return priority;
-   }
-   
-   public void setPriority(String priority)
-   {
-      this.priority = priority;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("className=").append(className);
-      sb.append(", priority=").append(priority);
-      sb.append(", delivery=").append(delivery);
-      sb.append(", methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Method.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Method.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Method.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an <method> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Method
-{
-
-   private String ejbName = null;
-
-   private String methodName = null;
-   
-   private String transactionTimeout = null;
-
-   private List methodParams;
-
-   public String getTransactionTimeout()
-   {
-      return transactionTimeout;
-   }
-
-   public void setTransactionTimeout(String transactionTimeout)
-   {
-      this.transactionTimeout = transactionTimeout;
-   }
-   
-   public String getEjbName()
-   {
-      return ejbName;
-   }
-
-   public void setEjbName(String ejbName)
-   {
-      this.ejbName = ejbName;
-   }
-
-   public String getMethodName()
-   {
-      return methodName;
-   }
-
-   public void setMethodName(String methodName)
-   {
-      this.methodName = methodName;
-   }
-
-   public void setHasParameters()
-   {
-      methodParams = new ArrayList();
-   }
-   
-   public void addMethodParam(String methodParam)
-   {
-      methodParams.add(methodParam);
-   }
-
-   public List getMethodParams()
-   {
-      return methodParams;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(ejbName);
-      sb.append(", methodName=").append(methodName);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodAttributes.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodAttributes.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodAttributes.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <method-attributes> element of the jboss.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MethodAttributes
-{
-   private static final Logger log = Logger.getLogger(MethodAttributes.class);
-
-   private List<Method> methods = new ArrayList();
-
-   public List<Method> getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodPermission.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodPermission.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/MethodPermission.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <method-permission> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MethodPermission
-{
-   private static final Logger log = Logger.getLogger(MethodPermission.class);
-
-   private List roleNames = new ArrayList();
-   private boolean isUnchecked = false;
-   private List<Method> methods = new ArrayList();
-
-   public boolean isUnchecked()
-   {
-      return isUnchecked;
-   }
-
-   public void setUnchecked(boolean isUnchecked)
-   {
-      this.isUnchecked = isUnchecked;
-   }
-
-   public List getRoleNames()
-   {
-      return roleNames;
-   }
-
-   public void addRoleName(String roleName)
-   {
-      roleNames.add(roleName);
-   }
-
-   public List<Method> getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("roleNames=").append(roleNames);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceContextRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceContextRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceContextRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import javax.persistence.PersistenceContextType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class PersistenceContextRef
-{
-   private String refName;
-   private String unitName;
-   private PersistenceContextType persistenceContextType;
-   private InjectionTarget injectionTarget;
-
-
-   public String getRefName()
-   {
-      return refName;
-   }
-
-   public void setRefName(String refName)
-   {
-      this.refName = refName;
-   }
-
-   public String getUnitName()
-   {
-      return unitName;
-   }
-
-   public void setUnitName(String unitName)
-   {
-      this.unitName = unitName;
-   }
-
-   public PersistenceContextType getPersistenceContextType()
-   {
-      return persistenceContextType;
-   }
-
-   public void setPersistenceContextType(PersistenceContextType persistenceContextType)
-   {
-      this.persistenceContextType = persistenceContextType;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceUnitRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceUnitRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/PersistenceUnitRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class PersistenceUnitRef
-{
-   private String refName;
-   private String unitName;
-   private InjectionTarget injectionTarget;
-
-
-   public String getRefName()
-   {
-      return refName;
-   }
-
-   public void setRefName(String refName)
-   {
-      this.refName = refName;
-   }
-
-   public String getUnitName()
-   {
-      return unitName;
-   }
-
-   public void setUnitName(String unitName)
-   {
-      this.unitName = unitName;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Producer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Producer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Producer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a producer element of the jboss.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Producer
-{
-   private static final Logger log = Logger.getLogger(Producer.class);
-
-   // jboss.xml
-   private String className;
-   private String connectionFactory;
-   private boolean local = false;
-   
-   public Producer(boolean local)
-   {
-      this.local = local;
-   }
-   
-   public boolean isLocal()
-   {
-      return local;
-   }
-
-   public String getClassName()
-   {
-      return className;
-   }
-
-   public void setClassName(String className)
-   {
-      this.className = className;
-   }
-   
-   public String getConnectionFactory()
-   {
-      return connectionFactory;
-   }
-
-   public void setConnectionFactory(String connectionFactory)
-   {
-      this.connectionFactory = connectionFactory;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("className=").append(className);
-      sb.append(", connectionFactory=").append(connectionFactory);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Query.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Query.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Query.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an query element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Query
-{
-
-   private String ejbQl;
-
-   private QueryMethod queryMethod;
-
-   public String getEjbQl()
-   {
-      return ejbQl;
-   }
-
-   public void setEjbQl(String ejbQl)
-   {
-      this.ejbQl = ejbQl;
-   }
-
-   public QueryMethod getQueryMethod()
-   {
-      return queryMethod;
-   }
-
-   public void setQueryMethod(QueryMethod queryMethod)
-   {
-      this.queryMethod = queryMethod;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbQl=").append(ejbQl);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/QueryMethod.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/QueryMethod.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/QueryMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.List;
-
-/**
- * Represents an query-method element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class QueryMethod
-{
-
-   private String methodName;
-
-   private List methodParams;
-
-   public String getMethodName()
-   {
-      return methodName;
-   }
-
-   public void setMethodName(String methodName)
-   {
-      this.methodName = methodName;
-   }
-
-   public List getMethodParams()
-   {
-      return methodParams;
-   }
-
-   public void setMethodParams(List methodParams)
-   {
-      this.methodParams = methodParams;
-   }
-
-   public void addMethodParam(String methodParam)
-   {
-      methodParams.add(methodParam);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methodName=").append(methodName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RelationshipRoleSource.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RelationshipRoleSource.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RelationshipRoleSource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an ejb-relationship-role element of the ejb-jar.xml deployment
- * descriptor for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class RelationshipRoleSource
-{
-
-   private String ejbName;
-
-   public String getEjbName()
-   {
-      return ejbName;
-   }
-
-   public void setEjbName(String ejbName)
-   {
-      this.ejbName = ejbName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(ejbName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Relationships.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Relationships.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Relationships.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents <relationships> elements of the ejb-jar.xml deployment descriptor for the 1.4
- * schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Relationships
-{
-
-   private List ejbRelations = new ArrayList();
-
-   public List getEjbRelations()
-   {
-      return ejbRelations;
-   }
-
-   public void setEjbRelations(List ejbRelations)
-   {
-      this.ejbRelations = ejbRelations;
-   }
-
-   public void addEjbRelation(EjbRelation ejbRelation)
-   {
-      ejbRelations.add(ejbRelation);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRelations=").append(ejbRelations);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveList.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveList.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <remove-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class RemoveList
-{
-   private static final Logger log = Logger.getLogger(RemoveList.class);
-
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveMethod.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveMethod.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/RemoveMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents an <remove-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class RemoveMethod
-{
-
-   private Method beanMethod;
-   private boolean retainIfException;
-
-   public Method getBeanMethod()
-   {
-      return beanMethod;
-   }
-
-   public void setBeanMethod(Method beanMethod)
-   {
-      this.beanMethod = beanMethod;
-   }
-
-   public boolean isRetainIfException()
-   {
-      return retainIfException;
-   }
-
-   public void setRetainIfException(boolean retainIfException)
-   {
-      this.retainIfException = retainIfException;
-   }
-
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("method=").append(beanMethod);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceEnvRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceEnvRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceEnvRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,185 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-
-import org.jboss.logging.Logger;
-
-import javax.annotation.Resource.AuthenticationType;
-
-/**
- * Represents a <resource-env-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ResourceEnvRef
-{
-   private static final Logger log = Logger.getLogger(ResourceEnvRef.class);
-   
-   private String resRefName;
-
-   private String resType;
-
-   private String resAuth;
-
-   private String resSharingScope;
-
-   private InjectionTarget injectionTarget;
-
-   private String mappedName;
-   
-private String jndiName;
-   
-   private String resourceName;
-   
-   public String getResourceName()
-   {
-      return resourceName;
-   }
-
-   public void setResourceName(String resourceName)
-   {
-      this.resourceName = resourceName;
-   }
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-      this.mappedName = jndiName;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String getResRefName()
-   {
-      return resRefName;
-   }
-
-   public void setResRefName(String resRefName)
-   {
-      this.resRefName = resRefName;
-   }
-
-   public String getResType()
-   {
-      return resType;
-   }
-
-   public void setResType(String resType)
-   {
-      this.resType = resType;
-   }
-
-   public String getResAuth()
-   {
-      return resAuth;
-   }
-
-   public void setResAuth(String resAuth)
-   {
-      this.resAuth = resAuth;
-   }
-
-   public AuthenticationType getAuthorizationType()
-   {
-      if (resAuth == null || resAuth.equals("Container"))
-         return AuthenticationType.CONTAINER;
-      else
-         return AuthenticationType.APPLICATION;
-   }
-
-   public String getResSharingScope()
-   {
-      return resSharingScope;
-   }
-
-   public void setResSharingScope(String resSharingScope)
-   {
-      this.resSharingScope = resSharingScope;
-   }
-
-   public boolean isShareable()
-   {
-      if (resSharingScope == null || resSharingScope.equals("Shareable"))
-         return true;
-      else
-         return false;
-   }
-   
-   public void merge(ResourceEnvRef ref)
-   {
-      if (ref.getJndiName() != null)
-      {
-         this.setJndiName(ref.getJndiName());
-         
-         setMappedName(ref.getJndiName());
-      }
-      
-      if (ref.getResourceName() != null)
-      {
-         this.setResourceName(ref.getResourceName());
-         
-         String mappedName = ref.getResourceName();
-         if (mappedName.startsWith("java:"))
-            this.setMappedName(ref.getResourceName());
-         else
-            this.setMappedName("java:" + ref.getResourceName());
-      }
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[ResourceEnvRef:");
-      sb.append("resRefName=").append(resRefName);
-      sb.append(",resType=").append(resType);
-      sb.append(",jndiName=").append(jndiName);
-      sb.append(",mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceManager.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceManager.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents a resource-manager element of the jboss.xml deployment descriptor for
- * the 4.0 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ResourceManager
-{
-   private String resourceName;
-   private String resourceJndiName;
-   
-   public String getResourceName()
-   {
-      return resourceName;
-   }
-   
-   public void setResourceName(String resourceName)
-   {
-      this.resourceName = resourceName;
-   }
-   
-   public String getResourceJndiName()
-   {
-      return resourceJndiName;
-   }
-   
-   public void setResourceJndiName(String resourceJndiName)
-   {
-      this.resourceJndiName = resourceJndiName;
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/ResourceRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,189 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import javax.annotation.Resource.AuthenticationType;
-
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-/**
- * Represents a <resource-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ResourceRef
-{
-   private static final Logger log = Logger.getLogger(ResourceRef.class);
-   
-   private String resRefName;
-
-   private String resType;
-
-   private String resAuth;
-
-   private String resSharingScope;
-
-   private InjectionTarget injectionTarget;
-
-   private String mappedName;
-   
-   private String jndiName;
-   
-   private String resourceName;
-   
-   public String getResourceName()
-   {
-      return resourceName;
-   }
-
-   public void setResourceName(String resourceName)
-   {
-      this.resourceName = resourceName;
-   }
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String getResRefName()
-   {
-      return resRefName;
-   }
-
-   public void setResRefName(String resRefName)
-   {
-      this.resRefName = resRefName;
-   }
-
-   public String getResType()
-   {
-      return resType;
-   }
-
-   public void setResType(String resType)
-   {
-      this.resType = resType;
-   }
-
-   public String getResAuth()
-   {
-      return resAuth;
-   }
-
-   public void setResAuth(String resAuth)
-   {
-      this.resAuth = resAuth;
-   }
-
-   public AuthenticationType getAuthorizationType()
-   {
-      if (resAuth == null || resAuth.equals("Container"))
-         return AuthenticationType.CONTAINER;
-      else
-         return AuthenticationType.APPLICATION;
-   }
-
-   public String getResSharingScope()
-   {
-      return resSharingScope;
-   }
-
-   public void setResSharingScope(String resSharingScope)
-   {
-      this.resSharingScope = resSharingScope;
-   }
-
-   public boolean isShareable()
-   {
-      if (resSharingScope == null || resSharingScope.equals("Shareable"))
-         return true;
-      else
-         return false;
-   }
-   
-   public void merge(ResourceRef ref)
-   {
-      if (ref.getJndiName() != null)
-      {
-         this.setJndiName(ref.getJndiName());
-         
-         String mappedName = ref.getJndiName();
-         if (mappedName.startsWith("java:"))
-            this.setMappedName(ref.getJndiName());
-         else
-            this.setMappedName("java:" + ref.getJndiName());
-      }
-      
-      if (ref.getResourceName() != null)
-      {
-         this.setResourceName(ref.getResourceName());
-         
-         String mappedName = ref.getResourceName();
-         if (mappedName.startsWith("java:"))
-            this.setMappedName(ref.getResourceName());
-         else
-            this.setMappedName("java:" + ref.getResourceName());
-      }
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[" + this.getClass().getSimpleName() + ": ");
-      sb.append("resRefName=").append(resRefName);
-      sb.append(", jndiName=").append(jndiName);
-      sb.append(", resourceName=").append(resourceName);
-      sb.append(", resType=").append(resType);
-      sb.append(", mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityIdentity.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityIdentity.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityIdentity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-/**
- * Represents a <security-identity> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SecurityIdentity
-{
-   private String id;
-
-   private boolean useCallerIdentity = false;
-
-   private String runAs;
-
-   private String runAsPrincipal;
-
-   public String getId()
-   {
-      return id;
-   }
-
-   public void setId(String id)
-   {
-      this.id = id;
-   }
-
-   public boolean isUseCallerIdentity()
-   {
-      return useCallerIdentity;
-   }
-
-   public void setUseCallerIdentity(boolean useCallerIdentity)
-   {
-      this.useCallerIdentity = useCallerIdentity;
-   }
-
-   public String getRunAs()
-   {
-      return runAs;
-   }
-
-   public void setRunAs(String runAs)
-   {
-      this.runAs = runAs;
-   }
-
-   public String getRunAsPrincipal()
-   {
-      return runAsPrincipal;
-   }
-
-   public void setRunAsPrincipal(String runAsPrincipal)
-   {
-      this.runAsPrincipal = runAsPrincipal;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(id);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityRole.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityRole.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SecurityRole.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-
-/**
- * Represents an security-role element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SecurityRole
-{
-
-   private String roleName = null;
-
-   public String getRoleName()
-   {
-      return roleName;
-   }
-
-   public void setRoleName(String roleName)
-   {
-      this.roleName = roleName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("roleName=").append(roleName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Service.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Service.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/Service.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Service extends EnterpriseBean
-{
-   private static final Logger log = Logger.getLogger(Service.class);
-   
-   private String management = null;
-   private String objectName = null;
-   
-   public String getManagement()
-   {
-      return management;
-   }
-   
-   public void setManagement(String management)
-   {
-      this.management = management;
-   }
-   
-   public String getObjectName()
-   {
-      return objectName;
-   }
-   
-   public void setObjectName(String objectName)
-   {
-      this.objectName = objectName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[Service:");
-      sb.append(super.toString());
-      sb.append(", management=" + management);
-      sb.append(", objectName=" + objectName);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SessionEnterpriseBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SessionEnterpriseBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/SessionEnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,156 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import java.util.List;
-import java.util.ArrayList;
-import org.jboss.logging.Logger;
-
-/**
- * Represents a Session EJB element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SessionEnterpriseBean extends EnterpriseBean
-{
-   private static final Logger log = Logger
-           .getLogger(SessionEnterpriseBean.class);
-
-   public static final String STATELESS = "Stateless";
-
-   public static final String STATEFUL = "Stateful";
-
-   // ejb-jar.xml
-   private String sessionType = STATELESS;
-   private Method aroundInvoke;
-   private Method postConstruct;
-   private Method postActivate;
-   private Method preDestroy;
-   private Method prePassivate;
-   private List<RemoveMethod> removeMethods = new ArrayList<RemoveMethod>();
-   private List<InitMethod> initMethods = new ArrayList<InitMethod>();
-
-   public List<RemoveMethod> getRemoveMethods()
-   {
-      return removeMethods;
-   }
-   
-   public void addRemoveMethod(RemoveMethod method)
-   {
-      removeMethods.add(method);
-   }
-   
-   public List<InitMethod> getInitMethods()
-   {
-      return initMethods;
-   }
-   
-   public void addInitMethod(InitMethod method)
-   {
-      initMethods.add(method);
-   }
-
-   public boolean isStateless()
-   {
-      return sessionType.equals(STATELESS);
-   }
-
-   public boolean isStateful()
-   {
-      return sessionType.equals(STATEFUL);
-   }
-
-   public String getSessionType()
-   {
-      return sessionType;
-   }
-
-   public void setSessionType(String sessionType)
-   {
-      this.sessionType = sessionType;
-   }
-
-   public Method getAroundInvoke()
-   {
-      return aroundInvoke;
-   }
-
-   public void setAroundInvoke(Method aroundInvoke)
-   {
-      this.aroundInvoke = aroundInvoke;
-   }
-
-   public Method getPostActivate()
-   {
-      if (sessionType.equals(STATELESS)) return null;
-      return postActivate;
-   }
-
-   public void setPostActivate(Method postActivate)
-   {
-      this.postActivate = postActivate;
-   }
-
-   public Method getPostConstruct()
-   {
-      return postConstruct;
-   }
-
-   public void setPostConstruct(Method postConstruct)
-   {
-      this.postConstruct = postConstruct;
-   }
-
-   public Method getPreDestroy()
-   {
-      return preDestroy;
-   }
-
-   public void setPreDestroy(Method preDestroy)
-   {
-      this.preDestroy = preDestroy;
-   }
-
-   public Method getPrePassivate()
-   {
-      if (sessionType.equals(STATELESS)) return null;
-      return prePassivate;
-   }
-
-   public void setPrePassivate(Method prePassivate)
-   {
-      this.prePassivate = prePassivate;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append(super.toString());
-      sb.append(",");
-      sb.append("sessionType=").append(sessionType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/WebServiceRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/WebServiceRef.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/dd/WebServiceRef.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,145 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.dd;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a <resource-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class WebServiceRef
-{
-   private static final Logger log = Logger.getLogger(WebServiceRef.class);
-   
-   private String serviceRefName;
-
-   private String resType;
-
-   private String serviceInterface;
-
-   private String wsdlFile;
-
-   private InjectionTarget injectionTarget;
-
-   private String mappedName;
-   
-   private String jndiName;
-   
-   private String jaxRpcMappingFile;
-   
-   public String getJaxRpcMappingFile()
-   {
-      return jaxRpcMappingFile;
-   }
-
-   public void setJaxRpcMappingFile(String jaxRpcMappingFile)
-   {
-      this.jaxRpcMappingFile = jaxRpcMappingFile;
-   }
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String getServiceRefName()
-   {
-      return serviceRefName;
-   }
-
-   public void setServiceRefName(String serviceRefName)
-   {
-      this.serviceRefName = serviceRefName;
-   }
-
-   public String getResType()
-   {
-      return resType;
-   }
-
-   public void setResType(String resType)
-   {
-      this.resType = resType;
-   }
-
-   public String getServiceInterface()
-   {
-      return serviceInterface;
-   }
-
-   public void setServiceInterface(String serviceInterface)
-   {
-      this.serviceInterface = serviceInterface;
-   }
-
-   public String getWsdlFile()
-   {
-      return wsdlFile;
-   }
-
-   public void setWsdlFile(String wsdlFile)
-   {
-      this.wsdlFile = wsdlFile;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[" + this.getClass().getSimpleName() + ": ");
-      sb.append("serviceRefName=").append(serviceRefName);
-      sb.append(", jndiName=").append(jndiName);
-      sb.append(", jaxRpcMappingFile=").append(jaxRpcMappingFile);
-      sb.append(", resType=").append(resType);
-      sb.append(", mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,118 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.deployers;
-
-import java.io.IOException;
-
-import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.DocumentType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class AppClientParsingDeployer extends ObjectModelFactoryDeployer<ApplicationClientDD>
-{
-   private String appClientXmlPath = "application-client.xml";
-   
-   public AppClientParsingDeployer()
-   {
-      super(ApplicationClientDD.class);
-   }
-   
-   @Override
-   protected ObjectModelFactory getObjectModelFactory(ApplicationClientDD root)
-   {
-      return new ApplicationClientDDObjectFactory();
-   }
-
-   @Override
-   public void deploy(DeploymentUnit unit) throws DeploymentException
-   {
-      if (accepts(unit))
-         createMetaData(unit, appClientXmlPath, null);
-   }
-   
-   /**
-    * This method looks to the deployment for a META-INF/application-client.xml
-    * descriptor to identify a j2ee client jar.
-    */
-   private boolean accepts(DeploymentUnit unit) throws DeploymentException
-   {
-      boolean accepts = false;
-
-      // The jar must contain an META-INF/application-client.xml
-      VirtualFile dd = unit.getMetaDataFile(appClientXmlPath);
-      if (dd != null)
-      {
-         log.debug("Found application-client.xml file: " + unit.getName());
-         try
-         {
-            Element root = DOMUtils.parse(dd.openStream());
-            String namespaceURI = root.getNamespaceURI();
-            // Accept the J2EE5 namespace
-            accepts = "http://java.sun.com/xml/ns/javaee".equals(namespaceURI);
-            if (accepts == false)
-               log.debug("Ignore application-client.xml with namespace: " + namespaceURI);
-         }
-         catch (IOException ex)
-         {
-            DeploymentException.rethrowAsDeploymentException("Cannot parse " + appClientXmlPath, ex);
-         }
-      }
-
-      if(accepts)
-      {
-         // in the cts there are apps with application-client with version 5
-         // and jboss-client with version 4
-         dd = unit.getMetaDataFile("jboss-client.xml");
-         if (dd != null)
-         {
-            log.debug("Found jboss-client.xml file: " + unit.getName());
-            try
-            {
-               Element root = DOMUtils.parse(dd.openStream());
-               DocumentType doctype = root.getOwnerDocument().getDoctype();
-               String publicId = (doctype != null ? doctype.getPublicId() : null);
-
-               accepts = !"-//JBoss//DTD Application Client 4.0//EN".equals(publicId);
-            }
-            catch (IOException ex)
-            {
-               DeploymentException.rethrowAsDeploymentException("Cannot parse " + appClientXmlPath, ex);
-            }
-         }
-      }
-
-      return accepts;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.deployers;
+
+import java.io.IOException;
+
+import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.w3c.dom.Element;
+import org.w3c.dom.DocumentType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class AppClientParsingDeployer extends ObjectModelFactoryDeployer<ApplicationClientDD>
+{
+   private String appClientXmlPath = "application-client.xml";
+   
+   public AppClientParsingDeployer()
+   {
+      super(ApplicationClientDD.class);
+   }
+   
+   @Override
+   protected ObjectModelFactory getObjectModelFactory(ApplicationClientDD root)
+   {
+      return new ApplicationClientDDObjectFactory();
+   }
+
+   @Override
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      if (accepts(unit))
+         createMetaData(unit, appClientXmlPath, null);
+   }
+   
+   /**
+    * This method looks to the deployment for a META-INF/application-client.xml
+    * descriptor to identify a j2ee client jar.
+    */
+   private boolean accepts(DeploymentUnit unit) throws DeploymentException
+   {
+      boolean accepts = false;
+
+      // The jar must contain an META-INF/application-client.xml
+      VirtualFile dd = unit.getMetaDataFile(appClientXmlPath);
+      if (dd != null)
+      {
+         log.debug("Found application-client.xml file: " + unit.getName());
+         try
+         {
+            Element root = DOMUtils.parse(dd.openStream());
+            String namespaceURI = root.getNamespaceURI();
+            // Accept the J2EE5 namespace
+            accepts = "http://java.sun.com/xml/ns/javaee".equals(namespaceURI);
+            if (accepts == false)
+               log.debug("Ignore application-client.xml with namespace: " + namespaceURI);
+         }
+         catch (IOException ex)
+         {
+            DeploymentException.rethrowAsDeploymentException("Cannot parse " + appClientXmlPath, ex);
+         }
+      }
+
+      if(accepts)
+      {
+         // in the cts there are apps with application-client with version 5
+         // and jboss-client with version 4
+         dd = unit.getMetaDataFile("jboss-client.xml");
+         if (dd != null)
+         {
+            log.debug("Found jboss-client.xml file: " + unit.getName());
+            try
+            {
+               Element root = DOMUtils.parse(dd.openStream());
+               DocumentType doctype = root.getOwnerDocument().getDoctype();
+               String publicId = (doctype != null ? doctype.getPublicId() : null);
+
+               accepts = !"-//JBoss//DTD Application Client 4.0//EN".equals(publicId);
+            }
+            catch (IOException ex)
+            {
+               DeploymentException.rethrowAsDeploymentException("Cannot parse " + appClientXmlPath, ex);
+            }
+         }
+      }
+
+      return accepts;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,145 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.deployers;
-
-import org.jboss.deployers.plugins.deployers.helpers.AbstractTypedDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.virtual.VirtualFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-/**
- * Scan the main & super classes for annotations.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class AppClientScanningDeployer extends AbstractTypedDeployer<ApplicationClientDD>
-{
-
-   public AppClientScanningDeployer()
-   {
-      super(ApplicationClientDD.class);
-      
-      setRelativeOrder(POSTPROCESS_CLASSLOADING_DEPLOYER);
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer#deploy(org.jboss.deployers.spi.deployer.DeploymentUnit)
-    */
-   @Override
-   public void deploy(DeploymentUnit unit) throws DeploymentException
-   {
-      ApplicationClientDD dd = unit.getAttachment(getDeploymentType());
-      // FIXME: implement metadata complete
-//      if(dd != null && dd.getMetaDataComplete())
-//         return;
-      // for now the EJB3 client deployer handles all
-      if(dd != null)
-         return;
-      
-      try
-      {
-         String mainClassName = getMainClassName(unit);
-         if(mainClassName == null)
-            return;
-         
-         Class<?> mainClass = unit.getClassLoader().loadClass(mainClassName);
-         
-         log.info("mainClass = " + mainClass);
-         
-         if(hasAnnotations(mainClass))
-         {
-            // add a dummy application client dd to fire up the ejb3 client deployer
-            dd = new ApplicationClientDD();
-            unit.addAttachment(ApplicationClientDD.class, dd);
-         }
-      }
-      catch(ClassNotFoundException e)
-      {
-         throw new DeploymentException(e);
-      }
-      catch(IOException e)
-      {
-         throw new DeploymentException(e);
-      }
-   }
-   
-   // TODO: integrate with Ejb3ClientDeployer.getMainClassName
-   private String getMainClassName(DeploymentUnit unit) throws IOException
-   {
-      VirtualFile file = unit.getMetaDataFile("MANIFEST.MF");
-      log.trace("parsing " + file);
-
-      if(file == null)
-      {
-         return null;
-      }
-
-      try
-      {
-         // TODO - use VFSUtils.readManifest
-         InputStream is = file.openStream();
-         Manifest mf;
-         try
-         {
-            mf = new Manifest(is);
-         }
-         finally
-         {
-            is.close();
-         }
-         Attributes attrs = mf.getMainAttributes();
-         String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
-         return className;
-      }
-      finally
-      {
-         file.close();
-      }
-   }
-   
-   // TODO: should we check for type of annotations?
-   private boolean hasAnnotations(Class<?> cls)
-   {
-      if(cls == null)
-         return false;
-      
-      // Note: this also returns true if super class has annotations
-      if(cls.getAnnotations().length > 0)
-         return true;
-      
-      for(Field f : cls.getDeclaredFields())
-      {
-         if(f.getAnnotations().length > 0)
-            return true;
-      }
-      
-      return hasAnnotations(cls.getSuperclass());
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,145 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.deployers;
+
+import org.jboss.deployers.plugins.deployers.helpers.AbstractTypedDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.virtual.VirtualFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+/**
+ * Scan the main & super classes for annotations.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class AppClientScanningDeployer extends AbstractTypedDeployer<ApplicationClientDD>
+{
+
+   public AppClientScanningDeployer()
+   {
+      super(ApplicationClientDD.class);
+      
+      setRelativeOrder(POSTPROCESS_CLASSLOADING_DEPLOYER);
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer#deploy(org.jboss.deployers.spi.deployer.DeploymentUnit)
+    */
+   @Override
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      ApplicationClientDD dd = unit.getAttachment(getDeploymentType());
+      // FIXME: implement metadata complete
+//      if(dd != null && dd.getMetaDataComplete())
+//         return;
+      // for now the EJB3 client deployer handles all
+      if(dd != null)
+         return;
+      
+      try
+      {
+         String mainClassName = getMainClassName(unit);
+         if(mainClassName == null)
+            return;
+         
+         Class<?> mainClass = unit.getClassLoader().loadClass(mainClassName);
+         
+         log.info("mainClass = " + mainClass);
+         
+         if(hasAnnotations(mainClass))
+         {
+            // add a dummy application client dd to fire up the ejb3 client deployer
+            dd = new ApplicationClientDD();
+            unit.addAttachment(ApplicationClientDD.class, dd);
+         }
+      }
+      catch(ClassNotFoundException e)
+      {
+         throw new DeploymentException(e);
+      }
+      catch(IOException e)
+      {
+         throw new DeploymentException(e);
+      }
+   }
+   
+   // TODO: integrate with Ejb3ClientDeployer.getMainClassName
+   private String getMainClassName(DeploymentUnit unit) throws IOException
+   {
+      VirtualFile file = unit.getMetaDataFile("MANIFEST.MF");
+      log.trace("parsing " + file);
+
+      if(file == null)
+      {
+         return null;
+      }
+
+      try
+      {
+         // TODO - use VFSUtils.readManifest
+         InputStream is = file.openStream();
+         Manifest mf;
+         try
+         {
+            mf = new Manifest(is);
+         }
+         finally
+         {
+            is.close();
+         }
+         Attributes attrs = mf.getMainAttributes();
+         String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
+         return className;
+      }
+      finally
+      {
+         file.close();
+      }
+   }
+   
+   // TODO: should we check for type of annotations?
+   private boolean hasAnnotations(Class<?> cls)
+   {
+      if(cls == null)
+         return false;
+      
+      // Note: this also returns true if super class has annotations
+      if(cls.getAnnotations().length > 0)
+         return true;
+      
+      for(Field f : cls.getDeclaredFields())
+      {
+         if(f.getAnnotations().length > 0)
+            return true;
+      }
+      
+      return hasAnnotations(cls.getSuperclass());
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,199 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.deployers;
-
-import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.EJB3Deployer;
-import org.jboss.kernel.Kernel;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.logging.Logger;
-
-import javax.management.MBeanServer;
-
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.List;
-
-/**
- * Creates initial EJB deployments and initializes only basic metadata.
- * A registration process is required so that
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 57082 $
- */
-public class EJBRegistrationDeployer extends AbstractSimpleDeployer
-{
-   private static final Logger log = Logger.getLogger(EJBRegistrationDeployer.class);
-
-   private HashSet ignoredJarsSet;
-   private MBeanServer mbeanServer;
-   private Kernel kernel;
-   private Properties defaultPersistenceProperties;
-   private List<String> allowedSuffixes;
-
-   public EJBRegistrationDeployer()
-   {
-      // make sure we run before the stage 2 deployer
-      // TODO: what's is the proper relative order?
-      setRelativeOrder(COMPONENT_DEPLOYER - 1);
-   }
-   
-   public List<String> getAllowedSuffixes()
-   {
-      return allowedSuffixes;
-   }
-
-   public void setAllowedSuffixes(List<String> allowedSuffixes)
-   {
-      this.allowedSuffixes = allowedSuffixes;
-   }
-
-   public HashSet getIgnoredJarsSet()
-   {
-      return ignoredJarsSet;
-   }
-
-   public void setIgnoredJarsSet(HashSet ignoredJarsSet)
-   {
-      this.ignoredJarsSet = ignoredJarsSet;
-   }
-
-   public MBeanServer getMbeanServer()
-   {
-      return mbeanServer;
-   }
-
-   public void setMbeanServer(MBeanServer mbeanServer)
-   {
-      this.mbeanServer = mbeanServer;
-   }
-
-   public Kernel getKernel()
-   {
-      return kernel;
-   }
-
-   public void setKernel(Kernel kernel)
-   {
-      this.kernel = kernel;
-   }
-
-   public Properties getDefaultPersistenceProperties()
-   {
-      return defaultPersistenceProperties;
-   }
-
-   public void setDefaultPersistenceProperties(Properties defaultPersistenceProperties)
-   {
-      this.defaultPersistenceProperties = defaultPersistenceProperties;
-   }
-
-   public void deploy(DeploymentUnit unit) throws DeploymentException
-   {
-      try
-      {
-         if (unit.getDeploymentContext().isComponent()) return;
-         VirtualFile jar = unit.getDeploymentContext().getRoot();
-         if (jar.isLeaf() || ignoredJarsSet.contains(jar.getName())                 )
-         {
-            log.trace("EJBRegistrationDeployer ignoring: " + jar.getName());
-            return;
-         }
-         if (allowedSuffixes != null)
-         {
-            for (String suffix : allowedSuffixes)
-            {
-               if (jar.getName().endsWith(suffix))
-               {
-                  log.trace("EJBRegistrationDeployer ignoring: " + jar.getName());
-                  return;
-               }
-            }
-         }
-         log.debug("********* EJBRegistrationDepoyer Begin Unit: " + unit.getName() + " jar: " + jar.getName());
-         VirtualFile ejbjar = unit.getMetaDataFile("ejb-jar.xml");
-         if (ejbjar != null)
-         {
-            InputStream is = ejbjar.openStream();
-            boolean has30EjbJarXml = EJB3Deployer.has30EjbJarXml(is);
-            is.close();
-            if (!has30EjbJarXml) return;
-         }
-         DeploymentScope scope = null;
-         DeploymentContext parent = unit.getDeploymentContext().getParent();
-         if (parent != null && parent.getRoot().getName().endsWith(".ear")) // todo should look for metadata instead of ".ear"
-         {
-            scope = parent.getTransientAttachments().getAttachment(DeploymentScope.class);
-            if (scope == null)
-            {
-               scope = new JBoss5DeploymentScope(unit.getDeploymentContext().getParent());
-               parent.getTransientAttachments().addAttachment(DeploymentScope.class, scope);
-            }
-         }
-         JBoss5DeploymentUnit du = new JBoss5DeploymentUnit(unit);
-         du.setDefaultPersistenceProperties(defaultPersistenceProperties);
-         Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope);
-         if (scope != null) scope.register(deployment);
-         // create() creates initial EJB containers and initializes metadata.
-         deployment.create();
-         if (deployment.getEjbContainers().size() == 0 && deployment.getPersistenceUnitDeployments().size() == 0)
-         {
-            log.trace("EJBRegistrationDeployer no containers in scanned jar, consider adding it to the ignore list: " + jar.getName() + " url: " + jar.toURL() + " unit: " + unit.getName());
-            return;
-         }
-         unit.addAttachment(Ejb3Deployment.class, deployment);
-      }
-      catch (Exception e)
-      {
-         throw new DeploymentException(e);
-      }
-   }
-
-   public void undeploy(DeploymentUnit unit)
-   {
-      Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);
-      if (deployment == null) return;
-      try
-      {
-         deployment.stop();
-      }
-      catch (Exception e)
-      {
-         log.error("failed to stop deployment", e);
-      }
-      try
-      {
-         deployment.destroy();
-      }
-      catch (Exception e)
-      {
-         log.error("failed to destroy deployment", e);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,199 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.deployers;
+
+import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.EJB3Deployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.logging.Logger;
+
+import javax.management.MBeanServer;
+
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.List;
+
+/**
+ * Creates initial EJB deployments and initializes only basic metadata.
+ * A registration process is required so that
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 57082 $
+ */
+public class EJBRegistrationDeployer extends AbstractSimpleDeployer
+{
+   private static final Logger log = Logger.getLogger(EJBRegistrationDeployer.class);
+
+   private HashSet ignoredJarsSet;
+   private MBeanServer mbeanServer;
+   private Kernel kernel;
+   private Properties defaultPersistenceProperties;
+   private List<String> allowedSuffixes;
+
+   public EJBRegistrationDeployer()
+   {
+      // make sure we run before the stage 2 deployer
+      // TODO: what's is the proper relative order?
+      setRelativeOrder(COMPONENT_DEPLOYER - 1);
+   }
+   
+   public List<String> getAllowedSuffixes()
+   {
+      return allowedSuffixes;
+   }
+
+   public void setAllowedSuffixes(List<String> allowedSuffixes)
+   {
+      this.allowedSuffixes = allowedSuffixes;
+   }
+
+   public HashSet getIgnoredJarsSet()
+   {
+      return ignoredJarsSet;
+   }
+
+   public void setIgnoredJarsSet(HashSet ignoredJarsSet)
+   {
+      this.ignoredJarsSet = ignoredJarsSet;
+   }
+
+   public MBeanServer getMbeanServer()
+   {
+      return mbeanServer;
+   }
+
+   public void setMbeanServer(MBeanServer mbeanServer)
+   {
+      this.mbeanServer = mbeanServer;
+   }
+
+   public Kernel getKernel()
+   {
+      return kernel;
+   }
+
+   public void setKernel(Kernel kernel)
+   {
+      this.kernel = kernel;
+   }
+
+   public Properties getDefaultPersistenceProperties()
+   {
+      return defaultPersistenceProperties;
+   }
+
+   public void setDefaultPersistenceProperties(Properties defaultPersistenceProperties)
+   {
+      this.defaultPersistenceProperties = defaultPersistenceProperties;
+   }
+
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      try
+      {
+         if (unit.getDeploymentContext().isComponent()) return;
+         VirtualFile jar = unit.getDeploymentContext().getRoot();
+         if (jar.isLeaf() || ignoredJarsSet.contains(jar.getName())                 )
+         {
+            log.trace("EJBRegistrationDeployer ignoring: " + jar.getName());
+            return;
+         }
+         if (allowedSuffixes != null)
+         {
+            for (String suffix : allowedSuffixes)
+            {
+               if (jar.getName().endsWith(suffix))
+               {
+                  log.trace("EJBRegistrationDeployer ignoring: " + jar.getName());
+                  return;
+               }
+            }
+         }
+         log.debug("********* EJBRegistrationDepoyer Begin Unit: " + unit.getName() + " jar: " + jar.getName());
+         VirtualFile ejbjar = unit.getMetaDataFile("ejb-jar.xml");
+         if (ejbjar != null)
+         {
+            InputStream is = ejbjar.openStream();
+            boolean has30EjbJarXml = EJB3Deployer.has30EjbJarXml(is);
+            is.close();
+            if (!has30EjbJarXml) return;
+         }
+         DeploymentScope scope = null;
+         DeploymentContext parent = unit.getDeploymentContext().getParent();
+         if (parent != null && parent.getRoot().getName().endsWith(".ear")) // todo should look for metadata instead of ".ear"
+         {
+            scope = parent.getTransientAttachments().getAttachment(DeploymentScope.class);
+            if (scope == null)
+            {
+               scope = new JBoss5DeploymentScope(unit.getDeploymentContext().getParent());
+               parent.getTransientAttachments().addAttachment(DeploymentScope.class, scope);
+            }
+         }
+         JBoss5DeploymentUnit du = new JBoss5DeploymentUnit(unit);
+         du.setDefaultPersistenceProperties(defaultPersistenceProperties);
+         Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope);
+         if (scope != null) scope.register(deployment);
+         // create() creates initial EJB containers and initializes metadata.
+         deployment.create();
+         if (deployment.getEjbContainers().size() == 0 && deployment.getPersistenceUnitDeployments().size() == 0)
+         {
+            log.trace("EJBRegistrationDeployer no containers in scanned jar, consider adding it to the ignore list: " + jar.getName() + " url: " + jar.toURL() + " unit: " + unit.getName());
+            return;
+         }
+         unit.addAttachment(Ejb3Deployment.class, deployment);
+      }
+      catch (Exception e)
+      {
+         throw new DeploymentException(e);
+      }
+   }
+
+   public void undeploy(DeploymentUnit unit)
+   {
+      Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);
+      if (deployment == null) return;
+      try
+      {
+         deployment.stop();
+      }
+      catch (Exception e)
+      {
+         log.error("failed to stop deployment", e);
+      }
+      try
+      {
+         deployment.destroy();
+      }
+      catch (Exception e)
+      {
+         log.error("failed to destroy deployment", e);
+      }
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.deployers;
-
-import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.logging.Logger;
-
-/**
- * Starts any initial EJB deployment created and initialized
- * by the EJBRegistrationDeployer
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 57082 $
- */
-public class EJBStage2Deployer extends AbstractSimpleDeployer
-{
-   private static final Logger log = Logger.getLogger(EJBStage2Deployer.class);
-
-   public EJBStage2Deployer()
-   {
-      // make sure we run at right moment (before EJB3 client deployer)
-      setRelativeOrder(COMPONENT_DEPLOYER);
-   }
-   
-   public void deploy(DeploymentUnit unit) throws DeploymentException
-   {
-      Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);
-      if (deployment == null) return;
-      try
-      {
-         log.debug("********* EJBStage2 Begin Unit: " + unit.getName() + " jar: " + unit.getDeploymentContext().getRoot().getName());
-         deployment.start();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.deployers;
+
+import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.logging.Logger;
+
+/**
+ * Starts any initial EJB deployment created and initialized
+ * by the EJBRegistrationDeployer
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 57082 $
+ */
+public class EJBStage2Deployer extends AbstractSimpleDeployer
+{
+   private static final Logger log = Logger.getLogger(EJBStage2Deployer.class);
+
+   public EJBStage2Deployer()
+   {
+      // make sure we run at right moment (before EJB3 client deployer)
+      setRelativeOrder(COMPONENT_DEPLOYER);
+   }
+   
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);
+      if (deployment == null) return;
+      try
+      {
+         log.debug("********* EJBStage2 Begin Unit: " + unit.getName() + " jar: " + unit.getDeploymentContext().getRoot().getName());
+         deployment.start();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,221 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.deployers;
-
-import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.KernelAbstraction;
-import org.jboss.ejb3.MCKernelAbstraction;
-import org.jboss.ejb3.clientmodule.ClientENCInjectionContainer;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.kernel.Kernel;
-import org.jboss.logging.Logger;
-import org.jboss.naming.Util;
-import org.jboss.virtual.VirtualFile;
-
-import javax.management.MBeanServer;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import java.io.InputStream;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-/**
- * Deploys a client application jar.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class Ejb3ClientDeployer extends AbstractSimpleRealDeployer<ApplicationClientDD>
-{
-   private static final Logger log = Logger.getLogger(Ejb3ClientDeployer.class);
-
-   private Kernel kernel;
-   private MBeanServer server;
-
-   public Ejb3ClientDeployer()
-   {
-      super(ApplicationClientDD.class);
-      // make sure we run after EJB3 deployer
-      setRelativeOrder(COMPONENT_DEPLOYER + 1);
-   }
-
-   @Override
-   public void deploy(DeploymentUnit unit, ApplicationClientDD metaData) throws DeploymentException
-   {
-      log.debug("deploy " + unit.getName());
-
-      String appClientName = getJndiName(unit, metaData);
-
-      try
-      {
-         // I create the namespace here, because I destroy it in undeploy
-         InitialContext iniCtx = new InitialContext();
-         Context encCtx = Util.createSubcontext(iniCtx, appClientName);
-         log.debug("Creating client ENC binding under: " + appClientName);
-
-         String mainClassName = getMainClassName(unit, true);
-
-         Class<?> mainClass = loadClass(unit, mainClassName);
-
-         ClientENCInjectionContainer container = new ClientENCInjectionContainer(unit, metaData, mainClass, appClientName, unit.getClassLoader(), encCtx);
-
-         //di.deployedObject = container.getObjectName();
-         unit.addAttachment(ClientENCInjectionContainer.class, container);
-         getKernelAbstraction().install(container.getObjectName().getCanonicalName(), container.getDependencyPolicy(), container);
-      }
-      catch(Exception e)
-      {
-         log.error("Could not deploy " + unit.getName(), e);
-         undeploy(unit, metaData);
-         throw new DeploymentException("Could not deploy " + unit.getName(), e);
-      }
-   }
-
-   /**
-    * If there is no deployment descriptor, or it doesn't specify a JNDI name, then we make up one.
-    * We use the basename from di.shortName.
-    *
-    * @param unit
-    * @param dd
-    * @return   a good JNDI name
-    */
-   private String getJndiName(DeploymentUnit unit, ApplicationClientDD dd)
-   {
-      String jndiName = dd.getJndiName();
-      if(jndiName != null)
-         return jndiName;
-
-      String shortName = unit.getDeploymentContext().getRoot().getName();
-      if(shortName.endsWith(".jar/"))
-         jndiName = shortName.substring(0, shortName.length() - 5);
-      else if(shortName.endsWith(".jar"))
-         jndiName = shortName.substring(0, shortName.length() - 4);
-      else
-         throw new IllegalStateException("Expected either '.jar' or '.jar/' at the end of " + shortName);
-
-      return jndiName;
-   }
-
-//   public Kernel getKernel()
-//   {
-//      return kernel;
-//   }
-
-   private KernelAbstraction getKernelAbstraction()
-   {
-      return new MCKernelAbstraction(kernel, server);
-   }
-
-   // TODO: move this method either to a utility class or to the scanning deployer
-   protected String getMainClassName(DeploymentUnit unit, boolean fail) throws Exception
-   {
-      VirtualFile file = unit.getMetaDataFile("MANIFEST.MF");
-      log.trace("parsing " + file);
-      // Default to the jboss client main
-      String mainClassName = "org.jboss.client.AppClientMain";
-
-      if (file != null)
-      {
-         try
-         {
-            // TODO - use VFSUtils.readManifest .. once VFS lib is updated
-            InputStream is = file.openStream();
-            Manifest mf;
-            try
-            {
-               mf = new Manifest(is);
-            }
-            finally
-            {
-               is.close();
-            }
-            Attributes attrs = mf.getMainAttributes();
-            String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
-            if (className != null)
-            {
-               mainClassName = className;
-            }
-         }
-         finally
-         {
-            file.close();
-         }
-      }
-      return mainClassName;
-   }
-
-   private Class<?> loadClass(DeploymentUnit unit, String className) throws ClassNotFoundException
-   {
-      ClassLoader old = Thread.currentThread().getContextClassLoader();
-      try
-      {
-         Thread.currentThread().setContextClassLoader(unit.getClassLoader());
-         return Thread.currentThread().getContextClassLoader().loadClass(className);
-      }
-      finally
-      {
-         Thread.currentThread().setContextClassLoader(old);
-      }
-   }
-
-   public void setKernel(Kernel kernel)
-   {
-      this.kernel = kernel;
-   }
-
-   public void setMbeanServer(MBeanServer server)
-   {
-      this.server = server;
-   }
-
-   @Override
-   public void undeploy(DeploymentUnit unit, ApplicationClientDD metaData)
-   {
-      log.debug("undeploy " + unit.getName());
-
-      ClientENCInjectionContainer container = unit.getAttachment(ClientENCInjectionContainer.class);
-      if(container != null)
-         getKernelAbstraction().uninstall(container.getObjectName().getCanonicalName());
-
-      String jndiName = getJndiName(unit, metaData);
-      log.debug("Removing client ENC from: " + jndiName);
-      try
-      {
-         InitialContext iniCtx = new InitialContext();
-         Util.unbind(iniCtx, jndiName);
-      }
-      catch(NameNotFoundException e)
-      {
-         // make sure stop doesn't fail for no reason
-         log.debug("Could not find client ENC");
-      }
-      catch (NamingException e)
-      {
-         log.error("Failed to remove client ENC", e);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,221 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.deployers;
+
+import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.KernelAbstraction;
+import org.jboss.ejb3.MCKernelAbstraction;
+import org.jboss.ejb3.clientmodule.ClientENCInjectionContainer;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.kernel.Kernel;
+import org.jboss.logging.Logger;
+import org.jboss.naming.Util;
+import org.jboss.virtual.VirtualFile;
+
+import javax.management.MBeanServer;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import java.io.InputStream;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+/**
+ * Deploys a client application jar.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class Ejb3ClientDeployer extends AbstractSimpleRealDeployer<ApplicationClientDD>
+{
+   private static final Logger log = Logger.getLogger(Ejb3ClientDeployer.class);
+
+   private Kernel kernel;
+   private MBeanServer server;
+
+   public Ejb3ClientDeployer()
+   {
+      super(ApplicationClientDD.class);
+      // make sure we run after EJB3 deployer
+      setRelativeOrder(COMPONENT_DEPLOYER + 1);
+   }
+
+   @Override
+   public void deploy(DeploymentUnit unit, ApplicationClientDD metaData) throws DeploymentException
+   {
+      log.debug("deploy " + unit.getName());
+
+      String appClientName = getJndiName(unit, metaData);
+
+      try
+      {
+         // I create the namespace here, because I destroy it in undeploy
+         InitialContext iniCtx = new InitialContext();
+         Context encCtx = Util.createSubcontext(iniCtx, appClientName);
+         log.debug("Creating client ENC binding under: " + appClientName);
+
+         String mainClassName = getMainClassName(unit, true);
+
+         Class<?> mainClass = loadClass(unit, mainClassName);
+
+         ClientENCInjectionContainer container = new ClientENCInjectionContainer(unit, metaData, mainClass, appClientName, unit.getClassLoader(), encCtx);
+
+         //di.deployedObject = container.getObjectName();
+         unit.addAttachment(ClientENCInjectionContainer.class, container);
+         getKernelAbstraction().install(container.getObjectName().getCanonicalName(), container.getDependencyPolicy(), container);
+      }
+      catch(Exception e)
+      {
+         log.error("Could not deploy " + unit.getName(), e);
+         undeploy(unit, metaData);
+         throw new DeploymentException("Could not deploy " + unit.getName(), e);
+      }
+   }
+
+   /**
+    * If there is no deployment descriptor, or it doesn't specify a JNDI name, then we make up one.
+    * We use the basename from di.shortName.
+    *
+    * @param unit
+    * @param dd
+    * @return   a good JNDI name
+    */
+   private String getJndiName(DeploymentUnit unit, ApplicationClientDD dd)
+   {
+      String jndiName = dd.getJndiName();
+      if(jndiName != null)
+         return jndiName;
+
+      String shortName = unit.getDeploymentContext().getRoot().getName();
+      if(shortName.endsWith(".jar/"))
+         jndiName = shortName.substring(0, shortName.length() - 5);
+      else if(shortName.endsWith(".jar"))
+         jndiName = shortName.substring(0, shortName.length() - 4);
+      else
+         throw new IllegalStateException("Expected either '.jar' or '.jar/' at the end of " + shortName);
+
+      return jndiName;
+   }
+
+//   public Kernel getKernel()
+//   {
+//      return kernel;
+//   }
+
+   private KernelAbstraction getKernelAbstraction()
+   {
+      return new MCKernelAbstraction(kernel, server);
+   }
+
+   // TODO: move this method either to a utility class or to the scanning deployer
+   protected String getMainClassName(DeploymentUnit unit, boolean fail) throws Exception
+   {
+      VirtualFile file = unit.getMetaDataFile("MANIFEST.MF");
+      log.trace("parsing " + file);
+      // Default to the jboss client main
+      String mainClassName = "org.jboss.client.AppClientMain";
+
+      if (file != null)
+      {
+         try
+         {
+            // TODO - use VFSUtils.readManifest .. once VFS lib is updated
+            InputStream is = file.openStream();
+            Manifest mf;
+            try
+            {
+               mf = new Manifest(is);
+            }
+            finally
+            {
+               is.close();
+            }
+            Attributes attrs = mf.getMainAttributes();
+            String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
+            if (className != null)
+            {
+               mainClassName = className;
+            }
+         }
+         finally
+         {
+            file.close();
+         }
+      }
+      return mainClassName;
+   }
+
+   private Class<?> loadClass(DeploymentUnit unit, String className) throws ClassNotFoundException
+   {
+      ClassLoader old = Thread.currentThread().getContextClassLoader();
+      try
+      {
+         Thread.currentThread().setContextClassLoader(unit.getClassLoader());
+         return Thread.currentThread().getContextClassLoader().loadClass(className);
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(old);
+      }
+   }
+
+   public void setKernel(Kernel kernel)
+   {
+      this.kernel = kernel;
+   }
+
+   public void setMbeanServer(MBeanServer server)
+   {
+      this.server = server;
+   }
+
+   @Override
+   public void undeploy(DeploymentUnit unit, ApplicationClientDD metaData)
+   {
+      log.debug("undeploy " + unit.getName());
+
+      ClientENCInjectionContainer container = unit.getAttachment(ClientENCInjectionContainer.class);
+      if(container != null)
+         getKernelAbstraction().uninstall(container.getObjectName().getCanonicalName());
+
+      String jndiName = getJndiName(unit, metaData);
+      log.debug("Removing client ENC from: " + jndiName);
+      try
+      {
+         InitialContext iniCtx = new InitialContext();
+         Util.unbind(iniCtx, jndiName);
+      }
+      catch(NameNotFoundException e)
+      {
+         // make sure stop doesn't fail for no reason
+         log.debug("Could not find client ENC");
+      }
+      catch (NamingException e)
+      {
+         log.error("Failed to remove client ENC", e);
+      }
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,85 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.deployers;
-
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.JmxDependencyPolicy;
-import org.jboss.ejb3.MCKernelAbstraction;
-import org.jboss.ejb3.MCDependencyPolicy;
-import org.jboss.ejb3.security.JaccHelper;
-import org.jboss.kernel.Kernel;
-import org.jboss.logging.Logger;
-
-import javax.management.MBeanServer;
-import javax.security.jacc.PolicyConfiguration;
-
-/**
- * JBoss 4.0 Microkernel specific implementation
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 56592 $
- */
-public class Ejb3JBoss5Deployment extends Ejb3Deployment
-{
-   private org.jboss.deployers.spi.deployer.DeploymentUnit deploymentInfo;
-
-   private static final Logger log = Logger.getLogger(Ejb3JBoss5Deployment.class);
-
-   public Ejb3JBoss5Deployment(DeploymentUnit du, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.spi.deployer.DeploymentUnit di, DeploymentScope deploymentScope)
-   {
-      super(du, deploymentScope);
-      this.deploymentInfo = di;
-      kernelAbstraction = new MCKernelAbstraction(kernel, mbeanServer);
-
-      // todo maybe mbeanServer should be injected?
-      this.mbeanServer = mbeanServer;
-   }
-
-   protected PolicyConfiguration createPolicyConfiguration() throws Exception
-   {
-      return JaccHelper.initialiseJacc(getJaccContextId());
-
-   }
-
-   protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit)
-   {
-      try
-      {
-         JaccHelper.putJaccInService(pc, deploymentInfo);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-
-   }
-
-   public DependencyPolicy createDependencyPolicy()
-   {
-      return new JBoss5DependencyPolicy();
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.deployers;
+
+import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.JmxDependencyPolicy;
+import org.jboss.ejb3.MCKernelAbstraction;
+import org.jboss.ejb3.MCDependencyPolicy;
+import org.jboss.ejb3.security.JaccHelper;
+import org.jboss.kernel.Kernel;
+import org.jboss.logging.Logger;
+
+import javax.management.MBeanServer;
+import javax.security.jacc.PolicyConfiguration;
+
+/**
+ * JBoss 4.0 Microkernel specific implementation
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 56592 $
+ */
+public class Ejb3JBoss5Deployment extends Ejb3Deployment
+{
+   private org.jboss.deployers.spi.deployer.DeploymentUnit deploymentInfo;
+
+   private static final Logger log = Logger.getLogger(Ejb3JBoss5Deployment.class);
+
+   public Ejb3JBoss5Deployment(DeploymentUnit du, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.spi.deployer.DeploymentUnit di, DeploymentScope deploymentScope)
+   {
+      super(du, deploymentScope);
+      this.deploymentInfo = di;
+      kernelAbstraction = new MCKernelAbstraction(kernel, mbeanServer);
+
+      // todo maybe mbeanServer should be injected?
+      this.mbeanServer = mbeanServer;
+   }
+
+   protected PolicyConfiguration createPolicyConfiguration() throws Exception
+   {
+      return JaccHelper.initialiseJacc(getJaccContextId());
+
+   }
+
+   protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit)
+   {
+      try
+      {
+         JaccHelper.putJaccInService(pc, deploymentInfo);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+
+   }
+
+   public DependencyPolicy createDependencyPolicy()
+   {
+      return new JBoss5DependencyPolicy();
+   }
+
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.deployers;
-
-import org.jboss.ejb3.MCDependencyPolicy;
-
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 44334 $
- */
-public class JBoss5DependencyPolicy extends MCDependencyPolicy
-{
-   public void addDatasource(String jndiName)
-   {
-      String ds = jndiName;
-      if (ds.startsWith("java:/"))
-      {
-         ds = ds.substring(6);
-
-      }
-      else if (ds.startsWith("java:"))
-      {
-         ds = ds.substring(5);
-      }
-      //tring onStr = "jboss.jca:name=" + ds + ",service=ManagedConnectionFactory";
-      String onStr = "jboss.jca:name=" + ds + ",service=DataSourceBinding";
-      dependencies.add(onStr);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DependencyPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.deployers;
+
+import org.jboss.ejb3.MCDependencyPolicy;
+
+import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 44334 $
+ */
+public class JBoss5DependencyPolicy extends MCDependencyPolicy
+{
+   public void addDatasource(String jndiName)
+   {
+      String ds = jndiName;
+      if (ds.startsWith("java:/"))
+      {
+         ds = ds.substring(6);
+
+      }
+      else if (ds.startsWith("java:"))
+      {
+         ds = ds.substring(5);
+      }
+      //tring onStr = "jboss.jca:name=" + ds + ",service=ManagedConnectionFactory";
+      String onStr = "jboss.jca:name=" + ds + ",service=DataSourceBinding";
+      dependencies.add(onStr);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,108 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.deployers;
-
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Abstraction for an EAR/WAR or anything that scopes EJB deployments
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 55144 $
- */
-public class JBoss5DeploymentScope implements DeploymentScope
-{
-   private ConcurrentHashMap<String, Ejb3Deployment> deployments;
-   private String shortName;
-   private String baseName;
-
-   public JBoss5DeploymentScope(DeploymentContext parent)
-   {
-      // Use the root vfs path name
-      this.shortName = parent.getRoot().getPathName();
-      if( shortName.length() == 0 )
-      {
-         shortName = parent.getName();
-         // this is a hack because VFS has gay URL name.
-         if (shortName.endsWith("!/"))
-         {
-            this.shortName = shortName.substring(0, shortName.length() - 2);
-         }
-      }
-      // Further reduce the path to the last component of the url name 
-      int x = shortName.lastIndexOf('/');
-      this.shortName = shortName.substring(x + 1);
-
-      baseName = shortName;
-      int idx = shortName.lastIndexOf('.');
-      if( idx > 0 )
-         baseName = shortName.substring(0, idx);
-      deployments = (ConcurrentHashMap<String, Ejb3Deployment>)parent.getDeploymentUnit().getAttachment("EJB_DEPLOYMENTS");
-      if (deployments == null)
-      {
-         deployments = new ConcurrentHashMap<String, Ejb3Deployment>();
-         parent.getDeploymentUnit().addAttachment("EJB_DEPLOYMENTS", deployments);
-      }
-   }
-
-   public Collection<Ejb3Deployment> getEjbDeployments()
-   {
-      return deployments.values();
-   }
-
-   public void register(Ejb3Deployment deployment)
-   {
-      deployments.put(deployment.getDeploymentUnit().getShortName(), deployment);
-   }
-
-   public void unregister(Ejb3Deployment deployment)
-   {
-      deployments.remove(deployment.getDeploymentUnit().getShortName());
-   }
-
-   public Ejb3Deployment findRelativeDeployment(String relativeName)
-   {
-      if (relativeName.startsWith("../"))
-      {
-         relativeName = relativeName.substring(3);
-      }
-      return deployments.get(relativeName);
-   }
-
-   public String getShortName()
-   {
-      return shortName;
-   }
-
-   public String getBaseName()
-   {
-      return baseName;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,108 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.deployers;
+
+import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Abstraction for an EAR/WAR or anything that scopes EJB deployments
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 55144 $
+ */
+public class JBoss5DeploymentScope implements DeploymentScope
+{
+   private ConcurrentHashMap<String, Ejb3Deployment> deployments;
+   private String shortName;
+   private String baseName;
+
+   public JBoss5DeploymentScope(DeploymentContext parent)
+   {
+      // Use the root vfs path name
+      this.shortName = parent.getRoot().getPathName();
+      if( shortName.length() == 0 )
+      {
+         shortName = parent.getName();
+         // this is a hack because VFS has gay URL name.
+         if (shortName.endsWith("!/"))
+         {
+            this.shortName = shortName.substring(0, shortName.length() - 2);
+         }
+      }
+      // Further reduce the path to the last component of the url name 
+      int x = shortName.lastIndexOf('/');
+      this.shortName = shortName.substring(x + 1);
+
+      baseName = shortName;
+      int idx = shortName.lastIndexOf('.');
+      if( idx > 0 )
+         baseName = shortName.substring(0, idx);
+      deployments = (ConcurrentHashMap<String, Ejb3Deployment>)parent.getDeploymentUnit().getAttachment("EJB_DEPLOYMENTS");
+      if (deployments == null)
+      {
+         deployments = new ConcurrentHashMap<String, Ejb3Deployment>();
+         parent.getDeploymentUnit().addAttachment("EJB_DEPLOYMENTS", deployments);
+      }
+   }
+
+   public Collection<Ejb3Deployment> getEjbDeployments()
+   {
+      return deployments.values();
+   }
+
+   public void register(Ejb3Deployment deployment)
+   {
+      deployments.put(deployment.getDeploymentUnit().getShortName(), deployment);
+   }
+
+   public void unregister(Ejb3Deployment deployment)
+   {
+      deployments.remove(deployment.getDeploymentUnit().getShortName());
+   }
+
+   public Ejb3Deployment findRelativeDeployment(String relativeName)
+   {
+      if (relativeName.startsWith("../"))
+      {
+         relativeName = relativeName.substring(3);
+      }
+      return deployments.get(relativeName);
+   }
+
+   public String getShortName()
+   {
+      return shortName;
+   }
+
+   public String getBaseName()
+   {
+      return baseName;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,212 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.deployers;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.context.jar.JarUtils;
-import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 43304 $
- */
-public class JBoss5DeploymentUnit implements org.jboss.ejb3.DeploymentUnit
-{
-   private DeploymentUnit unit;
-   private InterceptorInfoRepository interceptorInfoRepository = new InterceptorInfoRepository();
-   private Map defaultPersistenceProperties;
-
-   public JBoss5DeploymentUnit(DeploymentUnit unit)
-   {
-      this.unit = unit;
-   }
-
-   public VirtualFile getRootFile()
-   {
-      return unit.getDeploymentContext().getRoot();
-   }
-   
-   public URL getRelativeURL(String jar)
-   {
-      try
-      {
-         return new URL(jar);
-      }
-      catch (MalformedURLException e)
-      {
-         try
-         {
-            if (jar.startsWith(".."))
-            {
-               if (getUrl() == null)
-                  throw new RuntimeException("relative <jar-file> not allowed when standalone deployment unit is used");
-               String tmpjar = jar.substring(3);
-               VirtualFile vf = unit.getDeploymentContext().getRoot().getParent().findChild(tmpjar);
-               return vf.toURL();
-            }
-            else
-            {
-               File fp = new File(jar);
-               return fp.toURL();
-            }
-         }
-         catch (Exception e1)
-         {
-            throw new RuntimeException("could not find relative path: " + jar, e1);
-         }
-      }
-   }
-
-   URL extractDescriptorUrl(String resource)
-   {
-      try
-      {
-         VirtualFile vf = unit.getMetaDataFile(resource);
-         if (vf == null) return null;
-         return vf.toURL();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public URL getPersistenceXml()
-   {
-      return extractDescriptorUrl("persistence.xml");
-   }
-
-   public URL getEjbJarXml()
-   {
-      return extractDescriptorUrl("ejb-jar.xml");
-   }
-
-   public URL getJbossXml()
-   {
-      return extractDescriptorUrl("jboss.xml");
-   }
-
-   public VirtualFile getMetaDataFile(String name)
-   {
-      return unit.getMetaDataFile(name);
-   }
-   
-   public List<Class> getClasses()
-   {
-      return null;
-   }
-
-   public ClassLoader getClassLoader()
-   {
-      return unit.getClassLoader();
-   }
-
-   public ClassLoader getResourceLoader()
-   {
-      return unit.getClassLoader();
-   }
-
-   public String getShortName()
-   {
-      return unit.getDeploymentContext().getRoot().getName();
-   }
-
-   public URL getUrl()
-   {
-      try
-      {
-         return unit.getDeploymentContext().getRoot().toURL();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public String getDefaultEntityManagerName()
-   {
-      String url = getUrl().toString();
-      String name = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
-      return name;
-   }
-
-   public Map getDefaultPersistenceProperties()
-   {
-      return defaultPersistenceProperties;
-   }
-
-   public void setDefaultPersistenceProperties(Map defaultPersistenceProperties)
-   {
-      this.defaultPersistenceProperties = defaultPersistenceProperties;
-   }
-
-   public Hashtable getJndiProperties()
-   {
-      return null;
-   }
-
-   public InterceptorInfoRepository getInterceptorInfoRepository()
-   {
-      return interceptorInfoRepository;
-   }
-
-   public List<VirtualFile> getResources(VirtualFileFilter filter)
-   {
-      VisitorAttributes va = new VisitorAttributes();
-      va.setLeavesOnly(true);
-      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
-      va.setRecurseFilter(noJars);
-      FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
-
-      List<VirtualFile> classpath = unit.getDeploymentContext().getClassPath();
-      if (classpath != null)
-      {
-         for (VirtualFile vf : classpath)
-         {
-            try
-            {
-               vf.visit(visitor);
-            }
-            catch (IOException e)
-            {
-               throw new RuntimeException(e);
-            }
-         }
-      }
-      return visitor.getMatched();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,212 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.deployers;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.context.jar.JarUtils;
+import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 43304 $
+ */
+public class JBoss5DeploymentUnit implements org.jboss.ejb3.DeploymentUnit
+{
+   private DeploymentUnit unit;
+   private InterceptorInfoRepository interceptorInfoRepository = new InterceptorInfoRepository();
+   private Map defaultPersistenceProperties;
+
+   public JBoss5DeploymentUnit(DeploymentUnit unit)
+   {
+      this.unit = unit;
+   }
+
+   public VirtualFile getRootFile()
+   {
+      return unit.getDeploymentContext().getRoot();
+   }
+   
+   public URL getRelativeURL(String jar)
+   {
+      try
+      {
+         return new URL(jar);
+      }
+      catch (MalformedURLException e)
+      {
+         try
+         {
+            if (jar.startsWith(".."))
+            {
+               if (getUrl() == null)
+                  throw new RuntimeException("relative <jar-file> not allowed when standalone deployment unit is used");
+               String tmpjar = jar.substring(3);
+               VirtualFile vf = unit.getDeploymentContext().getRoot().getParent().findChild(tmpjar);
+               return vf.toURL();
+            }
+            else
+            {
+               File fp = new File(jar);
+               return fp.toURL();
+            }
+         }
+         catch (Exception e1)
+         {
+            throw new RuntimeException("could not find relative path: " + jar, e1);
+         }
+      }
+   }
+
+   URL extractDescriptorUrl(String resource)
+   {
+      try
+      {
+         VirtualFile vf = unit.getMetaDataFile(resource);
+         if (vf == null) return null;
+         return vf.toURL();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public URL getPersistenceXml()
+   {
+      return extractDescriptorUrl("persistence.xml");
+   }
+
+   public URL getEjbJarXml()
+   {
+      return extractDescriptorUrl("ejb-jar.xml");
+   }
+
+   public URL getJbossXml()
+   {
+      return extractDescriptorUrl("jboss.xml");
+   }
+
+   public VirtualFile getMetaDataFile(String name)
+   {
+      return unit.getMetaDataFile(name);
+   }
+   
+   public List<Class> getClasses()
+   {
+      return null;
+   }
+
+   public ClassLoader getClassLoader()
+   {
+      return unit.getClassLoader();
+   }
+
+   public ClassLoader getResourceLoader()
+   {
+      return unit.getClassLoader();
+   }
+
+   public String getShortName()
+   {
+      return unit.getDeploymentContext().getRoot().getName();
+   }
+
+   public URL getUrl()
+   {
+      try
+      {
+         return unit.getDeploymentContext().getRoot().toURL();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public String getDefaultEntityManagerName()
+   {
+      String url = getUrl().toString();
+      String name = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
+      return name;
+   }
+
+   public Map getDefaultPersistenceProperties()
+   {
+      return defaultPersistenceProperties;
+   }
+
+   public void setDefaultPersistenceProperties(Map defaultPersistenceProperties)
+   {
+      this.defaultPersistenceProperties = defaultPersistenceProperties;
+   }
+
+   public Hashtable getJndiProperties()
+   {
+      return null;
+   }
+
+   public InterceptorInfoRepository getInterceptorInfoRepository()
+   {
+      return interceptorInfoRepository;
+   }
+
+   public List<VirtualFile> getResources(VirtualFileFilter filter)
+   {
+      VisitorAttributes va = new VisitorAttributes();
+      va.setLeavesOnly(true);
+      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+      va.setRecurseFilter(noJars);
+      FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
+
+      List<VirtualFile> classpath = unit.getDeploymentContext().getClassPath();
+      if (classpath != null)
+      {
+         for (VirtualFile vf : classpath)
+         {
+            try
+            {
+               vf.visit(visitor);
+            }
+            catch (IOException e)
+            {
+               throw new RuntimeException(e);
+            }
+         }
+      }
+      return visitor.getMatched();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,111 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.deployers;
-
-import java.io.IOException;
-
-import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class JBossClientParsingDeployer extends ObjectModelFactoryDeployer<ApplicationClientDD>
-{
-   private String jbossClientXmlPath = "jboss-client.xml";
-   
-   /**
-    * Set the relative order to PARSER_DEPLOYER+1 by default
-    *
-    */   
-   public JBossClientParsingDeployer()
-   {
-      super(ApplicationClientDD.class);
-      setRelativeOrder(PARSER_DEPLOYER + 1);
-   }
-   
-   @Override
-   protected boolean allowsReparse()
-   {
-      return true;
-   }
-   
-   @Override
-   protected ObjectModelFactory getObjectModelFactory(ApplicationClientDD root)
-   {
-      // if we haven't gotten an application-client.xml yet
-      if(root == null)
-         root = new ApplicationClientDD();
-      
-      return new JBossClientDDObjectFactory(root);
-   }
-
-   @Override
-   public void deploy(DeploymentUnit unit) throws DeploymentException
-   {
-      if (accepts(unit))
-         createMetaData(unit, jbossClientXmlPath, null);
-   }
-
-   /**
-    * This method looks to the deployment for a META-INF/application-client.xml
-    * descriptor to identify a j2ee client jar.
-    */
-   private boolean accepts(DeploymentUnit unit) throws DeploymentException
-   {
-      boolean accepts = false;
-
-      // The jar must contain an META-INF/application-client.xml
-      VirtualFile dd = unit.getMetaDataFile(jbossClientXmlPath);
-      if (dd != null)
-      {
-         log.debug("Found application-client.xml file: " + unit.getName());
-         try
-         {
-            Element root = DOMUtils.parse(dd.openStream());
-            DocumentType doctype = root.getOwnerDocument().getDoctype();
-            String publicId = (doctype != null ? doctype.getPublicId() : null);
-            // Accept the JBoss5 publicId
-            accepts = "-//JBoss//DTD Application Client 5.0//EN".equals(publicId);
-            if (accepts == false)
-               log.debug("Ignore jboss-client.xml with publicId: " + publicId);
-         }
-         catch (IOException ex)
-         {
-            DeploymentException.rethrowAsDeploymentException("Cannot parse " + jbossClientXmlPath, ex);
-         }
-      }
-
-      return accepts;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.deployers;
+
+import java.io.IOException;
+
+import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class JBossClientParsingDeployer extends ObjectModelFactoryDeployer<ApplicationClientDD>
+{
+   private String jbossClientXmlPath = "jboss-client.xml";
+   
+   /**
+    * Set the relative order to PARSER_DEPLOYER+1 by default
+    *
+    */   
+   public JBossClientParsingDeployer()
+   {
+      super(ApplicationClientDD.class);
+      setRelativeOrder(PARSER_DEPLOYER + 1);
+   }
+   
+   @Override
+   protected boolean allowsReparse()
+   {
+      return true;
+   }
+   
+   @Override
+   protected ObjectModelFactory getObjectModelFactory(ApplicationClientDD root)
+   {
+      // if we haven't gotten an application-client.xml yet
+      if(root == null)
+         root = new ApplicationClientDD();
+      
+      return new JBossClientDDObjectFactory(root);
+   }
+
+   @Override
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      if (accepts(unit))
+         createMetaData(unit, jbossClientXmlPath, null);
+   }
+
+   /**
+    * This method looks to the deployment for a META-INF/application-client.xml
+    * descriptor to identify a j2ee client jar.
+    */
+   private boolean accepts(DeploymentUnit unit) throws DeploymentException
+   {
+      boolean accepts = false;
+
+      // The jar must contain an META-INF/application-client.xml
+      VirtualFile dd = unit.getMetaDataFile(jbossClientXmlPath);
+      if (dd != null)
+      {
+         log.debug("Found application-client.xml file: " + unit.getName());
+         try
+         {
+            Element root = DOMUtils.parse(dd.openStream());
+            DocumentType doctype = root.getOwnerDocument().getDoctype();
+            String publicId = (doctype != null ? doctype.getPublicId() : null);
+            // Accept the JBoss5 publicId
+            accepts = "-//JBoss//DTD Application Client 5.0//EN".equals(publicId);
+            if (accepts == false)
+               log.debug("Ignore jboss-client.xml with publicId: " + publicId);
+         }
+         catch (IOException ex)
+         {
+            DeploymentException.rethrowAsDeploymentException("Cannot parse " + jbossClientXmlPath, ex);
+         }
+      }
+
+      return accepts;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,418 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.embedded;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-import javax.naming.Context;
-
-import org.jboss.aop.AspectXmlLoader;
-import org.jboss.ejb3.InitialContextFactory;
-import org.jboss.ejb3.KernelAbstractionFactory;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.logging.Logger;
-import org.jboss.mx.server.ServerConstants;
-import org.jboss.mx.util.ObjectNameFactory;
-
-/**
- * This class is used to bootstrap the ejb3 container.
- * It find things by ClassLoader.getResource and will load
- * by default the embedded-jbosss-beans.xml file
- * and the ejb3-interceptors-aop.xml file.
- * <p/>
- * This is usually only used in standalone Java programs or Junit tests.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EJB3StandaloneBootstrap
-{
-   private static final Logger log = Logger.getLogger(EJB3StandaloneBootstrap.class);
-   
-   private final static ObjectName DEFAULT_LOADER_NAME =
-      ObjectNameFactory.create(ServerConstants.DEFAULT_LOADER_NAME);
-
-   public static Kernel kernel;
-   private static MBeanServer mbeanServer;
-   private static EJB3StandaloneDeployer deployer;
-   
-   /** Whether we have warned about the initial context */
-   private static boolean warned = false;
-
-   public static Kernel getKernel()
-   {
-      return kernel;
-   }
-
-   private static ArrayList<KernelDeployment> deployments = new ArrayList<KernelDeployment>();
-   private static ArrayList<URL> aopDeployments = new ArrayList<URL>();
-
-
-   /**
-    * Deploy a JBoss Microcontainer XML file.
-    *
-    * @param resource
-    */
-   public static void deployXmlResource(String resource)
-   {
-      try
-      {
-         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
-         URL bootstrap = Thread.currentThread().getContextClassLoader().getResource(resource);
-         if (bootstrap == null)
-            throw new RuntimeException("Cannot find " + resource);
-         KernelDeployment deployment = deployer.deploy(bootstrap);
-         deployments.add(0, deployment);
-         deployer.validate();
-      }
-      catch (Throwable throwable)
-      {
-         throw new RuntimeException(throwable);
-      }
-   }
-   
-   public static Object getDeployment(String name)
-   {
-      Iterator allDeployments = deployments.iterator();
-      while (allDeployments.hasNext())
-      {
-         KernelDeployment deployment = (KernelDeployment)allDeployments.next();
-         Iterator contexts = deployment.getInstalledContexts().iterator();
-         while (contexts.hasNext())
-         {
-            org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext context = (org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext)contexts.next();
-            if (context.getName().equals(name))
-               return context.getTarget();
-         }
-      }
-      
-      return null;
-   }
-
-   public static HashSet ignoredJars = new HashSet();
-
-   static
-   {
-      ignoredJars.add("antlr-2.7.5H3.jar");
-      ignoredJars.add("asm-attrs.jar");
-      ignoredJars.add("asm.jar");
-      ignoredJars.add("cglib-2.1.1.jar");
-      ignoredJars.add("commons-collections.jar");
-      ignoredJars.add("commons-logging-api.jar");
-      ignoredJars.add("commons-logging.jar");
-      ignoredJars.add("concurrent.jar");
-      ignoredJars.add("dom4j.jar");
-      ignoredJars.add("ejb3-persistence.jar");
-      ignoredJars.add("hibernate3.jar");
-      ignoredJars.add("hibernate-annotations.jar");
-      ignoredJars.add("hibernate-entitymanager.jar");
-      ignoredJars.add("hsqldb.jar");
-      ignoredJars.add("javassist.jar");
-      ignoredJars.add("jboss-annotations-ejb3.jar");
-      ignoredJars.add("jboss-aop-jdk50.jar");
-      ignoredJars.add("jboss-aspect-library-jdk50.jar");
-      ignoredJars.add("jboss-common.jar");
-      ignoredJars.add("jboss-common-jdbc-wrapper.jar");
-      ignoredJars.add("jboss-container.jar");
-      ignoredJars.add("jboss-dependency.jar");
-      ignoredJars.add("jboss-ejb3.jar");
-      ignoredJars.add("jboss-ejb3x.jar");
-      ignoredJars.add("jboss-j2ee.jar");
-      ignoredJars.add("jboss-j2se.jar");
-      ignoredJars.add("jboss.jar");
-      ignoredJars.add("jboss-jca.jar");
-      ignoredJars.add("jboss-local-jdbc.jar");
-      ignoredJars.add("jboss-microcontainer.jar");
-      ignoredJars.add("jbossmq.jar");
-      ignoredJars.add("jboss-remoting.jar");
-      ignoredJars.add("jbosssx.jar");
-      ignoredJars.add("jboss-system.jar");
-      ignoredJars.add("jboss-transaction.jar");
-      ignoredJars.add("jboss-xa-jdbc.jar");
-      ignoredJars.add("jnpserver.jar");
-      ignoredJars.add("log4j.jar");
-      ignoredJars.add("resolver.jar");
-      ignoredJars.add("trove.jar");
-      ignoredJars.add("xercesImpl.jar");
-      ignoredJars.add("xml-apis.jar");
-      ignoredJars.add("jboss-ejb3-all.jar");
-      ignoredJars.add("hibernate-all.jar");
-      ignoredJars.add("thirdparty-all.jar");
-   }
-
-
-   public static Hashtable getInitialContextProperties()
-   {
-      Hashtable hash = null;
-      ControllerContext context = kernel.getController().getInstalledContext("InitialContextProperties");
-      if (context != null)
-         hash = (Hashtable) context.getTarget();
-      else if (warned == false)
-      {
-         log.warn("Could not find an configured InitialContextProperties, this is ok if your already have a correct jndi.properties file");
-         warned = true;
-      }
-      return hash;
-   }
-
-
-   /**
-    * Scan java.class.path System property for jars that contain EJB3 files.
-    * <p/>
-    * This is unportable and unreliable.  Use with caution.
-    */
-   public static void scanClasspath(String paths)
-   {
-      try
-      {
-         String classpath = System.getProperty("java.class.path");
-         StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator);
-         String[] split = paths.split(",");
-         for (int i = 0; i < split.length; i++)
-         {
-            split[i] = split[i].trim();
-         }
-
-         deployer = createDeployer();
-
-         while (tokenizer.hasMoreTokens())
-         {
-            String path = tokenizer.nextToken().trim();
-            boolean found = false;
-            for (String wantedPath : split)
-            {
-               if (path.endsWith(System.getProperty("file.separator") + wantedPath))
-               {
-                  found = true;
-                  break;
-               }
-            }
-            if (!found) continue;
-            File fp = new File(path);
-            if (ignoredJars.contains(fp.getName())) continue;
-            URL archive = fp.toURL();
-            deployer.getArchives().add(archive);
-         }
-         if (deployer.getArchives().size() == 0)
-         {
-            deployer = null;
-            return;
-         }
-         deployer.create();
-         deployer.start();
-
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-      if (!KernelErrors.validate(kernel)) throw new RuntimeException("Problems scanning classpath");
-
-   }
-
-   /**
-    * Scan java.class.path System property for jars that contain EJB3 files.
-    * <p/>
-    * This is unportable and unreliable.  Use with caution.
-    */
-   public static void scanClasspath()
-   {
-      try
-      {
-         String classpath = System.getProperty("java.class.path");
-         StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator);
-
-         deployer = createDeployer();
-
-         while (tokenizer.hasMoreTokens())
-         {
-            String path = tokenizer.nextToken();
-            File fp = new File(path);
-            if (ignoredJars.contains(fp.getName())) continue;
-            URL archive = fp.toURL();
-            deployer.getArchives().add(archive);
-         }
-         if (deployer.getArchives().size() == 0)
-         {
-            deployer = null;
-            return;
-         }
-         deployer.create();
-         deployer.start();
-
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-      if (!KernelErrors.validate(kernel)) throw new RuntimeException("Problems scanning classpath");
-
-   }
-
-   /**
-    * Create a deployer that you can start deploying to.  You must call create/start and stop/destroy to bootstrap
-    * and shutdown
-    *
-    * @return
-    */
-   public static EJB3StandaloneDeployer createDeployer()
-   {
-      EJB3StandaloneDeployer deployer;
-      deployer = new EJB3StandaloneDeployer();
-      deployer.setJndiProperties(getInitialContextProperties());
-      deployer.setKernel(kernel);
-      deployer.setMbeanServer(mbeanServer);
-      
-      return deployer;
-   }
-
-   public static void shutdown()
-   {
-      try
-      {
-         if (deployer != null)
-         {
-            deployer.stop();
-            deployer.destroy();
-            deployer = null;
-         }
-         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
-         for (KernelDeployment deployment : deployments)
-         {
-            deployer.undeploy(deployment);
-         }
-
-         for (URL url : aopDeployments)
-         {
-            try
-            {
-               AspectXmlLoader.undeployXML(url);
-            }
-            catch (Exception e)
-            {
-               log.warn(e);
-            }
-         }
-         kernel = null;
-      }
-      catch (Throwable throwable)
-      {
-         log.warn(throwable);
-      }
-
-   }
-   
-   private static void initInitialContext()
-   {
-      Properties jndiProps = new Properties();
-      jndiProps.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.LocalOnlyContextFactory");
-      jndiProps.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
-      InitialContextFactory.setProperties(jndiProps);
-   }
-
-   /**
-    * Bootstrap the EJB3 container by loading up JBoss Microcontainer files.
-    *
-    * @param configPath base path for default resources.  null or "" should be good enough.
-    */
-   public static void boot(String configPath)
-   {
-      initInitialContext();
-      
-      String basePath = "";
-      if (configPath != null && !configPath.equals(""))
-      {
-         basePath = configPath;
-         if (!configPath.endsWith("/"))
-         {
-            basePath += "/";
-         }
-      }
-      
-      try
-      {
-         URL bootstrap = Thread.currentThread().getContextClassLoader().getResource(basePath + "embedded-jboss-beans.xml");
-         createKernel();
-         loadMBeanServer();
-         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
-         if (bootstrap == null)
-            throw new RuntimeException("Cannot find embedded-jboss-beans.xml");
-         deployments.add(0, deployer.deploy(bootstrap));
-         deployer.validate();
-
-         URL ejb3_interceptors = Thread.currentThread().getContextClassLoader().getResource(basePath + "ejb3-interceptors-aop.xml");
-         if (ejb3_interceptors == null)
-            throw new RuntimeException("Cannot find ejb3-interceptors-aop.xml");
-         AspectXmlLoader.deployXML(ejb3_interceptors);
-         aopDeployments.add(ejb3_interceptors);
-         
-         getDeployment("");
-      }
-      catch (Throwable throwable)
-      {
-         throw new RuntimeException(throwable);
-      }
-   }
-   
-   public static void loadMBeanServer() throws Exception
-   {
-      ControllerContext context = kernel.getController().getInstalledContext("MBeanServer");
-       
-      if (context != null)
-      {
-         mbeanServer = (MBeanServer) context.getTarget();
-      }
-      else
-      {
-         ArrayList servers = MBeanServerFactory.findMBeanServer(null);
-         if (servers.size() == 0)
-         {
-            mbeanServer = MBeanServerFactory.createMBeanServer();
-            org.jboss.mx.util.MBeanServerLocator.setJBoss(mbeanServer);
-         }
-      }
-   }
-
-
-   public static void createKernel()
-           throws Exception
-   {
-      BasicBootstrap bootstrap1 = new BasicBootstrap();
-      bootstrap1.run();
-      kernel = bootstrap1.getKernel();
-      KernelAbstractionFactory.setKernel(kernel);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,418 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import javax.naming.Context;
+
+import org.jboss.aop.AspectXmlLoader;
+import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.logging.Logger;
+import org.jboss.mx.server.ServerConstants;
+import org.jboss.mx.util.ObjectNameFactory;
+
+/**
+ * This class is used to bootstrap the ejb3 container.
+ * It find things by ClassLoader.getResource and will load
+ * by default the embedded-jbosss-beans.xml file
+ * and the ejb3-interceptors-aop.xml file.
+ * <p/>
+ * This is usually only used in standalone Java programs or Junit tests.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EJB3StandaloneBootstrap
+{
+   private static final Logger log = Logger.getLogger(EJB3StandaloneBootstrap.class);
+   
+   private final static ObjectName DEFAULT_LOADER_NAME =
+      ObjectNameFactory.create(ServerConstants.DEFAULT_LOADER_NAME);
+
+   public static Kernel kernel;
+   private static MBeanServer mbeanServer;
+   private static EJB3StandaloneDeployer deployer;
+   
+   /** Whether we have warned about the initial context */
+   private static boolean warned = false;
+
+   public static Kernel getKernel()
+   {
+      return kernel;
+   }
+
+   private static ArrayList<KernelDeployment> deployments = new ArrayList<KernelDeployment>();
+   private static ArrayList<URL> aopDeployments = new ArrayList<URL>();
+
+
+   /**
+    * Deploy a JBoss Microcontainer XML file.
+    *
+    * @param resource
+    */
+   public static void deployXmlResource(String resource)
+   {
+      try
+      {
+         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
+         URL bootstrap = Thread.currentThread().getContextClassLoader().getResource(resource);
+         if (bootstrap == null)
+            throw new RuntimeException("Cannot find " + resource);
+         KernelDeployment deployment = deployer.deploy(bootstrap);
+         deployments.add(0, deployment);
+         deployer.validate();
+      }
+      catch (Throwable throwable)
+      {
+         throw new RuntimeException(throwable);
+      }
+   }
+   
+   public static Object getDeployment(String name)
+   {
+      Iterator allDeployments = deployments.iterator();
+      while (allDeployments.hasNext())
+      {
+         KernelDeployment deployment = (KernelDeployment)allDeployments.next();
+         Iterator contexts = deployment.getInstalledContexts().iterator();
+         while (contexts.hasNext())
+         {
+            org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext context = (org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext)contexts.next();
+            if (context.getName().equals(name))
+               return context.getTarget();
+         }
+      }
+      
+      return null;
+   }
+
+   public static HashSet ignoredJars = new HashSet();
+
+   static
+   {
+      ignoredJars.add("antlr-2.7.5H3.jar");
+      ignoredJars.add("asm-attrs.jar");
+      ignoredJars.add("asm.jar");
+      ignoredJars.add("cglib-2.1.1.jar");
+      ignoredJars.add("commons-collections.jar");
+      ignoredJars.add("commons-logging-api.jar");
+      ignoredJars.add("commons-logging.jar");
+      ignoredJars.add("concurrent.jar");
+      ignoredJars.add("dom4j.jar");
+      ignoredJars.add("ejb3-persistence.jar");
+      ignoredJars.add("hibernate3.jar");
+      ignoredJars.add("hibernate-annotations.jar");
+      ignoredJars.add("hibernate-entitymanager.jar");
+      ignoredJars.add("hsqldb.jar");
+      ignoredJars.add("javassist.jar");
+      ignoredJars.add("jboss-annotations-ejb3.jar");
+      ignoredJars.add("jboss-aop-jdk50.jar");
+      ignoredJars.add("jboss-aspect-library-jdk50.jar");
+      ignoredJars.add("jboss-common.jar");
+      ignoredJars.add("jboss-common-jdbc-wrapper.jar");
+      ignoredJars.add("jboss-container.jar");
+      ignoredJars.add("jboss-dependency.jar");
+      ignoredJars.add("jboss-ejb3.jar");
+      ignoredJars.add("jboss-ejb3x.jar");
+      ignoredJars.add("jboss-j2ee.jar");
+      ignoredJars.add("jboss-j2se.jar");
+      ignoredJars.add("jboss.jar");
+      ignoredJars.add("jboss-jca.jar");
+      ignoredJars.add("jboss-local-jdbc.jar");
+      ignoredJars.add("jboss-microcontainer.jar");
+      ignoredJars.add("jbossmq.jar");
+      ignoredJars.add("jboss-remoting.jar");
+      ignoredJars.add("jbosssx.jar");
+      ignoredJars.add("jboss-system.jar");
+      ignoredJars.add("jboss-transaction.jar");
+      ignoredJars.add("jboss-xa-jdbc.jar");
+      ignoredJars.add("jnpserver.jar");
+      ignoredJars.add("log4j.jar");
+      ignoredJars.add("resolver.jar");
+      ignoredJars.add("trove.jar");
+      ignoredJars.add("xercesImpl.jar");
+      ignoredJars.add("xml-apis.jar");
+      ignoredJars.add("jboss-ejb3-all.jar");
+      ignoredJars.add("hibernate-all.jar");
+      ignoredJars.add("thirdparty-all.jar");
+   }
+
+
+   public static Hashtable getInitialContextProperties()
+   {
+      Hashtable hash = null;
+      ControllerContext context = kernel.getController().getInstalledContext("InitialContextProperties");
+      if (context != null)
+         hash = (Hashtable) context.getTarget();
+      else if (warned == false)
+      {
+         log.warn("Could not find an configured InitialContextProperties, this is ok if your already have a correct jndi.properties file");
+         warned = true;
+      }
+      return hash;
+   }
+
+
+   /**
+    * Scan java.class.path System property for jars that contain EJB3 files.
+    * <p/>
+    * This is unportable and unreliable.  Use with caution.
+    */
+   public static void scanClasspath(String paths)
+   {
+      try
+      {
+         String classpath = System.getProperty("java.class.path");
+         StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator);
+         String[] split = paths.split(",");
+         for (int i = 0; i < split.length; i++)
+         {
+            split[i] = split[i].trim();
+         }
+
+         deployer = createDeployer();
+
+         while (tokenizer.hasMoreTokens())
+         {
+            String path = tokenizer.nextToken().trim();
+            boolean found = false;
+            for (String wantedPath : split)
+            {
+               if (path.endsWith(System.getProperty("file.separator") + wantedPath))
+               {
+                  found = true;
+                  break;
+               }
+            }
+            if (!found) continue;
+            File fp = new File(path);
+            if (ignoredJars.contains(fp.getName())) continue;
+            URL archive = fp.toURL();
+            deployer.getArchives().add(archive);
+         }
+         if (deployer.getArchives().size() == 0)
+         {
+            deployer = null;
+            return;
+         }
+         deployer.create();
+         deployer.start();
+
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+      if (!KernelErrors.validate(kernel)) throw new RuntimeException("Problems scanning classpath");
+
+   }
+
+   /**
+    * Scan java.class.path System property for jars that contain EJB3 files.
+    * <p/>
+    * This is unportable and unreliable.  Use with caution.
+    */
+   public static void scanClasspath()
+   {
+      try
+      {
+         String classpath = System.getProperty("java.class.path");
+         StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator);
+
+         deployer = createDeployer();
+
+         while (tokenizer.hasMoreTokens())
+         {
+            String path = tokenizer.nextToken();
+            File fp = new File(path);
+            if (ignoredJars.contains(fp.getName())) continue;
+            URL archive = fp.toURL();
+            deployer.getArchives().add(archive);
+         }
+         if (deployer.getArchives().size() == 0)
+         {
+            deployer = null;
+            return;
+         }
+         deployer.create();
+         deployer.start();
+
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+      if (!KernelErrors.validate(kernel)) throw new RuntimeException("Problems scanning classpath");
+
+   }
+
+   /**
+    * Create a deployer that you can start deploying to.  You must call create/start and stop/destroy to bootstrap
+    * and shutdown
+    *
+    * @return
+    */
+   public static EJB3StandaloneDeployer createDeployer()
+   {
+      EJB3StandaloneDeployer deployer;
+      deployer = new EJB3StandaloneDeployer();
+      deployer.setJndiProperties(getInitialContextProperties());
+      deployer.setKernel(kernel);
+      deployer.setMbeanServer(mbeanServer);
+      
+      return deployer;
+   }
+
+   public static void shutdown()
+   {
+      try
+      {
+         if (deployer != null)
+         {
+            deployer.stop();
+            deployer.destroy();
+            deployer = null;
+         }
+         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
+         for (KernelDeployment deployment : deployments)
+         {
+            deployer.undeploy(deployment);
+         }
+
+         for (URL url : aopDeployments)
+         {
+            try
+            {
+               AspectXmlLoader.undeployXML(url);
+            }
+            catch (Exception e)
+            {
+               log.warn(e);
+            }
+         }
+         kernel = null;
+      }
+      catch (Throwable throwable)
+      {
+         log.warn(throwable);
+      }
+
+   }
+   
+   private static void initInitialContext()
+   {
+      Properties jndiProps = new Properties();
+      jndiProps.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.LocalOnlyContextFactory");
+      jndiProps.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
+      InitialContextFactory.setProperties(jndiProps);
+   }
+
+   /**
+    * Bootstrap the EJB3 container by loading up JBoss Microcontainer files.
+    *
+    * @param configPath base path for default resources.  null or "" should be good enough.
+    */
+   public static void boot(String configPath)
+   {
+      initInitialContext();
+      
+      String basePath = "";
+      if (configPath != null && !configPath.equals(""))
+      {
+         basePath = configPath;
+         if (!configPath.endsWith("/"))
+         {
+            basePath += "/";
+         }
+      }
+      
+      try
+      {
+         URL bootstrap = Thread.currentThread().getContextClassLoader().getResource(basePath + "embedded-jboss-beans.xml");
+         createKernel();
+         loadMBeanServer();
+         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
+         if (bootstrap == null)
+            throw new RuntimeException("Cannot find embedded-jboss-beans.xml");
+         deployments.add(0, deployer.deploy(bootstrap));
+         deployer.validate();
+
+         URL ejb3_interceptors = Thread.currentThread().getContextClassLoader().getResource(basePath + "ejb3-interceptors-aop.xml");
+         if (ejb3_interceptors == null)
+            throw new RuntimeException("Cannot find ejb3-interceptors-aop.xml");
+         AspectXmlLoader.deployXML(ejb3_interceptors);
+         aopDeployments.add(ejb3_interceptors);
+         
+         getDeployment("");
+      }
+      catch (Throwable throwable)
+      {
+         throw new RuntimeException(throwable);
+      }
+   }
+   
+   public static void loadMBeanServer() throws Exception
+   {
+      ControllerContext context = kernel.getController().getInstalledContext("MBeanServer");
+       
+      if (context != null)
+      {
+         mbeanServer = (MBeanServer) context.getTarget();
+      }
+      else
+      {
+         ArrayList servers = MBeanServerFactory.findMBeanServer(null);
+         if (servers.size() == 0)
+         {
+            mbeanServer = MBeanServerFactory.createMBeanServer();
+            org.jboss.mx.util.MBeanServerLocator.setJBoss(mbeanServer);
+         }
+      }
+   }
+
+
+   public static void createKernel()
+           throws Exception
+   {
+      BasicBootstrap bootstrap1 = new BasicBootstrap();
+      bootstrap1.run();
+      kernel = bootstrap1.getKernel();
+      KernelAbstractionFactory.setKernel(kernel);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneBootstrap.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,619 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.embedded;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.zip.ZipFile;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.kernel.Kernel;
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.context.jar.JarUtils;
-import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
-
-/**
- * When initialized properly, this class will search for annotated classes and archives in your
- * classpath and try to create EJB containers and EntityManagers automatically.
- * <p/>
- * All classes and jars must already be in your classpath for this deployer to work.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EJB3StandaloneDeployer
-{
-   private static class DeployerUnit implements DeploymentUnit
-   {
-      private URL url;
-      private ClassLoader resourceLoader;
-      private ClassLoader loader;
-      private Map defaultProps;
-      private Hashtable jndiProperties;
-      private InterceptorInfoRepository interceptorInfoRepository = new InterceptorInfoRepository();
-      private VirtualFile vfsRoot;
-
-      public DeployerUnit(ClassLoader loader, URL url, Map defaultProps, Hashtable jndiProperties)
-      {
-         this.loader = loader;
-         this.url = url;
-         URL[] urls = {url};
-         URL[] empty = {};
-         URLClassLoader parent = new URLClassLoader(empty)
-         {
-            @Override
-            public URL getResource(String name)
-            {
-               return null;
-            }
-         };
-         resourceLoader = new URLClassLoader(urls, parent);
-         this.defaultProps = defaultProps;
-         this.jndiProperties = jndiProperties;
-         try
-         {
-            VFS vfs = VFS.getVFS(url);
-            vfsRoot = vfs.getRoot();
-         }
-         catch (IOException e)
-         {
-            throw new RuntimeException();
-         }
-      }
-
-      public VirtualFile getRootFile()
-      {
-         return vfsRoot;
-      }
-      
-      public URL getRelativeURL(String jar)
-      {
-         URL url = null;
-         try
-         {
-            url = new URL(jar);
-         }
-         catch (MalformedURLException e)
-         {
-            try
-            {
-               if (jar.startsWith(".."))
-               {
-                  if (getUrl() == null)
-                     throw new RuntimeException("relative <jar-file> not allowed when standalone deployment unit is used");
-                  String base = getUrl().toString();
-                  jar = jar.replaceAll("\\.\\./", "+");
-                  int idx = jar.lastIndexOf('+');
-                  jar = jar.substring(idx + 1);
-                  for (int i = 0; i < idx + 1; i++)
-                  {
-                     int slash = base.lastIndexOf('/');
-                     base = base.substring(0, slash + 1);
-                  }
-                  url = new URL(base + jar.substring(idx));
-               }
-               else
-               {
-                  File fp = new File(jar);
-                  url = fp.toURL();
-               }
-            }
-            catch (MalformedURLException e1)
-            {
-               throw new RuntimeException("Unable to find relative url: " + jar, e1);
-            }
-         }
-         return url;
-      }
-      
-
-      public List<VirtualFile> getResources(VirtualFileFilter filter)
-      {
-         VisitorAttributes va = new VisitorAttributes();
-         va.setLeavesOnly(true);
-         SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
-         va.setRecurseFilter(noJars);
-         FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
-         try
-         {
-            vfsRoot.visit(visitor);
-         }
-         catch (IOException e)
-         {
-            throw new RuntimeException(e);
-         }
-         return visitor.getMatched();
-
-      }
-
-      public Hashtable getJndiProperties()
-      {
-         return jndiProperties;
-      }
-
-      public URL getPersistenceXml()
-      {
-         return getResourceLoader().getResource("META-INF/persistence.xml");
-      }
-
-      public URL getEjbJarXml()
-      {
-         return getResourceLoader().getResource("META-INF/ejb-jar.xml");
-      }
-
-      public URL getJbossXml()
-      {
-         return getResourceLoader().getResource("META-INF/jboss.xml");
-      }
-
-      public List<Class> getClasses()
-      {
-         return null;
-      }
-
-      public ClassLoader getClassLoader()
-      {
-         return loader;
-      }
-
-      public ClassLoader getResourceLoader()
-      {
-         return resourceLoader;
-      }
-
-      public String getShortName()
-      {
-         String url = getUrl().toString();
-         if (url.endsWith("/")) url = url.substring(0, url.length() - 1);
-
-         int dotIdx = url.lastIndexOf('.');
-         int slashIdx = url.lastIndexOf('/');
-         String name = null;
-         if (slashIdx > dotIdx)
-         {
-            name = url.substring(url.lastIndexOf('/') + 1);
-         }
-         else
-         {
-            name = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
-         }
-         return name;
-      }
-
-      public URL getUrl()
-      {
-         return url;
-      }
-
-      public String getDefaultEntityManagerName()
-      {
-         return getShortName();
-      }
-
-      public Map getDefaultPersistenceProperties()
-      {
-         return defaultProps;
-      }
-
-      public InterceptorInfoRepository getInterceptorInfoRepository()
-      {
-         return interceptorInfoRepository;
-      }
-
-      public VirtualFile getMetaDataFile(String path)
-      {
-         try
-         {
-            return vfsRoot.findChild(path);
-         }
-         catch (IOException e)
-         {
-            log.debug("Cannot get meta data file: " + path);
-            return null;
-         }
-      }
-   }
-
-   protected static final Logger log = Logger.getLogger(EJB3StandaloneDeployer.class);
-
-   protected Set<URL> archives = new HashSet<URL>();
-   protected Set<URL> deployDirs = new HashSet<URL>();
-   protected Set<String> archivesByResource = new HashSet<String>();
-   protected Set<String> deployDirsByResource = new HashSet<String>();
-   protected ClassLoader classLoader;
-   private Map defaultPersistenceProperties;
-   private Hashtable jndiProperties;
-
-   private List<EJB3StandaloneDeployment> deployments = new ArrayList<EJB3StandaloneDeployment>();
-
-   private Kernel kernel;
-   private MBeanServer mbeanServer;
-
-
-   public EJB3StandaloneDeployer()
-   {
-      classLoader = Thread.currentThread().getContextClassLoader();
-   }
-
-   public Kernel getKernel()
-   {
-      return kernel;
-   }
-
-   public void setKernel(Kernel kernel)
-   {
-      this.kernel = kernel;
-   }
-
-   /**
-    * This is used by deployer for @Service beans that have @Management interfaces
-    *
-    * @return
-    */
-   public MBeanServer getMbeanServer()
-   {
-      return mbeanServer;
-   }
-
-   public void setMbeanServer(MBeanServer mbeanServer)
-   {
-      this.mbeanServer = mbeanServer;
-   }
-
-   /**
-    * A set of URLs of jar archives to search for annotated EJB classes
-    *
-    * @return this will not return null.
-    */
-   public Set<URL> getArchives()
-   {
-      return archives;
-   }
-
-   public void setArchives(Set archives)
-   {
-      new Exception().printStackTrace();
-      this.archives = archives;
-   }
-
-
-   /**
-    * Set of directories where there are jar files and directories
-    * The deployer will search through all archives and directories for
-    * annotated classes
-    *
-    * @return this will not return null.
-    */
-   public Set<URL> getDeployDirs()
-   {
-      return deployDirs;
-   }
-
-   public void setDeployDirs(Set deployDirs)
-   {
-      this.deployDirs = deployDirs;
-   }
-
-   /**
-    * All strings in this set will be used with ClassLoader.getResources()
-    * All URLs returned will be used to search for annotated classes.
-    *
-    * @return
-    */
-   public Set<String> getArchivesByResource()
-   {
-      return archivesByResource;
-   }
-
-   public void setArchivesByResource(Set archivesByResource)
-   {
-      this.archivesByResource = archivesByResource;
-   }
-
-   /**
-    * All strings in this set will be used with ClassLoader.getResources().
-    * All URLs returned will be create a set of deploy directories that will
-    * be used to find archives and directories that will be searched for annotated classes
-    *
-    * @return
-    */
-   public Set<String> getDeployDirsByResource()
-   {
-      return deployDirsByResource;
-   }
-
-   public void setDeployDirsByResource(Set deployDirsByResource)
-   {
-      this.deployDirsByResource = deployDirsByResource;
-   }
-
-   public ClassLoader getClassLoader()
-   {
-      return classLoader;
-   }
-
-
-   /**
-    * You can set the classloader that will be used
-    *
-    * @param classLoader
-    */
-   public void setClassLoader(ClassLoader classLoader)
-   {
-      this.classLoader = classLoader;
-   }
-
-   public Map getDefaultPersistenceProperties()
-   {
-      return defaultPersistenceProperties;
-   }
-
-
-   /**
-    * If you do not specifiy the default persistence properties, the resource
-    * "default.persistence.properties" will be search for in your classpath
-    *
-    * @param defaultPersistenceProperties
-    */
-   public void setDefaultPersistenceProperties(Map defaultPersistenceProperties)
-   {
-      this.defaultPersistenceProperties = defaultPersistenceProperties;
-   }
-
-   public Hashtable getJndiProperties()
-   {
-      return jndiProperties;
-   }
-
-   public void setJndiProperties(Hashtable jndiProperties)
-   {
-      this.jndiProperties = jndiProperties;
-   }
-
-   /**
-    * Returns a list of deployments found in this
-    *
-    * @return
-    */
-   public List<EJB3StandaloneDeployment> getDeployments()
-   {
-      return deployments;
-   }
-
-   public void setDeployments(List<EJB3StandaloneDeployment> deployments)
-   {
-      this.deployments = deployments;
-   }
-
-   public static URL getContainingUrlFromResource(URL url, String resource) throws Exception
-   {
-      if (url.getProtocol().equals("jar"))
-      {
-         URL jarURL = url;
-         URLConnection urlConn = jarURL.openConnection();
-         JarURLConnection jarConn = (JarURLConnection) urlConn;
-         // Extract the archive to dest/jarName-contents/archive
-         String parentArchiveName = jarConn.getJarFile().getName();
-         File fp = new File(parentArchiveName);
-         return fp.toURL();
-      }
-
-      // its a file
-      String base = url.toString();
-      int idx = base.lastIndexOf(resource);
-      base = base.substring(0, idx);
-      return new URL(base);
-   }
-
-   public static URL getDeployDirFromResource(URL url, String resource) throws Exception
-   {
-      if (url.getProtocol().equals("jar"))
-      {
-         URL jarURL = url;
-         URLConnection urlConn = jarURL.openConnection();
-         JarURLConnection jarConn = (JarURLConnection) urlConn;
-         // Extract the archive to dest/jarName-contents/archive
-         String parentArchiveName = jarConn.getJarFile().getName();
-         File fp = new File(parentArchiveName);
-         return fp.getParentFile().toURL();
-      }
-
-      // its a file
-      String base = url.toString();
-      int idx = base.lastIndexOf(resource);
-      base = base.substring(0, idx);
-      File fp = new File(base);
-      return fp.getParentFile().toURL();
-   }
-
-   public void create() throws Exception
-   {
-      try
-      {
-         for (String resource : deployDirsByResource)
-         {
-            Enumeration<URL> urls = classLoader.getResources(resource);
-            while (urls.hasMoreElements())
-            {
-               URL url = urls.nextElement();
-               URL deployUrl = getDeployDirFromResource(url, resource);
-               deployDirs.add(deployUrl);
-            }
-         }
-
-         for (URL url : deployDirs)
-         {
-            File dir = new File(url.toURI());
-            for (File fp : dir.listFiles())
-            {
-               if (fp.isDirectory())
-               {
-                  archives.add(fp.toURL());
-                  continue;
-               }
-               try
-               {
-                  ZipFile zip = new ZipFile(fp);
-                  zip.entries();
-                  zip.close();
-                  archives.add(fp.toURL());
-               }
-               catch (IOException e)
-               {
-               }
-            }
-         }
-
-         for (String resource : archivesByResource)
-         {
-            Enumeration<URL> urls = classLoader.getResources(resource);
-            while (urls.hasMoreElements())
-            {
-               URL url = urls.nextElement();
-               URL archiveUrl = getContainingUrlFromResource(url, resource);
-               archives.add(archiveUrl);
-            }
-         }
-
-         if (defaultPersistenceProperties == null)
-         {
-            InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
-            if (is == null) throw new RuntimeException("cannot find default.persistence.properties");
-            Properties defaults = new Properties();
-            defaults.load(is);
-            defaultPersistenceProperties = defaults;
-         }
-
-         for (URL archive : archives)
-         {
-            DeployerUnit du = new DeployerUnit(classLoader, archive, defaultPersistenceProperties, jndiProperties);
-            EJB3StandaloneDeployment deployment = new EJB3StandaloneDeployment(du, kernel, mbeanServer);
-            deployments.add(deployment);
-            deployment.create();
-         }
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         throw e;
-      }
-   }
-
-   private void lookup(String name)
-   {
-      System.out.println("lookup " + name);
-      try {
-         InitialContext jndiContext = new InitialContext();
-         NamingEnumeration names = jndiContext.list(name);
-         if (names != null){
-            while (names.hasMore()){
-               System.out.println("  " + names.next());
-            }
-         }
-      } catch (Exception e){
-      }
-   }
-
-   public void start() throws Exception
-   {
-      try
-      {
-         loadMbeanServer();
-
-         for (EJB3StandaloneDeployment deployment : deployments)
-         {
-            if (deployment.getMbeanServer() == null)
-            {
-               deployment.setMbeanServer(mbeanServer);
-            }
-
-            deployment.start();
-            lookup("");
-         }
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         throw e;
-      }
-   }
-
-   private void loadMbeanServer()
-   {
-      if (mbeanServer == null)
-      {
-         ControllerContext context = kernel.getController().getInstalledContext("MBeanServer");
-
-         if (context != null)
-            mbeanServer = (MBeanServer) context.getTarget();
-         else
-         {
-            ArrayList servers = MBeanServerFactory.findMBeanServer(null);
-            if (servers.size() == 0)
-               mbeanServer = MBeanServerFactory.createMBeanServer();
-            else
-               mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
-         }
-      }
-   }
-
-   public void stop() throws Exception
-   {
-      for (EJB3StandaloneDeployment deployment : deployments)
-      {
-         deployment.stop();
-      }
-   }
-
-   public void destroy() throws Exception
-   {
-      for (EJB3StandaloneDeployment deployment : deployments)
-      {
-         deployment.destroy();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,619 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.zip.ZipFile;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
+import org.jboss.kernel.Kernel;
+import org.jboss.logging.Logger;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.context.jar.JarUtils;
+import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
+
+/**
+ * When initialized properly, this class will search for annotated classes and archives in your
+ * classpath and try to create EJB containers and EntityManagers automatically.
+ * <p/>
+ * All classes and jars must already be in your classpath for this deployer to work.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EJB3StandaloneDeployer
+{
+   private static class DeployerUnit implements DeploymentUnit
+   {
+      private URL url;
+      private ClassLoader resourceLoader;
+      private ClassLoader loader;
+      private Map defaultProps;
+      private Hashtable jndiProperties;
+      private InterceptorInfoRepository interceptorInfoRepository = new InterceptorInfoRepository();
+      private VirtualFile vfsRoot;
+
+      public DeployerUnit(ClassLoader loader, URL url, Map defaultProps, Hashtable jndiProperties)
+      {
+         this.loader = loader;
+         this.url = url;
+         URL[] urls = {url};
+         URL[] empty = {};
+         URLClassLoader parent = new URLClassLoader(empty)
+         {
+            @Override
+            public URL getResource(String name)
+            {
+               return null;
+            }
+         };
+         resourceLoader = new URLClassLoader(urls, parent);
+         this.defaultProps = defaultProps;
+         this.jndiProperties = jndiProperties;
+         try
+         {
+            VFS vfs = VFS.getVFS(url);
+            vfsRoot = vfs.getRoot();
+         }
+         catch (IOException e)
+         {
+            throw new RuntimeException();
+         }
+      }
+
+      public VirtualFile getRootFile()
+      {
+         return vfsRoot;
+      }
+      
+      public URL getRelativeURL(String jar)
+      {
+         URL url = null;
+         try
+         {
+            url = new URL(jar);
+         }
+         catch (MalformedURLException e)
+         {
+            try
+            {
+               if (jar.startsWith(".."))
+               {
+                  if (getUrl() == null)
+                     throw new RuntimeException("relative <jar-file> not allowed when standalone deployment unit is used");
+                  String base = getUrl().toString();
+                  jar = jar.replaceAll("\\.\\./", "+");
+                  int idx = jar.lastIndexOf('+');
+                  jar = jar.substring(idx + 1);
+                  for (int i = 0; i < idx + 1; i++)
+                  {
+                     int slash = base.lastIndexOf('/');
+                     base = base.substring(0, slash + 1);
+                  }
+                  url = new URL(base + jar.substring(idx));
+               }
+               else
+               {
+                  File fp = new File(jar);
+                  url = fp.toURL();
+               }
+            }
+            catch (MalformedURLException e1)
+            {
+               throw new RuntimeException("Unable to find relative url: " + jar, e1);
+            }
+         }
+         return url;
+      }
+      
+
+      public List<VirtualFile> getResources(VirtualFileFilter filter)
+      {
+         VisitorAttributes va = new VisitorAttributes();
+         va.setLeavesOnly(true);
+         SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+         va.setRecurseFilter(noJars);
+         FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
+         try
+         {
+            vfsRoot.visit(visitor);
+         }
+         catch (IOException e)
+         {
+            throw new RuntimeException(e);
+         }
+         return visitor.getMatched();
+
+      }
+
+      public Hashtable getJndiProperties()
+      {
+         return jndiProperties;
+      }
+
+      public URL getPersistenceXml()
+      {
+         return getResourceLoader().getResource("META-INF/persistence.xml");
+      }
+
+      public URL getEjbJarXml()
+      {
+         return getResourceLoader().getResource("META-INF/ejb-jar.xml");
+      }
+
+      public URL getJbossXml()
+      {
+         return getResourceLoader().getResource("META-INF/jboss.xml");
+      }
+
+      public List<Class> getClasses()
+      {
+         return null;
+      }
+
+      public ClassLoader getClassLoader()
+      {
+         return loader;
+      }
+
+      public ClassLoader getResourceLoader()
+      {
+         return resourceLoader;
+      }
+
+      public String getShortName()
+      {
+         String url = getUrl().toString();
+         if (url.endsWith("/")) url = url.substring(0, url.length() - 1);
+
+         int dotIdx = url.lastIndexOf('.');
+         int slashIdx = url.lastIndexOf('/');
+         String name = null;
+         if (slashIdx > dotIdx)
+         {
+            name = url.substring(url.lastIndexOf('/') + 1);
+         }
+         else
+         {
+            name = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
+         }
+         return name;
+      }
+
+      public URL getUrl()
+      {
+         return url;
+      }
+
+      public String getDefaultEntityManagerName()
+      {
+         return getShortName();
+      }
+
+      public Map getDefaultPersistenceProperties()
+      {
+         return defaultProps;
+      }
+
+      public InterceptorInfoRepository getInterceptorInfoRepository()
+      {
+         return interceptorInfoRepository;
+      }
+
+      public VirtualFile getMetaDataFile(String path)
+      {
+         try
+         {
+            return vfsRoot.findChild(path);
+         }
+         catch (IOException e)
+         {
+            log.debug("Cannot get meta data file: " + path);
+            return null;
+         }
+      }
+   }
+
+   protected static final Logger log = Logger.getLogger(EJB3StandaloneDeployer.class);
+
+   protected Set<URL> archives = new HashSet<URL>();
+   protected Set<URL> deployDirs = new HashSet<URL>();
+   protected Set<String> archivesByResource = new HashSet<String>();
+   protected Set<String> deployDirsByResource = new HashSet<String>();
+   protected ClassLoader classLoader;
+   private Map defaultPersistenceProperties;
+   private Hashtable jndiProperties;
+
+   private List<EJB3StandaloneDeployment> deployments = new ArrayList<EJB3StandaloneDeployment>();
+
+   private Kernel kernel;
+   private MBeanServer mbeanServer;
+
+
+   public EJB3StandaloneDeployer()
+   {
+      classLoader = Thread.currentThread().getContextClassLoader();
+   }
+
+   public Kernel getKernel()
+   {
+      return kernel;
+   }
+
+   public void setKernel(Kernel kernel)
+   {
+      this.kernel = kernel;
+   }
+
+   /**
+    * This is used by deployer for @Service beans that have @Management interfaces
+    *
+    * @return
+    */
+   public MBeanServer getMbeanServer()
+   {
+      return mbeanServer;
+   }
+
+   public void setMbeanServer(MBeanServer mbeanServer)
+   {
+      this.mbeanServer = mbeanServer;
+   }
+
+   /**
+    * A set of URLs of jar archives to search for annotated EJB classes
+    *
+    * @return this will not return null.
+    */
+   public Set<URL> getArchives()
+   {
+      return archives;
+   }
+
+   public void setArchives(Set archives)
+   {
+      new Exception().printStackTrace();
+      this.archives = archives;
+   }
+
+
+   /**
+    * Set of directories where there are jar files and directories
+    * The deployer will search through all archives and directories for
+    * annotated classes
+    *
+    * @return this will not return null.
+    */
+   public Set<URL> getDeployDirs()
+   {
+      return deployDirs;
+   }
+
+   public void setDeployDirs(Set deployDirs)
+   {
+      this.deployDirs = deployDirs;
+   }
+
+   /**
+    * All strings in this set will be used with ClassLoader.getResources()
+    * All URLs returned will be used to search for annotated classes.
+    *
+    * @return
+    */
+   public Set<String> getArchivesByResource()
+   {
+      return archivesByResource;
+   }
+
+   public void setArchivesByResource(Set archivesByResource)
+   {
+      this.archivesByResource = archivesByResource;
+   }
+
+   /**
+    * All strings in this set will be used with ClassLoader.getResources().
+    * All URLs returned will be create a set of deploy directories that will
+    * be used to find archives and directories that will be searched for annotated classes
+    *
+    * @return
+    */
+   public Set<String> getDeployDirsByResource()
+   {
+      return deployDirsByResource;
+   }
+
+   public void setDeployDirsByResource(Set deployDirsByResource)
+   {
+      this.deployDirsByResource = deployDirsByResource;
+   }
+
+   public ClassLoader getClassLoader()
+   {
+      return classLoader;
+   }
+
+
+   /**
+    * You can set the classloader that will be used
+    *
+    * @param classLoader
+    */
+   public void setClassLoader(ClassLoader classLoader)
+   {
+      this.classLoader = classLoader;
+   }
+
+   public Map getDefaultPersistenceProperties()
+   {
+      return defaultPersistenceProperties;
+   }
+
+
+   /**
+    * If you do not specifiy the default persistence properties, the resource
+    * "default.persistence.properties" will be search for in your classpath
+    *
+    * @param defaultPersistenceProperties
+    */
+   public void setDefaultPersistenceProperties(Map defaultPersistenceProperties)
+   {
+      this.defaultPersistenceProperties = defaultPersistenceProperties;
+   }
+
+   public Hashtable getJndiProperties()
+   {
+      return jndiProperties;
+   }
+
+   public void setJndiProperties(Hashtable jndiProperties)
+   {
+      this.jndiProperties = jndiProperties;
+   }
+
+   /**
+    * Returns a list of deployments found in this
+    *
+    * @return
+    */
+   public List<EJB3StandaloneDeployment> getDeployments()
+   {
+      return deployments;
+   }
+
+   public void setDeployments(List<EJB3StandaloneDeployment> deployments)
+   {
+      this.deployments = deployments;
+   }
+
+   public static URL getContainingUrlFromResource(URL url, String resource) throws Exception
+   {
+      if (url.getProtocol().equals("jar"))
+      {
+         URL jarURL = url;
+         URLConnection urlConn = jarURL.openConnection();
+         JarURLConnection jarConn = (JarURLConnection) urlConn;
+         // Extract the archive to dest/jarName-contents/archive
+         String parentArchiveName = jarConn.getJarFile().getName();
+         File fp = new File(parentArchiveName);
+         return fp.toURL();
+      }
+
+      // its a file
+      String base = url.toString();
+      int idx = base.lastIndexOf(resource);
+      base = base.substring(0, idx);
+      return new URL(base);
+   }
+
+   public static URL getDeployDirFromResource(URL url, String resource) throws Exception
+   {
+      if (url.getProtocol().equals("jar"))
+      {
+         URL jarURL = url;
+         URLConnection urlConn = jarURL.openConnection();
+         JarURLConnection jarConn = (JarURLConnection) urlConn;
+         // Extract the archive to dest/jarName-contents/archive
+         String parentArchiveName = jarConn.getJarFile().getName();
+         File fp = new File(parentArchiveName);
+         return fp.getParentFile().toURL();
+      }
+
+      // its a file
+      String base = url.toString();
+      int idx = base.lastIndexOf(resource);
+      base = base.substring(0, idx);
+      File fp = new File(base);
+      return fp.getParentFile().toURL();
+   }
+
+   public void create() throws Exception
+   {
+      try
+      {
+         for (String resource : deployDirsByResource)
+         {
+            Enumeration<URL> urls = classLoader.getResources(resource);
+            while (urls.hasMoreElements())
+            {
+               URL url = urls.nextElement();
+               URL deployUrl = getDeployDirFromResource(url, resource);
+               deployDirs.add(deployUrl);
+            }
+         }
+
+         for (URL url : deployDirs)
+         {
+            File dir = new File(url.toURI());
+            for (File fp : dir.listFiles())
+            {
+               if (fp.isDirectory())
+               {
+                  archives.add(fp.toURL());
+                  continue;
+               }
+               try
+               {
+                  ZipFile zip = new ZipFile(fp);
+                  zip.entries();
+                  zip.close();
+                  archives.add(fp.toURL());
+               }
+               catch (IOException e)
+               {
+               }
+            }
+         }
+
+         for (String resource : archivesByResource)
+         {
+            Enumeration<URL> urls = classLoader.getResources(resource);
+            while (urls.hasMoreElements())
+            {
+               URL url = urls.nextElement();
+               URL archiveUrl = getContainingUrlFromResource(url, resource);
+               archives.add(archiveUrl);
+            }
+         }
+
+         if (defaultPersistenceProperties == null)
+         {
+            InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
+            if (is == null) throw new RuntimeException("cannot find default.persistence.properties");
+            Properties defaults = new Properties();
+            defaults.load(is);
+            defaultPersistenceProperties = defaults;
+         }
+
+         for (URL archive : archives)
+         {
+            DeployerUnit du = new DeployerUnit(classLoader, archive, defaultPersistenceProperties, jndiProperties);
+            EJB3StandaloneDeployment deployment = new EJB3StandaloneDeployment(du, kernel, mbeanServer);
+            deployments.add(deployment);
+            deployment.create();
+         }
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         throw e;
+      }
+   }
+
+   private void lookup(String name)
+   {
+      System.out.println("lookup " + name);
+      try {
+         InitialContext jndiContext = new InitialContext();
+         NamingEnumeration names = jndiContext.list(name);
+         if (names != null){
+            while (names.hasMore()){
+               System.out.println("  " + names.next());
+            }
+         }
+      } catch (Exception e){
+      }
+   }
+
+   public void start() throws Exception
+   {
+      try
+      {
+         loadMbeanServer();
+
+         for (EJB3StandaloneDeployment deployment : deployments)
+         {
+            if (deployment.getMbeanServer() == null)
+            {
+               deployment.setMbeanServer(mbeanServer);
+            }
+
+            deployment.start();
+            lookup("");
+         }
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         throw e;
+      }
+   }
+
+   private void loadMbeanServer()
+   {
+      if (mbeanServer == null)
+      {
+         ControllerContext context = kernel.getController().getInstalledContext("MBeanServer");
+
+         if (context != null)
+            mbeanServer = (MBeanServer) context.getTarget();
+         else
+         {
+            ArrayList servers = MBeanServerFactory.findMBeanServer(null);
+            if (servers.size() == 0)
+               mbeanServer = MBeanServerFactory.createMBeanServer();
+            else
+               mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
+         }
+      }
+   }
+
+   public void stop() throws Exception
+   {
+      for (EJB3StandaloneDeployment deployment : deployments)
+      {
+         deployment.stop();
+      }
+   }
+
+   public void destroy() throws Exception
+   {
+      for (EJB3StandaloneDeployment deployment : deployments)
+      {
+         deployment.destroy();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,216 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.embedded;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.security.jacc.PolicyConfiguration;
-import javax.management.MBeanServer;
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.service.ServiceContainer;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.MCDependencyPolicy;
-import org.jboss.ejb3.MCKernelAbstraction;
-import org.jboss.ejb3.security.JaccHelper;
-import org.jboss.kernel.Kernel;
-
-/**
- * Use this class when you want to manually specify classes you want deployed.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EJB3StandaloneDeployment extends Ejb3Deployment
-{
-   public EJB3StandaloneDeployment(DeploymentUnit di, Kernel kernel, MBeanServer mbeanServer)
-   {
-      super(di, null);
-   
-      defaultSFSBDomain = "Embedded Stateful Bean";
-      kernelAbstraction = new MCKernelAbstraction(kernel, mbeanServer);
-      this.mbeanServer = mbeanServer;
-   }
-   
-   public void setMbeanServer(MBeanServer mbeanServer)
-   {
-      super.setMbeanServer(mbeanServer);
-      
-      kernelAbstraction.setMbeanServer(mbeanServer);
-   }
-
-   protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit)
-   {
-      /*
-      try
-      {
-         pc.commit();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }\
-      */
-   }
-
-   protected PolicyConfiguration createPolicyConfiguration() throws Exception
-   {
-      return JaccHelper.initialiseJacc(getJaccContextId());
-   }
-
-/*
-   protected Map getDefaultPersistenceProperties()
-   {
-      try
-      {
-         Properties hb = new Properties();
-         InputStream hbstream = di.getResourceLoader().getResourceAsStream("default.persistence.properties");
-         hb.load(hbstream);
-         hbstream.close();
-         return hb;
-      }
-      catch (IOException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-
-   @Override
-   protected void registerContainer(Container container) throws Exception
-   {
-      super.registerContainer(container);
-      container.create();
-   }
-
-   @Override
-   public void start() throws Exception
-   {
-      try
-      {
-      super.start();
-      ArrayList<Container> serviceBeans = new ArrayList<Container>();
-      Iterator it = containers.keySet().iterator();
-      while (it.hasNext())
-      {
-         ObjectName on = (ObjectName) it.next();
-         Container con = (Container) containers.get(on);
-         if (con instanceof ServiceManager || con instanceof ServiceContainer)
-         {
-            serviceBeans.add(con);
-         }
-         else
-         {
-            con.start();
-         }
-      }
-      for (Container con : serviceBeans)
-      {
-         con.start();
-      }
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         throw e;
-      }
-   }
-
-
-   @Override
-   public void stop() throws Exception
-   {
-      Iterator it = containers.keySet().iterator();
-      while (it.hasNext())
-      {
-         ObjectName on = (ObjectName) it.next();
-         Container con = (Container) containers.get(on);
-         con.stop();
-      }
-      super.stop();
-   }
-
-   @Override
-   public void destroy() throws Exception
-   {
-      super.destroy();
-
-      Iterator it = containers.keySet().iterator();
-      while (it.hasNext())
-      {
-         ObjectName on = (ObjectName) it.next();
-         Container con = (Container) containers.get(on);
-         con.destroy();
-      }
-   }
-
-   protected void startEntityManagerDeployment()
-   {
-      if (entityDeployment != null)
-      {
-         try
-         {
-            entityDeployment.start();
-         }
-         catch (Exception e)
-         {
-            throw new RuntimeException(e);
-         }
-      }
-   }
-
-   protected void stopEntityManagerDeployment()
-   {
-      if (entityDeployment != null)
-      {
-         try
-         {
-            entityDeployment.stop();
-         }
-         catch (Exception e)
-         {
-            throw new RuntimeException(e);
-         }
-      }
-   }
-
-*/
-
-   public DependencyPolicy createDependencyPolicy()
-   {
-      return new MCDependencyPolicy();
-   }
-   
-//   @Override
-//   public void start() throws Exception
-//   {
-//      System.err.println("EJB3StandaloneDeployment.start");
-//      super.start();
-//      for(Object o : ejbContainers.values())
-//      {
-//         Container con = (Container) o;
-//         if(con instanceof ServiceContainer)
-//            con.start();
-//      }
-//   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,216 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.security.jacc.PolicyConfiguration;
+import javax.management.MBeanServer;
+import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.service.ServiceContainer;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.MCDependencyPolicy;
+import org.jboss.ejb3.MCKernelAbstraction;
+import org.jboss.ejb3.security.JaccHelper;
+import org.jboss.kernel.Kernel;
+
+/**
+ * Use this class when you want to manually specify classes you want deployed.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EJB3StandaloneDeployment extends Ejb3Deployment
+{
+   public EJB3StandaloneDeployment(DeploymentUnit di, Kernel kernel, MBeanServer mbeanServer)
+   {
+      super(di, null);
+   
+      defaultSFSBDomain = "Embedded Stateful Bean";
+      kernelAbstraction = new MCKernelAbstraction(kernel, mbeanServer);
+      this.mbeanServer = mbeanServer;
+   }
+   
+   public void setMbeanServer(MBeanServer mbeanServer)
+   {
+      super.setMbeanServer(mbeanServer);
+      
+      kernelAbstraction.setMbeanServer(mbeanServer);
+   }
+
+   protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit)
+   {
+      /*
+      try
+      {
+         pc.commit();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }\
+      */
+   }
+
+   protected PolicyConfiguration createPolicyConfiguration() throws Exception
+   {
+      return JaccHelper.initialiseJacc(getJaccContextId());
+   }
+
+/*
+   protected Map getDefaultPersistenceProperties()
+   {
+      try
+      {
+         Properties hb = new Properties();
+         InputStream hbstream = di.getResourceLoader().getResourceAsStream("default.persistence.properties");
+         hb.load(hbstream);
+         hbstream.close();
+         return hb;
+      }
+      catch (IOException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+
+   @Override
+   protected void registerContainer(Container container) throws Exception
+   {
+      super.registerContainer(container);
+      container.create();
+   }
+
+   @Override
+   public void start() throws Exception
+   {
+      try
+      {
+      super.start();
+      ArrayList<Container> serviceBeans = new ArrayList<Container>();
+      Iterator it = containers.keySet().iterator();
+      while (it.hasNext())
+      {
+         ObjectName on = (ObjectName) it.next();
+         Container con = (Container) containers.get(on);
+         if (con instanceof ServiceManager || con instanceof ServiceContainer)
+         {
+            serviceBeans.add(con);
+         }
+         else
+         {
+            con.start();
+         }
+      }
+      for (Container con : serviceBeans)
+      {
+         con.start();
+      }
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         throw e;
+      }
+   }
+
+
+   @Override
+   public void stop() throws Exception
+   {
+      Iterator it = containers.keySet().iterator();
+      while (it.hasNext())
+      {
+         ObjectName on = (ObjectName) it.next();
+         Container con = (Container) containers.get(on);
+         con.stop();
+      }
+      super.stop();
+   }
+
+   @Override
+   public void destroy() throws Exception
+   {
+      super.destroy();
+
+      Iterator it = containers.keySet().iterator();
+      while (it.hasNext())
+      {
+         ObjectName on = (ObjectName) it.next();
+         Container con = (Container) containers.get(on);
+         con.destroy();
+      }
+   }
+
+   protected void startEntityManagerDeployment()
+   {
+      if (entityDeployment != null)
+      {
+         try
+         {
+            entityDeployment.start();
+         }
+         catch (Exception e)
+         {
+            throw new RuntimeException(e);
+         }
+      }
+   }
+
+   protected void stopEntityManagerDeployment()
+   {
+      if (entityDeployment != null)
+      {
+         try
+         {
+            entityDeployment.stop();
+         }
+         catch (Exception e)
+         {
+            throw new RuntimeException(e);
+         }
+      }
+   }
+
+*/
+
+   public DependencyPolicy createDependencyPolicy()
+   {
+      return new MCDependencyPolicy();
+   }
+   
+//   @Override
+//   public void start() throws Exception
+//   {
+//      System.err.println("EJB3StandaloneDeployment.start");
+//      super.start();
+//      for(Object o : ejbContainers.values())
+//      {
+//         Container con = (Container) o;
+//         if(con instanceof ServiceContainer)
+//            con.start();
+//      }
+//   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,137 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.embedded;
-
-
-import org.jboss.ejb3.naming.BrainlessContext;
-import org.jboss.logging.Logger;
-import org.jboss.security.auth.callback.SecurityAssociationHandler;
-import org.jboss.security.auth.login.XMLLoginConfigImpl;
-import org.jboss.security.plugins.JBossAuthorizationManager;
-import org.jboss.security.plugins.JaasSecurityManager;
-import org.jboss.security.plugins.SecurityDomainContext;
-
-import javax.naming.*;
-import javax.naming.spi.ObjectFactory;
-import javax.security.auth.login.Configuration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @author carlo
- */
-public class JaasSecurityManagerService
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(JaasSecurityManager.class);
-
-   private static final String SECURITY_MGR_PATH = "java:/jaas";
-
-   private static Map<String, JaasSecurityManager> cache = new HashMap<String, JaasSecurityManager>();
-
-   private Hashtable initialContextProperties;
-
-   public JaasSecurityManagerService()
-   {
-
-   }
-
-   public void setInitialContextProperties(Hashtable initialContextProperties)
-   {
-      this.initialContextProperties = initialContextProperties;
-   }
-
-   private InitialContext getInitialContext() throws NamingException
-   {
-      if (initialContextProperties != null) return new InitialContext(initialContextProperties);
-      else return new InitialContext();
-   }
-
-   public void start() throws Exception
-   {
-      XMLLoginConfigImpl configuration = new XMLLoginConfigImpl();
-      configuration.setConfigResource("login-config.xml");
-      configuration.loadConfig();
-
-      Configuration.setConfiguration(configuration);
-
-      Context ctx = getInitialContext();
-
-      String factoryName = SecurityDomainObjectFactory.class.getName();
-      Reference ref = new Reference("nl.wolfc.embedded.security.plugins.JaasSecurityManager", factoryName, null);
-      ctx.rebind(SECURITY_MGR_PATH, ref);
-   }
-
-   private static JaasSecurityManager getSecurityManager(String name)
-   {
-      JaasSecurityManager manager = cache.get(name);
-      if (manager != null)
-      {
-         //log.info("cache hit");
-         return manager;
-      }
-      synchronized (cache)
-      {
-         if (manager != null)
-            return manager;
-
-         manager = new JaasSecurityManager(name, new SecurityAssociationHandler());
-         cache.put(name, manager);
-      }
-      return manager;
-   }
-
-   public static class SecurityDomainObjectFactory implements ObjectFactory
-   {
-      @SuppressWarnings("unused")
-      private static final Logger log = Logger.getLogger(SecurityDomainObjectFactory.class);
-      
-      public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment) throws Exception
-      {
-         /**
-          * The lookup will be of the form java:/jaas/other
-          * So check for name.get(1)
-          */
-         String securityDomainName = name.get(1);
-         final SecurityDomainContext ctx = new SecurityDomainContext(getSecurityManager(securityDomainName), null);
-         ctx.setAuthorizationManager(new JBossAuthorizationManager(securityDomainName, new SecurityAssociationHandler()));
-         return new BrainlessContext()
-         {
-            public Object lookup(Name name) throws NamingException
-            {
-               log.debug("lookup " + name);
-               if(name.size() < 2)
-                  return lookup(name.get(0));
-               else
-                  return ctx.lookup(name.get(1));
-            }
-
-            public Object lookup(String name) throws NamingException
-            {
-               log.debug("lookup " + name);
-               return getSecurityManager(name);
-            }
-         };
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+
+import org.jboss.ejb3.naming.BrainlessContext;
+import org.jboss.logging.Logger;
+import org.jboss.security.auth.callback.SecurityAssociationHandler;
+import org.jboss.security.auth.login.XMLLoginConfigImpl;
+import org.jboss.security.plugins.JBossAuthorizationManager;
+import org.jboss.security.plugins.JaasSecurityManager;
+import org.jboss.security.plugins.SecurityDomainContext;
+
+import javax.naming.*;
+import javax.naming.spi.ObjectFactory;
+import javax.security.auth.login.Configuration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * @author carlo
+ */
+public class JaasSecurityManagerService
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(JaasSecurityManager.class);
+
+   private static final String SECURITY_MGR_PATH = "java:/jaas";
+
+   private static Map<String, JaasSecurityManager> cache = new HashMap<String, JaasSecurityManager>();
+
+   private Hashtable initialContextProperties;
+
+   public JaasSecurityManagerService()
+   {
+
+   }
+
+   public void setInitialContextProperties(Hashtable initialContextProperties)
+   {
+      this.initialContextProperties = initialContextProperties;
+   }
+
+   private InitialContext getInitialContext() throws NamingException
+   {
+      if (initialContextProperties != null) return new InitialContext(initialContextProperties);
+      else return new InitialContext();
+   }
+
+   public void start() throws Exception
+   {
+      XMLLoginConfigImpl configuration = new XMLLoginConfigImpl();
+      configuration.setConfigResource("login-config.xml");
+      configuration.loadConfig();
+
+      Configuration.setConfiguration(configuration);
+
+      Context ctx = getInitialContext();
+
+      String factoryName = SecurityDomainObjectFactory.class.getName();
+      Reference ref = new Reference("nl.wolfc.embedded.security.plugins.JaasSecurityManager", factoryName, null);
+      ctx.rebind(SECURITY_MGR_PATH, ref);
+   }
+
+   private static JaasSecurityManager getSecurityManager(String name)
+   {
+      JaasSecurityManager manager = cache.get(name);
+      if (manager != null)
+      {
+         //log.info("cache hit");
+         return manager;
+      }
+      synchronized (cache)
+      {
+         if (manager != null)
+            return manager;
+
+         manager = new JaasSecurityManager(name, new SecurityAssociationHandler());
+         cache.put(name, manager);
+      }
+      return manager;
+   }
+
+   public static class SecurityDomainObjectFactory implements ObjectFactory
+   {
+      @SuppressWarnings("unused")
+      private static final Logger log = Logger.getLogger(SecurityDomainObjectFactory.class);
+      
+      public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment) throws Exception
+      {
+         /**
+          * The lookup will be of the form java:/jaas/other
+          * So check for name.get(1)
+          */
+         String securityDomainName = name.get(1);
+         final SecurityDomainContext ctx = new SecurityDomainContext(getSecurityManager(securityDomainName), null);
+         ctx.setAuthorizationManager(new JBossAuthorizationManager(securityDomainName, new SecurityAssociationHandler()));
+         return new BrainlessContext()
+         {
+            public Object lookup(Name name) throws NamingException
+            {
+               log.debug("lookup " + name);
+               if(name.size() < 2)
+                  return lookup(name.get(0));
+               else
+                  return ctx.lookup(name.get(1));
+            }
+
+            public Object lookup(String name) throws NamingException
+            {
+               log.debug("lookup " + name);
+               return getSecurityManager(name);
+            }
+         };
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JaasSecurityManagerService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.embedded;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.EJB3Deployer;
-import org.jboss.ejb3.EJB3Util;
-
-/**
- * Initializes java:comp
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JavaCompInitializer
-{
-   private Hashtable jndiProperties;
-
-
-   public Hashtable getJndiProperties()
-   {
-      return jndiProperties;
-   }
-
-   public void setJndiProperties(Hashtable jndiProperties)
-   {
-      this.jndiProperties = jndiProperties;
-   }
-
-   public void start() throws Exception
-   {
-      InitialContext ctx = EJB3Util.getInitialContext(jndiProperties);
-      EJB3Deployer.initializeJavaComp(ctx);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.EJB3Deployer;
+import org.jboss.ejb3.EJB3Util;
+
+/**
+ * Initializes java:comp
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JavaCompInitializer
+{
+   private Hashtable jndiProperties;
+
+
+   public Hashtable getJndiProperties()
+   {
+      return jndiProperties;
+   }
+
+   public void setJndiProperties(Hashtable jndiProperties)
+   {
+      this.jndiProperties = jndiProperties;
+   }
+
+   public void start() throws Exception
+   {
+      InitialContext ctx = EJB3Util.getInitialContext(jndiProperties);
+      EJB3Deployer.initializeJavaComp(ctx);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JavaCompInitializer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,99 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.embedded;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.ejb3.EJB3Util;
-import org.jboss.ejb3.NonSerializableFactory;
-import org.jboss.naming.Util;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JndiBinder
-{
-   private String bindTo;
-   private Object target;
-   private boolean serializable;
-   private Hashtable properties;
-
-   public void setBindTo(String bindTo)
-   {
-      this.bindTo = bindTo;
-   }
-
-   public void setTarget(Object target)
-   {
-      this.target = target;
-   }
-
-   public void setSerializable(boolean serializable)
-   {
-      this.serializable = serializable;
-   }
-
-   public void setJndiProperties(Hashtable properties)
-   {
-      this.properties = properties;
-   }
-
-   public void start() throws Exception
-   {
-      InitialContext ctx = EJB3Util.getInitialContext(properties);
-      
-      try
-      {
-         if (serializable)
-         {
-            Util.rebind(ctx, bindTo, target);
-         }
-         else
-         {
-            NonSerializableFactory.rebind(ctx, bindTo, target);
-         }
-      } catch (NamingException e)
-      {
-         NamingException namingException = new NamingException("Could not bind JndiBinder service into JNDI under jndiName:" + ctx.getNameInNamespace() + "/" + bindTo);
-         namingException.setRootCause(e);
-         throw namingException;
-      }
-   }
-
-   public void stop() throws Exception
-   {
-      InitialContext ctx = EJB3Util.getInitialContext(properties);
-      if (serializable)
-      {
-         Util.unbind(ctx, bindTo);
-      }
-      else
-      {
-         NonSerializableFactory.unbind(ctx, bindTo);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.ejb3.EJB3Util;
+import org.jboss.ejb3.NonSerializableFactory;
+import org.jboss.naming.Util;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JndiBinder
+{
+   private String bindTo;
+   private Object target;
+   private boolean serializable;
+   private Hashtable properties;
+
+   public void setBindTo(String bindTo)
+   {
+      this.bindTo = bindTo;
+   }
+
+   public void setTarget(Object target)
+   {
+      this.target = target;
+   }
+
+   public void setSerializable(boolean serializable)
+   {
+      this.serializable = serializable;
+   }
+
+   public void setJndiProperties(Hashtable properties)
+   {
+      this.properties = properties;
+   }
+
+   public void start() throws Exception
+   {
+      InitialContext ctx = EJB3Util.getInitialContext(properties);
+      
+      try
+      {
+         if (serializable)
+         {
+            Util.rebind(ctx, bindTo, target);
+         }
+         else
+         {
+            NonSerializableFactory.rebind(ctx, bindTo, target);
+         }
+      } catch (NamingException e)
+      {
+         NamingException namingException = new NamingException("Could not bind JndiBinder service into JNDI under jndiName:" + ctx.getNameInNamespace() + "/" + bindTo);
+         namingException.setRootCause(e);
+         throw namingException;
+      }
+   }
+
+   public void stop() throws Exception
+   {
+      InitialContext ctx = EJB3Util.getInitialContext(properties);
+      if (serializable)
+      {
+         Util.unbind(ctx, bindTo);
+      }
+      else
+      {
+         NonSerializableFactory.unbind(ctx, bindTo);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,115 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.embedded;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.DependencyInfo;
-import org.jboss.dependency.spi.DependencyItem;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.util.JBossStringBuilder;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class KernelErrors
-{
-   private static final Logger log = Logger.getLogger(KernelErrors.class);
-
-   public static boolean validate(Kernel kernel)
-   {
-      Controller controller = kernel.getController();
-      Set notInstalled = new HashSet(controller.getNotInstalled());
-      if (notInstalled.isEmpty()) return true;
-
-      for (Iterator i = notInstalled.iterator(); i.hasNext();)
-      {
-         KernelControllerContext context = (KernelControllerContext) i.next();
-         if (context.getState().equals(context.getRequiredState()))
-            i.remove();
-      }
-
-      if (notInstalled.isEmpty()) return true;
-
-      HashSet errors = new HashSet();
-      HashSet incomplete = new HashSet();
-      for (Iterator i = notInstalled.iterator(); i.hasNext();)
-      {
-         KernelControllerContext ctx = (KernelControllerContext) i.next();
-         if (ctx.getState().equals(ControllerState.ERROR))
-            errors.add(ctx);
-         else
-            incomplete.add(ctx);
-      }
-      if (errors.size() != 0)
-      {
-         log.error("*** DEPLOYMENTS IN ERROR:\n");
-         for (Iterator i = errors.iterator(); i.hasNext();)
-         {
-            KernelControllerContext ctx = (KernelControllerContext) i.next();
-            log.error("Failed deployment: " + ctx.getName(), ctx.getError());
-         }
-      }
-      if (incomplete.size() != 0)
-      {
-         JBossStringBuilder buffer = new JBossStringBuilder();
-         buffer.append("\n*** DEPLOYMENTS MISSING DEPENDENCIES:\n");
-         for (Iterator i = incomplete.iterator(); i.hasNext();)
-         {
-            KernelControllerContext ctx = (KernelControllerContext) i.next();
-            buffer.append(ctx.getName()).append(" depends on: \n");
-            DependencyInfo dependsInfo = ctx.getDependencyInfo();
-            Set depends = dependsInfo.getIDependOn(null);
-            for (Iterator j = depends.iterator(); j.hasNext();)
-            {
-               DependencyItem item = (DependencyItem) j.next();
-               buffer.append("                     ").append(item.getIDependOn()).append("'{").append(item.getWhenRequired().getStateString());
-               buffer.append(':');
-               ControllerContext other = controller.getContext(item.getIDependOn(), null);
-               if (other == null)
-                  buffer.append("NOT FOUND");
-               else
-                  buffer.append(other.getState().getStateString());
-               buffer.append('}');
-               if (j.hasNext())
-                  buffer.append("\n");
-            }
-            buffer.append('\n');
-         }
-         log.error(buffer.toString());
-      }
-      if (errors.size() > 0 || incomplete.size() > 0)
-      {
-         return false;
-      }
-      return true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.util.JBossStringBuilder;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class KernelErrors
+{
+   private static final Logger log = Logger.getLogger(KernelErrors.class);
+
+   public static boolean validate(Kernel kernel)
+   {
+      Controller controller = kernel.getController();
+      Set notInstalled = new HashSet(controller.getNotInstalled());
+      if (notInstalled.isEmpty()) return true;
+
+      for (Iterator i = notInstalled.iterator(); i.hasNext();)
+      {
+         KernelControllerContext context = (KernelControllerContext) i.next();
+         if (context.getState().equals(context.getRequiredState()))
+            i.remove();
+      }
+
+      if (notInstalled.isEmpty()) return true;
+
+      HashSet errors = new HashSet();
+      HashSet incomplete = new HashSet();
+      for (Iterator i = notInstalled.iterator(); i.hasNext();)
+      {
+         KernelControllerContext ctx = (KernelControllerContext) i.next();
+         if (ctx.getState().equals(ControllerState.ERROR))
+            errors.add(ctx);
+         else
+            incomplete.add(ctx);
+      }
+      if (errors.size() != 0)
+      {
+         log.error("*** DEPLOYMENTS IN ERROR:\n");
+         for (Iterator i = errors.iterator(); i.hasNext();)
+         {
+            KernelControllerContext ctx = (KernelControllerContext) i.next();
+            log.error("Failed deployment: " + ctx.getName(), ctx.getError());
+         }
+      }
+      if (incomplete.size() != 0)
+      {
+         JBossStringBuilder buffer = new JBossStringBuilder();
+         buffer.append("\n*** DEPLOYMENTS MISSING DEPENDENCIES:\n");
+         for (Iterator i = incomplete.iterator(); i.hasNext();)
+         {
+            KernelControllerContext ctx = (KernelControllerContext) i.next();
+            buffer.append(ctx.getName()).append(" depends on: \n");
+            DependencyInfo dependsInfo = ctx.getDependencyInfo();
+            Set depends = dependsInfo.getIDependOn(null);
+            for (Iterator j = depends.iterator(); j.hasNext();)
+            {
+               DependencyItem item = (DependencyItem) j.next();
+               buffer.append("                     ").append(item.getIDependOn()).append("'{").append(item.getWhenRequired().getStateString());
+               buffer.append(':');
+               ControllerContext other = controller.getContext(item.getIDependOn(), null);
+               if (other == null)
+                  buffer.append("NOT FOUND");
+               else
+                  buffer.append(other.getState().getStateString());
+               buffer.append('}');
+               if (j.hasNext())
+                  buffer.append("\n");
+            }
+            buffer.append('\n');
+         }
+         log.error(buffer.toString());
+      }
+      if (errors.size() > 0 || incomplete.size() > 0)
+      {
+         return false;
+      }
+      return true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/KernelErrors.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,245 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.embedded;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import org.jboss.aop.AspectXmlLoader;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ServletBootstrapListener implements ServletContextListener
-{
-   private static final Logger log = Logger.getLogger(ServletBootstrapListener.class);
-
-   protected Kernel kernel;
-
-   protected List<KernelDeployment> deployments = new ArrayList<KernelDeployment>();
-   protected List<URL> aopDeployments = new ArrayList<URL>();
-
-
-   protected void createKernel()
-           throws Exception
-   {
-      BasicBootstrap bootstrap1 = new BasicBootstrap();
-      bootstrap1.run();
-      kernel = bootstrap1.getKernel();
-   }
-
-   protected void deployXmlResource(String resource)
-   {
-      try
-      {
-         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
-         URL bootstrap = Thread.currentThread().getContextClassLoader().getResource(resource);
-         if (bootstrap == null)
-            throw new RuntimeException("Cannot find " + resource);
-         KernelDeployment deployment = deployer.deploy(bootstrap);
-         deployer.validate();
-         deployments.add(0, deployment);
-      }
-      catch (Throwable throwable)
-      {
-         throwable.printStackTrace();
-         throw new RuntimeException(throwable);
-      }
-
-   }
-
-   public static HashSet ignoredJars = new HashSet();
-
-   static
-   {
-      ignoredJars.add("/WEB-INF/lib/antlr-2.7.5H3.jar");
-      ignoredJars.add("/WEB-INF/lib/asm-attrs.jar");
-      ignoredJars.add("/WEB-INF/lib/asm.jar");
-      ignoredJars.add("/WEB-INF/lib/cglib-2.1.1.jar");
-      ignoredJars.add("/WEB-INF/lib/commons-collections.jar");
-      ignoredJars.add("/WEB-INF/lib/commons-logging-api.jar");
-      ignoredJars.add("/WEB-INF/lib/commons-logging.jar");
-      ignoredJars.add("/WEB-INF/lib/concurrent.jar");
-      ignoredJars.add("/WEB-INF/lib/dom4j.jar");
-      ignoredJars.add("/WEB-INF/lib/ejb3-persistence.jar");
-      ignoredJars.add("/WEB-INF/lib/hibernate3.jar");
-      ignoredJars.add("/WEB-INF/lib/hibernate-annotations.jar");
-      ignoredJars.add("/WEB-INF/lib/hibernate-entitymanager.jar");
-      ignoredJars.add("/WEB-INF/lib/hsqldb.jar");
-      ignoredJars.add("/WEB-INF/lib/javassist.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-annotations-ejb3.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-aop-jdk50.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-aspect-library-jdk50.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-common.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-common-jdbc-wrapper.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-container.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-dependency.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-ejb3.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-ejb3x.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-j2ee.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-j2se.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-jca.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-local-jdbc.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-microcontainer.jar");
-      ignoredJars.add("/WEB-INF/lib/jbossmq.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-remoting.jar");
-      ignoredJars.add("/WEB-INF/lib/jbosssx.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-system.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-transaction.jar");
-      ignoredJars.add("/WEB-INF/lib/jboss-xa-jdbc.jar");
-      ignoredJars.add("/WEB-INF/lib/jnpserver.jar");
-      ignoredJars.add("/WEB-INF/lib/log4j.jar");
-      ignoredJars.add("/WEB-INF/lib/resolver.jar");
-      ignoredJars.add("/WEB-INF/lib/trove.jar");
-      ignoredJars.add("/WEB-INF/lib/xercesImpl.jar");
-      ignoredJars.add("/WEB-INF/lib/xml-apis.jar");
-   }
-
-   private EJB3StandaloneDeployer deployer;
-
-
-   public void contextInitialized(ServletContextEvent servletContextEvent)
-   {
-      try
-      {
-         createKernel();
-
-         ServletContext servletContext = servletContextEvent.getServletContext();
-         String aop = (String) servletContext.getInitParameter("jboss-aop-deployments");
-
-         if (aop == null) aop = "ejb3-interceptors-aop.xml";
-
-         StringTokenizer tokenizer = new StringTokenizer(aop, ",");
-         while (tokenizer.hasMoreTokens())
-         {
-            String token = tokenizer.nextToken().trim();
-            log.debug("deploying aop xml: " + token);
-            URL url = Thread.currentThread().getContextClassLoader().getResource(token);
-            try
-            {
-               AspectXmlLoader.deployXML(url);
-               aopDeployments.add(0, url);
-            }
-            catch (Exception e)
-            {
-               throw new RuntimeException(e);
-            }
-         }
-
-         String deployments = (String) servletContext.getInitParameter("jboss-kernel-deployments");
-
-         if (deployments == null) deployments = "embedded-jboss-beans.xml";
-
-         tokenizer = new StringTokenizer(deployments, ",");
-         while (tokenizer.hasMoreTokens())
-         {
-            String token = tokenizer.nextToken().trim();
-            log.debug("deploying kernel xml: " + token);
-            deployXmlResource(token);
-         }
-
-         String scan = (String) servletContext.getInitParameter("automatic-scan");
-         if (scan != null && !scan.equals("false")) return;
-
-         Set libJars = servletContext.getResourcePaths("/WEB-INF/lib");
-         deployer = new EJB3StandaloneDeployer();
-         deployer.setJndiProperties(getInitialContextProperties());
-         deployer.setKernel(kernel);
-         for (Object jar : libJars)
-         {
-            if (ignoredJars.contains(jar)) continue;
-            URL archive = servletContext.getResource((String)jar);
-            deployer.getArchives().add(archive);
-         }
-         if (deployer.getArchives().size() == 0)
-         {
-            deployer = null;
-            return;
-         }
-         deployer.create();
-         deployer.start();
-      }
-      catch (Exception e)
-      {
-         log.error(e);
-         throw new RuntimeException(e);
-      }
-
-      if (!KernelErrors.validate(kernel)) throw new RuntimeException("Problems scanning ServletContext.getResourcePaths");
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      Hashtable hash = null;
-      ControllerContext context = kernel.getController().getInstalledContext("InitialContextProperties");
-      if (context != null)
-         hash = (Hashtable) context.getTarget();
-      else
-         log.warn("could not find an configured InitialContextProperties, this is ok if your already have a correct jndi.properties file");
-      return hash;
-   }
-
-
-   public void contextDestroyed(ServletContextEvent servletContextEvent)
-   {
-      try
-      {
-         if (deployer != null)
-         {
-            deployer.stop();
-            deployer.destroy();
-         }
-         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
-         for (KernelDeployment deployment : deployments)
-         {
-            deployer.undeploy(deployment);
-         }
-
-         for (URL url : aopDeployments)
-         {
-            AspectXmlLoader.undeployXML(url);
-         }
-      }
-      catch (Throwable throwable)
-      {
-         throwable.printStackTrace();
-         throw new RuntimeException(throwable);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,245 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import org.jboss.aop.AspectXmlLoader;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ServletBootstrapListener implements ServletContextListener
+{
+   private static final Logger log = Logger.getLogger(ServletBootstrapListener.class);
+
+   protected Kernel kernel;
+
+   protected List<KernelDeployment> deployments = new ArrayList<KernelDeployment>();
+   protected List<URL> aopDeployments = new ArrayList<URL>();
+
+
+   protected void createKernel()
+           throws Exception
+   {
+      BasicBootstrap bootstrap1 = new BasicBootstrap();
+      bootstrap1.run();
+      kernel = bootstrap1.getKernel();
+   }
+
+   protected void deployXmlResource(String resource)
+   {
+      try
+      {
+         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
+         URL bootstrap = Thread.currentThread().getContextClassLoader().getResource(resource);
+         if (bootstrap == null)
+            throw new RuntimeException("Cannot find " + resource);
+         KernelDeployment deployment = deployer.deploy(bootstrap);
+         deployer.validate();
+         deployments.add(0, deployment);
+      }
+      catch (Throwable throwable)
+      {
+         throwable.printStackTrace();
+         throw new RuntimeException(throwable);
+      }
+
+   }
+
+   public static HashSet ignoredJars = new HashSet();
+
+   static
+   {
+      ignoredJars.add("/WEB-INF/lib/antlr-2.7.5H3.jar");
+      ignoredJars.add("/WEB-INF/lib/asm-attrs.jar");
+      ignoredJars.add("/WEB-INF/lib/asm.jar");
+      ignoredJars.add("/WEB-INF/lib/cglib-2.1.1.jar");
+      ignoredJars.add("/WEB-INF/lib/commons-collections.jar");
+      ignoredJars.add("/WEB-INF/lib/commons-logging-api.jar");
+      ignoredJars.add("/WEB-INF/lib/commons-logging.jar");
+      ignoredJars.add("/WEB-INF/lib/concurrent.jar");
+      ignoredJars.add("/WEB-INF/lib/dom4j.jar");
+      ignoredJars.add("/WEB-INF/lib/ejb3-persistence.jar");
+      ignoredJars.add("/WEB-INF/lib/hibernate3.jar");
+      ignoredJars.add("/WEB-INF/lib/hibernate-annotations.jar");
+      ignoredJars.add("/WEB-INF/lib/hibernate-entitymanager.jar");
+      ignoredJars.add("/WEB-INF/lib/hsqldb.jar");
+      ignoredJars.add("/WEB-INF/lib/javassist.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-annotations-ejb3.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-aop-jdk50.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-aspect-library-jdk50.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-common.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-common-jdbc-wrapper.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-container.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-dependency.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-ejb3.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-ejb3x.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-j2ee.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-j2se.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-jca.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-local-jdbc.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-microcontainer.jar");
+      ignoredJars.add("/WEB-INF/lib/jbossmq.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-remoting.jar");
+      ignoredJars.add("/WEB-INF/lib/jbosssx.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-system.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-transaction.jar");
+      ignoredJars.add("/WEB-INF/lib/jboss-xa-jdbc.jar");
+      ignoredJars.add("/WEB-INF/lib/jnpserver.jar");
+      ignoredJars.add("/WEB-INF/lib/log4j.jar");
+      ignoredJars.add("/WEB-INF/lib/resolver.jar");
+      ignoredJars.add("/WEB-INF/lib/trove.jar");
+      ignoredJars.add("/WEB-INF/lib/xercesImpl.jar");
+      ignoredJars.add("/WEB-INF/lib/xml-apis.jar");
+   }
+
+   private EJB3StandaloneDeployer deployer;
+
+
+   public void contextInitialized(ServletContextEvent servletContextEvent)
+   {
+      try
+      {
+         createKernel();
+
+         ServletContext servletContext = servletContextEvent.getServletContext();
+         String aop = (String) servletContext.getInitParameter("jboss-aop-deployments");
+
+         if (aop == null) aop = "ejb3-interceptors-aop.xml";
+
+         StringTokenizer tokenizer = new StringTokenizer(aop, ",");
+         while (tokenizer.hasMoreTokens())
+         {
+            String token = tokenizer.nextToken().trim();
+            log.debug("deploying aop xml: " + token);
+            URL url = Thread.currentThread().getContextClassLoader().getResource(token);
+            try
+            {
+               AspectXmlLoader.deployXML(url);
+               aopDeployments.add(0, url);
+            }
+            catch (Exception e)
+            {
+               throw new RuntimeException(e);
+            }
+         }
+
+         String deployments = (String) servletContext.getInitParameter("jboss-kernel-deployments");
+
+         if (deployments == null) deployments = "embedded-jboss-beans.xml";
+
+         tokenizer = new StringTokenizer(deployments, ",");
+         while (tokenizer.hasMoreTokens())
+         {
+            String token = tokenizer.nextToken().trim();
+            log.debug("deploying kernel xml: " + token);
+            deployXmlResource(token);
+         }
+
+         String scan = (String) servletContext.getInitParameter("automatic-scan");
+         if (scan != null && !scan.equals("false")) return;
+
+         Set libJars = servletContext.getResourcePaths("/WEB-INF/lib");
+         deployer = new EJB3StandaloneDeployer();
+         deployer.setJndiProperties(getInitialContextProperties());
+         deployer.setKernel(kernel);
+         for (Object jar : libJars)
+         {
+            if (ignoredJars.contains(jar)) continue;
+            URL archive = servletContext.getResource((String)jar);
+            deployer.getArchives().add(archive);
+         }
+         if (deployer.getArchives().size() == 0)
+         {
+            deployer = null;
+            return;
+         }
+         deployer.create();
+         deployer.start();
+      }
+      catch (Exception e)
+      {
+         log.error(e);
+         throw new RuntimeException(e);
+      }
+
+      if (!KernelErrors.validate(kernel)) throw new RuntimeException("Problems scanning ServletContext.getResourcePaths");
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      Hashtable hash = null;
+      ControllerContext context = kernel.getController().getInstalledContext("InitialContextProperties");
+      if (context != null)
+         hash = (Hashtable) context.getTarget();
+      else
+         log.warn("could not find an configured InitialContextProperties, this is ok if your already have a correct jndi.properties file");
+      return hash;
+   }
+
+
+   public void contextDestroyed(ServletContextEvent servletContextEvent)
+   {
+      try
+      {
+         if (deployer != null)
+         {
+            deployer.stop();
+            deployer.destroy();
+         }
+         BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
+         for (KernelDeployment deployment : deployments)
+         {
+            deployer.undeploy(deployment);
+         }
+
+         for (URL url : aopDeployments)
+         {
+            AspectXmlLoader.undeployXML(url);
+         }
+      }
+      catch (Throwable throwable)
+      {
+         throwable.printStackTrace();
+         throw new RuntimeException(throwable);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,138 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.embedded;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.tx.TxUtil;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public final class UserTransactionImpl implements UserTransaction, java.io.Externalizable
-{
-   protected static Logger log = Logger.getLogger(UserTransactionImpl.class);
-
-   /**
-    * Timeout value in seconds for new transactions started
-    * by this bean instance.
-    */
-   private TransactionManager tm;
-
-   public UserTransactionImpl()
-   {
-   }
-
-   public void start()
-   {
-      if (log.isDebugEnabled())
-         log.debug("new UserTx: " + this);
-      this.tm = TxUtil.getTransactionManager();
-   }
-
-   public void stop()
-   {
-      this.tm = null;
-   }
-
-   public void begin()
-           throws NotSupportedException, SystemException
-   {
-      // Start the transaction
-      tm.begin();
-
-      Transaction tx = tm.getTransaction();
-      if (log.isDebugEnabled())
-         log.debug("UserTx begin: " + tx);
-
-   }
-
-   public void commit()
-           throws RollbackException, HeuristicMixedException, HeuristicRollbackException,
-                  SecurityException, IllegalStateException, SystemException
-   {
-      Transaction tx = tm.getTransaction();
-      if (log.isDebugEnabled())
-         log.debug("UserTx commit: " + tx);
-
-      tm.commit();
-   }
-
-   public void rollback()
-           throws IllegalStateException, SecurityException, SystemException
-   {
-      Transaction tx = tm.getTransaction();
-      if (log.isDebugEnabled())
-         log.debug("UserTx rollback: " + tx);
-      tm.rollback();
-   }
-
-   public void setRollbackOnly()
-           throws IllegalStateException, SystemException
-   {
-      Transaction tx = tm.getTransaction();
-      if (log.isDebugEnabled())
-         log.debug("UserTx setRollbackOnly: " + tx);
-
-      tm.setRollbackOnly();
-   }
-
-   public int getStatus()
-           throws SystemException
-   {
-      return tm.getStatus();
-   }
-
-   /**
-    * Set the transaction timeout value for new transactions
-    * started by this instance.
-    */
-   public void setTransactionTimeout(int seconds)
-           throws SystemException
-   {
-      tm.setTransactionTimeout(seconds);
-   }
-
-   public void writeExternal(ObjectOutput out) throws IOException
-   {
-      //To change body of implemented methods use File | Settings | File Templates.
-   }
-
-   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
-   {
-      this.tm = TxUtil.getTransactionManager();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import org.jboss.logging.Logger;
+import org.jboss.ejb3.tx.TxUtil;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public final class UserTransactionImpl implements UserTransaction, java.io.Externalizable
+{
+   protected static Logger log = Logger.getLogger(UserTransactionImpl.class);
+
+   /**
+    * Timeout value in seconds for new transactions started
+    * by this bean instance.
+    */
+   private TransactionManager tm;
+
+   public UserTransactionImpl()
+   {
+   }
+
+   public void start()
+   {
+      if (log.isDebugEnabled())
+         log.debug("new UserTx: " + this);
+      this.tm = TxUtil.getTransactionManager();
+   }
+
+   public void stop()
+   {
+      this.tm = null;
+   }
+
+   public void begin()
+           throws NotSupportedException, SystemException
+   {
+      // Start the transaction
+      tm.begin();
+
+      Transaction tx = tm.getTransaction();
+      if (log.isDebugEnabled())
+         log.debug("UserTx begin: " + tx);
+
+   }
+
+   public void commit()
+           throws RollbackException, HeuristicMixedException, HeuristicRollbackException,
+                  SecurityException, IllegalStateException, SystemException
+   {
+      Transaction tx = tm.getTransaction();
+      if (log.isDebugEnabled())
+         log.debug("UserTx commit: " + tx);
+
+      tm.commit();
+   }
+
+   public void rollback()
+           throws IllegalStateException, SecurityException, SystemException
+   {
+      Transaction tx = tm.getTransaction();
+      if (log.isDebugEnabled())
+         log.debug("UserTx rollback: " + tx);
+      tm.rollback();
+   }
+
+   public void setRollbackOnly()
+           throws IllegalStateException, SystemException
+   {
+      Transaction tx = tm.getTransaction();
+      if (log.isDebugEnabled())
+         log.debug("UserTx setRollbackOnly: " + tx);
+
+      tm.setRollbackOnly();
+   }
+
+   public int getStatus()
+           throws SystemException
+   {
+      return tm.getStatus();
+   }
+
+   /**
+    * Set the transaction timeout value for new transactions
+    * started by this instance.
+    */
+   public void setTransactionTimeout(int seconds)
+           throws SystemException
+   {
+      tm.setTransactionTimeout(seconds);
+   }
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      //To change body of implemented methods use File | Settings | File Templates.
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      this.tm = TxUtil.getTransactionManager();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/UserTransactionImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,167 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.embedded;
-
-import javax.transaction.xa.Xid;
-import org.jboss.tm.*;
-
-/**
- * Stupid wrapper because tons of services use the XidFactoryMBean interface.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class XidFactoryMBean implements org.jboss.tm.XidFactoryMBean
-{
-   private XidFactoryBase base;
-
-   public XidFactoryMBean(XidFactoryBase base)
-   {
-      this.base = base;
-   }
-
-   public org.jboss.tm.XidFactoryMBean getInstance()
-   {
-      return this;
-   }
-
-   public String getName()
-   {
-      throw new RuntimeException("should not be called");
-   }
-
-   public int getState()
-   {
-      throw new RuntimeException("should not be called");
-   }
-
-   public String getStateString()
-   {
-      throw new RuntimeException("should not be called");
-   }
-
-   public void jbossInternalLifecycle(String method) throws Exception
-   {
-      throw new RuntimeException("should not be called");
-   }
-
-   public void create() throws Exception
-   {
-   }
-
-   public void start() throws Exception
-   {
-   }
-
-   public void stop()
-   {
-   }
-
-   public void destroy()
-   {
-   }
-
-   public String getBaseGlobalId()
-   {
-      return base.getBaseGlobalId();
-   }
-
-   public void setBaseGlobalId(String baseGlobalId)
-   {
-      base.setBaseGlobalId(baseGlobalId);
-   }
-
-   public long getGlobalIdNumber()
-   {
-      return base.getGlobalIdNumber();
-   }
-
-   public void setGlobalIdNumber(long globalIdNumber)
-   {
-      base.setGlobalIdNumber(globalIdNumber);
-   }
-
-   public String getBranchQualifier()
-   {
-      return base.getBranchQualifier();
-   }
-
-   public void setBranchQualifier(String branchQualifier)
-   {
-      base.setBranchQualifier(branchQualifier);
-   }
-
-   public boolean isPad()
-   {
-      return base.isPad();
-   }
-
-   public void setPad(boolean pad)
-   {
-      base.setPad(pad);
-   }
-
-   public XidImpl newXid()
-   {
-      return base.newXid();
-   }
-
-   public XidImpl newBranch(GlobalId globalId)
-   {
-      return base.newBranch(globalId);
-   }
-
-   public XidImpl newBranch(XidImpl xid, long branchIdNum)
-   {
-      return base.newBranch(xid, branchIdNum);
-   }
-
-   public XidImpl recreateXid(long localId)
-   {
-      return base.recreateXid(localId);
-   }
-
-   public XidImpl recreateXid(long localId, GlobalId globalId)
-   {
-      return base.recreateXid(localId, globalId);
-   }
-
-   public byte[] localIdToGlobalId(long localId)
-   {
-      return base.localIdToGlobalId(localId);
-   }
-
-   public long extractLocalIdFrom(byte[] globalId)
-   {
-      return base.extractLocalIdFrom(globalId);
-   }
-
-   public String getBaseBranchQualifier(byte[] branchQualifier)
-   {
-      return base.getBaseBranchQualifier(branchQualifier);
-   }
-
-   public String toString(Xid xid)
-   {
-      return base.toString(xid);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,167 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded;
+
+import javax.transaction.xa.Xid;
+import org.jboss.tm.*;
+
+/**
+ * Stupid wrapper because tons of services use the XidFactoryMBean interface.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class XidFactoryMBean implements org.jboss.tm.XidFactoryMBean
+{
+   private XidFactoryBase base;
+
+   public XidFactoryMBean(XidFactoryBase base)
+   {
+      this.base = base;
+   }
+
+   public org.jboss.tm.XidFactoryMBean getInstance()
+   {
+      return this;
+   }
+
+   public String getName()
+   {
+      throw new RuntimeException("should not be called");
+   }
+
+   public int getState()
+   {
+      throw new RuntimeException("should not be called");
+   }
+
+   public String getStateString()
+   {
+      throw new RuntimeException("should not be called");
+   }
+
+   public void jbossInternalLifecycle(String method) throws Exception
+   {
+      throw new RuntimeException("should not be called");
+   }
+
+   public void create() throws Exception
+   {
+   }
+
+   public void start() throws Exception
+   {
+   }
+
+   public void stop()
+   {
+   }
+
+   public void destroy()
+   {
+   }
+
+   public String getBaseGlobalId()
+   {
+      return base.getBaseGlobalId();
+   }
+
+   public void setBaseGlobalId(String baseGlobalId)
+   {
+      base.setBaseGlobalId(baseGlobalId);
+   }
+
+   public long getGlobalIdNumber()
+   {
+      return base.getGlobalIdNumber();
+   }
+
+   public void setGlobalIdNumber(long globalIdNumber)
+   {
+      base.setGlobalIdNumber(globalIdNumber);
+   }
+
+   public String getBranchQualifier()
+   {
+      return base.getBranchQualifier();
+   }
+
+   public void setBranchQualifier(String branchQualifier)
+   {
+      base.setBranchQualifier(branchQualifier);
+   }
+
+   public boolean isPad()
+   {
+      return base.isPad();
+   }
+
+   public void setPad(boolean pad)
+   {
+      base.setPad(pad);
+   }
+
+   public XidImpl newXid()
+   {
+      return base.newXid();
+   }
+
+   public XidImpl newBranch(GlobalId globalId)
+   {
+      return base.newBranch(globalId);
+   }
+
+   public XidImpl newBranch(XidImpl xid, long branchIdNum)
+   {
+      return base.newBranch(xid, branchIdNum);
+   }
+
+   public XidImpl recreateXid(long localId)
+   {
+      return base.recreateXid(localId);
+   }
+
+   public XidImpl recreateXid(long localId, GlobalId globalId)
+   {
+      return base.recreateXid(localId, globalId);
+   }
+
+   public byte[] localIdToGlobalId(long localId)
+   {
+      return base.localIdToGlobalId(localId);
+   }
+
+   public long extractLocalIdFrom(byte[] globalId)
+   {
+      return base.extractLocalIdFrom(globalId);
+   }
+
+   public String getBaseBranchQualifier(byte[] branchQualifier)
+   {
+      return base.getBaseBranchQualifier(branchQualifier);
+   }
+
+   public String toString(Xid xid)
+   {
+      return base.toString(xid);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.embedded.resource;
-
-import java.net.URL;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-
-import org.jboss.deployment.DeploymentInfo;
-
-import org.jboss.logging.Logger;
-import org.jboss.resource.metadata.ConnectorMetaData;
-import org.jboss.resource.metadata.MessageListenerMetaData;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-
-import org.jboss.resource.deployment.ResourceAdapterObjectModelFactory;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class Ejb3DeploymentInfo extends DeploymentInfo
-{
-   private static final Logger log = Logger.getLogger(Ejb3DeploymentInfo.class);
-   
-   protected String rarName;
-   protected String listenerType;
-   protected String activationSpecType;
-  
-   public Ejb3DeploymentInfo(String rarName, String listenerType, String activationSpecType) throws Exception
-   {
-      super(Thread.currentThread().getContextClassLoader().getResource(rarName), null, null);
-      
-      this.rarName = rarName;
-      this.listenerType = listenerType;
-      this.activationSpecType = activationSpecType;
-        
-      MessageListenerMetaData listener = new MessageListenerMetaData();
-      listener.setType(listenerType);
-      listener.setActivationSpecType(activationSpecType);
-      ConnectorMetaData metaData = getConnectorMetaData();
-      this.metaData = metaData;
-   }
-   
-   protected ConnectorMetaData getConnectorMetaData() throws Exception
-   {  
-      ObjectModelFactory factory = new ResourceAdapterObjectModelFactory();
-      UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
-      Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
-      
-      URL rar = Thread.currentThread().getContextClassLoader().getResource(rarName);
-      JarFile rarFile = new JarFile(rar.getFile());
-      ZipEntry entry = rarFile.getEntry("META-INF/ra.xml");
-      
-      ConnectorMetaData metaData = (ConnectorMetaData) unmarshaller.unmarshal(rarFile.getInputStream(entry),
-               factory, null);
-      
-      return metaData;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.embedded.resource;
+
+import java.net.URL;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+import org.jboss.deployment.DeploymentInfo;
+
+import org.jboss.logging.Logger;
+import org.jboss.resource.metadata.ConnectorMetaData;
+import org.jboss.resource.metadata.MessageListenerMetaData;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+
+import org.jboss.resource.deployment.ResourceAdapterObjectModelFactory;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class Ejb3DeploymentInfo extends DeploymentInfo
+{
+   private static final Logger log = Logger.getLogger(Ejb3DeploymentInfo.class);
+   
+   protected String rarName;
+   protected String listenerType;
+   protected String activationSpecType;
+  
+   public Ejb3DeploymentInfo(String rarName, String listenerType, String activationSpecType) throws Exception
+   {
+      super(Thread.currentThread().getContextClassLoader().getResource(rarName), null, null);
+      
+      this.rarName = rarName;
+      this.listenerType = listenerType;
+      this.activationSpecType = activationSpecType;
+        
+      MessageListenerMetaData listener = new MessageListenerMetaData();
+      listener.setType(listenerType);
+      listener.setActivationSpecType(activationSpecType);
+      ConnectorMetaData metaData = getConnectorMetaData();
+      this.metaData = metaData;
+   }
+   
+   protected ConnectorMetaData getConnectorMetaData() throws Exception
+   {  
+      ObjectModelFactory factory = new ResourceAdapterObjectModelFactory();
+      UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+      Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+      
+      URL rar = Thread.currentThread().getContextClassLoader().getResource(rarName);
+      JarFile rarFile = new JarFile(rar.getFile());
+      ZipEntry entry = rarFile.getEntry("META-INF/ra.xml");
+      
+      ConnectorMetaData metaData = (ConnectorMetaData) unmarshaller.unmarshal(rarFile.getInputStream(entry),
+               factory, null);
+      
+      return metaData;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/Ejb3DeploymentInfo.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,204 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.embedded.resource;
-
-import javax.management.ObjectName;
-import javax.resource.spi.work.ExecutionContext;
-import javax.resource.spi.work.Work;
-import javax.resource.spi.work.WorkException;
-import javax.resource.spi.work.WorkListener;
-import javax.resource.spi.work.WorkManager;
-import javax.transaction.xa.Xid;
-
-import org.jboss.logging.Logger;
-import org.jboss.tm.JBossXATerminator;
-import org.jboss.util.threadpool.Task;
-import org.jboss.util.threadpool.ThreadPool;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class JBossWorkManager implements WorkManager
-{
-   private static final Logger log = Logger.getLogger(Ejb3DeploymentInfo.class);
-   
-   private ThreadPool threadPool = new org.jboss.util.threadpool.BasicThreadPool();
-
-   /** The xa terminator */
-   private JBossXATerminator xaTerminator;
-
-   /** The xa terminator name */
-   private ObjectName xaTerminatorName;
-
-   public ObjectName getXATerminatorName()
-   {
-      return xaTerminatorName;
-   }
-
-   public void setXATerminatorName(ObjectName xaTerminatorName)
-   {
-      this.xaTerminatorName = xaTerminatorName;
-   }
-
-   public WorkManager getInstance()
-   {
-      return this;
-   }
-
-   public void doWork(Work work, long startTimeout, ExecutionContext ctx, WorkListener listener) throws WorkException
-   {
-      if (ctx == null)
-         ctx = new ExecutionContext();
-      WorkWrapper wrapper = new WorkWrapper(this, work, Task.WAIT_FOR_COMPLETE, startTimeout, ctx, listener);
-      importWork(wrapper);
-      executeWork(wrapper);
-      if (wrapper.getWorkException() != null)
-         throw wrapper.getWorkException();
-   }
-
-   public void doWork(Work work) throws WorkException
-   {
-      doWork(work, WorkManager.INDEFINITE, null, null);
-   }
-
-   public long startWork(Work work, long startTimeout, ExecutionContext ctx, WorkListener listener) throws WorkException
-   {
-      if (ctx == null)
-         ctx = new ExecutionContext();
-      WorkWrapper wrapper = new WorkWrapper(this, work, Task.WAIT_FOR_START, startTimeout, ctx, listener);
-      importWork(wrapper);
-      executeWork(wrapper);
-      if (wrapper.getWorkException() != null)
-         throw wrapper.getWorkException();
-      return wrapper.getBlockedElapsed();
-   }
-
-   public long startWork(Work work) throws WorkException
-   {
-      return startWork(work, WorkManager.INDEFINITE, null, null);
-   }
-
-   public void scheduleWork(Work work, long startTimeout, ExecutionContext ctx, WorkListener listener) throws WorkException
-   {
-      if (ctx == null)
-         ctx = new ExecutionContext();
-      WorkWrapper wrapper = new WorkWrapper(this, work, Task.WAIT_NONE, startTimeout, ctx, listener);
-      importWork(wrapper);
-      executeWork(wrapper);
-      if (wrapper.getWorkException() != null)
-         throw wrapper.getWorkException();
-   }
-
-   public void scheduleWork(Work work) throws WorkException
-   {
-      scheduleWork(work, WorkManager.INDEFINITE, null, null);
-   }
-
-   /**
-    * Import any work
-    * 
-    * @param wrapper the work wrapper
-    * @throws WorkException for any error 
-    */
-   protected void importWork(WorkWrapper wrapper) throws WorkException
-   {
-      ExecutionContext ctx = wrapper.getExecutionContext();
-      if (ctx != null)
-      {
-         Xid xid = ctx.getXid();
-         if (xid != null)
-         {
-            long timeout = ctx.getTransactionTimeout();
-            xaTerminator.registerWork(wrapper.getWork(), xid, timeout);
-         }
-      }
-   }
-   
-   /**
-    * Execute the work
-    * 
-    * @param wrapper the work wrapper
-    * @throws WorkException for any error 
-    */
-   protected void executeWork(WorkWrapper wrapper) throws WorkException
-   {
-      threadPool.runTaskWrapper(wrapper);
-   }
-
-   /**
-    * Start work
-    * 
-    * @param wrapper the work wrapper
-    * @throws WorkException for any error 
-    */
-   protected void startWork(WorkWrapper wrapper) throws WorkException
-   {
-      ExecutionContext ctx = wrapper.getExecutionContext();
-      if (ctx != null)
-      {
-         Xid xid = ctx.getXid();
-         if (xid != null)
-         {
-            xaTerminator.startWork(wrapper.getWork(), xid);
-         }
-      }
-   }
-
-   /**
-    * End work
-    * 
-    * @param wrapper the work wrapper
-    * @throws WorkException for any error 
-    */
-   protected void endWork(WorkWrapper wrapper)
-   {
-      ExecutionContext ctx = wrapper.getExecutionContext();
-      if (ctx != null)
-      {
-         Xid xid = ctx.getXid();
-         if (xid != null)
-         {
-            xaTerminator.endWork(wrapper.getWork(), xid);
-         }
-      }
-   }
-
-   /**
-    * Cancel work
-    * 
-    * @param wrapper the work wrapper
-    * @throws WorkException for any error 
-    */
-   protected void cancelWork(WorkWrapper wrapper)
-   {
-      ExecutionContext ctx = wrapper.getExecutionContext();
-      if (ctx != null)
-      {
-         Xid xid = ctx.getXid();
-         if (xid != null)
-         {
-            xaTerminator.cancelWork(wrapper.getWork(), xid);
-         }
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,204 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded.resource;
+
+import javax.management.ObjectName;
+import javax.resource.spi.work.ExecutionContext;
+import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkException;
+import javax.resource.spi.work.WorkListener;
+import javax.resource.spi.work.WorkManager;
+import javax.transaction.xa.Xid;
+
+import org.jboss.logging.Logger;
+import org.jboss.tm.JBossXATerminator;
+import org.jboss.util.threadpool.Task;
+import org.jboss.util.threadpool.ThreadPool;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class JBossWorkManager implements WorkManager
+{
+   private static final Logger log = Logger.getLogger(Ejb3DeploymentInfo.class);
+   
+   private ThreadPool threadPool = new org.jboss.util.threadpool.BasicThreadPool();
+
+   /** The xa terminator */
+   private JBossXATerminator xaTerminator;
+
+   /** The xa terminator name */
+   private ObjectName xaTerminatorName;
+
+   public ObjectName getXATerminatorName()
+   {
+      return xaTerminatorName;
+   }
+
+   public void setXATerminatorName(ObjectName xaTerminatorName)
+   {
+      this.xaTerminatorName = xaTerminatorName;
+   }
+
+   public WorkManager getInstance()
+   {
+      return this;
+   }
+
+   public void doWork(Work work, long startTimeout, ExecutionContext ctx, WorkListener listener) throws WorkException
+   {
+      if (ctx == null)
+         ctx = new ExecutionContext();
+      WorkWrapper wrapper = new WorkWrapper(this, work, Task.WAIT_FOR_COMPLETE, startTimeout, ctx, listener);
+      importWork(wrapper);
+      executeWork(wrapper);
+      if (wrapper.getWorkException() != null)
+         throw wrapper.getWorkException();
+   }
+
+   public void doWork(Work work) throws WorkException
+   {
+      doWork(work, WorkManager.INDEFINITE, null, null);
+   }
+
+   public long startWork(Work work, long startTimeout, ExecutionContext ctx, WorkListener listener) throws WorkException
+   {
+      if (ctx == null)
+         ctx = new ExecutionContext();
+      WorkWrapper wrapper = new WorkWrapper(this, work, Task.WAIT_FOR_START, startTimeout, ctx, listener);
+      importWork(wrapper);
+      executeWork(wrapper);
+      if (wrapper.getWorkException() != null)
+         throw wrapper.getWorkException();
+      return wrapper.getBlockedElapsed();
+   }
+
+   public long startWork(Work work) throws WorkException
+   {
+      return startWork(work, WorkManager.INDEFINITE, null, null);
+   }
+
+   public void scheduleWork(Work work, long startTimeout, ExecutionContext ctx, WorkListener listener) throws WorkException
+   {
+      if (ctx == null)
+         ctx = new ExecutionContext();
+      WorkWrapper wrapper = new WorkWrapper(this, work, Task.WAIT_NONE, startTimeout, ctx, listener);
+      importWork(wrapper);
+      executeWork(wrapper);
+      if (wrapper.getWorkException() != null)
+         throw wrapper.getWorkException();
+   }
+
+   public void scheduleWork(Work work) throws WorkException
+   {
+      scheduleWork(work, WorkManager.INDEFINITE, null, null);
+   }
+
+   /**
+    * Import any work
+    * 
+    * @param wrapper the work wrapper
+    * @throws WorkException for any error 
+    */
+   protected void importWork(WorkWrapper wrapper) throws WorkException
+   {
+      ExecutionContext ctx = wrapper.getExecutionContext();
+      if (ctx != null)
+      {
+         Xid xid = ctx.getXid();
+         if (xid != null)
+         {
+            long timeout = ctx.getTransactionTimeout();
+            xaTerminator.registerWork(wrapper.getWork(), xid, timeout);
+         }
+      }
+   }
+   
+   /**
+    * Execute the work
+    * 
+    * @param wrapper the work wrapper
+    * @throws WorkException for any error 
+    */
+   protected void executeWork(WorkWrapper wrapper) throws WorkException
+   {
+      threadPool.runTaskWrapper(wrapper);
+   }
+
+   /**
+    * Start work
+    * 
+    * @param wrapper the work wrapper
+    * @throws WorkException for any error 
+    */
+   protected void startWork(WorkWrapper wrapper) throws WorkException
+   {
+      ExecutionContext ctx = wrapper.getExecutionContext();
+      if (ctx != null)
+      {
+         Xid xid = ctx.getXid();
+         if (xid != null)
+         {
+            xaTerminator.startWork(wrapper.getWork(), xid);
+         }
+      }
+   }
+
+   /**
+    * End work
+    * 
+    * @param wrapper the work wrapper
+    * @throws WorkException for any error 
+    */
+   protected void endWork(WorkWrapper wrapper)
+   {
+      ExecutionContext ctx = wrapper.getExecutionContext();
+      if (ctx != null)
+      {
+         Xid xid = ctx.getXid();
+         if (xid != null)
+         {
+            xaTerminator.endWork(wrapper.getWork(), xid);
+         }
+      }
+   }
+
+   /**
+    * Cancel work
+    * 
+    * @param wrapper the work wrapper
+    * @throws WorkException for any error 
+    */
+   protected void cancelWork(WorkWrapper wrapper)
+   {
+      ExecutionContext ctx = wrapper.getExecutionContext();
+      if (ctx != null)
+      {
+         Xid xid = ctx.getXid();
+         if (xid != null)
+         {
+            xaTerminator.cancelWork(wrapper.getWork(), xid);
+         }
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/JBossWorkManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,308 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.embedded.resource;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Timer;
-
-import javax.management.AttributeNotFoundException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanParameterInfo;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.UnavailableException;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.resource.spi.work.WorkManager;
-
-import org.jboss.deployment.DeploymentException;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.logging.Logger;
-import org.jboss.resource.deployment.ActivationSpecFactory;
-import org.jboss.resource.deployment.ResourceAdapterFactory;
-import org.jboss.resource.metadata.ConfigPropertyMetaData;
-import org.jboss.resource.metadata.ConnectorMetaData;
-import org.jboss.resource.metadata.DescriptionGroupMetaData;
-import org.jboss.resource.metadata.MessageListenerMetaData;
-import org.jboss.system.ServiceDynamicMBeanSupport;
-import org.jboss.system.server.ServerConfigUtil;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class RARDeployment implements BootstrapContext
-{
-   private static final Logger log = Logger.getLogger(RARDeployment.class);
-   
-   /** The deployment info */
-   protected DeploymentInfo di;
-   
-   /** The work manager */
-   protected WorkManager workManager;
-   
-   /** The xa terminator */
-   protected XATerminator xaTerminator;
-   
-   /** The meta data */
-   protected ConnectorMetaData cmd;
-   
-   /** The resource adapter */
-   protected ResourceAdapter resourceAdapter;
-   
-   protected ObjectName serviceName;
-
-   /**
-    * Create a new RAR deployment
-    * 
-    * @param di the deployment info
-    */
-   public RARDeployment(DeploymentInfo di) throws Exception
-   {
-      this.di = di;
-      this.cmd = (ConnectorMetaData) di.metaData;
-      
-      resourceAdapter = ResourceAdapterFactory.createResourceAdapter(cmd);
-      resourceAdapter.start(this);
-   }
-   
-   // Public --------------------------------------------------------
-   
-   public ObjectName getServiceName()
-   {
-      return serviceName;
-   }
-   
-   public void setServiceName(ObjectName serviceName)
-   {
-      this.serviceName = serviceName;
-   }
-
-   public Timer createTimer() throws UnavailableException
-   {
-      return new Timer(true);
-   }
-
-   public WorkManager getWorkManager()
-   {
-      return workManager;
-   }
-   
-   public void setWorkManager(WorkManager workManager)
-   {
-      this.workManager = workManager;
-   }
-   
-   public XATerminator getXATerminator()
-   {
-      return xaTerminator;
-   }
-   
-   public void setXATerminator(XATerminator xaTerminator)
-   {
-      this.xaTerminator = xaTerminator;
-   }
-   
-   protected String getInternalDescription()
-   {
-      String description = null;
-      DescriptionGroupMetaData dgmd = cmd.getDescription();
-      if (dgmd != null)
-         description = dgmd.getDescription();
-      if (description == null)
-         description = "RAR Deployment " + di.url;
-      return description;
-   }
-
-   protected MBeanAttributeInfo[] getInternalAttributeInfo()
-   {
-      Collection properties = cmd.getProperties();
-      MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[11+properties.size()];
-      attrs[0] = new MBeanAttributeInfo("MetaData", ConnectorMetaData.class.getName(), "The meta data", true, false, false);
-      attrs[1] = new MBeanAttributeInfo("AuthenticationMechanism", String.class.getName(), "The authentication mechanism", true, false, false);
-      attrs[2] = new MBeanAttributeInfo("EISType", String.class.getName(), "The EIS type", true, false, false);
-      attrs[3] = new MBeanAttributeInfo("License", String.class.getName(), "The license", true, false, false);
-      attrs[4] = new MBeanAttributeInfo("RAClass", String.class.getName(), "The resource adapter class", true, false, false);
-      attrs[5] = new MBeanAttributeInfo("RAVersion", String.class.getName(), "The resource adapter version", true, false, false);
-      attrs[6] = new MBeanAttributeInfo("TransactionSupport", String.class.getName(), "The transaction support", true, false, false);
-      attrs[7] = new MBeanAttributeInfo("VendorName", String.class.getName(), "The vendor name", true, false, false);
-      attrs[8] = new MBeanAttributeInfo("Version", String.class.getName(), "The spec version", true, false, false);
-      attrs[9] = new MBeanAttributeInfo("ReauthenticationSupport", Boolean.TYPE.getName(), "Whether reauthentication support is supported", true, false, false);
-      attrs[10] = new MBeanAttributeInfo("ResourceAdapter", ResourceAdapter.class.getName(), "The resource adapter instance", true, false, false);
-      int n = 11;
-      for (Iterator i = properties.iterator(); i.hasNext();)
-      {
-         ConfigPropertyMetaData cpmd = (ConfigPropertyMetaData) i.next();
-         attrs[n++] = new MBeanAttributeInfo(cpmd.getName(), cpmd.getType(), cpmd.getDescription().getDescription(), true, false, false);
-      }
-      return attrs;
-   }
-   
-   protected Object getInternalAttribute(String attribute)
-      throws AttributeNotFoundException, MBeanException, ReflectionException
-   {
-      if ("MetaData".equals(attribute))
-         return cmd;
-      else if ("AuthenticationMechanism".equals(attribute))
-         return cmd.getAuthenticationMechanism().getAuthenticationMechansimType();
-      else if ("EISType".equals(attribute))
-         return cmd.getEISType();
-      else if ("License".equals(attribute))
-         return cmd.getLicense().getDescription().getDescription();
-      else if ("RAClass".equals(attribute))
-         return cmd.getRAClass();
-      else if ("RAVersion".equals(attribute))
-         return cmd.getRAVersion();
-      else if ("TransactionSupport".equals(attribute))
-         return cmd.getTransactionSupport();
-      else if ("VendorName".equals(attribute))
-         return cmd.getVendorName();
-      else if ("Version".equals(attribute))
-         return cmd.getVersion();
-      else if ("ReauthenticationSupport".equals(attribute))
-         return new Boolean(cmd.getReauthenticationSupport());
-      else if ("ResourceAdapter".equals(attribute))
-         return resourceAdapter;
-      Object property = cmd.getProperty(attribute);
-      if (property != null)
-         return property;
-      
-      return null;
-   }
-
-   protected MBeanOperationInfo[] getInternalOperationInfo()
-   {
-      MBeanOperationInfo[] ops = new MBeanOperationInfo[3];
-
-      MBeanParameterInfo[] createActivationSpecParams = new MBeanParameterInfo[]
-      {
-         new MBeanParameterInfo("MessagingType", Class.class.getName(), "The type of the message listener"),
-         new MBeanParameterInfo("ActivationConfig", Collection.class.getName(), "A collection of activation config properties")
-      };
-      ops[0] = new MBeanOperationInfo("createActivationSpec", "Create an activation spec",
-            createActivationSpecParams, ActivationSpec.class.getName(), MBeanOperationInfo.ACTION);
-
-      MBeanParameterInfo[] activationParams = new MBeanParameterInfo[]
-      {
-         new MBeanParameterInfo("MessageEndpointFactory", MessageEndpointFactory.class.getName(), "The message endpoint factory"),
-         new MBeanParameterInfo("ActivationSpec", ActivationSpec.class.getName(), "The activation spec")
-      };
-      ops[1] = new MBeanOperationInfo("endpointActivation", "Active the endpoint",
-            activationParams, Void.class.getName(), MBeanOperationInfo.ACTION);
-      ops[2] = new MBeanOperationInfo("endpointDeactivation", "Deactive the endpoint",
-            activationParams, Void.class.getName(), MBeanOperationInfo.ACTION);
-
-      return ops;
-   }
-   
-   public Object invoke(String actionName, Object[] params, String[] signature) throws MBeanException,
-         ReflectionException
-   {
-      Object result = null;
-      if ("createActivationSpec".equals(actionName))
-      {
-         if (params.length != 2)
-            throw new IllegalArgumentException("Wrong number of parameters for " + actionName);
-         Class messagingType = (Class) params[0];
-         Collection activationConfig = (Collection) params[1];
-         result = createActivationSpec(messagingType, activationConfig);
-      }
-      else if ("endpointActivation".equals(actionName))
-      {
-         if (params.length != 2)
-            throw new IllegalArgumentException("Wrong number of parameters for " + actionName);
-         MessageEndpointFactory messageEndpointFactory = (MessageEndpointFactory) params[0];
-         ActivationSpec activationSpec = (ActivationSpec) params[1];
-         endpointActivation(messageEndpointFactory, activationSpec);
-      }
-      else if ("endpointDeactivation".equals(actionName))
-      {
-         if (params.length != 2)
-            throw new IllegalArgumentException("Wrong number of parameters for " + actionName);
-         MessageEndpointFactory messageEndpointFactory = (MessageEndpointFactory) params[0];
-         ActivationSpec activationSpec = (ActivationSpec) params[1];
-         endpointDeactivation(messageEndpointFactory, activationSpec);
-      }
-      
-      return result;
-   }
-
-   protected ActivationSpec createActivationSpec(Class messagingType, Collection activationConfig) throws MBeanException
-   {
-      boolean trace = log.isTraceEnabled();
-      if (trace)
-         log.trace("CreateActivateSpec rar=" + getServiceName() + " messagingType=" + messagingType.getName() + " activationConfig=" + activationConfig);
-      
-      try
-      {
-         // Find the meta data
-         MessageListenerMetaData mlmd = cmd.getMessageListener(messagingType.getName());
-         if (mlmd == null)
-            throw new DeploymentException("MessagingType '" + messagingType.getName() + "' not found in resource deployment " + getServiceName());
-         
-         return ActivationSpecFactory.createActivationSpec(getServiceName(), messagingType.getName(), activationConfig, mlmd);
-      }
-      catch (Exception e)
-      {
-         throw new MBeanException(e, "Error in create activation spec " + getServiceName());
-      }
-   }
-
-   protected void endpointActivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) throws MBeanException
-   {
-      boolean trace = log.isTraceEnabled();
-      if (trace)
-         log.trace("EndpointActivation rar=" + getServiceName() + " messagingEndpointFactory=" + messageEndpointFactory + " activationSpec=" + activationSpec);
-
-      try
-      {
-         activationSpec.setResourceAdapter(resourceAdapter);
-         resourceAdapter.endpointActivation(messageEndpointFactory, activationSpec);
-      }
-      catch (Exception e)
-      {
-         throw new MBeanException(e, "Error in endpoint activation " + getServiceName());
-      }
-   }
-
-   protected void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) throws MBeanException
-   {
-      boolean trace = log.isTraceEnabled();
-      if (trace)
-         log.trace("EndpointDeactivation rar=" + getServiceName() + " messagingEndpointFactory=" + messageEndpointFactory + " activationSpec=" + activationSpec);
-
-      try
-      {
-         resourceAdapter.endpointDeactivation(messageEndpointFactory, activationSpec);
-      }
-      catch (Exception e)
-      {
-         throw new MBeanException(e, "Error in endpoint deactivation " + getServiceName());
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,308 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded.resource;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Timer;
+
+import javax.management.AttributeNotFoundException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanException;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import javax.resource.spi.ActivationSpec;
+import javax.resource.spi.BootstrapContext;
+import javax.resource.spi.ResourceAdapter;
+import javax.resource.spi.UnavailableException;
+import javax.resource.spi.XATerminator;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.resource.spi.work.WorkManager;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.logging.Logger;
+import org.jboss.resource.deployment.ActivationSpecFactory;
+import org.jboss.resource.deployment.ResourceAdapterFactory;
+import org.jboss.resource.metadata.ConfigPropertyMetaData;
+import org.jboss.resource.metadata.ConnectorMetaData;
+import org.jboss.resource.metadata.DescriptionGroupMetaData;
+import org.jboss.resource.metadata.MessageListenerMetaData;
+import org.jboss.system.ServiceDynamicMBeanSupport;
+import org.jboss.system.server.ServerConfigUtil;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class RARDeployment implements BootstrapContext
+{
+   private static final Logger log = Logger.getLogger(RARDeployment.class);
+   
+   /** The deployment info */
+   protected DeploymentInfo di;
+   
+   /** The work manager */
+   protected WorkManager workManager;
+   
+   /** The xa terminator */
+   protected XATerminator xaTerminator;
+   
+   /** The meta data */
+   protected ConnectorMetaData cmd;
+   
+   /** The resource adapter */
+   protected ResourceAdapter resourceAdapter;
+   
+   protected ObjectName serviceName;
+
+   /**
+    * Create a new RAR deployment
+    * 
+    * @param di the deployment info
+    */
+   public RARDeployment(DeploymentInfo di) throws Exception
+   {
+      this.di = di;
+      this.cmd = (ConnectorMetaData) di.metaData;
+      
+      resourceAdapter = ResourceAdapterFactory.createResourceAdapter(cmd);
+      resourceAdapter.start(this);
+   }
+   
+   // Public --------------------------------------------------------
+   
+   public ObjectName getServiceName()
+   {
+      return serviceName;
+   }
+   
+   public void setServiceName(ObjectName serviceName)
+   {
+      this.serviceName = serviceName;
+   }
+
+   public Timer createTimer() throws UnavailableException
+   {
+      return new Timer(true);
+   }
+
+   public WorkManager getWorkManager()
+   {
+      return workManager;
+   }
+   
+   public void setWorkManager(WorkManager workManager)
+   {
+      this.workManager = workManager;
+   }
+   
+   public XATerminator getXATerminator()
+   {
+      return xaTerminator;
+   }
+   
+   public void setXATerminator(XATerminator xaTerminator)
+   {
+      this.xaTerminator = xaTerminator;
+   }
+   
+   protected String getInternalDescription()
+   {
+      String description = null;
+      DescriptionGroupMetaData dgmd = cmd.getDescription();
+      if (dgmd != null)
+         description = dgmd.getDescription();
+      if (description == null)
+         description = "RAR Deployment " + di.url;
+      return description;
+   }
+
+   protected MBeanAttributeInfo[] getInternalAttributeInfo()
+   {
+      Collection properties = cmd.getProperties();
+      MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[11+properties.size()];
+      attrs[0] = new MBeanAttributeInfo("MetaData", ConnectorMetaData.class.getName(), "The meta data", true, false, false);
+      attrs[1] = new MBeanAttributeInfo("AuthenticationMechanism", String.class.getName(), "The authentication mechanism", true, false, false);
+      attrs[2] = new MBeanAttributeInfo("EISType", String.class.getName(), "The EIS type", true, false, false);
+      attrs[3] = new MBeanAttributeInfo("License", String.class.getName(), "The license", true, false, false);
+      attrs[4] = new MBeanAttributeInfo("RAClass", String.class.getName(), "The resource adapter class", true, false, false);
+      attrs[5] = new MBeanAttributeInfo("RAVersion", String.class.getName(), "The resource adapter version", true, false, false);
+      attrs[6] = new MBeanAttributeInfo("TransactionSupport", String.class.getName(), "The transaction support", true, false, false);
+      attrs[7] = new MBeanAttributeInfo("VendorName", String.class.getName(), "The vendor name", true, false, false);
+      attrs[8] = new MBeanAttributeInfo("Version", String.class.getName(), "The spec version", true, false, false);
+      attrs[9] = new MBeanAttributeInfo("ReauthenticationSupport", Boolean.TYPE.getName(), "Whether reauthentication support is supported", true, false, false);
+      attrs[10] = new MBeanAttributeInfo("ResourceAdapter", ResourceAdapter.class.getName(), "The resource adapter instance", true, false, false);
+      int n = 11;
+      for (Iterator i = properties.iterator(); i.hasNext();)
+      {
+         ConfigPropertyMetaData cpmd = (ConfigPropertyMetaData) i.next();
+         attrs[n++] = new MBeanAttributeInfo(cpmd.getName(), cpmd.getType(), cpmd.getDescription().getDescription(), true, false, false);
+      }
+      return attrs;
+   }
+   
+   protected Object getInternalAttribute(String attribute)
+      throws AttributeNotFoundException, MBeanException, ReflectionException
+   {
+      if ("MetaData".equals(attribute))
+         return cmd;
+      else if ("AuthenticationMechanism".equals(attribute))
+         return cmd.getAuthenticationMechanism().getAuthenticationMechansimType();
+      else if ("EISType".equals(attribute))
+         return cmd.getEISType();
+      else if ("License".equals(attribute))
+         return cmd.getLicense().getDescription().getDescription();
+      else if ("RAClass".equals(attribute))
+         return cmd.getRAClass();
+      else if ("RAVersion".equals(attribute))
+         return cmd.getRAVersion();
+      else if ("TransactionSupport".equals(attribute))
+         return cmd.getTransactionSupport();
+      else if ("VendorName".equals(attribute))
+         return cmd.getVendorName();
+      else if ("Version".equals(attribute))
+         return cmd.getVersion();
+      else if ("ReauthenticationSupport".equals(attribute))
+         return new Boolean(cmd.getReauthenticationSupport());
+      else if ("ResourceAdapter".equals(attribute))
+         return resourceAdapter;
+      Object property = cmd.getProperty(attribute);
+      if (property != null)
+         return property;
+      
+      return null;
+   }
+
+   protected MBeanOperationInfo[] getInternalOperationInfo()
+   {
+      MBeanOperationInfo[] ops = new MBeanOperationInfo[3];
+
+      MBeanParameterInfo[] createActivationSpecParams = new MBeanParameterInfo[]
+      {
+         new MBeanParameterInfo("MessagingType", Class.class.getName(), "The type of the message listener"),
+         new MBeanParameterInfo("ActivationConfig", Collection.class.getName(), "A collection of activation config properties")
+      };
+      ops[0] = new MBeanOperationInfo("createActivationSpec", "Create an activation spec",
+            createActivationSpecParams, ActivationSpec.class.getName(), MBeanOperationInfo.ACTION);
+
+      MBeanParameterInfo[] activationParams = new MBeanParameterInfo[]
+      {
+         new MBeanParameterInfo("MessageEndpointFactory", MessageEndpointFactory.class.getName(), "The message endpoint factory"),
+         new MBeanParameterInfo("ActivationSpec", ActivationSpec.class.getName(), "The activation spec")
+      };
+      ops[1] = new MBeanOperationInfo("endpointActivation", "Active the endpoint",
+            activationParams, Void.class.getName(), MBeanOperationInfo.ACTION);
+      ops[2] = new MBeanOperationInfo("endpointDeactivation", "Deactive the endpoint",
+            activationParams, Void.class.getName(), MBeanOperationInfo.ACTION);
+
+      return ops;
+   }
+   
+   public Object invoke(String actionName, Object[] params, String[] signature) throws MBeanException,
+         ReflectionException
+   {
+      Object result = null;
+      if ("createActivationSpec".equals(actionName))
+      {
+         if (params.length != 2)
+            throw new IllegalArgumentException("Wrong number of parameters for " + actionName);
+         Class messagingType = (Class) params[0];
+         Collection activationConfig = (Collection) params[1];
+         result = createActivationSpec(messagingType, activationConfig);
+      }
+      else if ("endpointActivation".equals(actionName))
+      {
+         if (params.length != 2)
+            throw new IllegalArgumentException("Wrong number of parameters for " + actionName);
+         MessageEndpointFactory messageEndpointFactory = (MessageEndpointFactory) params[0];
+         ActivationSpec activationSpec = (ActivationSpec) params[1];
+         endpointActivation(messageEndpointFactory, activationSpec);
+      }
+      else if ("endpointDeactivation".equals(actionName))
+      {
+         if (params.length != 2)
+            throw new IllegalArgumentException("Wrong number of parameters for " + actionName);
+         MessageEndpointFactory messageEndpointFactory = (MessageEndpointFactory) params[0];
+         ActivationSpec activationSpec = (ActivationSpec) params[1];
+         endpointDeactivation(messageEndpointFactory, activationSpec);
+      }
+      
+      return result;
+   }
+
+   protected ActivationSpec createActivationSpec(Class messagingType, Collection activationConfig) throws MBeanException
+   {
+      boolean trace = log.isTraceEnabled();
+      if (trace)
+         log.trace("CreateActivateSpec rar=" + getServiceName() + " messagingType=" + messagingType.getName() + " activationConfig=" + activationConfig);
+      
+      try
+      {
+         // Find the meta data
+         MessageListenerMetaData mlmd = cmd.getMessageListener(messagingType.getName());
+         if (mlmd == null)
+            throw new DeploymentException("MessagingType '" + messagingType.getName() + "' not found in resource deployment " + getServiceName());
+         
+         return ActivationSpecFactory.createActivationSpec(getServiceName(), messagingType.getName(), activationConfig, mlmd);
+      }
+      catch (Exception e)
+      {
+         throw new MBeanException(e, "Error in create activation spec " + getServiceName());
+      }
+   }
+
+   protected void endpointActivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) throws MBeanException
+   {
+      boolean trace = log.isTraceEnabled();
+      if (trace)
+         log.trace("EndpointActivation rar=" + getServiceName() + " messagingEndpointFactory=" + messageEndpointFactory + " activationSpec=" + activationSpec);
+
+      try
+      {
+         activationSpec.setResourceAdapter(resourceAdapter);
+         resourceAdapter.endpointActivation(messageEndpointFactory, activationSpec);
+      }
+      catch (Exception e)
+      {
+         throw new MBeanException(e, "Error in endpoint activation " + getServiceName());
+      }
+   }
+
+   protected void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) throws MBeanException
+   {
+      boolean trace = log.isTraceEnabled();
+      if (trace)
+         log.trace("EndpointDeactivation rar=" + getServiceName() + " messagingEndpointFactory=" + messageEndpointFactory + " activationSpec=" + activationSpec);
+
+      try
+      {
+         resourceAdapter.endpointDeactivation(messageEndpointFactory, activationSpec);
+      }
+      catch (Exception e)
+      {
+         throw new MBeanException(e, "Error in endpoint deactivation " + getServiceName());
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/RARDeployment.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,343 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.embedded.resource;
-
-import javax.resource.spi.work.ExecutionContext;
-import javax.resource.spi.work.Work;
-import javax.resource.spi.work.WorkCompletedException;
-import javax.resource.spi.work.WorkEvent;
-import javax.resource.spi.work.WorkException;
-import javax.resource.spi.work.WorkListener;
-import javax.resource.spi.work.WorkManager;
-import javax.resource.spi.work.WorkRejectedException;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.JBossStringBuilder;
-import org.jboss.util.NestedRuntimeException;
-import org.jboss.util.threadpool.BasicTaskWrapper;
-import org.jboss.util.threadpool.StartTimeoutException;
-import org.jboss.util.threadpool.Task;
-
-/**
- * Wraps the resource adapter's work.
- *
- * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
- * @version $Revision$
- */
-public class WorkWrapper extends BasicTaskWrapper implements Task
-{
-   /** The log */
-   private static final Logger log = Logger.getLogger(WorkWrapper.class);
-
-   /** Whether we are tracing */
-   private boolean trace = log.isTraceEnabled();
-   
-   /** The work */
-   private Work work;
-
-   /** The execution context */
-   private ExecutionContext executionContext;
-
-   /** the work listener */
-   private WorkListener workListener;
-
-   /** The start timeout */
-   private long startTimeout;
-
-   /** The work manager */
-   private JBossWorkManager workManager;
-
-   /** The wait type */
-   private int waitType;
-
-   /** The blocked time */
-   private long blockedTime;
-
-   /** Any exception */
-   private WorkException exception;
-
-   /**
-    * Create a new WorkWrapper
-    *
-    * @param workManager the work manager
-    * @param work the work
-    * @param waitType the waitType
-    * @param executionContext the execution context
-    * @param workListener the WorkListener
-    * @throws IllegalArgumentException for null work, execution context or a negative start timeout
-    */
-   public WorkWrapper(JBossWorkManager workManager, Work work, int waitType, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
-   {
-      super();
-
-      if (work == null)
-         throw new IllegalArgumentException("Null work");
-      if (executionContext == null)
-         throw new IllegalArgumentException("Null execution context");
-      if (startTimeout < 0)
-         throw new IllegalArgumentException("Illegal start timeout: " + startTimeout);
-
-      this.workManager = workManager;
-      this.work = work;
-      this.waitType = waitType;
-      this.startTimeout = startTimeout;
-      this.executionContext = executionContext;
-      this.workListener = workListener;
-
-      setTask(this);
-   }
-
-   /**
-    * Get the work manager
-    *
-    * @return the work manager
-    */
-   public JBossWorkManager getWorkManager()
-   {
-      return workManager;
-   }
-
-   /**
-    * Retrieve the work
-    *
-    * @return the work
-    */
-   public Work getWork()
-   {
-      return work;
-   }
-
-   /**
-    * Retrieve the work listener
-    *
-    * @return the WorkListener
-    */
-   public WorkListener getWorkListener()
-   {
-      return workListener;
-   }
-
-   /**
-    * Retrieve the exection context
-    *
-    * @return the execution context
-    */
-   public ExecutionContext getExecutionContext()
-   {
-      return executionContext;
-   }
-
-   /**
-    * Retrieve the time blocked
-    *
-    * @return the blocked time
-    */
-   public long getBlockedElapsed()
-   {
-      return blockedTime;
-   }
-   
-   /**
-    * Get any exception
-    * 
-    * @return the exception or null if there is none
-    */
-   public WorkException getWorkException()
-   {
-      return exception;
-   }
-
-   public int getWaitType()
-   {
-      return waitType;
-   }
-
-   public int getPriority()
-   {
-      return Thread.NORM_PRIORITY;
-   }
-
-   public long getStartTimeout()
-   {
-      return startTimeout;
-   }
-
-   public long getCompletionTimeout()
-   {
-      return executionContext.getTransactionTimeout();
-   }
-
-   public void execute()
-   {  
-      if (trace)
-         log.trace("Executing work " + this);
-      try
-      {
-         workManager.startWork(this);
-      }
-      catch (WorkException e)
-      {
-         e.printStackTrace();
-         taskRejected(new NestedRuntimeException(e));
-         return;
-      }
-      try
-      {
-         work.run();
-      }
-      finally
-      {
-         workManager.endWork(this);
-      }
-      if (trace)
-         log.trace("Executed work " + this);
-   }
-
-   public void stop()
-   {
-      if (trace)
-         log.trace("Stopping work " + this);
-
-      work.release();
-   }
-
-   public void accepted(long time)
-   {
-      blockedTime = time;
-
-      if (trace)
-         log.trace("Accepted work " + this);
-
-      if (workListener != null)
-      {
-         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_ACCEPTED, work, null);
-         workListener.workAccepted(event);
-      }
-   }
-
-   public void rejected(long time, Throwable throwable)
-   {
-      blockedTime = time;
-
-      if (trace)
-      {
-         if (throwable != null)
-            log.trace("Rejecting work " + this, throwable);
-         else
-            log.trace("Rejecting work " + this);
-      }
-
-      if (throwable != null)
-      {
-         exception = new WorkRejectedException(throwable);
-         if (throwable instanceof StartTimeoutException)
-            exception.setErrorCode(WorkRejectedException.START_TIMED_OUT);
-      }
-      
-      workManager.cancelWork(this);
-      
-      if (workListener != null)
-      {
-         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_ACCEPTED, work, exception);
-         workListener.workRejected(event);
-      }
-   }
-
-   public void started(long time)
-   {
-      if (waitType != WAIT_NONE)
-         blockedTime = time;
-
-      if (workListener != null)
-      {
-         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_STARTED, work, null);
-         workListener.workStarted(event);
-      }
-   }
-
-   public void completed(long time, Throwable throwable)
-   { 
-      if (waitType == WAIT_FOR_COMPLETE)
-         blockedTime = time;
-
-      if (throwable != null)
-         exception = new WorkCompletedException(throwable);
-
-      if (trace)
-         log.trace("Completed work " + this);
-
-      if (workListener != null)
-      {
-         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_COMPLETED, work, exception);
-         workListener.workCompleted(event);
-      }
-   }
-   
-   public String toString()
-   {
-      JBossStringBuilder buffer = new JBossStringBuilder(100);
-      buffer.append("WorkWrapper@").append(Integer.toHexString(System.identityHashCode(this)));
-      buffer.append("[workManger=").append(workManager);
-      buffer.append(" work=").append(work);
-      buffer.append(" state=").append(getStateString());
-      if (executionContext != null && executionContext.getXid() != null)
-      {
-         buffer.append(" xid=").append(executionContext.getXid());
-         buffer.append(" txTimeout=").append(executionContext.getTransactionTimeout());
-      }
-      buffer.append(" waitType=");
-      switch (waitType)
-      {
-         case WAIT_NONE:
-         {
-            buffer.append("WAIT_NONE");
-            break;
-         }
-         case WAIT_FOR_START:
-         {
-            buffer.append("WAIT_FOR_START");
-            break;
-         }
-         case WAIT_FOR_COMPLETE:
-         {
-            buffer.append("WAIT_FOR_COMPLETE");
-            break;
-         }
-         default:
-            buffer.append("???");
-      }
-      if (startTimeout != WorkManager.INDEFINITE)
-         buffer.append(" startTimeout=").append(startTimeout);
-      long completionTimeout = getCompletionTimeout();
-      if (completionTimeout != -1)
-         buffer.append(" completionTimeout=").append(completionTimeout);
-      if (blockedTime != 0)
-         buffer.append(" blockTime=").append(blockedTime);
-      buffer.append(" elapsedTime=").append(getElapsedTime());
-      if (workListener != null)
-         buffer.append(" workListener=").append(workListener);
-      if (exception != null)
-         buffer.append(" exception=").append(exception);
-      buffer.append("]");
-      return buffer.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,343 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.embedded.resource;
+
+import javax.resource.spi.work.ExecutionContext;
+import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkCompletedException;
+import javax.resource.spi.work.WorkEvent;
+import javax.resource.spi.work.WorkException;
+import javax.resource.spi.work.WorkListener;
+import javax.resource.spi.work.WorkManager;
+import javax.resource.spi.work.WorkRejectedException;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.JBossStringBuilder;
+import org.jboss.util.NestedRuntimeException;
+import org.jboss.util.threadpool.BasicTaskWrapper;
+import org.jboss.util.threadpool.StartTimeoutException;
+import org.jboss.util.threadpool.Task;
+
+/**
+ * Wraps the resource adapter's work.
+ *
+ * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class WorkWrapper extends BasicTaskWrapper implements Task
+{
+   /** The log */
+   private static final Logger log = Logger.getLogger(WorkWrapper.class);
+
+   /** Whether we are tracing */
+   private boolean trace = log.isTraceEnabled();
+   
+   /** The work */
+   private Work work;
+
+   /** The execution context */
+   private ExecutionContext executionContext;
+
+   /** the work listener */
+   private WorkListener workListener;
+
+   /** The start timeout */
+   private long startTimeout;
+
+   /** The work manager */
+   private JBossWorkManager workManager;
+
+   /** The wait type */
+   private int waitType;
+
+   /** The blocked time */
+   private long blockedTime;
+
+   /** Any exception */
+   private WorkException exception;
+
+   /**
+    * Create a new WorkWrapper
+    *
+    * @param workManager the work manager
+    * @param work the work
+    * @param waitType the waitType
+    * @param executionContext the execution context
+    * @param workListener the WorkListener
+    * @throws IllegalArgumentException for null work, execution context or a negative start timeout
+    */
+   public WorkWrapper(JBossWorkManager workManager, Work work, int waitType, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
+   {
+      super();
+
+      if (work == null)
+         throw new IllegalArgumentException("Null work");
+      if (executionContext == null)
+         throw new IllegalArgumentException("Null execution context");
+      if (startTimeout < 0)
+         throw new IllegalArgumentException("Illegal start timeout: " + startTimeout);
+
+      this.workManager = workManager;
+      this.work = work;
+      this.waitType = waitType;
+      this.startTimeout = startTimeout;
+      this.executionContext = executionContext;
+      this.workListener = workListener;
+
+      setTask(this);
+   }
+
+   /**
+    * Get the work manager
+    *
+    * @return the work manager
+    */
+   public JBossWorkManager getWorkManager()
+   {
+      return workManager;
+   }
+
+   /**
+    * Retrieve the work
+    *
+    * @return the work
+    */
+   public Work getWork()
+   {
+      return work;
+   }
+
+   /**
+    * Retrieve the work listener
+    *
+    * @return the WorkListener
+    */
+   public WorkListener getWorkListener()
+   {
+      return workListener;
+   }
+
+   /**
+    * Retrieve the exection context
+    *
+    * @return the execution context
+    */
+   public ExecutionContext getExecutionContext()
+   {
+      return executionContext;
+   }
+
+   /**
+    * Retrieve the time blocked
+    *
+    * @return the blocked time
+    */
+   public long getBlockedElapsed()
+   {
+      return blockedTime;
+   }
+   
+   /**
+    * Get any exception
+    * 
+    * @return the exception or null if there is none
+    */
+   public WorkException getWorkException()
+   {
+      return exception;
+   }
+
+   public int getWaitType()
+   {
+      return waitType;
+   }
+
+   public int getPriority()
+   {
+      return Thread.NORM_PRIORITY;
+   }
+
+   public long getStartTimeout()
+   {
+      return startTimeout;
+   }
+
+   public long getCompletionTimeout()
+   {
+      return executionContext.getTransactionTimeout();
+   }
+
+   public void execute()
+   {  
+      if (trace)
+         log.trace("Executing work " + this);
+      try
+      {
+         workManager.startWork(this);
+      }
+      catch (WorkException e)
+      {
+         e.printStackTrace();
+         taskRejected(new NestedRuntimeException(e));
+         return;
+      }
+      try
+      {
+         work.run();
+      }
+      finally
+      {
+         workManager.endWork(this);
+      }
+      if (trace)
+         log.trace("Executed work " + this);
+   }
+
+   public void stop()
+   {
+      if (trace)
+         log.trace("Stopping work " + this);
+
+      work.release();
+   }
+
+   public void accepted(long time)
+   {
+      blockedTime = time;
+
+      if (trace)
+         log.trace("Accepted work " + this);
+
+      if (workListener != null)
+      {
+         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_ACCEPTED, work, null);
+         workListener.workAccepted(event);
+      }
+   }
+
+   public void rejected(long time, Throwable throwable)
+   {
+      blockedTime = time;
+
+      if (trace)
+      {
+         if (throwable != null)
+            log.trace("Rejecting work " + this, throwable);
+         else
+            log.trace("Rejecting work " + this);
+      }
+
+      if (throwable != null)
+      {
+         exception = new WorkRejectedException(throwable);
+         if (throwable instanceof StartTimeoutException)
+            exception.setErrorCode(WorkRejectedException.START_TIMED_OUT);
+      }
+      
+      workManager.cancelWork(this);
+      
+      if (workListener != null)
+      {
+         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_ACCEPTED, work, exception);
+         workListener.workRejected(event);
+      }
+   }
+
+   public void started(long time)
+   {
+      if (waitType != WAIT_NONE)
+         blockedTime = time;
+
+      if (workListener != null)
+      {
+         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_STARTED, work, null);
+         workListener.workStarted(event);
+      }
+   }
+
+   public void completed(long time, Throwable throwable)
+   { 
+      if (waitType == WAIT_FOR_COMPLETE)
+         blockedTime = time;
+
+      if (throwable != null)
+         exception = new WorkCompletedException(throwable);
+
+      if (trace)
+         log.trace("Completed work " + this);
+
+      if (workListener != null)
+      {
+         WorkEvent event = new WorkEvent(workManager, WorkEvent.WORK_COMPLETED, work, exception);
+         workListener.workCompleted(event);
+      }
+   }
+   
+   public String toString()
+   {
+      JBossStringBuilder buffer = new JBossStringBuilder(100);
+      buffer.append("WorkWrapper@").append(Integer.toHexString(System.identityHashCode(this)));
+      buffer.append("[workManger=").append(workManager);
+      buffer.append(" work=").append(work);
+      buffer.append(" state=").append(getStateString());
+      if (executionContext != null && executionContext.getXid() != null)
+      {
+         buffer.append(" xid=").append(executionContext.getXid());
+         buffer.append(" txTimeout=").append(executionContext.getTransactionTimeout());
+      }
+      buffer.append(" waitType=");
+      switch (waitType)
+      {
+         case WAIT_NONE:
+         {
+            buffer.append("WAIT_NONE");
+            break;
+         }
+         case WAIT_FOR_START:
+         {
+            buffer.append("WAIT_FOR_START");
+            break;
+         }
+         case WAIT_FOR_COMPLETE:
+         {
+            buffer.append("WAIT_FOR_COMPLETE");
+            break;
+         }
+         default:
+            buffer.append("???");
+      }
+      if (startTimeout != WorkManager.INDEFINITE)
+         buffer.append(" startTimeout=").append(startTimeout);
+      long completionTimeout = getCompletionTimeout();
+      if (completionTimeout != -1)
+         buffer.append(" completionTimeout=").append(completionTimeout);
+      if (blockedTime != 0)
+         buffer.append(" blockTime=").append(blockedTime);
+      buffer.append(" elapsedTime=").append(getElapsedTime());
+      if (workListener != null)
+         buffer.append(" workListener=").append(workListener);
+      if (exception != null)
+         buffer.append(" exception=").append(exception);
+      buffer.append("]");
+      return buffer.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/embedded/resource/WorkWrapper.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,171 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.enc;
-
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.Ejb3Registry;
-import org.jboss.ejb3.ProxyFactoryHelper;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DeploymentScope;
-
-import javax.naming.NameNotFoundException;
-import java.util.Iterator;
-
-/**
- * Class to resolve EJB containers from ejb-ref or @EJB metadata
- * This class is overriden for specific behaviors, specifically whether or not
- * to resolve the EJB internally in a specific deployment or not.  There will be one for
- * an EJB jar deployment and a WAR deployment and any other deployment package that needs to
- * use @EJB.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public abstract class DeploymentEjbResolver
-{
-   protected DeploymentScope deploymentScope;
-   protected String errorName;
-
-   protected DeploymentEjbResolver(DeploymentScope deploymentScope, String errorName)
-   {
-      this.deploymentScope = deploymentScope;
-      this.errorName = errorName;
-   }
-
-   protected abstract EJBContainer searchDeploymentInternally(String ejbLink, Class businessIntf);
-
-   public EJBContainer getEjbContainer(String ejbLink, Class businessIntf)
-   {
-      int hashIndex = ejbLink.indexOf('#');
-      if (hashIndex != -1)
-      {
-         if (deploymentScope == null) return null;
-         String relativePath = ejbLink.substring(0, hashIndex);
-         Ejb3Deployment dep = deploymentScope.findRelativeDeployment(relativePath);
-         if (dep == null) return null;
-         String ejbName = ejbLink.substring(hashIndex);
-         return dep.getEjbContainer(ejbName, businessIntf);
-      }
-      // look internally
-      EJBContainer ejb = searchDeploymentInternally(ejbLink, businessIntf);
-      if (ejb != null) return ejb;
-      for (Object obj : Ejb3Registry.getContainers())
-      {
-         EJBContainer container = (EJBContainer) obj;
-         if (container.getEjbName().equals(ejbLink))
-         {
-            return container;
-         }
-      }
-      return null;
-   }
-
-   public String getEjbJndiName(String ejbLink, Class businessIntf)
-   {
-      EJBContainer container = getEjbContainer(ejbLink, businessIntf);
-      if (container == null)
-      {
-         return null;
-      }
-      return ProxyFactoryHelper.getJndiName(container, businessIntf);
-   }
-
-   public EJBContainer getEjbContainer(Ejb3Deployment deployment, Class businessIntf) throws NameNotFoundException
-   {
-      EJBContainer container = null;
-      // search in myself
-      for (Object obj : deployment.getEjbContainers().values())
-      {
-         EJBContainer newContainer = (EJBContainer) obj;
-         if (container == newContainer) continue;
-         if (ProxyFactoryHelper.publishesInterface(newContainer, businessIntf))
-         {
-            if (container != null) throw new NameNotFoundException("duplicated in " + errorName);
-            container = newContainer;
-         }
-      }
-      return container;
-   }
-
-   public EJBContainer getEjbContainer(Class businessIntf) throws NameNotFoundException
-   {
-      EJBContainer rtnContainer = null;
-      // search in deployment first
-      rtnContainer = searchForEjbContainerInternally(businessIntf);
-      if (rtnContainer != null) return rtnContainer;
-      // search in EAR
-      String jarName = null;
-      if (deploymentScope != null)
-      {
-         for (Ejb3Deployment deployment : deploymentScope.getEjbDeployments())
-         {
-            EJBContainer newContainer = getEjbContainer(deployment, businessIntf);
-            if (rtnContainer == newContainer) continue; // don't check self
-            if (rtnContainer != null && newContainer != null)
-            {
-               throw new NameNotFoundException("duplicated in .ear within " + jarName +
-                       " and " + deployment.getDeploymentUnit().getShortName());
-            }
-            if (newContainer != null)
-            {
-               rtnContainer = newContainer;
-               jarName = deployment.getDeploymentUnit().getShortName();
-            }
-         }
-      }
-      if (rtnContainer != null)
-      {
-         return rtnContainer;
-      }
-      // search everywhere
-      Iterator containers = Ejb3Registry.getContainers().iterator();
-      while (containers.hasNext())
-      {
-         Container container = (Container)containers.next();
-         EJBContainer ejbContainer = (EJBContainer) container;
-         if (ejbContainer == rtnContainer) continue;
-         if (ProxyFactoryHelper.publishesInterface(container, businessIntf))
-         {
-            if (rtnContainer != null)
-            {
-               throw new NameNotFoundException("duplicated in " + ejbContainer.getDeployment().getDeploymentUnit().getShortName()
-                       + " and " + jarName);
-            }
-            rtnContainer = ejbContainer;
-            jarName = ejbContainer.getDeployment().getDeploymentUnit().getShortName();
-         }
-      }
-      if (rtnContainer != null) return rtnContainer;
-      throw new NameNotFoundException("not used by any EJBs");
-   }
-
-   protected abstract EJBContainer searchForEjbContainerInternally(Class businessIntf) throws NameNotFoundException;
-
-   public String getEjbJndiName(Class businessIntf) throws NameNotFoundException
-   {
-      EJBContainer container = getEjbContainer(businessIntf);
-      String jndiName = ProxyFactoryHelper.getJndiName(container, businessIntf);
-      if (jndiName == null) throw new NameNotFoundException("not used by any EJBs");
-      return jndiName;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,171 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.enc;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.Ejb3Registry;
+import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.DeploymentScope;
+
+import javax.naming.NameNotFoundException;
+import java.util.Iterator;
+
+/**
+ * Class to resolve EJB containers from ejb-ref or @EJB metadata
+ * This class is overriden for specific behaviors, specifically whether or not
+ * to resolve the EJB internally in a specific deployment or not.  There will be one for
+ * an EJB jar deployment and a WAR deployment and any other deployment package that needs to
+ * use @EJB.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public abstract class DeploymentEjbResolver
+{
+   protected DeploymentScope deploymentScope;
+   protected String errorName;
+
+   protected DeploymentEjbResolver(DeploymentScope deploymentScope, String errorName)
+   {
+      this.deploymentScope = deploymentScope;
+      this.errorName = errorName;
+   }
+
+   protected abstract EJBContainer searchDeploymentInternally(String ejbLink, Class businessIntf);
+
+   public EJBContainer getEjbContainer(String ejbLink, Class businessIntf)
+   {
+      int hashIndex = ejbLink.indexOf('#');
+      if (hashIndex != -1)
+      {
+         if (deploymentScope == null) return null;
+         String relativePath = ejbLink.substring(0, hashIndex);
+         Ejb3Deployment dep = deploymentScope.findRelativeDeployment(relativePath);
+         if (dep == null) return null;
+         String ejbName = ejbLink.substring(hashIndex);
+         return dep.getEjbContainer(ejbName, businessIntf);
+      }
+      // look internally
+      EJBContainer ejb = searchDeploymentInternally(ejbLink, businessIntf);
+      if (ejb != null) return ejb;
+      for (Object obj : Ejb3Registry.getContainers())
+      {
+         EJBContainer container = (EJBContainer) obj;
+         if (container.getEjbName().equals(ejbLink))
+         {
+            return container;
+         }
+      }
+      return null;
+   }
+
+   public String getEjbJndiName(String ejbLink, Class businessIntf)
+   {
+      EJBContainer container = getEjbContainer(ejbLink, businessIntf);
+      if (container == null)
+      {
+         return null;
+      }
+      return ProxyFactoryHelper.getJndiName(container, businessIntf);
+   }
+
+   public EJBContainer getEjbContainer(Ejb3Deployment deployment, Class businessIntf) throws NameNotFoundException
+   {
+      EJBContainer container = null;
+      // search in myself
+      for (Object obj : deployment.getEjbContainers().values())
+      {
+         EJBContainer newContainer = (EJBContainer) obj;
+         if (container == newContainer) continue;
+         if (ProxyFactoryHelper.publishesInterface(newContainer, businessIntf))
+         {
+            if (container != null) throw new NameNotFoundException("duplicated in " + errorName);
+            container = newContainer;
+         }
+      }
+      return container;
+   }
+
+   public EJBContainer getEjbContainer(Class businessIntf) throws NameNotFoundException
+   {
+      EJBContainer rtnContainer = null;
+      // search in deployment first
+      rtnContainer = searchForEjbContainerInternally(businessIntf);
+      if (rtnContainer != null) return rtnContainer;
+      // search in EAR
+      String jarName = null;
+      if (deploymentScope != null)
+      {
+         for (Ejb3Deployment deployment : deploymentScope.getEjbDeployments())
+         {
+            EJBContainer newContainer = getEjbContainer(deployment, businessIntf);
+            if (rtnContainer == newContainer) continue; // don't check self
+            if (rtnContainer != null && newContainer != null)
+            {
+               throw new NameNotFoundException("duplicated in .ear within " + jarName +
+                       " and " + deployment.getDeploymentUnit().getShortName());
+            }
+            if (newContainer != null)
+            {
+               rtnContainer = newContainer;
+               jarName = deployment.getDeploymentUnit().getShortName();
+            }
+         }
+      }
+      if (rtnContainer != null)
+      {
+         return rtnContainer;
+      }
+      // search everywhere
+      Iterator containers = Ejb3Registry.getContainers().iterator();
+      while (containers.hasNext())
+      {
+         Container container = (Container)containers.next();
+         EJBContainer ejbContainer = (EJBContainer) container;
+         if (ejbContainer == rtnContainer) continue;
+         if (ProxyFactoryHelper.publishesInterface(container, businessIntf))
+         {
+            if (rtnContainer != null)
+            {
+               throw new NameNotFoundException("duplicated in " + ejbContainer.getDeployment().getDeploymentUnit().getShortName()
+                       + " and " + jarName);
+            }
+            rtnContainer = ejbContainer;
+            jarName = ejbContainer.getDeployment().getDeploymentUnit().getShortName();
+         }
+      }
+      if (rtnContainer != null) return rtnContainer;
+      throw new NameNotFoundException("not used by any EJBs");
+   }
+
+   protected abstract EJBContainer searchForEjbContainerInternally(Class businessIntf) throws NameNotFoundException;
+
+   public String getEjbJndiName(Class businessIntf) throws NameNotFoundException
+   {
+      EJBContainer container = getEjbContainer(businessIntf);
+      String jndiName = ProxyFactoryHelper.getJndiName(container, businessIntf);
+      if (jndiName == null) throw new NameNotFoundException("not used by any EJBs");
+      return jndiName;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,125 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.enc;
-
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.ejb3.PersistenceUnitRegistry;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.Ejb3Deployment;
-
-import javax.naming.NameNotFoundException;
-import java.util.List;
-import java.util.LinkedHashMap;
-
-/**
- * Resolves persistence units for @PersistenceContext and @PersistenceUnit
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class DeploymentPersistenceUnitResolver
-{
-   protected List<PersistenceUnitDeployment> persistenceUnitDeployments;
-   protected DeploymentScope deploymentScope;
-   protected LinkedHashMap ejbContainers;
-
-   public DeploymentPersistenceUnitResolver(List<PersistenceUnitDeployment> persistenceUnitDeployments, DeploymentScope deploymentScope, LinkedHashMap ejbContainers)
-   {
-      this.persistenceUnitDeployments = persistenceUnitDeployments;
-      this.deploymentScope = deploymentScope;
-      this.ejbContainers = ejbContainers;
-   }
-
-   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
-   {
-      if ("".equals(unitName))
-      {
-         if (persistenceUnitDeployments == null)
-         {
-            throw new NameNotFoundException("EMPTY STRING unitName but there is no deployments in scope");
-         }
-         if (persistenceUnitDeployments.size() == 1 && ejbContainers.size() > 0)
-         {
-            return persistenceUnitDeployments.get(0);
-         }
-         else if (persistenceUnitDeployments.size() > 1)
-         {
-            throw new NameNotFoundException("EMPTY STRING unitName and there is more than one scoped persistence unit");
-         }
-         throw new NameNotFoundException("There is no default persistence unit in this deployment.");
-      }
-      int hashIndex = unitName.indexOf('#');
-      if (hashIndex != -1)
-      {
-         String relativePath = unitName.substring(0, hashIndex);
-         String name = unitName.substring(hashIndex + 1);
-         if (deploymentScope == null)
-         {
-            String relativeJarName = relativePath.substring(3);
-            // look in global EJB jars.
-            for (PersistenceUnitDeployment pud : PersistenceUnitRegistry.getPersistenceUnits())
-            {
-               String jarName = pud.getDeployment().getDeploymentUnit().getShortName() + ".jar";
-               if (pud.getDeployment().getEar() == null
-                       && jarName.equals(relativeJarName)
-                       && pud.getEntityManagerName().equals(name)
-                       && pud.isScoped())
-               {
-                  return pud;
-               }
-            }
-            return null;
-         }
-         Ejb3Deployment dep = deploymentScope.findRelativeDeployment(relativePath);
-         if (dep == null)
-         {
-            return null;
-         }
-         PersistenceUnitDeployment rtn = dep.getPersistenceUnitDeploymentInternal(name);
-         return rtn;
-      }
-      PersistenceUnitDeployment rtn = getPersistenceUnitDeploymentInternal(unitName);
-      if (rtn != null) return rtn;
-
-      for (PersistenceUnitDeployment deployment : PersistenceUnitRegistry.getPersistenceUnits())
-      {
-         if (deployment.isScoped()) continue;
-         if (deployment.getEntityManagerName().equals(unitName)) return deployment;
-      }
-      return rtn;
-   }
-
-   public PersistenceUnitDeployment getPersistenceUnitDeploymentInternal(String unitName)
-   {
-      if (persistenceUnitDeployments != null)
-      {
-         for (PersistenceUnitDeployment deployment : persistenceUnitDeployments)
-         {
-            if (deployment.getEntityManagerName().equals(unitName))
-            {
-               return deployment;
-            }
-         }
-      }
-      return null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,125 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.enc;
+
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.ejb3.PersistenceUnitRegistry;
+import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.Ejb3Deployment;
+
+import javax.naming.NameNotFoundException;
+import java.util.List;
+import java.util.LinkedHashMap;
+
+/**
+ * Resolves persistence units for @PersistenceContext and @PersistenceUnit
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class DeploymentPersistenceUnitResolver
+{
+   protected List<PersistenceUnitDeployment> persistenceUnitDeployments;
+   protected DeploymentScope deploymentScope;
+   protected LinkedHashMap ejbContainers;
+
+   public DeploymentPersistenceUnitResolver(List<PersistenceUnitDeployment> persistenceUnitDeployments, DeploymentScope deploymentScope, LinkedHashMap ejbContainers)
+   {
+      this.persistenceUnitDeployments = persistenceUnitDeployments;
+      this.deploymentScope = deploymentScope;
+      this.ejbContainers = ejbContainers;
+   }
+
+   public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
+   {
+      if ("".equals(unitName))
+      {
+         if (persistenceUnitDeployments == null)
+         {
+            throw new NameNotFoundException("EMPTY STRING unitName but there is no deployments in scope");
+         }
+         if (persistenceUnitDeployments.size() == 1 && ejbContainers.size() > 0)
+         {
+            return persistenceUnitDeployments.get(0);
+         }
+         else if (persistenceUnitDeployments.size() > 1)
+         {
+            throw new NameNotFoundException("EMPTY STRING unitName and there is more than one scoped persistence unit");
+         }
+         throw new NameNotFoundException("There is no default persistence unit in this deployment.");
+      }
+      int hashIndex = unitName.indexOf('#');
+      if (hashIndex != -1)
+      {
+         String relativePath = unitName.substring(0, hashIndex);
+         String name = unitName.substring(hashIndex + 1);
+         if (deploymentScope == null)
+         {
+            String relativeJarName = relativePath.substring(3);
+            // look in global EJB jars.
+            for (PersistenceUnitDeployment pud : PersistenceUnitRegistry.getPersistenceUnits())
+            {
+               String jarName = pud.getDeployment().getDeploymentUnit().getShortName() + ".jar";
+               if (pud.getDeployment().getEar() == null
+                       && jarName.equals(relativeJarName)
+                       && pud.getEntityManagerName().equals(name)
+                       && pud.isScoped())
+               {
+                  return pud;
+               }
+            }
+            return null;
+         }
+         Ejb3Deployment dep = deploymentScope.findRelativeDeployment(relativePath);
+         if (dep == null)
+         {
+            return null;
+         }
+         PersistenceUnitDeployment rtn = dep.getPersistenceUnitDeploymentInternal(name);
+         return rtn;
+      }
+      PersistenceUnitDeployment rtn = getPersistenceUnitDeploymentInternal(unitName);
+      if (rtn != null) return rtn;
+
+      for (PersistenceUnitDeployment deployment : PersistenceUnitRegistry.getPersistenceUnits())
+      {
+         if (deployment.isScoped()) continue;
+         if (deployment.getEntityManagerName().equals(unitName)) return deployment;
+      }
+      return rtn;
+   }
+
+   public PersistenceUnitDeployment getPersistenceUnitDeploymentInternal(String unitName)
+   {
+      if (persistenceUnitDeployments != null)
+      {
+         for (PersistenceUnitDeployment deployment : persistenceUnitDeployments)
+         {
+            if (deployment.getEntityManagerName().equals(unitName))
+            {
+               return deployment;
+            }
+         }
+      }
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.enc;
-
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.DeploymentScope;
-
-import javax.naming.NameNotFoundException;
-import java.util.LinkedHashMap;
-
-/**
- * Resolve EJBs.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EjbModuleEjbResolver extends DeploymentEjbResolver
-{
-   protected LinkedHashMap ejbContainers;
-   protected Ejb3Deployment deployment;
-
-   public EjbModuleEjbResolver(DeploymentScope deploymentScope, String errorName, LinkedHashMap ejbContainers, Ejb3Deployment deployment)
-   {
-      super(deploymentScope, errorName);
-      this.ejbContainers = ejbContainers;
-      this.deployment = deployment;
-   }
-
-   @Override
-   protected EJBContainer searchDeploymentInternally(String ejbLink, Class businessIntf)
-   {
-      for (Object obj : ejbContainers.values())
-      {
-         EJBContainer container = (EJBContainer) obj;
-         if (container.getEjbName().equals(ejbLink))
-         {
-            return container;
-         }
-      }
-      return null;
-   }
-
-   @Override
-   protected EJBContainer searchForEjbContainerInternally(Class businessIntf) throws NameNotFoundException
-   {
-      EJBContainer rtnContainer;
-      rtnContainer = getEjbContainer(deployment, businessIntf);
-      return rtnContainer;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.enc;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.DeploymentScope;
+
+import javax.naming.NameNotFoundException;
+import java.util.LinkedHashMap;
+
+/**
+ * Resolve EJBs.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EjbModuleEjbResolver extends DeploymentEjbResolver
+{
+   protected LinkedHashMap ejbContainers;
+   protected Ejb3Deployment deployment;
+
+   public EjbModuleEjbResolver(DeploymentScope deploymentScope, String errorName, LinkedHashMap ejbContainers, Ejb3Deployment deployment)
+   {
+      super(deploymentScope, errorName);
+      this.ejbContainers = ejbContainers;
+      this.deployment = deployment;
+   }
+
+   @Override
+   protected EJBContainer searchDeploymentInternally(String ejbLink, Class businessIntf)
+   {
+      for (Object obj : ejbContainers.values())
+      {
+         EJBContainer container = (EJBContainer) obj;
+         if (container.getEjbName().equals(ejbLink))
+         {
+            return container;
+         }
+      }
+      return null;
+   }
+
+   @Override
+   protected EJBContainer searchForEjbContainerInternally(Class businessIntf) throws NameNotFoundException
+   {
+      EJBContainer rtnContainer;
+      rtnContainer = getEjbContainer(deployment, businessIntf);
+      return rtnContainer;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModuleEjbResolver.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.enc;
-
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.ejb3.DeploymentScope;
-
-import java.util.List;
-import java.util.LinkedHashMap;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EjbModulePersistenceUnitResolver extends DeploymentPersistenceUnitResolver
-{
-   public EjbModulePersistenceUnitResolver(List<PersistenceUnitDeployment> persistenceUnitDeployments, DeploymentScope deploymentScope, LinkedHashMap ejbContainers)
-   {
-      super(persistenceUnitDeployments, deploymentScope, ejbContainers);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.enc;
+
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.ejb3.DeploymentScope;
+
+import java.util.List;
+import java.util.LinkedHashMap;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EjbModulePersistenceUnitResolver extends DeploymentPersistenceUnitResolver
+{
+   public EjbModulePersistenceUnitResolver(List<PersistenceUnitDeployment> persistenceUnitDeployments, DeploymentScope deploymentScope, LinkedHashMap ejbContainers)
+   {
+      super(persistenceUnitDeployments, deploymentScope, ejbContainers);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/EjbModulePersistenceUnitResolver.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,188 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import java.io.Serializable;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import org.hibernate.Session;
-import org.hibernate.ejb.HibernateEntityManager;
-import org.jboss.ejb3.stateful.StatefulBeanContext;
-
-/**
- * EntityManager a managed extended persistence context.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public class ExtendedEntityManager implements EntityManager, HibernateSession, Serializable, ExtendedPersistenceContext
-{
-   private String identity;
-
-   public ExtendedEntityManager(String name)
-   {
-      this.identity = name;
-   }
-
-   public ExtendedEntityManager()
-   {
-   }
-
-   public ManagedEntityManagerFactory getFactory()
-   {
-      throw new RuntimeException("NOT IMPLEMENTED");
-   }
-
-   public EntityManager getPersistenceContext()
-   {
-      StatefulBeanContext beanContext = StatefulBeanContext.currentBean.get();
-      EntityManager persistenceContext = beanContext.getExtendedPersistenceContext(identity);
-      if (persistenceContext == null)
-         throw new RuntimeException("Unable to determine persistenceContext: " + identity
-                                    + " in injected SFSB: " + beanContext.getContainer().getObjectName());
-      return persistenceContext;
-   }
-
-   // delegates
-
-   public Session getHibernateSession()
-   {
-      if (getPersistenceContext() instanceof HibernateEntityManager)
-      {
-         return ((HibernateEntityManager) getPersistenceContext()).getSession();
-      }
-      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate persistence provider");
-   }
-
-   public void joinTransaction()
-   {
-      getPersistenceContext().joinTransaction();
-   }
-
-   public void clear()
-   {
-      getPersistenceContext().clear();
-   }
-
-   public void lock(Object entity, LockModeType lockMode)
-   {
-      getPersistenceContext().lock(entity, lockMode);
-   }
-
-   public FlushModeType getFlushMode()
-   {
-      return getPersistenceContext().getFlushMode();
-   }
-
-   public <T> T getReference(Class<T> entityClass, Object primaryKey)
-   {
-      return getPersistenceContext().getReference(entityClass, primaryKey);
-   }
-
-   public void persist(Object entity)
-   {
-      getPersistenceContext().persist(entity);
-   }
-
-   public <T> T merge(T entity)
-   {
-      return getPersistenceContext().merge(entity);
-   }
-
-   public void remove(Object entity)
-   {
-      getPersistenceContext().remove(entity);
-   }
-
-   public <T> T find(Class<T> entityClass, Object primaryKey)
-   {
-      return getPersistenceContext().find(entityClass, primaryKey);
-   }
-
-   public void flush()
-   {
-      getPersistenceContext().flush();
-   }
-
-   public javax.persistence.Query createQuery(String ejbqlString)
-   {
-      return getPersistenceContext().createQuery(ejbqlString);
-   }
-
-   public javax.persistence.Query createNamedQuery(String name)
-   {
-      return getPersistenceContext().createNamedQuery(name);
-   }
-
-   public javax.persistence.Query createNativeQuery(String sqlString)
-   {
-      return getPersistenceContext().createNativeQuery(sqlString);
-   }
-
-   public javax.persistence.Query createNativeQuery(String sqlString, Class resultClass)
-   {
-      return getPersistenceContext().createNativeQuery(sqlString, resultClass);
-   }
-
-   public javax.persistence.Query createNativeQuery(String sqlString, String resultSetMapping)
-   {
-      return getPersistenceContext().createNativeQuery(sqlString, resultSetMapping);
-   }
-
-   public void refresh(Object entity)
-   {
-      getPersistenceContext().refresh(entity);
-   }
-
-   public boolean contains(Object entity)
-   {
-      return getPersistenceContext().contains(entity);
-   }
-
-   public void close()
-   {
-      throw new IllegalStateException("It is illegal to close an injected EntityManager");
-   }
-
-   public boolean isOpen()
-   {
-      return getPersistenceContext().isOpen();
-   }
-
-   public EntityTransaction getTransaction()
-   {
-      return getPersistenceContext().getTransaction();
-   }
-
-   public void setFlushMode(FlushModeType flushMode)
-   {
-      getPersistenceContext().setFlushMode(flushMode);
-   }
-
-   public Object getDelegate()
-   {
-      return getPersistenceContext();
-   }
-
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,188 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import java.io.Serializable;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import org.hibernate.Session;
+import org.hibernate.ejb.HibernateEntityManager;
+import org.jboss.ejb3.stateful.StatefulBeanContext;
+
+/**
+ * EntityManager a managed extended persistence context.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public class ExtendedEntityManager implements EntityManager, HibernateSession, Serializable, ExtendedPersistenceContext
+{
+   private String identity;
+
+   public ExtendedEntityManager(String name)
+   {
+      this.identity = name;
+   }
+
+   public ExtendedEntityManager()
+   {
+   }
+
+   public ManagedEntityManagerFactory getFactory()
+   {
+      throw new RuntimeException("NOT IMPLEMENTED");
+   }
+
+   public EntityManager getPersistenceContext()
+   {
+      StatefulBeanContext beanContext = StatefulBeanContext.currentBean.get();
+      EntityManager persistenceContext = beanContext.getExtendedPersistenceContext(identity);
+      if (persistenceContext == null)
+         throw new RuntimeException("Unable to determine persistenceContext: " + identity
+                                    + " in injected SFSB: " + beanContext.getContainer().getObjectName());
+      return persistenceContext;
+   }
+
+   // delegates
+
+   public Session getHibernateSession()
+   {
+      if (getPersistenceContext() instanceof HibernateEntityManager)
+      {
+         return ((HibernateEntityManager) getPersistenceContext()).getSession();
+      }
+      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate persistence provider");
+   }
+
+   public void joinTransaction()
+   {
+      getPersistenceContext().joinTransaction();
+   }
+
+   public void clear()
+   {
+      getPersistenceContext().clear();
+   }
+
+   public void lock(Object entity, LockModeType lockMode)
+   {
+      getPersistenceContext().lock(entity, lockMode);
+   }
+
+   public FlushModeType getFlushMode()
+   {
+      return getPersistenceContext().getFlushMode();
+   }
+
+   public <T> T getReference(Class<T> entityClass, Object primaryKey)
+   {
+      return getPersistenceContext().getReference(entityClass, primaryKey);
+   }
+
+   public void persist(Object entity)
+   {
+      getPersistenceContext().persist(entity);
+   }
+
+   public <T> T merge(T entity)
+   {
+      return getPersistenceContext().merge(entity);
+   }
+
+   public void remove(Object entity)
+   {
+      getPersistenceContext().remove(entity);
+   }
+
+   public <T> T find(Class<T> entityClass, Object primaryKey)
+   {
+      return getPersistenceContext().find(entityClass, primaryKey);
+   }
+
+   public void flush()
+   {
+      getPersistenceContext().flush();
+   }
+
+   public javax.persistence.Query createQuery(String ejbqlString)
+   {
+      return getPersistenceContext().createQuery(ejbqlString);
+   }
+
+   public javax.persistence.Query createNamedQuery(String name)
+   {
+      return getPersistenceContext().createNamedQuery(name);
+   }
+
+   public javax.persistence.Query createNativeQuery(String sqlString)
+   {
+      return getPersistenceContext().createNativeQuery(sqlString);
+   }
+
+   public javax.persistence.Query createNativeQuery(String sqlString, Class resultClass)
+   {
+      return getPersistenceContext().createNativeQuery(sqlString, resultClass);
+   }
+
+   public javax.persistence.Query createNativeQuery(String sqlString, String resultSetMapping)
+   {
+      return getPersistenceContext().createNativeQuery(sqlString, resultSetMapping);
+   }
+
+   public void refresh(Object entity)
+   {
+      getPersistenceContext().refresh(entity);
+   }
+
+   public boolean contains(Object entity)
+   {
+      return getPersistenceContext().contains(entity);
+   }
+
+   public void close()
+   {
+      throw new IllegalStateException("It is illegal to close an injected EntityManager");
+   }
+
+   public boolean isOpen()
+   {
+      return getPersistenceContext().isOpen();
+   }
+
+   public EntityTransaction getTransaction()
+   {
+      return getPersistenceContext().getTransaction();
+   }
+
+   public void setFlushMode(FlushModeType flushMode)
+   {
+      getPersistenceContext().setFlushMode(flushMode);
+   }
+
+   public Object getDelegate()
+   {
+      return getPersistenceContext();
+   }
+
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,458 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import java.io.Serializable;
-import java.sql.Connection;
-import javax.persistence.EntityManager;
-import org.hibernate.CacheMode;
-import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
-import org.hibernate.Filter;
-import org.hibernate.FlushMode;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.Query;
-import org.hibernate.ReplicationMode;
-import org.hibernate.SQLQuery;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.ejb.HibernateEntityManager;
-import org.hibernate.stat.SessionStatistics;
-import org.jboss.ejb3.stateful.StatefulBeanContext;
-
-/**
- * Hibernate Session with a managed extended persistence context.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public class ExtendedHibernateSession implements Session, ExtendedPersistenceContext, Serializable
-{
-   private String identity;
-
-   public ExtendedHibernateSession(String name)
-   {
-      this.identity = name;
-   }
-
-   public ExtendedHibernateSession()
-   {
-   }
-
-   public ManagedEntityManagerFactory getFactory()
-   {
-      throw new RuntimeException("NOT IMPLEMENTED");
-   }
-
-   public EntityManager getPersistenceContext()
-   {
-      StatefulBeanContext beanContext = StatefulBeanContext.currentBean.get();
-      EntityManager persistenceContext = beanContext.getExtendedPersistenceContext(identity);
-      if (persistenceContext == null)
-         throw new RuntimeException("Unable to determine persistenceContext: " + identity
-                                    + " in injected SFSB: " + beanContext.getContainer().getObjectName());
-      return persistenceContext;
-   }
-
-   public Session getHibernateSession()
-   {
-      EntityManager persistenceContext = getPersistenceContext();
-      if (persistenceContext instanceof HibernateEntityManager)
-      {
-         return ((HibernateEntityManager) persistenceContext).getSession();
-      }
-      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate persistence provider");
-   }
-
-
-   public EntityMode getEntityMode()
-   {
-      return getHibernateSession().getEntityMode();
-   }
-
-   public Session getSession(EntityMode entityMode)
-   {
-      return getHibernateSession().getSession(entityMode);
-   }
-
-   public void flush()
-   throws HibernateException
-   {
-      getHibernateSession().flush();
-   }
-
-   public void setFlushMode(FlushMode flushMode)
-   {
-      getHibernateSession().setFlushMode(flushMode);
-   }
-
-   public FlushMode getFlushMode()
-   {
-      return getHibernateSession().getFlushMode();
-   }
-
-   public void setCacheMode(CacheMode cacheMode)
-   {
-      getHibernateSession().setCacheMode(cacheMode);
-   }
-
-   public CacheMode getCacheMode()
-   {
-      return getHibernateSession().getCacheMode();
-   }
-
-   public SessionFactory getSessionFactory()
-   {
-      return getHibernateSession().getSessionFactory();
-   }
-
-   public Connection connection()
-   throws HibernateException
-   {
-      return getHibernateSession().connection();
-   }
-
-   public Connection disconnect()
-   throws HibernateException
-   {
-      return getHibernateSession().disconnect();
-   }
-
-   public void reconnect()
-   throws HibernateException
-   {
-      getHibernateSession().reconnect();
-   }
-
-   public void reconnect(Connection connection)
-   throws HibernateException
-   {
-      getHibernateSession().reconnect(connection);
-   }
-
-   public Connection close()
-   throws HibernateException
-   {
-      throw new IllegalStateException("It is illegal to close an injected Hibernate Session");
-   }
-
-   public void cancelQuery()
-   throws HibernateException
-   {
-      getHibernateSession().cancelQuery();
-   }
-
-   public boolean isOpen()
-   {
-      return getHibernateSession().isOpen();
-   }
-
-   public boolean isConnected()
-   {
-      return getHibernateSession().isConnected();
-   }
-
-   public boolean isDirty()
-   throws HibernateException
-   {
-      return getHibernateSession().isDirty();
-   }
-
-   public Serializable getIdentifier(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().getIdentifier(object);
-   }
-
-   public boolean contains(Object object)
-   {
-      return getHibernateSession().contains(object);
-   }
-
-   public void evict(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().evict(object);
-   }
-
-   public Object load(Class theClass, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().load(theClass, id, lockMode);
-   }
-
-   public Object load(String entityName, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().load(entityName, id, lockMode);
-   }
-
-   public Object load(Class theClass, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().load(theClass, id);
-   }
-
-   public Object load(String entityName, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().load(entityName, id);
-   }
-
-   public void load(Object object, Serializable id)
-   throws HibernateException
-   {
-      getHibernateSession().load(object, id);
-   }
-
-   public void replicate(Object object, ReplicationMode replicationMode)
-   throws HibernateException
-   {
-      getHibernateSession().replicate(object, replicationMode);
-   }
-
-   public void replicate(String entityName, Object object, ReplicationMode replicationMode)
-   throws HibernateException
-   {
-      getHibernateSession().replicate(entityName, object, replicationMode);
-   }
-
-   public Serializable save(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().save(object);
-   }
-
-   public Serializable save(String entityName, Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().save(entityName, object);
-   }
-
-   public void saveOrUpdate(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().saveOrUpdate(object);
-   }
-
-   public void saveOrUpdate(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().saveOrUpdate(entityName, object);
-   }
-
-   public void update(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().update(object);
-   }
-
-   public void update(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().update(entityName, object);
-   }
-
-   public Object merge(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().merge(object);
-   }
-
-   public Object merge(String entityName, Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().merge(entityName, object);
-   }
-
-   public void persist(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().persist(object);
-   }
-
-   public void persist(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().persist(entityName, object);
-   }
-
-   public void delete(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().delete(object);
-   }
-
-   public void delete(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().delete(entityName, object);
-   }
-
-   public void lock(Object object, LockMode lockMode)
-   throws HibernateException
-   {
-      getHibernateSession().lock(object, lockMode);
-   }
-
-   public void lock(String entityName, Object object, LockMode lockMode)
-   throws HibernateException
-   {
-      getHibernateSession().lock(entityName, object, lockMode);
-   }
-
-   public void refresh(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().refresh(object);
-   }
-
-   public void refresh(Object object, LockMode lockMode)
-   throws HibernateException
-   {
-      getHibernateSession().refresh(object, lockMode);
-   }
-
-   public LockMode getCurrentLockMode(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().getCurrentLockMode(object);
-   }
-
-   public Transaction beginTransaction()
-   throws HibernateException
-   {
-      return getHibernateSession().beginTransaction();
-   }
-
-   public Criteria createCriteria(Class persistentClass)
-   {
-      return getHibernateSession().createCriteria(persistentClass);
-   }
-
-   public Criteria createCriteria(Class persistentClass, String alias)
-   {
-      return getHibernateSession().createCriteria(persistentClass, alias);
-   }
-
-   public Criteria createCriteria(String entityName)
-   {
-      return getHibernateSession().createCriteria(entityName);
-   }
-
-   public Criteria createCriteria(String entityName, String alias)
-   {
-      return getHibernateSession().createCriteria(entityName, alias);
-   }
-
-   public Query createQuery(String queryString)
-   throws HibernateException
-   {
-      return getHibernateSession().createQuery(queryString);
-   }
-
-   public SQLQuery createSQLQuery(String queryString)
-   throws HibernateException
-   {
-      return getHibernateSession().createSQLQuery(queryString);
-   }
-
-   public Query createFilter(Object collection, String queryString)
-   throws HibernateException
-   {
-      return getHibernateSession().createFilter(collection, queryString);
-   }
-
-   public Query getNamedQuery(String queryName)
-   throws HibernateException
-   {
-      return getHibernateSession().getNamedQuery(queryName);
-   }
-
-   public void clear()
-   {
-      getHibernateSession().clear();
-   }
-
-   public Object get(Class clazz, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().get(clazz, id);
-   }
-
-   public Object get(Class clazz, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().get(clazz, id, lockMode);
-   }
-
-   public Object get(String entityName, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().get(entityName, id);
-   }
-
-   public Object get(String entityName, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().get(entityName, id, lockMode);
-   }
-
-   public String getEntityName(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().getEntityName(object);
-   }
-
-   public Filter enableFilter(String filterName)
-   {
-      return getHibernateSession().enableFilter(filterName);
-   }
-
-   public Filter getEnabledFilter(String filterName)
-   {
-      return getHibernateSession().getEnabledFilter(filterName);
-   }
-
-   public void disableFilter(String filterName)
-   {
-      getHibernateSession().disableFilter(filterName);
-   }
-
-   public SessionStatistics getStatistics()
-   {
-      return getHibernateSession().getStatistics();
-   }
-
-   public void setReadOnly(Object entity, boolean readOnly)
-   {
-      getHibernateSession().setReadOnly(entity, readOnly);
-   }
-
-   public Transaction getTransaction()
-   {
-      return getHibernateSession().getTransaction();
-   }
-
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,458 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import javax.persistence.EntityManager;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Filter;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
+import org.hibernate.ReplicationMode;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.ejb.HibernateEntityManager;
+import org.hibernate.stat.SessionStatistics;
+import org.jboss.ejb3.stateful.StatefulBeanContext;
+
+/**
+ * Hibernate Session with a managed extended persistence context.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+public class ExtendedHibernateSession implements Session, ExtendedPersistenceContext, Serializable
+{
+   private String identity;
+
+   public ExtendedHibernateSession(String name)
+   {
+      this.identity = name;
+   }
+
+   public ExtendedHibernateSession()
+   {
+   }
+
+   public ManagedEntityManagerFactory getFactory()
+   {
+      throw new RuntimeException("NOT IMPLEMENTED");
+   }
+
+   public EntityManager getPersistenceContext()
+   {
+      StatefulBeanContext beanContext = StatefulBeanContext.currentBean.get();
+      EntityManager persistenceContext = beanContext.getExtendedPersistenceContext(identity);
+      if (persistenceContext == null)
+         throw new RuntimeException("Unable to determine persistenceContext: " + identity
+                                    + " in injected SFSB: " + beanContext.getContainer().getObjectName());
+      return persistenceContext;
+   }
+
+   public Session getHibernateSession()
+   {
+      EntityManager persistenceContext = getPersistenceContext();
+      if (persistenceContext instanceof HibernateEntityManager)
+      {
+         return ((HibernateEntityManager) persistenceContext).getSession();
+      }
+      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate persistence provider");
+   }
+
+
+   public EntityMode getEntityMode()
+   {
+      return getHibernateSession().getEntityMode();
+   }
+
+   public Session getSession(EntityMode entityMode)
+   {
+      return getHibernateSession().getSession(entityMode);
+   }
+
+   public void flush()
+   throws HibernateException
+   {
+      getHibernateSession().flush();
+   }
+
+   public void setFlushMode(FlushMode flushMode)
+   {
+      getHibernateSession().setFlushMode(flushMode);
+   }
+
+   public FlushMode getFlushMode()
+   {
+      return getHibernateSession().getFlushMode();
+   }
+
+   public void setCacheMode(CacheMode cacheMode)
+   {
+      getHibernateSession().setCacheMode(cacheMode);
+   }
+
+   public CacheMode getCacheMode()
+   {
+      return getHibernateSession().getCacheMode();
+   }
+
+   public SessionFactory getSessionFactory()
+   {
+      return getHibernateSession().getSessionFactory();
+   }
+
+   public Connection connection()
+   throws HibernateException
+   {
+      return getHibernateSession().connection();
+   }
+
+   public Connection disconnect()
+   throws HibernateException
+   {
+      return getHibernateSession().disconnect();
+   }
+
+   public void reconnect()
+   throws HibernateException
+   {
+      getHibernateSession().reconnect();
+   }
+
+   public void reconnect(Connection connection)
+   throws HibernateException
+   {
+      getHibernateSession().reconnect(connection);
+   }
+
+   public Connection close()
+   throws HibernateException
+   {
+      throw new IllegalStateException("It is illegal to close an injected Hibernate Session");
+   }
+
+   public void cancelQuery()
+   throws HibernateException
+   {
+      getHibernateSession().cancelQuery();
+   }
+
+   public boolean isOpen()
+   {
+      return getHibernateSession().isOpen();
+   }
+
+   public boolean isConnected()
+   {
+      return getHibernateSession().isConnected();
+   }
+
+   public boolean isDirty()
+   throws HibernateException
+   {
+      return getHibernateSession().isDirty();
+   }
+
+   public Serializable getIdentifier(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().getIdentifier(object);
+   }
+
+   public boolean contains(Object object)
+   {
+      return getHibernateSession().contains(object);
+   }
+
+   public void evict(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().evict(object);
+   }
+
+   public Object load(Class theClass, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().load(theClass, id, lockMode);
+   }
+
+   public Object load(String entityName, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().load(entityName, id, lockMode);
+   }
+
+   public Object load(Class theClass, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().load(theClass, id);
+   }
+
+   public Object load(String entityName, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().load(entityName, id);
+   }
+
+   public void load(Object object, Serializable id)
+   throws HibernateException
+   {
+      getHibernateSession().load(object, id);
+   }
+
+   public void replicate(Object object, ReplicationMode replicationMode)
+   throws HibernateException
+   {
+      getHibernateSession().replicate(object, replicationMode);
+   }
+
+   public void replicate(String entityName, Object object, ReplicationMode replicationMode)
+   throws HibernateException
+   {
+      getHibernateSession().replicate(entityName, object, replicationMode);
+   }
+
+   public Serializable save(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().save(object);
+   }
+
+   public Serializable save(String entityName, Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().save(entityName, object);
+   }
+
+   public void saveOrUpdate(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().saveOrUpdate(object);
+   }
+
+   public void saveOrUpdate(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().saveOrUpdate(entityName, object);
+   }
+
+   public void update(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().update(object);
+   }
+
+   public void update(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().update(entityName, object);
+   }
+
+   public Object merge(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().merge(object);
+   }
+
+   public Object merge(String entityName, Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().merge(entityName, object);
+   }
+
+   public void persist(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().persist(object);
+   }
+
+   public void persist(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().persist(entityName, object);
+   }
+
+   public void delete(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().delete(object);
+   }
+
+   public void delete(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().delete(entityName, object);
+   }
+
+   public void lock(Object object, LockMode lockMode)
+   throws HibernateException
+   {
+      getHibernateSession().lock(object, lockMode);
+   }
+
+   public void lock(String entityName, Object object, LockMode lockMode)
+   throws HibernateException
+   {
+      getHibernateSession().lock(entityName, object, lockMode);
+   }
+
+   public void refresh(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().refresh(object);
+   }
+
+   public void refresh(Object object, LockMode lockMode)
+   throws HibernateException
+   {
+      getHibernateSession().refresh(object, lockMode);
+   }
+
+   public LockMode getCurrentLockMode(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().getCurrentLockMode(object);
+   }
+
+   public Transaction beginTransaction()
+   throws HibernateException
+   {
+      return getHibernateSession().beginTransaction();
+   }
+
+   public Criteria createCriteria(Class persistentClass)
+   {
+      return getHibernateSession().createCriteria(persistentClass);
+   }
+
+   public Criteria createCriteria(Class persistentClass, String alias)
+   {
+      return getHibernateSession().createCriteria(persistentClass, alias);
+   }
+
+   public Criteria createCriteria(String entityName)
+   {
+      return getHibernateSession().createCriteria(entityName);
+   }
+
+   public Criteria createCriteria(String entityName, String alias)
+   {
+      return getHibernateSession().createCriteria(entityName, alias);
+   }
+
+   public Query createQuery(String queryString)
+   throws HibernateException
+   {
+      return getHibernateSession().createQuery(queryString);
+   }
+
+   public SQLQuery createSQLQuery(String queryString)
+   throws HibernateException
+   {
+      return getHibernateSession().createSQLQuery(queryString);
+   }
+
+   public Query createFilter(Object collection, String queryString)
+   throws HibernateException
+   {
+      return getHibernateSession().createFilter(collection, queryString);
+   }
+
+   public Query getNamedQuery(String queryName)
+   throws HibernateException
+   {
+      return getHibernateSession().getNamedQuery(queryName);
+   }
+
+   public void clear()
+   {
+      getHibernateSession().clear();
+   }
+
+   public Object get(Class clazz, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().get(clazz, id);
+   }
+
+   public Object get(Class clazz, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().get(clazz, id, lockMode);
+   }
+
+   public Object get(String entityName, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().get(entityName, id);
+   }
+
+   public Object get(String entityName, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().get(entityName, id, lockMode);
+   }
+
+   public String getEntityName(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().getEntityName(object);
+   }
+
+   public Filter enableFilter(String filterName)
+   {
+      return getHibernateSession().enableFilter(filterName);
+   }
+
+   public Filter getEnabledFilter(String filterName)
+   {
+      return getHibernateSession().getEnabledFilter(filterName);
+   }
+
+   public void disableFilter(String filterName)
+   {
+      getHibernateSession().disableFilter(filterName);
+   }
+
+   public SessionStatistics getStatistics()
+   {
+      return getHibernateSession().getStatistics();
+   }
+
+   public void setReadOnly(Object entity, boolean readOnly)
+   {
+      getHibernateSession().setReadOnly(entity, readOnly);
+   }
+
+   public Transaction getTransaction()
+   {
+      return getHibernateSession().getTransaction();
+   }
+
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedHibernateSession.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -28,7 +28,6 @@
 import java.util.Map;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContextType;
 import org.jboss.ejb3.PersistenceUnitRegistry;
 
 /**
@@ -39,14 +38,17 @@
  */
 public class InjectedEntityManagerFactory implements EntityManagerFactory, Externalizable
 {
+   private static final long serialVersionUID = -3734435119658196788L;
+   
    private transient EntityManagerFactory delegate;
    private transient ManagedEntityManagerFactory managedFactory;
-   private String kernelName;
-
+   
    public InjectedEntityManagerFactory() {}
 
    public InjectedEntityManagerFactory(ManagedEntityManagerFactory managedFactory)
    {
+      assert managedFactory != null : "managedFactory is null";
+      
       this.delegate = managedFactory.getEntityManagerFactory();
       this.managedFactory = managedFactory;
    }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,238 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.sql.Connection;
-import java.util.Map;
-import java.util.Set;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.persistence.EntityManagerFactory;
-import org.hibernate.HibernateException;
-import org.hibernate.Interceptor;
-import org.hibernate.SessionFactory;
-import org.hibernate.StatelessSession;
-import org.hibernate.classic.Session;
-import org.hibernate.ejb.HibernateEntityManagerFactory;
-import org.hibernate.engine.FilterDefinition;
-import org.hibernate.metadata.ClassMetadata;
-import org.hibernate.metadata.CollectionMetadata;
-import org.hibernate.stat.Statistics;
-import org.jboss.ejb3.PersistenceUnitRegistry;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class InjectedSessionFactory implements SessionFactory, Externalizable
-{
-   private transient EntityManagerFactory delegate;
-   private transient ManagedEntityManagerFactory managedFactory;
-
-   public InjectedSessionFactory(ManagedEntityManagerFactory factory)
-   {
-      this.managedFactory = factory;
-      this.delegate = factory.getEntityManagerFactory();
-   }
-
-   public InjectedSessionFactory() {}
-
-   public void writeExternal(ObjectOutput out) throws IOException
-   {
-      out.writeUTF(managedFactory.getKernelName());
-   }
-
-   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
-   {
-      String kernelName = in.readUTF();
-      PersistenceUnitDeployment deployment = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
-      if (deployment == null) throw new IOException("Unable to find persistence unit in registry: " + kernelName);
-      managedFactory = deployment.getManagedFactory();
-      delegate = managedFactory.getEntityManagerFactory();
-   }
-
-   private EntityManagerFactory getDelegate()
-   {
-      return delegate;
-   }
-
-   private SessionFactory getSessionFactory()
-   {
-      return ((HibernateEntityManagerFactory)getDelegate()).getSessionFactory();
-   }
-
-   public Set getDefinedFilterNames()
-   {
-      return getSessionFactory().getDefinedFilterNames();
-   }
-
-   public FilterDefinition getFilterDefinition(String filterName) throws HibernateException
-   {
-      return getSessionFactory().getFilterDefinition(filterName);
-   }
-
-   public Session openSession(Connection connection)
-   {
-      return getSessionFactory().openSession(connection);
-   }
-
-   public Session openSession(Interceptor interceptor)
-   throws HibernateException
-   {
-      return getSessionFactory().openSession(interceptor);
-   }
-
-   public Session openSession(Connection connection, Interceptor interceptor)
-   {
-      return getSessionFactory().openSession(connection, interceptor);
-   }
-
-   public Session openSession()
-   throws HibernateException
-   {
-      return getSessionFactory().openSession();
-   }
-
-   public Session getCurrentSession()
-   throws HibernateException
-   {
-      return getSessionFactory().getCurrentSession();
-   }
-
-   public ClassMetadata getClassMetadata(Class persistentClass)
-   throws HibernateException
-   {
-      return getSessionFactory().getClassMetadata(persistentClass);
-   }
-
-   public ClassMetadata getClassMetadata(String entityName)
-   throws HibernateException
-   {
-      return getSessionFactory().getClassMetadata(entityName);
-   }
-
-   public CollectionMetadata getCollectionMetadata(String roleName)
-   throws HibernateException
-   {
-      return getSessionFactory().getCollectionMetadata(roleName);
-   }
-
-   public Map getAllClassMetadata()
-   throws HibernateException
-   {
-      return getSessionFactory().getAllClassMetadata();
-   }
-
-   public Map getAllCollectionMetadata()
-   throws HibernateException
-   {
-      return getSessionFactory().getAllCollectionMetadata();
-   }
-
-   public Statistics getStatistics()
-   {
-      return getSessionFactory().getStatistics();
-   }
-
-   public void close()
-   throws HibernateException
-   {
-      throw new IllegalStateException("It is illegal to close an injected SessionFactory");
-   }
-
-   public boolean isClosed()
-   {
-      return getSessionFactory().isClosed();
-   }
-
-   public void evict(Class persistentClass)
-   throws HibernateException
-   {
-      getSessionFactory().evict(persistentClass);
-   }
-
-   public void evict(Class persistentClass, Serializable id)
-   throws HibernateException
-   {
-      getSessionFactory().evict(persistentClass, id);
-   }
-
-   public void evictEntity(String entityName)
-   throws HibernateException
-   {
-      getSessionFactory().evictEntity(entityName);
-   }
-
-   public void evictEntity(String entityName, Serializable id)
-   throws HibernateException
-   {
-      getSessionFactory().evictEntity(entityName, id);
-   }
-
-   public void evictCollection(String roleName)
-   throws HibernateException
-   {
-      getSessionFactory().evictCollection(roleName);
-   }
-
-   public void evictCollection(String roleName, Serializable id)
-   throws HibernateException
-   {
-      getSessionFactory().evictCollection(roleName, id);
-   }
-
-   public void evictQueries()
-   throws HibernateException
-   {
-      getSessionFactory().evictQueries();
-   }
-
-   public void evictQueries(String cacheRegion)
-   throws HibernateException
-   {
-      getSessionFactory().evictQueries(cacheRegion);
-   }
-
-   public StatelessSession openStatelessSession()
-   {
-      return getSessionFactory().openStatelessSession();
-   }
-
-   public StatelessSession openStatelessSession(Connection connection)
-   {
-      return getSessionFactory().openStatelessSession(connection);
-   }
-
-   public Reference getReference()
-   throws NamingException
-   {
-      return getSessionFactory().getReference();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,238 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.sql.Connection;
+import java.util.Map;
+import java.util.Set;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.persistence.EntityManagerFactory;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.SessionFactory;
+import org.hibernate.StatelessSession;
+import org.hibernate.classic.Session;
+import org.hibernate.ejb.HibernateEntityManagerFactory;
+import org.hibernate.engine.FilterDefinition;
+import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.metadata.CollectionMetadata;
+import org.hibernate.stat.Statistics;
+import org.jboss.ejb3.PersistenceUnitRegistry;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class InjectedSessionFactory implements SessionFactory, Externalizable
+{
+   private transient EntityManagerFactory delegate;
+   private transient ManagedEntityManagerFactory managedFactory;
+
+   public InjectedSessionFactory(ManagedEntityManagerFactory factory)
+   {
+      this.managedFactory = factory;
+      this.delegate = factory.getEntityManagerFactory();
+   }
+
+   public InjectedSessionFactory() {}
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeUTF(managedFactory.getKernelName());
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      String kernelName = in.readUTF();
+      PersistenceUnitDeployment deployment = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
+      if (deployment == null) throw new IOException("Unable to find persistence unit in registry: " + kernelName);
+      managedFactory = deployment.getManagedFactory();
+      delegate = managedFactory.getEntityManagerFactory();
+   }
+
+   private EntityManagerFactory getDelegate()
+   {
+      return delegate;
+   }
+
+   private SessionFactory getSessionFactory()
+   {
+      return ((HibernateEntityManagerFactory)getDelegate()).getSessionFactory();
+   }
+
+   public Set getDefinedFilterNames()
+   {
+      return getSessionFactory().getDefinedFilterNames();
+   }
+
+   public FilterDefinition getFilterDefinition(String filterName) throws HibernateException
+   {
+      return getSessionFactory().getFilterDefinition(filterName);
+   }
+
+   public Session openSession(Connection connection)
+   {
+      return getSessionFactory().openSession(connection);
+   }
+
+   public Session openSession(Interceptor interceptor)
+   throws HibernateException
+   {
+      return getSessionFactory().openSession(interceptor);
+   }
+
+   public Session openSession(Connection connection, Interceptor interceptor)
+   {
+      return getSessionFactory().openSession(connection, interceptor);
+   }
+
+   public Session openSession()
+   throws HibernateException
+   {
+      return getSessionFactory().openSession();
+   }
+
+   public Session getCurrentSession()
+   throws HibernateException
+   {
+      return getSessionFactory().getCurrentSession();
+   }
+
+   public ClassMetadata getClassMetadata(Class persistentClass)
+   throws HibernateException
+   {
+      return getSessionFactory().getClassMetadata(persistentClass);
+   }
+
+   public ClassMetadata getClassMetadata(String entityName)
+   throws HibernateException
+   {
+      return getSessionFactory().getClassMetadata(entityName);
+   }
+
+   public CollectionMetadata getCollectionMetadata(String roleName)
+   throws HibernateException
+   {
+      return getSessionFactory().getCollectionMetadata(roleName);
+   }
+
+   public Map getAllClassMetadata()
+   throws HibernateException
+   {
+      return getSessionFactory().getAllClassMetadata();
+   }
+
+   public Map getAllCollectionMetadata()
+   throws HibernateException
+   {
+      return getSessionFactory().getAllCollectionMetadata();
+   }
+
+   public Statistics getStatistics()
+   {
+      return getSessionFactory().getStatistics();
+   }
+
+   public void close()
+   throws HibernateException
+   {
+      throw new IllegalStateException("It is illegal to close an injected SessionFactory");
+   }
+
+   public boolean isClosed()
+   {
+      return getSessionFactory().isClosed();
+   }
+
+   public void evict(Class persistentClass)
+   throws HibernateException
+   {
+      getSessionFactory().evict(persistentClass);
+   }
+
+   public void evict(Class persistentClass, Serializable id)
+   throws HibernateException
+   {
+      getSessionFactory().evict(persistentClass, id);
+   }
+
+   public void evictEntity(String entityName)
+   throws HibernateException
+   {
+      getSessionFactory().evictEntity(entityName);
+   }
+
+   public void evictEntity(String entityName, Serializable id)
+   throws HibernateException
+   {
+      getSessionFactory().evictEntity(entityName, id);
+   }
+
+   public void evictCollection(String roleName)
+   throws HibernateException
+   {
+      getSessionFactory().evictCollection(roleName);
+   }
+
+   public void evictCollection(String roleName, Serializable id)
+   throws HibernateException
+   {
+      getSessionFactory().evictCollection(roleName, id);
+   }
+
+   public void evictQueries()
+   throws HibernateException
+   {
+      getSessionFactory().evictQueries();
+   }
+
+   public void evictQueries(String cacheRegion)
+   throws HibernateException
+   {
+      getSessionFactory().evictQueries(cacheRegion);
+   }
+
+   public StatelessSession openStatelessSession()
+   {
+      return getSessionFactory().openStatelessSession();
+   }
+
+   public StatelessSession openStatelessSession(Connection connection)
+   {
+      return getSessionFactory().openStatelessSession(connection);
+   }
+
+   public Reference getReference()
+   throws NamingException
+   {
+      return getSessionFactory().getReference();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,298 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-import org.hibernate.ejb.HibernatePersistence;
-import org.hibernate.ejb.packaging.PersistenceMetadata;
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.NonSerializableFactory;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class PersistenceUnitDeployment
-{
-   private static final Logger log = Logger.getLogger(PersistenceUnitDeployment.class);
-
-   protected InitialContext initialContext;
-   protected DeploymentUnit di;
-   protected List<String> explicitEntityClasses = new ArrayList<String>();
-   protected ManagedEntityManagerFactory managedFactory;
-   protected EntityManagerFactory actualFactory;
-   protected URL persistenceXmlUrl;
-   protected PersistenceMetadata xml;
-   protected String kernelName;
-   protected Ejb3Deployment deployment;
-   protected boolean scoped;
-
-   public PersistenceUnitDeployment(InitialContext initialContext, Ejb3Deployment deployment, List<String> explicitEntityClasses, URL persistenceXmlUrl, PersistenceMetadata metadata, String ear, String jar, boolean isScoped)
-   {
-      this.scoped = isScoped;
-      this.deployment = deployment;
-      this.initialContext = initialContext;
-      this.di = deployment.getDeploymentUnit();
-      this.explicitEntityClasses = explicitEntityClasses;
-      this.persistenceXmlUrl = persistenceXmlUrl;
-      xml = metadata;
-      kernelName = "persistence.units:";
-      String name = getEntityManagerName();
-      if (name == null || name.equals(""))
-         throw new RuntimeException("Empty string is not allowed for a persistence unit.  Fix your persistence.xml file");
-      if (ear != null)
-      {
-         kernelName += "ear=" + ear;
-         if (!ear.endsWith(".ear")) kernelName += ".ear";
-         kernelName += ",";
-      }
-      if (isScoped)
-      {
-         kernelName += "jar=" + jar;
-         if (!jar.endsWith(".jar")) kernelName += ".jar";
-         kernelName += ",";
-      }
-      kernelName += "unitName=" + name;
-   }
-
-   public static String getDefaultKernelName(String unitName)
-   {
-      int hashIndex = unitName.indexOf('#');
-      if (hashIndex != -1)
-      {
-         String relativePath = unitName.substring(3, hashIndex);
-         String name = unitName.substring(hashIndex + 1);
-         return "persistence.units:jar=" + relativePath + "," + "unitName=" + name;
-      }
-      return "persistence.units:unitName=" + unitName;
-   }
-
-   public boolean isScoped()
-   {
-      return scoped;
-   }
-
-   public Ejb3Deployment getDeployment()
-   {
-      return deployment;
-   }
-
-   protected String getJaccContextId()
-   {
-      return di.getShortName();
-   }
-
-   public EntityManagerFactory getActualFactory()
-   {
-      return actualFactory;
-   }
-
-   public PersistenceMetadata getXml()
-   {
-      return xml;
-   }
-
-   public String getKernelName()
-   {
-      return kernelName;
-   }
-
-   public String getEntityManagerName()
-   {
-      return xml.getName() == null ? "" : xml.getName();
-   }
-
-   public ManagedEntityManagerFactory getManagedFactory()
-   {
-      return managedFactory;
-   }
-   
-   public void addDependencies(DependencyPolicy policy)
-   {
-      Properties props = getXml().getProps();
-      if (!props.containsKey("jboss.no.implicit.datasource.dependency"))
-      {
-         if (getXml().getJtaDatasource() != null)
-         {
-            String ds = getXml().getJtaDatasource();
-            policy.addDatasource(ds);
-         }
-         if (getXml().getNonJtaDatasource() != null)
-         {
-            String ds = getXml().getNonJtaDatasource();
-            policy.addDatasource(ds);
-         }
-      }
-      for (Object prop : props.keySet())
-      {
-         String property = (String)prop;
-         if (property.startsWith("jboss.depends"))
-         {
-            policy.addDependency(props.getProperty(property));
-         }
-      }
-
-   }
-
-
-   public void start()
-           throws Exception
-   {
-      Properties props = new Properties();
-      props.putAll(di.getDefaultPersistenceProperties());
-      props.put(HibernatePersistence.JACC_CONTEXT_ID, getJaccContextId());
-
-      PersistenceUnitInfoImpl pi = new PersistenceUnitInfoImpl();
-      pi.setClassLoader(di.getClassLoader());
-
-      ArrayList<URL> jarFiles = new ArrayList<URL>();
-      pi.setJarFiles(jarFiles);
-      pi.setPersistenceProviderClassName(HibernatePersistence.class.getName());
-      log.debug("Found persistence.xml file in EJB3 jar");
-      props.putAll(xml.getProps());
-      pi.setManagedClassnames(xml.getClasses());
-      pi.setPersistenceUnitName(xml.getName());
-      pi.setMappingFileNames(xml.getMappingFiles());
-      pi.setExcludeUnlistedClasses(xml.getExcludeUnlistedClasses());
-      pi.setPersistenceUnitRootUrl(di.getUrl());
-      PersistenceUnitTransactionType transactionType = PersistenceUnitTransactionType.JTA;
-      if ("RESOURCE_LOCAL".equals(xml.getTransactionType()))
-         transactionType = PersistenceUnitTransactionType.RESOURCE_LOCAL;
-      pi.setTransactionType(transactionType);
-
-      for (String jar : xml.getJarFiles())
-      {
-         URL url = null;
-         try
-         {
-            url = new URL(jar);
-         }
-         catch (MalformedURLException e)
-         {
-            if (jar.startsWith(".."))
-            {
-               if (di.getUrl() == null)
-                  throw new RuntimeException("relative <jar-file> not allowed when standalone deployment unit is used");
-               String base = di.getUrl().toString();
-               jar = jar.replaceAll("\\.\\./", "+");
-               int idx = jar.lastIndexOf('+');
-               jar = jar.substring(idx + 1);
-               for (int i = 0; i < idx + 1; i++)
-               {
-                  int slash = base.lastIndexOf('/');
-                  base = base.substring(0, slash + 1);
-               }
-               url = new URL(base + jar.substring(idx));
-            }
-            else
-            {
-               File fp = new File(jar);
-               url = fp.toURL();
-            }
-         }
-         log.debug("adding JarFile URL: " + url.toString());
-         jarFiles.add(url);
-      }
-      if (xml.getProvider() != null) pi.setPersistenceProviderClassName(xml.getProvider());
-      if (explicitEntityClasses.size() > 0)
-      {
-         List<String> classes = pi.getManagedClassNames();
-         if (classes == null) classes = explicitEntityClasses;
-         else classes.addAll(explicitEntityClasses);
-         pi.setManagedClassnames(classes);
-      }
-      if (xml.getJtaDatasource() != null)
-      {
-         pi.setJtaDataSource((javax.sql.DataSource) initialContext.lookup(xml.getJtaDatasource()));
-      }
-      else if (transactionType == PersistenceUnitTransactionType.JTA)
-      {
-         throw new RuntimeException("You have not defined a jta-data-source for a JTA enabled persistence context named: " + xml.getName());
-      }
-      if (xml.getNonJtaDatasource() != null)
-      {
-         pi.setNonJtaDataSource((javax.sql.DataSource) initialContext.lookup(xml.getNonJtaDatasource()));
-      }
-      else if (transactionType == PersistenceUnitTransactionType.RESOURCE_LOCAL)
-      {
-         throw new RuntimeException("You have not defined a non-jta-data-source for a RESOURCE_LOCAL enabled persistence context named: " + xml.getName());
-      }
-      pi.setProperties(props);
-
-      if (pi.getPersistenceUnitName() == null)
-      {
-         throw new RuntimeException("you must specify a name in persistence.xml");
-      }
-
-      Class providerClass = Thread.currentThread().getContextClassLoader().loadClass(pi.getPersistenceProviderClassName());
-
-      PersistenceProvider pp = (PersistenceProvider) providerClass.newInstance();
-      actualFactory = pp.createContainerEntityManagerFactory(pi, null);
-
-      managedFactory = new ManagedEntityManagerFactory(actualFactory, kernelName);
-
-      String entityManagerJndiName = (String) props.get("jboss.entity.manager.jndi.name");
-      if (entityManagerJndiName != null)
-      {
-         EntityManager injectedManager = new TransactionScopedEntityManager(managedFactory);
-         NonSerializableFactory.rebind(initialContext, entityManagerJndiName, injectedManager);
-      }
-      String entityManagerFactoryJndiName = (String) props.get("jboss.entity.manager.factory.jndi.name");
-      if (entityManagerFactoryJndiName != null)
-      {
-         EntityManagerFactory injectedFactory = new InjectedEntityManagerFactory(managedFactory);
-         NonSerializableFactory.rebind(initialContext, entityManagerFactoryJndiName, injectedFactory);
-      }
-   }
-
-   public void stop() throws Exception
-   {
-      String entityManagerJndiName = (String) xml.getProps().get("jboss.entity.manager.jndi.name");
-      if (entityManagerJndiName != null)
-      {
-         NonSerializableFactory.unbind(initialContext, entityManagerJndiName);
-      }
-      String entityManagerFactoryJndiName = (String) xml.getProps().get("jboss.entity.manager.factory.jndi.name");
-      if (entityManagerFactoryJndiName != null)
-      {
-         NonSerializableFactory.unbind(initialContext, entityManagerFactoryJndiName);
-      }
-      managedFactory.destroy();
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,278 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import javax.naming.InitialContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import org.hibernate.ejb.HibernatePersistence;
+import org.hibernate.ejb.packaging.PersistenceMetadata;
+import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.NonSerializableFactory;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class PersistenceUnitDeployment
+{
+   private static final Logger log = Logger.getLogger(PersistenceUnitDeployment.class);
+
+   protected InitialContext initialContext;
+   protected DeploymentUnit di;
+   protected List<String> explicitEntityClasses = new ArrayList<String>();
+   protected ManagedEntityManagerFactory managedFactory;
+   protected EntityManagerFactory actualFactory;
+   protected URL persistenceXmlUrl;
+   protected PersistenceMetadata xml;
+   protected String kernelName;
+   protected Ejb3Deployment deployment;
+   protected boolean scoped;
+
+   public PersistenceUnitDeployment(InitialContext initialContext, Ejb3Deployment deployment, List<String> explicitEntityClasses, URL persistenceXmlUrl, PersistenceMetadata metadata, String ear, String jar, boolean isScoped)
+   {
+      this.scoped = isScoped;
+      this.deployment = deployment;
+      this.initialContext = initialContext;
+      this.di = deployment.getDeploymentUnit();
+      this.explicitEntityClasses = explicitEntityClasses;
+      this.persistenceXmlUrl = persistenceXmlUrl;
+      xml = metadata;
+      kernelName = "persistence.units:";
+      String name = getEntityManagerName();
+      if (name == null || name.equals(""))
+         throw new RuntimeException("Empty string is not allowed for a persistence unit.  Fix your persistence.xml file");
+      if (ear != null)
+      {
+         kernelName += "ear=" + ear;
+         if (!ear.endsWith(".ear")) kernelName += ".ear";
+         kernelName += ",";
+      }
+      if (isScoped)
+      {
+         kernelName += "jar=" + jar;
+         if (!jar.endsWith(".jar")) kernelName += ".jar";
+         kernelName += ",";
+      }
+      kernelName += "unitName=" + name;
+   }
+
+   public static String getDefaultKernelName(String unitName)
+   {
+      int hashIndex = unitName.indexOf('#');
+      if (hashIndex != -1)
+      {
+         String relativePath = unitName.substring(3, hashIndex);
+         String name = unitName.substring(hashIndex + 1);
+         return "persistence.units:jar=" + relativePath + "," + "unitName=" + name;
+      }
+      return "persistence.units:unitName=" + unitName;
+   }
+
+   public boolean isScoped()
+   {
+      return scoped;
+   }
+
+   public Ejb3Deployment getDeployment()
+   {
+      return deployment;
+   }
+
+   protected String getJaccContextId()
+   {
+      return di.getShortName();
+   }
+
+   public EntityManagerFactory getActualFactory()
+   {
+      return actualFactory;
+   }
+
+   public PersistenceMetadata getXml()
+   {
+      return xml;
+   }
+
+   public String getKernelName()
+   {
+      return kernelName;
+   }
+
+   public String getEntityManagerName()
+   {
+      return xml.getName() == null ? "" : xml.getName();
+   }
+
+   public ManagedEntityManagerFactory getManagedFactory()
+   {
+      if(managedFactory == null)
+         log.warn("managed factory is null, persistence unit " + kernelName + " has not yet been started");
+      return managedFactory;
+   }
+   
+   public void addDependencies(DependencyPolicy policy)
+   {
+      Properties props = getXml().getProps();
+      if (!props.containsKey("jboss.no.implicit.datasource.dependency"))
+      {
+         if (getXml().getJtaDatasource() != null)
+         {
+            String ds = getXml().getJtaDatasource();
+            policy.addDatasource(ds);
+         }
+         if (getXml().getNonJtaDatasource() != null)
+         {
+            String ds = getXml().getNonJtaDatasource();
+            policy.addDatasource(ds);
+         }
+      }
+      for (Object prop : props.keySet())
+      {
+         String property = (String)prop;
+         if (property.startsWith("jboss.depends"))
+         {
+            policy.addDependency(props.getProperty(property));
+         }
+      }
+
+   }
+
+
+   public void start()
+           throws Exception
+   {
+      log.info("Starting persistence unit " + kernelName);
+      
+      Properties props = new Properties();
+      props.putAll(di.getDefaultPersistenceProperties());
+      props.put(HibernatePersistence.JACC_CONTEXT_ID, getJaccContextId());
+
+      PersistenceUnitInfoImpl pi = new PersistenceUnitInfoImpl();
+      pi.setClassLoader(di.getClassLoader());
+
+      ArrayList<URL> jarFiles = new ArrayList<URL>();
+      pi.setJarFiles(jarFiles);
+      pi.setPersistenceProviderClassName(HibernatePersistence.class.getName());
+      log.debug("Found persistence.xml file in EJB3 jar");
+      props.putAll(xml.getProps());
+      pi.setManagedClassnames(xml.getClasses());
+      pi.setPersistenceUnitName(xml.getName());
+      pi.setMappingFileNames(xml.getMappingFiles());
+      pi.setExcludeUnlistedClasses(xml.getExcludeUnlistedClasses());
+      pi.setPersistenceUnitRootUrl(di.getUrl());
+//      PersistenceUnitTransactionType transactionType = PersistenceUnitTransactionType.JTA;
+//      if ("RESOURCE_LOCAL".equals(xml.getTransactionType()))
+//         transactionType = PersistenceUnitTransactionType.RESOURCE_LOCAL;
+      PersistenceUnitTransactionType transactionType = xml.getTransactionType();
+      pi.setTransactionType(transactionType);
+
+      for (String jar : xml.getJarFiles())
+      {
+         jarFiles.add(deployment.getDeploymentUnit().getRelativeURL(jar));
+      }
+
+
+      if (xml.getProvider() != null) pi.setPersistenceProviderClassName(xml.getProvider());
+      if (explicitEntityClasses.size() > 0)
+      {
+         List<String> classes = pi.getManagedClassNames();
+         if (classes == null) classes = explicitEntityClasses;
+         else classes.addAll(explicitEntityClasses);
+         pi.setManagedClassnames(classes);
+      }
+      if (xml.getJtaDatasource() != null)
+      {
+         pi.setJtaDataSource((javax.sql.DataSource) initialContext.lookup(xml.getJtaDatasource()));
+      }
+      else if (transactionType == PersistenceUnitTransactionType.JTA)
+      {
+         throw new RuntimeException("You have not defined a jta-data-source for a JTA enabled persistence context named: " + xml.getName());
+      }
+      if (xml.getNonJtaDatasource() != null)
+      {
+         pi.setNonJtaDataSource((javax.sql.DataSource) initialContext.lookup(xml.getNonJtaDatasource()));
+      }
+      else if (transactionType == PersistenceUnitTransactionType.RESOURCE_LOCAL)
+      {
+         throw new RuntimeException("You have not defined a non-jta-data-source for a RESOURCE_LOCAL enabled persistence context named: " + xml.getName());
+      }
+      pi.setProperties(props);
+
+      if (pi.getPersistenceUnitName() == null)
+      {
+         throw new RuntimeException("you must specify a name in persistence.xml");
+      }
+
+      Class providerClass = Thread.currentThread().getContextClassLoader().loadClass(pi.getPersistenceProviderClassName());
+
+      PersistenceProvider pp = (PersistenceProvider) providerClass.newInstance();
+      actualFactory = pp.createContainerEntityManagerFactory(pi, null);
+
+      managedFactory = new ManagedEntityManagerFactory(actualFactory, kernelName);
+
+      String entityManagerJndiName = (String) props.get("jboss.entity.manager.jndi.name");
+      if (entityManagerJndiName != null)
+      {
+         EntityManager injectedManager = new TransactionScopedEntityManager(managedFactory);
+         NonSerializableFactory.rebind(initialContext, entityManagerJndiName, injectedManager);
+      }
+      String entityManagerFactoryJndiName = (String) props.get("jboss.entity.manager.factory.jndi.name");
+      if (entityManagerFactoryJndiName != null)
+      {
+         EntityManagerFactory injectedFactory = new InjectedEntityManagerFactory(managedFactory);
+         NonSerializableFactory.rebind(initialContext, entityManagerFactoryJndiName, injectedFactory);
+      }
+   }
+
+   public void stop() throws Exception
+   {
+      log.info("Stopping persistence unit " + kernelName);
+      
+      String entityManagerJndiName = (String) xml.getProps().get("jboss.entity.manager.jndi.name");
+      if (entityManagerJndiName != null)
+      {
+         NonSerializableFactory.unbind(initialContext, entityManagerJndiName);
+      }
+      String entityManagerFactoryJndiName = (String) xml.getProps().get("jboss.entity.manager.factory.jndi.name");
+      if (entityManagerFactoryJndiName != null)
+      {
+         NonSerializableFactory.unbind(initialContext, entityManagerFactoryJndiName);
+      }
+      managedFactory.destroy();
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,187 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.persistence.spi.ClassTransformer;
-import javax.sql.DataSource;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class PersistenceUnitInfoImpl implements PersistenceUnitInfo
-{
-   private String entityManagerName;
-   private DataSource jtaDataSource;
-   private DataSource nonJtaDataSource;
-   private List<String> mappingFileNames;
-   private List<URL> jarFiles;
-   private List<String> entityclassNames;
-   private Properties properties;
-   private ClassLoader classLoader;
-   private String persistenceProviderClassName;
-   private PersistenceUnitTransactionType transactionType;
-   private URL persistenceUnitRootUrl;
-   private boolean excludeClasses;
-
-   public PersistenceUnitInfoImpl()
-   {
-   }
-
-   public void addTransformer(ClassTransformer transformer)
-   {
-      //throw new RuntimeException("NOT IMPLEMENTED");
-   }
-
-   public ClassLoader getNewTempClassLoader()
-   {
-      return null;
-   }
-
-   public String getPersistenceProviderClassName()
-   {
-      return persistenceProviderClassName;
-   }
-
-   public void setPersistenceProviderClassName(String persistenceProviderClassName)
-   {
-      this.persistenceProviderClassName = persistenceProviderClassName;
-   }
-
-   public String getPersistenceUnitName()
-   {
-      return entityManagerName;
-   }
-
-   public void setPersistenceUnitName(String entityManagerName)
-   {
-      this.entityManagerName = entityManagerName;
-   }
-
-   public DataSource getJtaDataSource()
-   {
-      return jtaDataSource;
-   }
-
-   public void setJtaDataSource(DataSource jtaDataSource)
-   {
-      this.jtaDataSource = jtaDataSource;
-   }
-
-   public DataSource getNonJtaDataSource()
-   {
-      return nonJtaDataSource;
-   }
-
-   public void setNonJtaDataSource(DataSource nonJtaDataSource)
-   {
-      this.nonJtaDataSource = nonJtaDataSource;
-   }
-
-   public List<String> getMappingFileNames()
-   {
-      return mappingFileNames;
-   }
-
-   public void setMappingFileNames(List<String> mappingFileNames)
-   {
-      this.mappingFileNames = mappingFileNames;
-   }
-
-   public List<URL> getJarFileUrls()
-   {
-      return jarFiles;
-   }
-
-   public void setJarFiles(List<URL> jarFiles)
-   {
-      this.jarFiles = jarFiles;
-   }
-
-   public List<String> getManagedClassNames()
-   {
-      return entityclassNames;
-   }
-
-   public void setManagedClassnames(List<String> entityclassNames)
-   {
-      this.entityclassNames = entityclassNames;
-   }
-
-   public Properties getProperties()
-   {
-      return properties;
-   }
-
-   public void setProperties(Properties properties)
-   {
-      this.properties = properties;
-   }
-
-   public ClassLoader getClassLoader()
-   {
-      return classLoader;
-   }
-
-   public void setClassLoader(ClassLoader classLoader)
-   {
-      this.classLoader = classLoader;
-   }
-
-   public PersistenceUnitTransactionType getTransactionType()
-   {
-      return transactionType;
-   }
-
-   public void setTransactionType(PersistenceUnitTransactionType transactionType)
-   {
-      this.transactionType = transactionType;
-   }
-
-   public URL getPersistenceUnitRootUrl()
-   {
-      return persistenceUnitRootUrl;
-   }
-
-   public void setPersistenceUnitRootUrl(URL persistenceUnitRootUrl)
-   {
-      this.persistenceUnitRootUrl = persistenceUnitRootUrl;
-   }
-
-   public boolean excludeUnlistedClasses()
-   {
-      return excludeClasses;
-   }
-
-   public void setExcludeUnlistedClasses(boolean excludeClasses)
-   {
-      this.excludeClasses = excludeClasses;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,187 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Properties;
+import javax.persistence.spi.PersistenceUnitInfo;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import javax.persistence.spi.ClassTransformer;
+import javax.sql.DataSource;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class PersistenceUnitInfoImpl implements PersistenceUnitInfo
+{
+   private String entityManagerName;
+   private DataSource jtaDataSource;
+   private DataSource nonJtaDataSource;
+   private List<String> mappingFileNames;
+   private List<URL> jarFiles;
+   private List<String> entityclassNames;
+   private Properties properties;
+   private ClassLoader classLoader;
+   private String persistenceProviderClassName;
+   private PersistenceUnitTransactionType transactionType;
+   private URL persistenceUnitRootUrl;
+   private boolean excludeClasses;
+
+   public PersistenceUnitInfoImpl()
+   {
+   }
+
+   public void addTransformer(ClassTransformer transformer)
+   {
+      //throw new RuntimeException("NOT IMPLEMENTED");
+   }
+
+   public ClassLoader getNewTempClassLoader()
+   {
+      return null;
+   }
+
+   public String getPersistenceProviderClassName()
+   {
+      return persistenceProviderClassName;
+   }
+
+   public void setPersistenceProviderClassName(String persistenceProviderClassName)
+   {
+      this.persistenceProviderClassName = persistenceProviderClassName;
+   }
+
+   public String getPersistenceUnitName()
+   {
+      return entityManagerName;
+   }
+
+   public void setPersistenceUnitName(String entityManagerName)
+   {
+      this.entityManagerName = entityManagerName;
+   }
+
+   public DataSource getJtaDataSource()
+   {
+      return jtaDataSource;
+   }
+
+   public void setJtaDataSource(DataSource jtaDataSource)
+   {
+      this.jtaDataSource = jtaDataSource;
+   }
+
+   public DataSource getNonJtaDataSource()
+   {
+      return nonJtaDataSource;
+   }
+
+   public void setNonJtaDataSource(DataSource nonJtaDataSource)
+   {
+      this.nonJtaDataSource = nonJtaDataSource;
+   }
+
+   public List<String> getMappingFileNames()
+   {
+      return mappingFileNames;
+   }
+
+   public void setMappingFileNames(List<String> mappingFileNames)
+   {
+      this.mappingFileNames = mappingFileNames;
+   }
+
+   public List<URL> getJarFileUrls()
+   {
+      return jarFiles;
+   }
+
+   public void setJarFiles(List<URL> jarFiles)
+   {
+      this.jarFiles = jarFiles;
+   }
+
+   public List<String> getManagedClassNames()
+   {
+      return entityclassNames;
+   }
+
+   public void setManagedClassnames(List<String> entityclassNames)
+   {
+      this.entityclassNames = entityclassNames;
+   }
+
+   public Properties getProperties()
+   {
+      return properties;
+   }
+
+   public void setProperties(Properties properties)
+   {
+      this.properties = properties;
+   }
+
+   public ClassLoader getClassLoader()
+   {
+      return classLoader;
+   }
+
+   public void setClassLoader(ClassLoader classLoader)
+   {
+      this.classLoader = classLoader;
+   }
+
+   public PersistenceUnitTransactionType getTransactionType()
+   {
+      return transactionType;
+   }
+
+   public void setTransactionType(PersistenceUnitTransactionType transactionType)
+   {
+      this.transactionType = transactionType;
+   }
+
+   public URL getPersistenceUnitRootUrl()
+   {
+      return persistenceUnitRootUrl;
+   }
+
+   public void setPersistenceUnitRootUrl(URL persistenceUnitRootUrl)
+   {
+      this.persistenceUnitRootUrl = persistenceUnitRootUrl;
+   }
+
+   public boolean excludeUnlistedClasses()
+   {
+      return excludeClasses;
+   }
+
+   public void setExcludeUnlistedClasses(boolean excludeClasses)
+   {
+      this.excludeClasses = excludeClasses;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitInfoImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceXmlLoader.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/PersistenceXmlLoader.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceXmlLoader.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/PersistenceXmlLoader.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,253 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.entity;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+import org.hibernate.ejb.packaging.PersistenceMetadata;
+import org.hibernate.ejb.packaging.XmlHelper;
+import org.hibernate.ejb.HibernatePersistence;
+import org.hibernate.ejb.util.ConfigurationHelper;
+import org.hibernate.util.StringHelper;
+import org.hibernate.cfg.EJB3DTDEntityResolver;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.persistence.PersistenceException;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import java.net.URL;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Persistence.xml handler
+ *
+ * THIS CLASS SHOULD BE REMOVED WHEN HEM FIXES default transactiontype bug
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author Emmanuel Bernard
+ */
+ at Deprecated
+public final class PersistenceXmlLoader
+{
+	private static Log log = LogFactory.getLog( PersistenceXmlLoader.class );
+
+	private PersistenceXmlLoader() {
+	}
+
+	private static Document loadURL(URL configURL, EntityResolver resolver) throws Exception {
+		InputStream is = configURL != null ? configURL.openStream() : null;
+		if ( is == null ) {
+			throw new IOException( "Failed to obtain InputStream from url: " + configURL );
+		}
+		List errors = new ArrayList();
+		DocumentBuilderFactory docBuilderFactory = null;
+		docBuilderFactory = DocumentBuilderFactory.newInstance();
+		docBuilderFactory.setValidating( true );
+		docBuilderFactory.setNamespaceAware( true );
+		try {
+			//otherwise Xerces fails in validation
+			docBuilderFactory.setAttribute( "http://apache.org/xml/features/validation/schema", true );
+		}
+		catch (IllegalArgumentException e) {
+			docBuilderFactory.setValidating( false );
+			docBuilderFactory.setNamespaceAware( false );
+		}
+		InputSource source = new InputSource( is );
+		DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+		docBuilder.setEntityResolver( resolver );
+		docBuilder.setErrorHandler( new PersistenceXmlLoader.ErrorLogger( "XML InputStream", errors, resolver ) );
+		Document doc = docBuilder.parse( source );
+		if ( errors.size() != 0 ) {
+			throw new PersistenceException( "invalid persistence.xml", (Throwable) errors.get( 0 ) );
+		}
+		return doc;
+	}
+
+   public static List<PersistenceMetadata> deploy(URL url, Map overrides, EntityResolver resolver) throws Exception {
+      return deploy(url, overrides, resolver, PersistenceUnitTransactionType.RESOURCE_LOCAL);
+   }
+
+
+   public static List<PersistenceMetadata> deploy(URL url, Map overrides, EntityResolver resolver, PersistenceUnitTransactionType defaultTransactionType) throws Exception {
+		Document doc = loadURL( url, resolver );
+		Element top = doc.getDocumentElement();
+		NodeList children = top.getChildNodes();
+		ArrayList<PersistenceMetadata> units = new ArrayList<PersistenceMetadata>();
+		for ( int i = 0; i < children.getLength() ; i++ ) {
+			if ( children.item( i ).getNodeType() == Node.ELEMENT_NODE ) {
+				Element element = (Element) children.item( i );
+				String tag = element.getTagName();
+				if ( tag.equals( "persistence-unit" ) ) {
+					PersistenceMetadata metadata = parsePersistenceUnit( element, defaultTransactionType);
+					//override properties of metadata if needed
+					String provider = (String) overrides.get( HibernatePersistence.PROVIDER );
+					if ( provider != null ) {
+						metadata.setProvider( provider );
+					}
+					String transactionType = (String) overrides.get( HibernatePersistence.TRANSACTION_TYPE );
+					if ( StringHelper.isNotEmpty( transactionType ) ) {
+						metadata.setTransactionType( getTransactionType( transactionType ) );
+					}
+					String dataSource = (String) overrides.get( HibernatePersistence.JTA_DATASOURCE );
+					if ( dataSource != null ) {
+						metadata.setJtaDatasource( dataSource );
+					}
+					dataSource = (String) overrides.get( HibernatePersistence.NON_JTA_DATASOURCE );
+					if ( dataSource != null ) {
+						metadata.setNonJtaDatasource( dataSource );
+					}
+					Properties properties = metadata.getProps();
+					ConfigurationHelper.overrideProperties( properties, overrides );
+					units.add( metadata );
+				}
+			}
+		}
+
+		return units;
+	}
+
+	private static PersistenceMetadata parsePersistenceUnit(Element top, PersistenceUnitTransactionType defaultTransactionType)
+			throws Exception {
+		PersistenceMetadata metadata = new PersistenceMetadata();
+		String puName = top.getAttribute( "name" );
+		if ( StringHelper.isNotEmpty( puName ) ) {
+			log.trace( "Persistent Unit name from persistence.xml: " + puName );
+			metadata.setName( puName );
+		}
+		PersistenceUnitTransactionType transactionType = getTransactionType( top.getAttribute( "transaction-type" ) );
+		//parsing a persistence.xml means we are in a JavaSE environment
+		transactionType = transactionType != null ? transactionType : defaultTransactionType;
+		metadata.setTransactionType( transactionType );
+		NodeList children = top.getChildNodes();
+		for ( int i = 0; i < children.getLength() ; i++ ) {
+			if ( children.item( i ).getNodeType() == Node.ELEMENT_NODE ) {
+				Element element = (Element) children.item( i );
+				String tag = element.getTagName();
+//				if ( tag.equals( "name" ) ) {
+//					String puName = XmlHelper.getElementContent( element );
+//					log.trace( "FOUND PU NAME: " + puName );
+//					metadata.setName( puName );
+//				}
+//				else
+				if ( tag.equals( "non-jta-data-source" ) ) {
+					metadata.setNonJtaDatasource( XmlHelper.getElementContent( element ) );
+				}
+				else if ( tag.equals( "jta-data-source" ) ) {
+					metadata.setJtaDatasource( XmlHelper.getElementContent( element ) );
+				}
+				else if ( tag.equals( "provider" ) ) {
+					metadata.setProvider( XmlHelper.getElementContent( element ) );
+				}
+				else if ( tag.equals( "class" ) ) {
+					metadata.getClasses().add( XmlHelper.getElementContent( element ) );
+				}
+				else if ( tag.equals( "mapping-file" ) ) {
+					metadata.getMappingFiles().add( XmlHelper.getElementContent( element ) );
+				}
+				else if ( tag.equals( "jar-file" ) ) {
+					metadata.getJarFiles().add( XmlHelper.getElementContent( element ) );
+				}
+				else if ( tag.equals( "exclude-unlisted-classes" ) ) {
+					metadata.setExcludeUnlistedClasses( true );
+				}
+				else if ( tag.equals( "properties" ) ) {
+					NodeList props = element.getChildNodes();
+					for ( int j = 0; j < props.getLength() ; j++ ) {
+						if ( props.item( j ).getNodeType() == Node.ELEMENT_NODE ) {
+							Element propElement = (Element) props.item( j );
+							if ( !"property".equals( propElement.getTagName() ) ) continue;
+							String propName = propElement.getAttribute( "name" ).trim();
+							String propValue = propElement.getAttribute( "value" ).trim();
+							if ( StringHelper.isEmpty( propValue ) ) {
+								//fall back to the natural (Hibernate) way of description
+								propValue = XmlHelper.getElementContent( propElement, "" );
+							}
+							metadata.getProps().put( propName, propValue );
+						}
+					}
+
+				}
+			}
+		}
+
+		return metadata;
+	}
+
+	public static PersistenceUnitTransactionType getTransactionType(String elementContent) {
+		if ( StringHelper.isEmpty( elementContent ) ) {
+			return null; //PersistenceUnitTransactionType.JTA;
+		}
+		else if ( elementContent.equalsIgnoreCase( "JTA" ) ) {
+			return PersistenceUnitTransactionType.JTA;
+		}
+		else if ( elementContent.equalsIgnoreCase( "RESOURCE_LOCAL" ) ) {
+			return PersistenceUnitTransactionType.RESOURCE_LOCAL;
+		}
+		else {
+			throw new PersistenceException( "Unknown TransactionType: " + elementContent );
+		}
+	}
+
+	public static class ErrorLogger implements ErrorHandler
+   {
+		private String file;
+		private List errors;
+		private EntityResolver resolver;
+
+		ErrorLogger(String file, List errors, EntityResolver resolver) {
+			this.file = file;
+			this.errors = errors;
+			this.resolver = resolver;
+		}
+
+		public void error(SAXParseException error) {
+			if ( resolver instanceof EJB3DTDEntityResolver) {
+				if ( ( (EJB3DTDEntityResolver) resolver ).isResolved() == false ) return;
+			}
+			log.error( "Error parsing XML: " + file + '(' + error.getLineNumber() + ") " + error.getMessage() );
+			errors.add( error );
+		}
+
+		public void fatalError(SAXParseException error) {
+			log.error( "Error parsing XML: " + file + '(' + error.getLineNumber() + ") " + error.getMessage() );
+			errors.add( error );
+		}
+
+		public void warning(SAXParseException warn) {
+			log.warn( "Warning parsing XML: " + file + '(' + warn.getLineNumber() + ") " + warn.getMessage() );
+		}
+	}
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,222 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import org.hibernate.Session;
-import org.hibernate.ejb.HibernateEntityManager;
-import org.jboss.ejb3.PersistenceUnitRegistry;
-
-import javax.persistence.*;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-
-/**
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class TransactionScopedEntityManager implements EntityManager, HibernateSession, Externalizable
-{
-   private transient ManagedEntityManagerFactory factory;
-
-   public Session getHibernateSession()
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (em instanceof HibernateEntityManager)
-      {
-         return ((HibernateEntityManager) em).getSession();
-      }
-      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate pe" +
-              "rsistence provider");
-   }
-
-   public TransactionScopedEntityManager(ManagedEntityManagerFactory factory)
-   {
-      if (factory == null) throw new NullPointerException("factory must not be null");
-      this.factory = factory;
-   }
-
-   public TransactionScopedEntityManager()
-   {
-   }
-
-   public void writeExternal(ObjectOutput out) throws IOException
-   {
-      out.writeUTF(factory.getKernelName());
-   }
-
-   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
-   {
-      String kernelName = in.readUTF();
-      PersistenceUnitDeployment deployment = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
-      if (deployment == null) throw new IOException("Unable to find persistence unit in registry: " + kernelName);
-      factory = deployment.getManagedFactory();
-   }
-
-   public Object getDelegate()
-   {
-      return factory.getTransactionScopedEntityManager();
-   }
-
-   public void joinTransaction()
-   {
-      factory.verifyInTx();
-      factory.getTransactionScopedEntityManager().joinTransaction();
-   }
-
-   public void clear()
-   {
-      factory.getTransactionScopedEntityManager().clear();
-   }
-
-   public FlushModeType getFlushMode()
-   {
-      return factory.getTransactionScopedEntityManager().getFlushMode();
-   }
-
-   public void lock(Object entity, LockModeType lockMode)
-   {
-      factory.verifyInTx();
-      factory.getTransactionScopedEntityManager().lock(entity, lockMode);
-   }
-
-   public <T> T getReference(Class<T> entityClass, Object primaryKey)
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      try
-      {
-         return em.getReference(entityClass, primaryKey);
-      }
-      finally
-      {
-         if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      }
-   }
-
-   public void setFlushMode(FlushModeType flushMode)
-   {
-      factory.getTransactionScopedEntityManager().setFlushMode(flushMode);
-   }
-
-   public Query createQuery(String ejbqlString)
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      return em.createQuery(ejbqlString);
-   }
-
-   public Query createNamedQuery(String name)
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      return em.createNamedQuery(name);
-   }
-
-   public Query createNativeQuery(String sqlString)
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      return em.createNativeQuery(sqlString);
-   }
-
-   public Query createNativeQuery(String sqlString, Class resultClass)
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      return em.createNativeQuery(sqlString, resultClass);
-   }
-
-   public Query createNativeQuery(String sqlString, String resultSetMapping)
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      return em.createNativeQuery(sqlString, resultSetMapping);
-   }
-
-   public <A> A find(Class<A> entityClass, Object primaryKey)
-   {
-      EntityManager em = factory.getTransactionScopedEntityManager();
-      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      try
-      {
-         return em.find(entityClass, primaryKey);
-      }
-      finally
-      {
-         if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
-      }
-   }
-
-   public void persist(Object entity)
-   {
-      factory.verifyInTx();
-      factory.getTransactionScopedEntityManager().persist(entity);
-   }
-
-   public <A> A merge(A entity)
-   {
-      factory.verifyInTx();
-      return (A) factory.getTransactionScopedEntityManager().merge(entity);
-   }
-
-   public void remove(Object entity)
-   {
-      factory.verifyInTx();
-      factory.getTransactionScopedEntityManager().remove(entity);
-   }
-
-   public void refresh(Object entity)
-   {
-      factory.verifyInTx();
-      factory.getTransactionScopedEntityManager().refresh(entity);
-   }
-
-   public boolean contains(Object entity)
-   {
-      return factory.getTransactionScopedEntityManager().contains(entity);
-   }
-
-   public void flush()
-   {
-      factory.verifyInTx();
-      factory.getTransactionScopedEntityManager().flush();
-   }
-
-   public void close()
-   {
-      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
-   }
-
-   public boolean isOpen()
-   {
-      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
-   }
-
-   public EntityTransaction getTransaction()
-   {
-      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,222 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import org.hibernate.Session;
+import org.hibernate.ejb.HibernateEntityManager;
+import org.jboss.ejb3.PersistenceUnitRegistry;
+
+import javax.persistence.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+/**
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class TransactionScopedEntityManager implements EntityManager, HibernateSession, Externalizable
+{
+   private transient ManagedEntityManagerFactory factory;
+
+   public Session getHibernateSession()
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (em instanceof HibernateEntityManager)
+      {
+         return ((HibernateEntityManager) em).getSession();
+      }
+      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate pe" +
+              "rsistence provider");
+   }
+
+   public TransactionScopedEntityManager(ManagedEntityManagerFactory factory)
+   {
+      if (factory == null) throw new NullPointerException("factory must not be null");
+      this.factory = factory;
+   }
+
+   public TransactionScopedEntityManager()
+   {
+   }
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeUTF(factory.getKernelName());
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      String kernelName = in.readUTF();
+      PersistenceUnitDeployment deployment = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
+      if (deployment == null) throw new IOException("Unable to find persistence unit in registry: " + kernelName);
+      factory = deployment.getManagedFactory();
+   }
+
+   public Object getDelegate()
+   {
+      return factory.getTransactionScopedEntityManager();
+   }
+
+   public void joinTransaction()
+   {
+      factory.verifyInTx();
+      factory.getTransactionScopedEntityManager().joinTransaction();
+   }
+
+   public void clear()
+   {
+      factory.getTransactionScopedEntityManager().clear();
+   }
+
+   public FlushModeType getFlushMode()
+   {
+      return factory.getTransactionScopedEntityManager().getFlushMode();
+   }
+
+   public void lock(Object entity, LockModeType lockMode)
+   {
+      factory.verifyInTx();
+      factory.getTransactionScopedEntityManager().lock(entity, lockMode);
+   }
+
+   public <T> T getReference(Class<T> entityClass, Object primaryKey)
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      try
+      {
+         return em.getReference(entityClass, primaryKey);
+      }
+      finally
+      {
+         if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      }
+   }
+
+   public void setFlushMode(FlushModeType flushMode)
+   {
+      factory.getTransactionScopedEntityManager().setFlushMode(flushMode);
+   }
+
+   public Query createQuery(String ejbqlString)
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      return em.createQuery(ejbqlString);
+   }
+
+   public Query createNamedQuery(String name)
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      return em.createNamedQuery(name);
+   }
+
+   public Query createNativeQuery(String sqlString)
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      return em.createNativeQuery(sqlString);
+   }
+
+   public Query createNativeQuery(String sqlString, Class resultClass)
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      return em.createNativeQuery(sqlString, resultClass);
+   }
+
+   public Query createNativeQuery(String sqlString, String resultSetMapping)
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      return em.createNativeQuery(sqlString, resultSetMapping);
+   }
+
+   public <A> A find(Class<A> entityClass, Object primaryKey)
+   {
+      EntityManager em = factory.getTransactionScopedEntityManager();
+      if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      try
+      {
+         return em.find(entityClass, primaryKey);
+      }
+      finally
+      {
+         if (!factory.isInTx()) em.clear(); // em will be closed by interceptor
+      }
+   }
+
+   public void persist(Object entity)
+   {
+      factory.verifyInTx();
+      factory.getTransactionScopedEntityManager().persist(entity);
+   }
+
+   public <A> A merge(A entity)
+   {
+      factory.verifyInTx();
+      return (A) factory.getTransactionScopedEntityManager().merge(entity);
+   }
+
+   public void remove(Object entity)
+   {
+      factory.verifyInTx();
+      factory.getTransactionScopedEntityManager().remove(entity);
+   }
+
+   public void refresh(Object entity)
+   {
+      factory.verifyInTx();
+      factory.getTransactionScopedEntityManager().refresh(entity);
+   }
+
+   public boolean contains(Object entity)
+   {
+      return factory.getTransactionScopedEntityManager().contains(entity);
+   }
+
+   public void flush()
+   {
+      factory.verifyInTx();
+      factory.getTransactionScopedEntityManager().flush();
+   }
+
+   public void close()
+   {
+      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
+   }
+
+   public boolean isOpen()
+   {
+      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
+   }
+
+   public EntityTransaction getTransaction()
+   {
+      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-import javax.persistence.EntityManager;
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-/**
- * If a transaction-scoped entitymanager is accessed outside of a transaction
- * an entitymanager is created for the duration of the current EJB method call
- * this entitymanager must be closed at the end of the method invocation.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class TransactionScopedEntityManagerInterceptor implements Interceptor
-{
-   private static final Logger log = Logger.getLogger(TransactionScopedEntityManagerInterceptor.class);
-
-   public String getName()
-   {
-      return this.getClass().getName();
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      try
-      {
-         ManagedEntityManagerFactory.nonTxStack.push(new IdentityHashMap());
-         return invocation.invokeNext();
-      }
-      finally
-      {
-         Map map = ManagedEntityManagerFactory.nonTxStack.pop();
-         for (Object obj : map.values())
-         {
-            try
-            {
-               ((EntityManager)obj).close();
-               log.debug("********************* CLOSING tx scoped nontx entity manager");
-            }
-            catch (Exception ignored)
-            {
-            }
-         }
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
+
+import javax.persistence.EntityManager;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+/**
+ * If a transaction-scoped entitymanager is accessed outside of a transaction
+ * an entitymanager is created for the duration of the current EJB method call
+ * this entitymanager must be closed at the end of the method invocation.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class TransactionScopedEntityManagerInterceptor implements Interceptor
+{
+   private static final Logger log = Logger.getLogger(TransactionScopedEntityManagerInterceptor.class);
+
+   public String getName()
+   {
+      return this.getClass().getName();
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      try
+      {
+         ManagedEntityManagerFactory.nonTxStack.push(new IdentityHashMap());
+         return invocation.invokeNext();
+      }
+      finally
+      {
+         Map map = ManagedEntityManagerFactory.nonTxStack.pop();
+         for (Object obj : map.values())
+         {
+            try
+            {
+               ((EntityManager)obj).close();
+               log.debug("********************* CLOSING tx scoped nontx entity manager");
+            }
+            catch (Exception ignored)
+            {
+            }
+         }
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManagerInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,463 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.entity;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.sql.Connection;
-import javax.persistence.EntityManager;
-import org.hibernate.CacheMode;
-import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
-import org.hibernate.Filter;
-import org.hibernate.FlushMode;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.ReplicationMode;
-import org.hibernate.SQLQuery;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.ejb.HibernateEntityManager;
-import org.hibernate.stat.SessionStatistics;
-import org.jboss.ejb3.PersistenceUnitRegistry;
-
-
-/**
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class TransactionScopedHibernateSession implements Session, Externalizable
-{
-   private transient ManagedEntityManagerFactory factory;
-
-   protected Session getHibernateSession()
-   {
-      if (getSession() instanceof HibernateEntityManager)
-      {
-         return ((HibernateEntityManager) getSession()).getSession();
-      }
-      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate pe" +
-                                 "rsistence provider");
-   }
-
-   protected EntityManager getSession()
-   {
-      return factory.getTransactionScopedEntityManager();
-   }
-
-   public TransactionScopedHibernateSession(ManagedEntityManagerFactory factory)
-   {
-      if (factory == null) throw new NullPointerException("factory must not be null");
-      this.factory = factory;
-   }
-
-   public TransactionScopedHibernateSession()
-   {
-
-   }
-
-   public void writeExternal(ObjectOutput out) throws IOException
-   {
-      out.writeUTF(factory.getKernelName());
-   }
-
-   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
-   {
-      String kernelName = in.readUTF();
-      PersistenceUnitDeployment deployment = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
-      if (deployment == null) throw new IOException("Unable to find persistence unit in registry: " + kernelName);
-      factory = deployment.getManagedFactory();
-   }
-
-   public EntityMode getEntityMode()
-   {
-      return getHibernateSession().getEntityMode();
-   }
-
-   public Session getSession(EntityMode entityMode)
-   {
-      return getHibernateSession().getSession(entityMode);
-   }
-
-   public void flush()
-   throws HibernateException
-   {
-      getHibernateSession().flush();
-   }
-
-   public void setFlushMode(FlushMode flushMode)
-   {
-      getHibernateSession().setFlushMode(flushMode);
-   }
-
-   public FlushMode getFlushMode()
-   {
-      return getHibernateSession().getFlushMode();
-   }
-
-   public void setCacheMode(CacheMode cacheMode)
-   {
-      getHibernateSession().setCacheMode(cacheMode);
-   }
-
-   public CacheMode getCacheMode()
-   {
-      return getHibernateSession().getCacheMode();
-   }
-
-   public SessionFactory getSessionFactory()
-   {
-      return getHibernateSession().getSessionFactory();
-   }
-
-   public Connection connection()
-   throws HibernateException
-   {
-      return getHibernateSession().connection();
-   }
-
-   public Connection disconnect()
-   throws HibernateException
-   {
-      return getHibernateSession().disconnect();
-   }
-
-   public void reconnect()
-   throws HibernateException
-   {
-      getHibernateSession().reconnect();
-   }
-
-   public void reconnect(Connection connection)
-   throws HibernateException
-   {
-      getHibernateSession().reconnect(connection);
-   }
-
-   public Connection close()
-   throws HibernateException
-   {
-      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
-   }
-
-   public void cancelQuery()
-   throws HibernateException
-   {
-      getHibernateSession().cancelQuery();
-   }
-
-   public boolean isOpen()
-   {
-      return getHibernateSession().isOpen();
-   }
-
-   public boolean isConnected()
-   {
-      return getHibernateSession().isConnected();
-   }
-
-   public boolean isDirty()
-   throws HibernateException
-   {
-      return getHibernateSession().isDirty();
-   }
-
-   public Serializable getIdentifier(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().getIdentifier(object);
-   }
-
-   public boolean contains(Object object)
-   {
-      return getHibernateSession().contains(object);
-   }
-
-   public void evict(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().evict(object);
-   }
-
-   public Object load(Class theClass, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().load(theClass, id, lockMode);
-   }
-
-   public Object load(String entityName, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().load(entityName, id, lockMode);
-   }
-
-   public Object load(Class theClass, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().load(theClass, id);
-   }
-
-   public Object load(String entityName, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().load(entityName, id);
-   }
-
-   public void load(Object object, Serializable id)
-   throws HibernateException
-   {
-      getHibernateSession().load(object, id);
-   }
-
-   public void replicate(Object object, ReplicationMode replicationMode)
-   throws HibernateException
-   {
-      getHibernateSession().replicate(object, replicationMode);
-   }
-
-   public void replicate(String entityName, Object object, ReplicationMode replicationMode)
-   throws HibernateException
-   {
-      getHibernateSession().replicate(entityName, object, replicationMode);
-   }
-
-   public Serializable save(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().save(object);
-   }
-
-   public Serializable save(String entityName, Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().save(entityName, object);
-   }
-
-   public void saveOrUpdate(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().saveOrUpdate(object);
-   }
-
-   public void saveOrUpdate(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().saveOrUpdate(entityName, object);
-   }
-
-   public void update(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().update(object);
-   }
-
-   public void update(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().update(entityName, object);
-   }
-
-   public Object merge(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().merge(object);
-   }
-
-   public Object merge(String entityName, Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().merge(entityName, object);
-   }
-
-   public void persist(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().persist(object);
-   }
-
-   public void persist(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().persist(entityName, object);
-   }
-
-   public void delete(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().delete(object);
-   }
-
-   public void delete(String entityName, Object object)
-   throws HibernateException
-   {
-      getHibernateSession().delete(entityName, object);
-   }
-
-   public void lock(Object object, LockMode lockMode)
-   throws HibernateException
-   {
-      getHibernateSession().lock(object, lockMode);
-   }
-
-   public void lock(String entityName, Object object, LockMode lockMode)
-   throws HibernateException
-   {
-      getHibernateSession().lock(entityName, object, lockMode);
-   }
-
-   public void refresh(Object object)
-   throws HibernateException
-   {
-      getHibernateSession().refresh(object);
-   }
-
-   public void refresh(Object object, LockMode lockMode)
-   throws HibernateException
-   {
-      getHibernateSession().refresh(object, lockMode);
-   }
-
-   public LockMode getCurrentLockMode(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().getCurrentLockMode(object);
-   }
-
-   public Transaction beginTransaction()
-   throws HibernateException
-   {
-      return getHibernateSession().beginTransaction();
-   }
-
-   public Criteria createCriteria(Class persistentClass)
-   {
-      return getHibernateSession().createCriteria(persistentClass);
-   }
-
-   public Criteria createCriteria(Class persistentClass, String alias)
-   {
-      return getHibernateSession().createCriteria(persistentClass, alias);
-   }
-
-   public Criteria createCriteria(String entityName)
-   {
-      return getHibernateSession().createCriteria(entityName);
-   }
-
-   public Criteria createCriteria(String entityName, String alias)
-   {
-      return getHibernateSession().createCriteria(entityName, alias);
-   }
-
-   public org.hibernate.Query createQuery(String queryString)
-   throws HibernateException
-   {
-      return getHibernateSession().createQuery(queryString);
-   }
-
-   public SQLQuery createSQLQuery(String queryString)
-   throws HibernateException
-   {
-      return getHibernateSession().createSQLQuery(queryString);
-   }
-
-   public org.hibernate.Query createFilter(Object collection, String queryString)
-   throws HibernateException
-   {
-      return getHibernateSession().createFilter(collection, queryString);
-   }
-
-   public org.hibernate.Query getNamedQuery(String queryName)
-   throws HibernateException
-   {
-      return getHibernateSession().getNamedQuery(queryName);
-   }
-
-   public void clear()
-   {
-      getHibernateSession().clear();
-   }
-
-   public Object get(Class clazz, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().get(clazz, id);
-   }
-
-   public Object get(Class clazz, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().get(clazz, id, lockMode);
-   }
-
-   public Object get(String entityName, Serializable id)
-   throws HibernateException
-   {
-      return getHibernateSession().get(entityName, id);
-   }
-
-   public Object get(String entityName, Serializable id, LockMode lockMode)
-   throws HibernateException
-   {
-      return getHibernateSession().get(entityName, id, lockMode);
-   }
-
-   public String getEntityName(Object object)
-   throws HibernateException
-   {
-      return getHibernateSession().getEntityName(object);
-   }
-
-   public Filter enableFilter(String filterName)
-   {
-      return getHibernateSession().enableFilter(filterName);
-   }
-
-   public Filter getEnabledFilter(String filterName)
-   {
-      return getHibernateSession().getEnabledFilter(filterName);
-   }
-
-   public void disableFilter(String filterName)
-   {
-      getHibernateSession().disableFilter(filterName);
-   }
-
-   public SessionStatistics getStatistics()
-   {
-      return getHibernateSession().getStatistics();
-   }
-
-   public void setReadOnly(Object entity, boolean readOnly)
-   {
-      getHibernateSession().setReadOnly(entity, readOnly);
-   }
-
-   public Transaction getTransaction()
-   {
-      return getHibernateSession().getTransaction();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,463 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.entity;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+import java.sql.Connection;
+import javax.persistence.EntityManager;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Filter;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.ReplicationMode;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.ejb.HibernateEntityManager;
+import org.hibernate.stat.SessionStatistics;
+import org.jboss.ejb3.PersistenceUnitRegistry;
+
+
+/**
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class TransactionScopedHibernateSession implements Session, Externalizable
+{
+   private transient ManagedEntityManagerFactory factory;
+
+   protected Session getHibernateSession()
+   {
+      if (getSession() instanceof HibernateEntityManager)
+      {
+         return ((HibernateEntityManager) getSession()).getSession();
+      }
+      throw new RuntimeException("ILLEGAL ACTION:  Not a Hibernate pe" +
+                                 "rsistence provider");
+   }
+
+   protected EntityManager getSession()
+   {
+      return factory.getTransactionScopedEntityManager();
+   }
+
+   public TransactionScopedHibernateSession(ManagedEntityManagerFactory factory)
+   {
+      if (factory == null) throw new NullPointerException("factory must not be null");
+      this.factory = factory;
+   }
+
+   public TransactionScopedHibernateSession()
+   {
+
+   }
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeUTF(factory.getKernelName());
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      String kernelName = in.readUTF();
+      PersistenceUnitDeployment deployment = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
+      if (deployment == null) throw new IOException("Unable to find persistence unit in registry: " + kernelName);
+      factory = deployment.getManagedFactory();
+   }
+
+   public EntityMode getEntityMode()
+   {
+      return getHibernateSession().getEntityMode();
+   }
+
+   public Session getSession(EntityMode entityMode)
+   {
+      return getHibernateSession().getSession(entityMode);
+   }
+
+   public void flush()
+   throws HibernateException
+   {
+      getHibernateSession().flush();
+   }
+
+   public void setFlushMode(FlushMode flushMode)
+   {
+      getHibernateSession().setFlushMode(flushMode);
+   }
+
+   public FlushMode getFlushMode()
+   {
+      return getHibernateSession().getFlushMode();
+   }
+
+   public void setCacheMode(CacheMode cacheMode)
+   {
+      getHibernateSession().setCacheMode(cacheMode);
+   }
+
+   public CacheMode getCacheMode()
+   {
+      return getHibernateSession().getCacheMode();
+   }
+
+   public SessionFactory getSessionFactory()
+   {
+      return getHibernateSession().getSessionFactory();
+   }
+
+   public Connection connection()
+   throws HibernateException
+   {
+      return getHibernateSession().connection();
+   }
+
+   public Connection disconnect()
+   throws HibernateException
+   {
+      return getHibernateSession().disconnect();
+   }
+
+   public void reconnect()
+   throws HibernateException
+   {
+      getHibernateSession().reconnect();
+   }
+
+   public void reconnect(Connection connection)
+   throws HibernateException
+   {
+      getHibernateSession().reconnect(connection);
+   }
+
+   public Connection close()
+   throws HibernateException
+   {
+      throw new IllegalStateException("Illegal to call this method from injected, managed EntityManager");
+   }
+
+   public void cancelQuery()
+   throws HibernateException
+   {
+      getHibernateSession().cancelQuery();
+   }
+
+   public boolean isOpen()
+   {
+      return getHibernateSession().isOpen();
+   }
+
+   public boolean isConnected()
+   {
+      return getHibernateSession().isConnected();
+   }
+
+   public boolean isDirty()
+   throws HibernateException
+   {
+      return getHibernateSession().isDirty();
+   }
+
+   public Serializable getIdentifier(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().getIdentifier(object);
+   }
+
+   public boolean contains(Object object)
+   {
+      return getHibernateSession().contains(object);
+   }
+
+   public void evict(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().evict(object);
+   }
+
+   public Object load(Class theClass, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().load(theClass, id, lockMode);
+   }
+
+   public Object load(String entityName, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().load(entityName, id, lockMode);
+   }
+
+   public Object load(Class theClass, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().load(theClass, id);
+   }
+
+   public Object load(String entityName, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().load(entityName, id);
+   }
+
+   public void load(Object object, Serializable id)
+   throws HibernateException
+   {
+      getHibernateSession().load(object, id);
+   }
+
+   public void replicate(Object object, ReplicationMode replicationMode)
+   throws HibernateException
+   {
+      getHibernateSession().replicate(object, replicationMode);
+   }
+
+   public void replicate(String entityName, Object object, ReplicationMode replicationMode)
+   throws HibernateException
+   {
+      getHibernateSession().replicate(entityName, object, replicationMode);
+   }
+
+   public Serializable save(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().save(object);
+   }
+
+   public Serializable save(String entityName, Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().save(entityName, object);
+   }
+
+   public void saveOrUpdate(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().saveOrUpdate(object);
+   }
+
+   public void saveOrUpdate(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().saveOrUpdate(entityName, object);
+   }
+
+   public void update(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().update(object);
+   }
+
+   public void update(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().update(entityName, object);
+   }
+
+   public Object merge(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().merge(object);
+   }
+
+   public Object merge(String entityName, Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().merge(entityName, object);
+   }
+
+   public void persist(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().persist(object);
+   }
+
+   public void persist(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().persist(entityName, object);
+   }
+
+   public void delete(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().delete(object);
+   }
+
+   public void delete(String entityName, Object object)
+   throws HibernateException
+   {
+      getHibernateSession().delete(entityName, object);
+   }
+
+   public void lock(Object object, LockMode lockMode)
+   throws HibernateException
+   {
+      getHibernateSession().lock(object, lockMode);
+   }
+
+   public void lock(String entityName, Object object, LockMode lockMode)
+   throws HibernateException
+   {
+      getHibernateSession().lock(entityName, object, lockMode);
+   }
+
+   public void refresh(Object object)
+   throws HibernateException
+   {
+      getHibernateSession().refresh(object);
+   }
+
+   public void refresh(Object object, LockMode lockMode)
+   throws HibernateException
+   {
+      getHibernateSession().refresh(object, lockMode);
+   }
+
+   public LockMode getCurrentLockMode(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().getCurrentLockMode(object);
+   }
+
+   public Transaction beginTransaction()
+   throws HibernateException
+   {
+      return getHibernateSession().beginTransaction();
+   }
+
+   public Criteria createCriteria(Class persistentClass)
+   {
+      return getHibernateSession().createCriteria(persistentClass);
+   }
+
+   public Criteria createCriteria(Class persistentClass, String alias)
+   {
+      return getHibernateSession().createCriteria(persistentClass, alias);
+   }
+
+   public Criteria createCriteria(String entityName)
+   {
+      return getHibernateSession().createCriteria(entityName);
+   }
+
+   public Criteria createCriteria(String entityName, String alias)
+   {
+      return getHibernateSession().createCriteria(entityName, alias);
+   }
+
+   public org.hibernate.Query createQuery(String queryString)
+   throws HibernateException
+   {
+      return getHibernateSession().createQuery(queryString);
+   }
+
+   public SQLQuery createSQLQuery(String queryString)
+   throws HibernateException
+   {
+      return getHibernateSession().createSQLQuery(queryString);
+   }
+
+   public org.hibernate.Query createFilter(Object collection, String queryString)
+   throws HibernateException
+   {
+      return getHibernateSession().createFilter(collection, queryString);
+   }
+
+   public org.hibernate.Query getNamedQuery(String queryName)
+   throws HibernateException
+   {
+      return getHibernateSession().getNamedQuery(queryName);
+   }
+
+   public void clear()
+   {
+      getHibernateSession().clear();
+   }
+
+   public Object get(Class clazz, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().get(clazz, id);
+   }
+
+   public Object get(Class clazz, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().get(clazz, id, lockMode);
+   }
+
+   public Object get(String entityName, Serializable id)
+   throws HibernateException
+   {
+      return getHibernateSession().get(entityName, id);
+   }
+
+   public Object get(String entityName, Serializable id, LockMode lockMode)
+   throws HibernateException
+   {
+      return getHibernateSession().get(entityName, id, lockMode);
+   }
+
+   public String getEntityName(Object object)
+   throws HibernateException
+   {
+      return getHibernateSession().getEntityName(object);
+   }
+
+   public Filter enableFilter(String filterName)
+   {
+      return getHibernateSession().enableFilter(filterName);
+   }
+
+   public Filter getEnabledFilter(String filterName)
+   {
+      return getHibernateSession().getEnabledFilter(filterName);
+   }
+
+   public void disableFilter(String filterName)
+   {
+      getHibernateSession().disableFilter(filterName);
+   }
+
+   public SessionStatistics getStatistics()
+   {
+      return getHibernateSession().getStatistics();
+   }
+
+   public void setReadOnly(Object entity, boolean readOnly)
+   {
+      getHibernateSession().setReadOnly(entity, readOnly);
+   }
+
+   public Transaction getTransaction()
+   {
+      return getHibernateSession().getTransaction();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedHibernateSession.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionalCacheFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/entity/TransactionalCacheFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionalCacheFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionalCacheFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+package org.jboss.ejb3.entity;
+
+import java.util.Properties;
+
+import org.hibernate.cache.Cache;
+import org.hibernate.cache.CacheException;
+import org.jboss.cache.Version;
+
+public abstract class TransactionalCacheFactory
+{
+
+   /**
+    * Gets and configures a concrete TransactionalCacheFactory suitable for 
+    * interoperation with the version of JBoss Cache visible on the classpath.
+    * 
+    * @param hibernateConfig properties to use to {@link #configure(Properties) configure}
+    *                        the factory.
+    * @return the factory
+    * 
+    * @throws CacheException
+    */
+   public static TransactionalCacheFactory getFactory(Properties hibernateConfig) throws CacheException
+   {
+      String factoryClass = null;
+      short version = Version.getVersionShort();
+      if (version >= Version.getVersionShort("2.0.0.GA") || version <= 0)
+      {
+         factoryClass = "org.jboss.ejb3.entity.JBCCacheFactory";
+      }
+      else
+      {
+         // TODO write a factory for the old hibernate stuff
+         // needs to be in a separate code tree from JBCCacheFactory as 
+         // TreeCacheMBean is no longer available in 2.0
+         throw new IllegalStateException("Cannot create factory for JBC 1.x");
+      }
+      
+      try
+      {
+         Class clazz = Thread.currentThread().getContextClassLoader().loadClass(factoryClass);
+         TransactionalCacheFactory factory = (TransactionalCacheFactory) clazz.newInstance();
+         factory.configure(hibernateConfig);
+         
+         return factory;
+      }
+      catch (CacheException e)
+      {
+         throw e;
+      }
+      catch (Exception e)
+      {
+         throw new CacheException(e);
+      }
+      
+   }
+   
+   /**
+    * Construct and configure the Cache representation of a named cache region.
+    *
+    * @param regionName the name of the cache region
+    * @param properties configuration settings
+    * @return The Cache representation of the named cache region.
+    * @throws org.hibernate.cache.CacheException
+    *          Indicates an error building the cache region.
+    */
+   public abstract Cache buildCache(String regionName, Properties properties) throws CacheException;
+   
+   /**
+    * Configures the factory using the Hibernate configuration properties.  
+    * Called by {@link #getFactory(Properties)}.
+    *  
+    * @param hibernateConfig the Hibernate configuration properties
+    */
+   protected abstract void configure(Properties hibernateConfig);
+   
+}

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -23,28 +23,21 @@
 
 import java.util.Properties;
 
-import javax.management.ObjectName;
-
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.CacheProvider;
-import org.hibernate.cache.TreeCache;
-import org.jboss.cache.TreeCacheMBean;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
 
 /**
  * Support for a standalone JBossCache (TreeCache) instance.  The JBossCache is configured
  * via a local config resource.
  *
  * @author Gavin King
+ * @author Brian Stansberry
  */
 public class TreeCacheProviderHook implements CacheProvider
 {
+   private TransactionalCacheFactory cacheFactory;
 
-   private org.jboss.cache.TreeCache cache;
-
    /**
     * Construct and configure the Cache representation of a named cache region.
     *
@@ -56,7 +49,8 @@
     */
    public Cache buildCache(String regionName, Properties properties) throws CacheException
    {
-      return new TreeCache(cache, regionName, TxUtil.getTransactionManager());
+//      return new TreeCache(cache, regionName, TxUtil.getTransactionManager());
+      return cacheFactory.buildCache(regionName, properties);
    }
 
    public boolean isMinimalPutsEnabledByDefault()
@@ -78,16 +72,17 @@
     */
    public void start(Properties properties)
    {
-      try
-      {
-         ObjectName mbeanObjectName = new ObjectName((String) properties.get("hibernate.treecache.mbean.object_name"));
-         TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, mbeanObjectName, MBeanServerLocator.locateJBoss());
-         cache = mbean.getInstance();
-      }
-      catch (Exception e)
-      {
-         throw new CacheException(e);
-      }
+      cacheFactory = TransactionalCacheFactory.getFactory(properties);
+//      try
+//      {
+//         ObjectName mbeanObjectName = new ObjectName((String) properties.get("hibernate.treecache.mbean.object_name"));
+//         TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, mbeanObjectName, MBeanServerLocator.locateJBoss());
+//         cache = mbean.getInstance();
+//      }
+//      catch (Exception e)
+//      {
+//         throw new CacheException(e);
+//      }
    }
 
    public void stop()

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/iiop)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,252 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.iiop;
-
-import java.lang.reflect.Method;
-import java.security.Principal;
-import java.util.HashMap;
-
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.stateful.StatefulContainer;
-import org.jboss.ejb3.stateless.StatelessContainer;
-import org.jboss.iiop.CorbaORB;
-import org.jboss.iiop.csiv2.SASCurrent;
-import org.jboss.iiop.rmi.AttributeAnalysis;
-import org.jboss.iiop.rmi.InterfaceAnalysis;
-import org.jboss.iiop.rmi.OperationAnalysis;
-import org.jboss.iiop.rmi.RmiIdlUtil;
-import org.jboss.iiop.rmi.marshal.strategy.SkeletonStrategy;
-import org.jboss.invocation.iiop.ReferenceData;
-import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.tm.TransactionManagerLocator;
-import org.jboss.tm.iiop.TxServerInterceptor;
-import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.InterfaceDef;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.ORBPackage.InvalidName;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.InvokeHandler;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.ResponseHandler;
-import org.omg.PortableServer.Current;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.Servant;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class BeanCorbaServant extends Servant
-   implements InvokeHandler
-{
-   private static final Logger log = Logger.getLogger(BeanCorbaServant.class);
-
-   private final IORFactory factory;
-   private final Current poaCurrent;
-   private final Container container;
-   private final InterfaceDef interfaceDef;
-   private final String repositoryIds[];
-   private SASCurrent sasCurrent;
-
-   private HashMap<String, SkeletonStrategy> methodMap;
-   
-   protected BeanCorbaServant(IORFactory factory, Current poaCurrent, Container container, InterfaceDef interfaceDef, InterfaceAnalysis interfaceAnalysis)
-   {
-      assert factory != null;
-      assert poaCurrent != null;
-      assert container != null;
-      assert container instanceof SessionContainer; // see invoke
-      assert interfaceDef != null;
-      assert interfaceAnalysis != null;
-      
-      this.factory = factory;
-      this.poaCurrent = poaCurrent;
-      this.container = container;
-      this.interfaceDef = interfaceDef;
-      this.repositoryIds = interfaceAnalysis.getAllTypeIds();
-      
-      try
-      {
-         this.sasCurrent = (SASCurrent) CorbaORB.getInstance().resolve_initial_references("SASCurrent");
-      }
-      catch (InvalidName e)
-      {
-         log.warn("Can't find SASCurrent");
-         this.sasCurrent = null;
-      }
-      
-      this.methodMap = new HashMap<String, SkeletonStrategy>();
-      AttributeAnalysis[] attrs = interfaceAnalysis.getAttributes();
-      for (int i = 0; i < attrs.length; i++) {
-         OperationAnalysis op = attrs[i].getAccessorAnalysis();
-
-         log.debug("    " + op.getJavaName() + ": " + op.getIDLName());
-         methodMap.put(op.getIDLName(),
-                           new SkeletonStrategy(op.getMethod()));
-         op = attrs[i].getMutatorAnalysis();
-         if (op != null) {
-            log.debug("    " + op.getJavaName() + ": " + op.getIDLName());
-            methodMap.put(op.getIDLName(),
-                              new SkeletonStrategy(op.getMethod()));
-         }
-      }
-
-      OperationAnalysis[] ops = interfaceAnalysis.getOperations();
-      for (int i = 0; i < ops.length; i++) {
-         log.debug("    " + ops[i].getJavaName() + ": " + ops[i].getIDLName());
-         methodMap.put(ops[i].getIDLName(),
-                           new SkeletonStrategy(ops[i].getMethod()));
-      }
-   }
-   
-   @Override
-   public String[] _all_interfaces(POA poa, byte[] objectId)
-   {
-      return (String[]) repositoryIds.clone();
-   }
-
-   /**
-    * Returns an IR object describing the bean's remote interface.
-    */
-   @Override
-   public org.omg.CORBA.Object _get_interface_def()
-   {
-      if (interfaceDef != null)
-         return interfaceDef;
-      else
-         return super._get_interface_def();
-   }
-   
-   public OutputStream _invoke(String opName, InputStream in, ResponseHandler handler) throws SystemException
-   {
-      log.trace("invoke: " + opName);
-      
-      SkeletonStrategy op = (SkeletonStrategy) methodMap.get(opName);
-      if (op == null)
-      {
-         log.debug("Unable to find opname '" + opName + "' valid operations:" + methodMap.keySet());
-         throw new BAD_OPERATION(opName);
-      }
-
-      org.omg.CORBA_2_3.portable.OutputStream out;
-      try
-      {
-         Object id = ReferenceData.extractObjectId(poaCurrent.get_object_id());
-         log.trace("id = " + id);
-         
-         Transaction tx = TxServerInterceptor.getCurrentTransaction();
-         log.trace("tx = " + tx);
-         
-         if(sasCurrent != null)
-         {
-            byte username[] = sasCurrent.get_incoming_username();
-            byte credentials[] = sasCurrent.get_incoming_password();
-            byte principalName[] = sasCurrent.get_incoming_principal_name();
-            
-            if(username != null && username.length > 0)
-            {
-               String name = new String(username, "UTF-8");
-               int domainIndex = name.lastIndexOf("@");
-               if(domainIndex > 0)
-                  name = name.substring(0, domainIndex);
-               log.debug("username = " + name);
-               Principal principal = new SimplePrincipal(name);
-               SecurityAssociation.setPrincipal(principal);
-            }
-            
-            if(credentials != null && credentials.length > 0)
-            {
-               SecurityAssociation.setCredential(new String(credentials, "UTF-8").toCharArray());
-            }
-            
-            if(principalName != null && principalName.length > 0)
-               log.warn("principalName = " + new String(principalName, "UTF-8")); // FIXME: implement principalName support
-         }
-         
-         Object args[] = op.readParams((org.omg.CORBA_2_3.portable.InputStream) in);
-         
-         Object retVal = invoke(tx, id, op.getMethod(), args);
-         
-         out = (org.omg.CORBA_2_3.portable.OutputStream) handler.createReply();
-         if(op.isNonVoid())
-            op.writeRetval(out, retVal);
-      }
-      catch(Throwable t)
-      {
-         // TODO: check log level before stacktrace?
-         t.printStackTrace();
-         if(t instanceof Exception)
-         {
-            Exception e = (Exception) t;
-            RmiIdlUtil.rethrowIfCorbaSystemException(e);
-            out = (org.omg.CORBA_2_3.portable.OutputStream) handler.createExceptionReply();
-            op.writeException(out, e);
-         }
-         else
-            throw new RuntimeException("NYI");
-      }
-      return out;
-   }
-
-   private TransactionManager getTransactionManager()
-   {
-      //return TxUtil.getTransactionManager();
-      return TransactionManagerLocator.getInstance().locate();
-   }
-   
-   private Object invoke(Object id, Method method, Object args[]) throws Throwable
-   {
-      // TODO: Support other containers beside Stateless and Stateful?
-      return ((SessionContainer) container).invoke(factory, id, method, args, null);
-   }
-   
-   private Object invoke(Transaction tx, Object id, Method method, Object args[]) throws Throwable
-   {
-      if(tx == null)
-         return invoke(id, method, args);
-      
-      // FIXME: refactor TxServerInterceptor so that it pushed the tpc into the invocation like ClientTxPropegationInterceptor
-      // this would require the localInvoke to be also refactored, so that it uses invocation instead of localInvoke.
-      TransactionManager tm = getTransactionManager();
-      
-      // see TxPropagationInterceptor
-      if(tm.getTransaction() != null)
-         throw new RuntimeException("cannot import a transaction context when a transaction is already associated with the thread");
-      tm.resume(tx);
-      try
-      {
-         return invoke(id, method, args);
-      }
-      finally
-      {
-         tm.suspend();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,252 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.iiop;
+
+import java.lang.reflect.Method;
+import java.security.Principal;
+import java.util.HashMap;
+
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.SessionContainer;
+import org.jboss.ejb3.stateful.StatefulContainer;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.iiop.CorbaORB;
+import org.jboss.iiop.csiv2.SASCurrent;
+import org.jboss.iiop.rmi.AttributeAnalysis;
+import org.jboss.iiop.rmi.InterfaceAnalysis;
+import org.jboss.iiop.rmi.OperationAnalysis;
+import org.jboss.iiop.rmi.RmiIdlUtil;
+import org.jboss.iiop.rmi.marshal.strategy.SkeletonStrategy;
+import org.jboss.invocation.iiop.ReferenceData;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.tm.TransactionManagerLocator;
+import org.jboss.tm.iiop.TxServerInterceptor;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.InterfaceDef;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.InvokeHandler;
+import org.omg.CORBA.portable.OutputStream;
+import org.omg.CORBA.portable.ResponseHandler;
+import org.omg.PortableServer.Current;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class BeanCorbaServant extends Servant
+   implements InvokeHandler
+{
+   private static final Logger log = Logger.getLogger(BeanCorbaServant.class);
+
+   private final IORFactory factory;
+   private final Current poaCurrent;
+   private final Container container;
+   private final InterfaceDef interfaceDef;
+   private final String repositoryIds[];
+   private SASCurrent sasCurrent;
+
+   private HashMap<String, SkeletonStrategy> methodMap;
+   
+   protected BeanCorbaServant(IORFactory factory, Current poaCurrent, Container container, InterfaceDef interfaceDef, InterfaceAnalysis interfaceAnalysis)
+   {
+      assert factory != null;
+      assert poaCurrent != null;
+      assert container != null;
+      assert container instanceof SessionContainer; // see invoke
+      assert interfaceDef != null;
+      assert interfaceAnalysis != null;
+      
+      this.factory = factory;
+      this.poaCurrent = poaCurrent;
+      this.container = container;
+      this.interfaceDef = interfaceDef;
+      this.repositoryIds = interfaceAnalysis.getAllTypeIds();
+      
+      try
+      {
+         this.sasCurrent = (SASCurrent) CorbaORB.getInstance().resolve_initial_references("SASCurrent");
+      }
+      catch (InvalidName e)
+      {
+         log.warn("Can't find SASCurrent");
+         this.sasCurrent = null;
+      }
+      
+      this.methodMap = new HashMap<String, SkeletonStrategy>();
+      AttributeAnalysis[] attrs = interfaceAnalysis.getAttributes();
+      for (int i = 0; i < attrs.length; i++) {
+         OperationAnalysis op = attrs[i].getAccessorAnalysis();
+
+         log.debug("    " + op.getJavaName() + ": " + op.getIDLName());
+         methodMap.put(op.getIDLName(),
+                           new SkeletonStrategy(op.getMethod()));
+         op = attrs[i].getMutatorAnalysis();
+         if (op != null) {
+            log.debug("    " + op.getJavaName() + ": " + op.getIDLName());
+            methodMap.put(op.getIDLName(),
+                              new SkeletonStrategy(op.getMethod()));
+         }
+      }
+
+      OperationAnalysis[] ops = interfaceAnalysis.getOperations();
+      for (int i = 0; i < ops.length; i++) {
+         log.debug("    " + ops[i].getJavaName() + ": " + ops[i].getIDLName());
+         methodMap.put(ops[i].getIDLName(),
+                           new SkeletonStrategy(ops[i].getMethod()));
+      }
+   }
+   
+   @Override
+   public String[] _all_interfaces(POA poa, byte[] objectId)
+   {
+      return (String[]) repositoryIds.clone();
+   }
+
+   /**
+    * Returns an IR object describing the bean's remote interface.
+    */
+   @Override
+   public org.omg.CORBA.Object _get_interface_def()
+   {
+      if (interfaceDef != null)
+         return interfaceDef;
+      else
+         return super._get_interface_def();
+   }
+   
+   public OutputStream _invoke(String opName, InputStream in, ResponseHandler handler) throws SystemException
+   {
+      log.trace("invoke: " + opName);
+      
+      SkeletonStrategy op = (SkeletonStrategy) methodMap.get(opName);
+      if (op == null)
+      {
+         log.debug("Unable to find opname '" + opName + "' valid operations:" + methodMap.keySet());
+         throw new BAD_OPERATION(opName);
+      }
+
+      org.omg.CORBA_2_3.portable.OutputStream out;
+      try
+      {
+         Object id = ReferenceData.extractObjectId(poaCurrent.get_object_id());
+         log.trace("id = " + id);
+         
+         Transaction tx = TxServerInterceptor.getCurrentTransaction();
+         log.trace("tx = " + tx);
+         
+         if(sasCurrent != null)
+         {
+            byte username[] = sasCurrent.get_incoming_username();
+            byte credentials[] = sasCurrent.get_incoming_password();
+            byte principalName[] = sasCurrent.get_incoming_principal_name();
+            
+            if(username != null && username.length > 0)
+            {
+               String name = new String(username, "UTF-8");
+               int domainIndex = name.lastIndexOf("@");
+               if(domainIndex > 0)
+                  name = name.substring(0, domainIndex);
+               log.debug("username = " + name);
+               Principal principal = new SimplePrincipal(name);
+               SecurityAssociation.setPrincipal(principal);
+            }
+            
+            if(credentials != null && credentials.length > 0)
+            {
+               SecurityAssociation.setCredential(new String(credentials, "UTF-8").toCharArray());
+            }
+            
+            if(principalName != null && principalName.length > 0)
+               log.warn("principalName = " + new String(principalName, "UTF-8")); // FIXME: implement principalName support
+         }
+         
+         Object args[] = op.readParams((org.omg.CORBA_2_3.portable.InputStream) in);
+         
+         Object retVal = invoke(tx, id, op.getMethod(), args);
+         
+         out = (org.omg.CORBA_2_3.portable.OutputStream) handler.createReply();
+         if(op.isNonVoid())
+            op.writeRetval(out, retVal);
+      }
+      catch(Throwable t)
+      {
+         // TODO: check log level before stacktrace?
+         t.printStackTrace();
+         if(t instanceof Exception)
+         {
+            Exception e = (Exception) t;
+            RmiIdlUtil.rethrowIfCorbaSystemException(e);
+            out = (org.omg.CORBA_2_3.portable.OutputStream) handler.createExceptionReply();
+            op.writeException(out, e);
+         }
+         else
+            throw new RuntimeException("NYI");
+      }
+      return out;
+   }
+
+   private TransactionManager getTransactionManager()
+   {
+      //return TxUtil.getTransactionManager();
+      return TransactionManagerLocator.getInstance().locate();
+   }
+   
+   private Object invoke(Object id, Method method, Object args[]) throws Throwable
+   {
+      // TODO: Support other containers beside Stateless and Stateful?
+      return ((SessionContainer) container).invoke(factory, id, method, args, null);
+   }
+   
+   private Object invoke(Transaction tx, Object id, Method method, Object args[]) throws Throwable
+   {
+      if(tx == null)
+         return invoke(id, method, args);
+      
+      // FIXME: refactor TxServerInterceptor so that it pushed the tpc into the invocation like ClientTxPropegationInterceptor
+      // this would require the localInvoke to be also refactored, so that it uses invocation instead of localInvoke.
+      TransactionManager tm = getTransactionManager();
+      
+      // see TxPropagationInterceptor
+      if(tm.getTransaction() != null)
+         throw new RuntimeException("cannot import a transaction context when a transaction is already associated with the thread");
+      tm.resume(tx);
+      try
+      {
+         return invoke(id, method, args);
+      }
+      finally
+      {
+         tm.suspend();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.iiop;
-
-import javax.management.ObjectName;
-
-import org.jboss.iiop.WebCL;
-import org.jboss.mx.loading.RepositoryClassLoader;
-
-/**
- * The getKey method of the WebCL class is not working in EJB3, this class fixes that.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class EJB3IIOPWebClassLoader extends WebCL
-{
-   private String jndiName;
-   
-   public EJB3IIOPWebClassLoader(ObjectName container, RepositoryClassLoader parent, String jndiName)
-   {
-      super(container, parent);
-      this.jndiName = jndiName;
-   }
-
-   @Override
-   public String getKey()
-   {
-      String className = getClass().getName();
-      int dot = className.lastIndexOf('.');
-      if( dot >= 0 )
-          className = className.substring(dot+1);
-      String key =  className + '[' + jndiName + ']';
-      return key;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.iiop;
+
+import javax.management.ObjectName;
+
+import org.jboss.iiop.WebCL;
+import org.jboss.mx.loading.RepositoryClassLoader;
+
+/**
+ * The getKey method of the WebCL class is not working in EJB3, this class fixes that.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class EJB3IIOPWebClassLoader extends WebCL
+{
+   private String jndiName;
+   
+   public EJB3IIOPWebClassLoader(ObjectName container, RepositoryClassLoader parent, String jndiName)
+   {
+      super(container, parent);
+      this.jndiName = jndiName;
+   }
+
+   @Override
+   public String getKey()
+   {
+      String className = getClass().getName();
+      int dot = className.lastIndexOf('.');
+      if( dot >= 0 )
+          className = className.substring(dot+1);
+      String key =  className + '[' + jndiName + ']';
+      return key;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/EJB3IIOPWebClassLoader.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,444 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.iiop;
-
-import java.lang.annotation.Annotation;
-import java.net.URL;
-
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-
-import org.jboss.annotation.ejb.IIOP;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.aop.Advisor;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.NonSerializableFactory;
-import org.jboss.ejb3.ProxyFactoryHelper;
-import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.remoting.RemoteProxyFactory;
-import org.jboss.iiop.CorbaORBService;
-import org.jboss.iiop.codebase.CodebasePolicy;
-import org.jboss.iiop.csiv2.CSIv2Policy;
-import org.jboss.iiop.rmi.InterfaceAnalysis;
-import org.jboss.iiop.rmi.ir.InterfaceRepository;
-import org.jboss.invocation.iiop.ReferenceFactory;
-import org.jboss.invocation.iiop.ServantRegistries;
-import org.jboss.invocation.iiop.ServantRegistry;
-import org.jboss.invocation.iiop.ServantRegistryKind;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.IorSecurityConfigMetaData;
-import org.jboss.mx.loading.RepositoryClassLoader;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.proxy.ejb.handle.HandleDelegateImpl;
-import org.jboss.system.Registry;
-import org.jboss.web.WebClassLoader;
-import org.jboss.web.WebServiceMBean;
-import org.omg.CORBA.Any;
-import org.omg.CORBA.InterfaceDef;
-import org.omg.CORBA.InterfaceDefHelper;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Policy;
-import org.omg.CORBA.Repository;
-import org.omg.CORBA.UserException;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextExt;
-import org.omg.CosNaming.NamingContextExtHelper;
-import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
-import org.omg.CosNaming.NamingContextPackage.CannotProceed;
-import org.omg.CosNaming.NamingContextPackage.InvalidName;
-import org.omg.CosNaming.NamingContextPackage.NotFound;
-import org.omg.PortableServer.Current;
-import org.omg.PortableServer.CurrentHelper;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.Servant;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class IORFactory
-   implements RemoteProxyFactory
-{
-   private static final Logger log = Logger.getLogger(IORFactory.class);
-   
-   private Container container;
-   private Advisor advisor;
-   private RemoteBinding binding;
-   private String webServiceName = "jboss:service=WebService"; // TODO: make webServiceName configurable
-   
-   // after start available
-   private String beanRepositoryIds[];
-   private String homeRepositoryIds[];
-//   private InterfaceAnalysis interfaceAnalysis;
-   private ORB orb;
-//   private POA poa;
-   private POA irPoa;
-   private InterfaceRepository iri;
-   private ServantRegistry servantRegistry;
-   private ServantRegistry homeServantRegistry;
-   private WebClassLoader wcl;
-   private ReferenceFactory referenceFactory;
-   private ReferenceFactory homeReferenceFactory;
-
-   // TODO: create a default IIOP annotation
-   private static final IIOP defaultIIOP = new IIOP()
-   {
-      public boolean interfaceRepositorySupported()
-      {
-         return false;
-      }
-
-      public String poa()
-      {
-         return POA_PER_SERVANT;
-      }
-      
-      public Class<? extends Annotation> annotationType()
-      {
-         return IIOP.class;
-      }
-   };
-   
-   // TODO: do I really need this method
-   public Object createHomeProxy()
-   {
-      try
-      {
-         org.omg.CORBA.Object corbaRef = homeReferenceFactory.createReference(homeRepositoryIds[0]);
-         
-         EJBHome corbaObj = (EJBHome) PortableRemoteObject.narrow(corbaRef, EJBHome.class);
-         
-         return corbaObj;
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   public Object createProxy()
-   {
-      try
-      {
-         org.omg.CORBA.Object corbaRef = referenceFactory.createReference(beanRepositoryIds[0]);
-         
-         EJBObject corbaObj = (EJBObject) PortableRemoteObject.narrow(corbaRef, EJBObject.class);
-         
-         return corbaObj;
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   public Object createProxy(Object id)
-   {
-      try
-      {
-         org.omg.CORBA.Object corbaRef = referenceFactory.createReferenceWithId(id, beanRepositoryIds[0]);
-         
-         EJBObject corbaObj = (EJBObject) PortableRemoteObject.narrow(corbaRef, EJBObject.class);
-         
-         return corbaObj;
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   private IIOP getIIOP()
-   {
-      IIOP iiop = (IIOP) advisor.resolveAnnotation(IIOP.class);
-      if(iiop != null)
-         return iiop;
-      
-      return defaultIIOP;
-   }
-   
-   private String getJndiName()
-   {
-      return ProxyFactoryHelper.getDefaultRemoteJndiName(container);
-   }
-   
-   private String getServantName()
-   {
-      // TODO: is "Servant/" a good prefix for servant name
-      return "Servant/" + getJndiName();
-   }
-   
-   private WebServiceMBean getWebServer() throws MalformedObjectNameException
-   {
-      if(webServiceName == null)
-         throw new IllegalStateException("iiop is not going to work without a web service");
-      
-      return (WebServiceMBean) MBeanProxyExt.create(WebServiceMBean.class, webServiceName);
-   }
-   
-   /**
-    * Literal copy from org.jboss.proxy.ejb.IORFactory
-    */
-   private void rebind(NamingContextExt ctx, String strName, org.omg.CORBA.Object obj) throws Exception
-   {
-      NameComponent[] name = ctx.to_name(strName);
-      NamingContext intermediateCtx = ctx;
-
-      for (int i = 0; i < name.length - 1; i++ ) {
-         NameComponent[] relativeName = new NameComponent[] { name[i] };
-         try {
-            intermediateCtx = NamingContextHelper.narrow(
-                  intermediateCtx.resolve(relativeName));
-         }
-         catch (NotFound e) {
-            intermediateCtx = intermediateCtx.bind_new_context(relativeName);
-         }
-      }
-      intermediateCtx.rebind(new NameComponent[] { name[name.length - 1] }, obj);
-   }
-   
-   private void removeWebClassLoader() throws MalformedObjectNameException
-   {
-      getWebServer().removeClassLoader(wcl);
-   }
-   
-   public void setContainer(Container container)
-   {
-      this.container = container;
-      this.advisor = (Advisor) container; // TODO: why the cast?
-   }
-   
-   public void setRemoteBinding(RemoteBinding binding)
-   {
-      this.binding = binding;
-   }
-   
-   public void setWebServiceName(String name)
-   {
-      this.webServiceName = name;
-   }
-   
-   public void start() throws Exception
-   {
-      // TODO: IORFactory only supports 1 remote interface
-      Class remoteInterfaces[] = ProxyFactoryHelper.getRemoteInterfaces(container);
-      if(remoteInterfaces.length > 1)
-         log.warn("IIOP binding only works on 1 interface, using: " + remoteInterfaces[0].getName());
-      InterfaceAnalysis interfaceAnalysis = InterfaceAnalysis.getInterfaceAnalysis(remoteInterfaces[0]);
-      this.beanRepositoryIds = interfaceAnalysis.getAllTypeIds();
-      
-      InterfaceAnalysis homeInterfaceAnalysis = null;
-      Class homeInterface = ProxyFactoryHelper.getRemoteHomeInterface(container);
-      if(homeInterface != null)
-      {
-         if(!EJBHome.class.isAssignableFrom(homeInterface))
-            throw new IllegalArgumentException("home interface " + homeInterface.getName() + " must extend javax.ejb.EJBHome (EJB3 4.6.8)");
-         homeInterfaceAnalysis = InterfaceAnalysis.getInterfaceAnalysis(homeInterface);
-         this.homeRepositoryIds = homeInterfaceAnalysis.getAllTypeIds();
-      }
-      // To allow EJB3 Stateless beans to operate we can function without a home interface.
-      
-      // Get orb and irPoa references
-      try {
-         orb = (ORB)new InitialContext().lookup("java:/" + CorbaORBService.ORB_NAME);
-      }
-      catch (NamingException e) {
-         throw new Exception("Cannot lookup java:/" + CorbaORBService.ORB_NAME + ": " + e);
-      }
-      try {
-         irPoa = (POA)new InitialContext().lookup("java:/" + CorbaORBService.IR_POA_NAME);
-      }
-      catch (NamingException e) {
-         throw new Exception("Cannot lookup java:/" + CorbaORBService.IR_POA_NAME + ": " + e);
-      }
-      
-      IIOP iiop = getIIOP();
-      if(iiop.interfaceRepositorySupported())
-      {
-         this.iri = new InterfaceRepository(orb, irPoa, getJndiName());
-         iri.mapClass(remoteInterfaces[0]);
-         if(homeInterface != null)
-            iri.mapClass(homeInterface);
-         iri.finishBuild();
-      }
-      
-      // TODO: obtain the iiop invoker name properly
-      ObjectName invokerName = new ObjectName("jboss:service=invoker,type=iiop");
-      ServantRegistries servantRegistries = (ServantRegistries) Registry.lookup(invokerName);
-      if(servantRegistries == null)
-         throw new Exception("can't find iiop invoker");
-      ServantRegistryKind registryWithTransientPOA;
-      ServantRegistryKind registryWithPersistentPOA; 
-      if(iiop.poa().equals(IIOP.POA_PER_SERVANT))
-      {
-         registryWithTransientPOA = ServantRegistryKind.TRANSIENT_POA_PER_SERVANT;
-         registryWithPersistentPOA = ServantRegistryKind.PERSISTENT_POA_PER_SERVANT;
-      }
-      else if(iiop.poa().equals(IIOP.POA_SHARED))
-      {
-         registryWithTransientPOA = ServantRegistryKind.SHARED_TRANSIENT_POA;
-         registryWithPersistentPOA = ServantRegistryKind.SHARED_PERSISTENT_POA;
-      }
-      else
-         throw new IllegalArgumentException("@IIOP.poa can only be 'per-servant' or 'shared'");
-      // Only works for session container
-      this.servantRegistry = servantRegistries.getServantRegistry(registryWithTransientPOA);
-      this.homeServantRegistry = servantRegistries.getServantRegistry(registryWithPersistentPOA); // TODO: why is home interface in persistent poa?
-      
-      // Hack in a WebCL (from org.jboss.ejb.EjbModule.initializeContainer)
-      // TODO:  seting up a WebClassLoader needs to be done somewhere where
-      ObjectName on = container.getObjectName();
-      this.wcl = new EJB3IIOPWebClassLoader(on, (RepositoryClassLoader) ((SessionContainer) container).getClassloader(), getJndiName());
-      WebServiceMBean webServer = getWebServer();
-      URL[] codebaseURLs = {webServer.addClassLoader(wcl)};
-      wcl.setWebURLs(codebaseURLs);
-      
-      // setup a codebase policy, the CodebaseInterceptor will translate this to a TAG_JAVA_CODEBASE
-      String codebaseString = wcl.getCodebaseString();
-      log.debug("codebase = " + codebaseString);
-      Any codebase = orb.create_any();
-      codebase.insert_string(codebaseString);
-      Policy codebasePolicy;
-      codebasePolicy = orb.create_policy(CodebasePolicy.TYPE, codebase);
-      
-      // Create csiv2Policy for both home and remote containing
-      // IorSecurityConfigMetadata
-      Any secPolicy = orb.create_any();
-//      IorSecurityConfigMetaData iorSecurityConfigMetaData =
-//         container.getBeanMetaData().getIorSecurityConfigMetaData();
-      IorSecurityConfigMetaData iorSecurityConfigMetaData = new IorSecurityConfigMetaData(); // TODO: make ior security configurable
-      secPolicy.insert_Value(iorSecurityConfigMetaData);
-      Policy csiv2Policy = orb.create_policy(CSIv2Policy.TYPE, secPolicy);
-      
-      Policy policies[] = { codebasePolicy, csiv2Policy };
-      
-      InterfaceDef interfaceDef = null;
-      if(iri != null)
-      {
-         Repository ir = iri.getReference();
-         interfaceDef = InterfaceDefHelper.narrow(ir.lookup_id(beanRepositoryIds[0]));
-      }
-      
-      Current poaCurrent = CurrentHelper.narrow(orb.resolve_initial_references("POACurrent"));
-
-      NamingContextExt ctx = getNamingContextExt();
-
-      log.debug("binding servant name " + getServantName());
-      
-      Servant servant = new BeanCorbaServant(this, poaCurrent, container, interfaceDef, interfaceAnalysis);
-      this.referenceFactory = servantRegistry.bind(getServantName(), servant, policies);
-      
-      EJBObject corbaObj = (EJBObject) createProxy();
-      
-      rebind(ctx, getJndiName(), (org.omg.CORBA.Object) corbaObj);
-      
-      // TODO: use iri
-      if(homeInterfaceAnalysis != null)
-      {
-         servant = new BeanCorbaServant(this, poaCurrent, container, null, homeInterfaceAnalysis);
-         this.homeReferenceFactory = homeServantRegistry.bind(getServantName() + "Home", servant, policies);
-         
-         Object homeObject = createHomeProxy();
-         
-         rebind(ctx, getJndiName() + "Home", (org.omg.CORBA.Object) homeObject);
-      }
-      
-      // bind HandleDelegate stuff
-      Context compCtx = (Context) new InitialContext().lookup("java:comp");
-      NonSerializableFactory.rebind(compCtx, "ORB", orb);
-      NonSerializableFactory.rebind(compCtx, "HandleDelegate", new HandleDelegateImpl());
-   }
-   
-   public void stop() throws Exception
-   {
-      if(homeReferenceFactory != null)
-      {
-         unbind(getJndiName() + "Home");
-         unbindHomeServant();
-      }
-      unbind(getJndiName());
-      
-      unbindServant();
-      
-      removeWebClassLoader();
-   }
-   
-   /**
-    * Unbind the bean from CosNaming
-    */
-   private void unbind(String strName)
-   {
-      try
-      {
-         NamingContextExt corbaContext = getNamingContextExt();
-         NameComponent n[] = corbaContext.to_name(strName);
-         getNamingContextExt().unbind(n);
-      }
-      catch(Exception e)
-      {
-         log.warn("unable to unbind '" + strName + "'", e);
-      }
-   }
-   
-   private void unbindHomeServant()
-   {
-      try
-      {
-         homeServantRegistry.unbind(getServantName() + "Home");
-      }
-      catch(Exception e)
-      {
-         log.warn("unable to unbind home servant", e);
-      }
-   }
-   
-   private void unbindServant()
-   {
-      try
-      {
-         servantRegistry.unbind(getServantName());
-      }
-      catch(Exception e)
-      {
-         log.warn("unable to unbind servant", e);
-      }
-   }
-
-   private NamingContextExt getNamingContextExt() throws NamingException
-   {
-      Context initialContext = new InitialContext();
-      
-      // NOTE: eclipse editor parser crashes silently on this line (because of org.jboss.iiop.CorbaNamingService) with unknown reason
-      // that's why this method is at the end
-      return NamingContextExtHelper.narrow((org.omg.CORBA.Object) initialContext.lookup("java:/" + org.jboss.iiop.CorbaNamingService.NAMING_NAME));
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,444 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.iiop;
+
+import java.lang.annotation.Annotation;
+import java.net.URL;
+
+import javax.ejb.EJBHome;
+import javax.ejb.EJBObject;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.rmi.PortableRemoteObject;
+
+import org.jboss.annotation.ejb.IIOP;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.NonSerializableFactory;
+import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.SessionContainer;
+import org.jboss.ejb3.remoting.RemoteProxyFactory;
+import org.jboss.iiop.CorbaORBService;
+import org.jboss.iiop.codebase.CodebasePolicy;
+import org.jboss.iiop.csiv2.CSIv2Policy;
+import org.jboss.iiop.rmi.InterfaceAnalysis;
+import org.jboss.iiop.rmi.ir.InterfaceRepository;
+import org.jboss.invocation.iiop.ReferenceFactory;
+import org.jboss.invocation.iiop.ServantRegistries;
+import org.jboss.invocation.iiop.ServantRegistry;
+import org.jboss.invocation.iiop.ServantRegistryKind;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.IorSecurityConfigMetaData;
+import org.jboss.mx.loading.RepositoryClassLoader;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.proxy.ejb.handle.HandleDelegateImpl;
+import org.jboss.system.Registry;
+import org.jboss.web.WebClassLoader;
+import org.jboss.web.WebServiceMBean;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.InterfaceDef;
+import org.omg.CORBA.InterfaceDefHelper;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.Repository;
+import org.omg.CORBA.UserException;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
+import org.omg.CosNaming.NamingContextPackage.CannotProceed;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
+import org.omg.PortableServer.Current;
+import org.omg.PortableServer.CurrentHelper;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class IORFactory
+   implements RemoteProxyFactory
+{
+   private static final Logger log = Logger.getLogger(IORFactory.class);
+   
+   private Container container;
+   private Advisor advisor;
+   private RemoteBinding binding;
+   private String webServiceName = "jboss:service=WebService"; // TODO: make webServiceName configurable
+   
+   // after start available
+   private String beanRepositoryIds[];
+   private String homeRepositoryIds[];
+//   private InterfaceAnalysis interfaceAnalysis;
+   private ORB orb;
+//   private POA poa;
+   private POA irPoa;
+   private InterfaceRepository iri;
+   private ServantRegistry servantRegistry;
+   private ServantRegistry homeServantRegistry;
+   private WebClassLoader wcl;
+   private ReferenceFactory referenceFactory;
+   private ReferenceFactory homeReferenceFactory;
+
+   // TODO: create a default IIOP annotation
+   private static final IIOP defaultIIOP = new IIOP()
+   {
+      public boolean interfaceRepositorySupported()
+      {
+         return false;
+      }
+
+      public String poa()
+      {
+         return POA_PER_SERVANT;
+      }
+      
+      public Class<? extends Annotation> annotationType()
+      {
+         return IIOP.class;
+      }
+   };
+   
+   // TODO: do I really need this method
+   public Object createHomeProxy()
+   {
+      try
+      {
+         org.omg.CORBA.Object corbaRef = homeReferenceFactory.createReference(homeRepositoryIds[0]);
+         
+         EJBHome corbaObj = (EJBHome) PortableRemoteObject.narrow(corbaRef, EJBHome.class);
+         
+         return corbaObj;
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   public Object createProxy()
+   {
+      try
+      {
+         org.omg.CORBA.Object corbaRef = referenceFactory.createReference(beanRepositoryIds[0]);
+         
+         EJBObject corbaObj = (EJBObject) PortableRemoteObject.narrow(corbaRef, EJBObject.class);
+         
+         return corbaObj;
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   public Object createProxy(Object id)
+   {
+      try
+      {
+         org.omg.CORBA.Object corbaRef = referenceFactory.createReferenceWithId(id, beanRepositoryIds[0]);
+         
+         EJBObject corbaObj = (EJBObject) PortableRemoteObject.narrow(corbaRef, EJBObject.class);
+         
+         return corbaObj;
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   private IIOP getIIOP()
+   {
+      IIOP iiop = (IIOP) advisor.resolveAnnotation(IIOP.class);
+      if(iiop != null)
+         return iiop;
+      
+      return defaultIIOP;
+   }
+   
+   private String getJndiName()
+   {
+      return ProxyFactoryHelper.getDefaultRemoteJndiName(container);
+   }
+   
+   private String getServantName()
+   {
+      // TODO: is "Servant/" a good prefix for servant name
+      return "Servant/" + getJndiName();
+   }
+   
+   private WebServiceMBean getWebServer() throws MalformedObjectNameException
+   {
+      if(webServiceName == null)
+         throw new IllegalStateException("iiop is not going to work without a web service");
+      
+      return (WebServiceMBean) MBeanProxyExt.create(WebServiceMBean.class, webServiceName);
+   }
+   
+   /**
+    * Literal copy from org.jboss.proxy.ejb.IORFactory
+    */
+   private void rebind(NamingContextExt ctx, String strName, org.omg.CORBA.Object obj) throws Exception
+   {
+      NameComponent[] name = ctx.to_name(strName);
+      NamingContext intermediateCtx = ctx;
+
+      for (int i = 0; i < name.length - 1; i++ ) {
+         NameComponent[] relativeName = new NameComponent[] { name[i] };
+         try {
+            intermediateCtx = NamingContextHelper.narrow(
+                  intermediateCtx.resolve(relativeName));
+         }
+         catch (NotFound e) {
+            intermediateCtx = intermediateCtx.bind_new_context(relativeName);
+         }
+      }
+      intermediateCtx.rebind(new NameComponent[] { name[name.length - 1] }, obj);
+   }
+   
+   private void removeWebClassLoader() throws MalformedObjectNameException
+   {
+      getWebServer().removeClassLoader(wcl);
+   }
+   
+   public void setContainer(Container container)
+   {
+      this.container = container;
+      this.advisor = (Advisor) container; // TODO: why the cast?
+   }
+   
+   public void setRemoteBinding(RemoteBinding binding)
+   {
+      this.binding = binding;
+   }
+   
+   public void setWebServiceName(String name)
+   {
+      this.webServiceName = name;
+   }
+   
+   public void start() throws Exception
+   {
+      // TODO: IORFactory only supports 1 remote interface
+      Class remoteInterfaces[] = ProxyFactoryHelper.getRemoteInterfaces(container);
+      if(remoteInterfaces.length > 1)
+         log.warn("IIOP binding only works on 1 interface, using: " + remoteInterfaces[0].getName());
+      InterfaceAnalysis interfaceAnalysis = InterfaceAnalysis.getInterfaceAnalysis(remoteInterfaces[0]);
+      this.beanRepositoryIds = interfaceAnalysis.getAllTypeIds();
+      
+      InterfaceAnalysis homeInterfaceAnalysis = null;
+      Class homeInterface = ProxyFactoryHelper.getRemoteHomeInterface(container);
+      if(homeInterface != null)
+      {
+         if(!EJBHome.class.isAssignableFrom(homeInterface))
+            throw new IllegalArgumentException("home interface " + homeInterface.getName() + " must extend javax.ejb.EJBHome (EJB3 4.6.8)");
+         homeInterfaceAnalysis = InterfaceAnalysis.getInterfaceAnalysis(homeInterface);
+         this.homeRepositoryIds = homeInterfaceAnalysis.getAllTypeIds();
+      }
+      // To allow EJB3 Stateless beans to operate we can function without a home interface.
+      
+      // Get orb and irPoa references
+      try {
+         orb = (ORB)new InitialContext().lookup("java:/" + CorbaORBService.ORB_NAME);
+      }
+      catch (NamingException e) {
+         throw new Exception("Cannot lookup java:/" + CorbaORBService.ORB_NAME + ": " + e);
+      }
+      try {
+         irPoa = (POA)new InitialContext().lookup("java:/" + CorbaORBService.IR_POA_NAME);
+      }
+      catch (NamingException e) {
+         throw new Exception("Cannot lookup java:/" + CorbaORBService.IR_POA_NAME + ": " + e);
+      }
+      
+      IIOP iiop = getIIOP();
+      if(iiop.interfaceRepositorySupported())
+      {
+         this.iri = new InterfaceRepository(orb, irPoa, getJndiName());
+         iri.mapClass(remoteInterfaces[0]);
+         if(homeInterface != null)
+            iri.mapClass(homeInterface);
+         iri.finishBuild();
+      }
+      
+      // TODO: obtain the iiop invoker name properly
+      ObjectName invokerName = new ObjectName("jboss:service=invoker,type=iiop");
+      ServantRegistries servantRegistries = (ServantRegistries) Registry.lookup(invokerName);
+      if(servantRegistries == null)
+         throw new Exception("can't find iiop invoker");
+      ServantRegistryKind registryWithTransientPOA;
+      ServantRegistryKind registryWithPersistentPOA; 
+      if(iiop.poa().equals(IIOP.POA_PER_SERVANT))
+      {
+         registryWithTransientPOA = ServantRegistryKind.TRANSIENT_POA_PER_SERVANT;
+         registryWithPersistentPOA = ServantRegistryKind.PERSISTENT_POA_PER_SERVANT;
+      }
+      else if(iiop.poa().equals(IIOP.POA_SHARED))
+      {
+         registryWithTransientPOA = ServantRegistryKind.SHARED_TRANSIENT_POA;
+         registryWithPersistentPOA = ServantRegistryKind.SHARED_PERSISTENT_POA;
+      }
+      else
+         throw new IllegalArgumentException("@IIOP.poa can only be 'per-servant' or 'shared'");
+      // Only works for session container
+      this.servantRegistry = servantRegistries.getServantRegistry(registryWithTransientPOA);
+      this.homeServantRegistry = servantRegistries.getServantRegistry(registryWithPersistentPOA); // TODO: why is home interface in persistent poa?
+      
+      // Hack in a WebCL (from org.jboss.ejb.EjbModule.initializeContainer)
+      // TODO:  seting up a WebClassLoader needs to be done somewhere where
+      ObjectName on = container.getObjectName();
+      this.wcl = new EJB3IIOPWebClassLoader(on, (RepositoryClassLoader) ((SessionContainer) container).getClassloader(), getJndiName());
+      WebServiceMBean webServer = getWebServer();
+      URL[] codebaseURLs = {webServer.addClassLoader(wcl)};
+      wcl.setWebURLs(codebaseURLs);
+      
+      // setup a codebase policy, the CodebaseInterceptor will translate this to a TAG_JAVA_CODEBASE
+      String codebaseString = wcl.getCodebaseString();
+      log.debug("codebase = " + codebaseString);
+      Any codebase = orb.create_any();
+      codebase.insert_string(codebaseString);
+      Policy codebasePolicy;
+      codebasePolicy = orb.create_policy(CodebasePolicy.TYPE, codebase);
+      
+      // Create csiv2Policy for both home and remote containing
+      // IorSecurityConfigMetadata
+      Any secPolicy = orb.create_any();
+//      IorSecurityConfigMetaData iorSecurityConfigMetaData =
+//         container.getBeanMetaData().getIorSecurityConfigMetaData();
+      IorSecurityConfigMetaData iorSecurityConfigMetaData = new IorSecurityConfigMetaData(); // TODO: make ior security configurable
+      secPolicy.insert_Value(iorSecurityConfigMetaData);
+      Policy csiv2Policy = orb.create_policy(CSIv2Policy.TYPE, secPolicy);
+      
+      Policy policies[] = { codebasePolicy, csiv2Policy };
+      
+      InterfaceDef interfaceDef = null;
+      if(iri != null)
+      {
+         Repository ir = iri.getReference();
+         interfaceDef = InterfaceDefHelper.narrow(ir.lookup_id(beanRepositoryIds[0]));
+      }
+      
+      Current poaCurrent = CurrentHelper.narrow(orb.resolve_initial_references("POACurrent"));
+
+      NamingContextExt ctx = getNamingContextExt();
+
+      log.debug("binding servant name " + getServantName());
+      
+      Servant servant = new BeanCorbaServant(this, poaCurrent, container, interfaceDef, interfaceAnalysis);
+      this.referenceFactory = servantRegistry.bind(getServantName(), servant, policies);
+      
+      EJBObject corbaObj = (EJBObject) createProxy();
+      
+      rebind(ctx, getJndiName(), (org.omg.CORBA.Object) corbaObj);
+      
+      // TODO: use iri
+      if(homeInterfaceAnalysis != null)
+      {
+         servant = new BeanCorbaServant(this, poaCurrent, container, null, homeInterfaceAnalysis);
+         this.homeReferenceFactory = homeServantRegistry.bind(getServantName() + "Home", servant, policies);
+         
+         Object homeObject = createHomeProxy();
+         
+         rebind(ctx, getJndiName() + "Home", (org.omg.CORBA.Object) homeObject);
+      }
+      
+      // bind HandleDelegate stuff
+      Context compCtx = (Context) new InitialContext().lookup("java:comp");
+      NonSerializableFactory.rebind(compCtx, "ORB", orb);
+      NonSerializableFactory.rebind(compCtx, "HandleDelegate", new HandleDelegateImpl());
+   }
+   
+   public void stop() throws Exception
+   {
+      if(homeReferenceFactory != null)
+      {
+         unbind(getJndiName() + "Home");
+         unbindHomeServant();
+      }
+      unbind(getJndiName());
+      
+      unbindServant();
+      
+      removeWebClassLoader();
+   }
+   
+   /**
+    * Unbind the bean from CosNaming
+    */
+   private void unbind(String strName)
+   {
+      try
+      {
+         NamingContextExt corbaContext = getNamingContextExt();
+         NameComponent n[] = corbaContext.to_name(strName);
+         getNamingContextExt().unbind(n);
+      }
+      catch(Exception e)
+      {
+         log.warn("unable to unbind '" + strName + "'", e);
+      }
+   }
+   
+   private void unbindHomeServant()
+   {
+      try
+      {
+         homeServantRegistry.unbind(getServantName() + "Home");
+      }
+      catch(Exception e)
+      {
+         log.warn("unable to unbind home servant", e);
+      }
+   }
+   
+   private void unbindServant()
+   {
+      try
+      {
+         servantRegistry.unbind(getServantName());
+      }
+      catch(Exception e)
+      {
+         log.warn("unable to unbind servant", e);
+      }
+   }
+
+   private NamingContextExt getNamingContextExt() throws NamingException
+   {
+      Context initialContext = new InitialContext();
+      
+      // NOTE: eclipse editor parser crashes silently on this line (because of org.jboss.iiop.CorbaNamingService) with unknown reason
+      // that's why this method is at the end
+      return NamingContextExtHelper.narrow((org.omg.CORBA.Object) initialContext.lookup("java:/" + org.jboss.iiop.CorbaNamingService.NAMING_NAME));
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/injection (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/injection)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,195 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.interceptor;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.aop.util.PayloadKey;
-
-/**
- * Utility class for placing the client interceptor data under a given metadata tag
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ClientInterceptorUtil
-{
-   public static final String CLIENT_METADATA = "jboss.ejb3.client.invocation.metadata";
-   
-   public static void addMetadata(Invocation invocation, Object key, Object value, PayloadKey payload)
-   {
-      invocation.getMetaData().addMetaData(CLIENT_METADATA, key, value, payload);
-   }
-   
-   public static void addMetadata(Invocation invocation, Object key, Object value)
-   {
-      invocation.getMetaData().addMetaData(CLIENT_METADATA, key, value);
-   }
-   
-   public static Object getMetadata(Invocation invocation, Object key)
-   {
-      return invocation.getMetaData().getMetaData(CLIENT_METADATA, key);
-   }
-   
-   static Map getClientMetadataMap(Invocation invocation)
-   {
-      Map map =  invocation.getMetaData().tag(CLIENT_METADATA);
-      if (map != null)
-      {
-         return new ClientValueMap(map);
-      }
-      return null;
-   }
-
-   /**
-    * Wraps map containing data set by client interceptorss and lazily unmarshals it 
-    */
-         
-   private static class ClientValueMap implements Map
-   {
-      Map marshalledMap;
-      boolean haveUnmarshalledAllEntries;
-
-      private ClientValueMap(Map marshalledMap)
-      {
-         this.marshalledMap = marshalledMap;
-      }
-      
-      public void clear()
-      {
-         marshalledMap.clear();
-      }
-
-      public boolean containsKey(Object key)
-      {
-         return marshalledMap.containsKey(key);
-      }
-
-      public boolean containsValue(Object value)
-      {
-         unmarshallAllEntries();
-         return marshalledMap.containsValue(value);
-      }
-
-      public Set entrySet()
-      {
-         unmarshallAllEntries();
-         return marshalledMap.entrySet();
-      }
-
-      public boolean equals(Object o)
-      {
-         return marshalledMap.equals(o);
-      }
-
-      public Object get(Object key)
-      {
-         return unmarshallEntry(key);
-      }
-
-      public int hashCode()
-      {
-         return marshalledMap.hashCode();
-      }
-
-      public boolean isEmpty()
-      {
-         return marshalledMap.isEmpty();
-      }
-
-      public Set keySet()
-      {
-         return marshalledMap.keySet();
-      }
-
-      public Object put(Object key, Object value)
-      {
-         return marshalledMap.put(key, value);
-      }
-
-      public void putAll(Map t)
-      {
-         marshalledMap.putAll(t);
-      }
-
-      public Object remove(Object key)
-      {
-         return marshalledMap.remove(key);
-      }
-
-      public int size()
-      {
-         return marshalledMap.size();
-      }
-
-      public Collection values()
-      {
-         unmarshallAllEntries();
-         return marshalledMap.values();
-      }
-      
-      private void unmarshallAllEntries()
-      {
-         if (haveUnmarshalledAllEntries)
-         {
-            return;
-         }
-         
-         Iterator keys = marshalledMap.keySet().iterator();
-         while (keys.hasNext())
-         {
-            //Make sure that each entry gets unmarshalled
-            unmarshallEntry(keys.next());
-         }
-         haveUnmarshalledAllEntries = true;
-      }
-      
-      private Object unmarshallEntry(Object key)
-      {
-         try
-         {
-            Object obj = marshalledMap.get(key);
-            if (obj instanceof SimpleMetaData.MetaDataValue)
-            {
-               Object realObj = ((SimpleMetaData.MetaDataValue)obj).get(); 
-               marshalledMap.put(key, realObj);
-               return realObj;
-            }
-            return obj;
-         }
-         catch (IOException e)
-         {
-            throw new RuntimeException(e);
-         }
-         catch (ClassNotFoundException e)
-         {
-            throw new RuntimeException(e);
-         }
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,195 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.interceptor;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.aop.util.PayloadKey;
+
+/**
+ * Utility class for placing the client interceptor data under a given metadata tag
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ClientInterceptorUtil
+{
+   public static final String CLIENT_METADATA = "jboss.ejb3.client.invocation.metadata";
+   
+   public static void addMetadata(Invocation invocation, Object key, Object value, PayloadKey payload)
+   {
+      invocation.getMetaData().addMetaData(CLIENT_METADATA, key, value, payload);
+   }
+   
+   public static void addMetadata(Invocation invocation, Object key, Object value)
+   {
+      invocation.getMetaData().addMetaData(CLIENT_METADATA, key, value);
+   }
+   
+   public static Object getMetadata(Invocation invocation, Object key)
+   {
+      return invocation.getMetaData().getMetaData(CLIENT_METADATA, key);
+   }
+   
+   static Map getClientMetadataMap(Invocation invocation)
+   {
+      Map map =  invocation.getMetaData().tag(CLIENT_METADATA);
+      if (map != null)
+      {
+         return new ClientValueMap(map);
+      }
+      return null;
+   }
+
+   /**
+    * Wraps map containing data set by client interceptorss and lazily unmarshals it 
+    */
+         
+   private static class ClientValueMap implements Map
+   {
+      Map marshalledMap;
+      boolean haveUnmarshalledAllEntries;
+
+      private ClientValueMap(Map marshalledMap)
+      {
+         this.marshalledMap = marshalledMap;
+      }
+      
+      public void clear()
+      {
+         marshalledMap.clear();
+      }
+
+      public boolean containsKey(Object key)
+      {
+         return marshalledMap.containsKey(key);
+      }
+
+      public boolean containsValue(Object value)
+      {
+         unmarshallAllEntries();
+         return marshalledMap.containsValue(value);
+      }
+
+      public Set entrySet()
+      {
+         unmarshallAllEntries();
+         return marshalledMap.entrySet();
+      }
+
+      public boolean equals(Object o)
+      {
+         return marshalledMap.equals(o);
+      }
+
+      public Object get(Object key)
+      {
+         return unmarshallEntry(key);
+      }
+
+      public int hashCode()
+      {
+         return marshalledMap.hashCode();
+      }
+
+      public boolean isEmpty()
+      {
+         return marshalledMap.isEmpty();
+      }
+
+      public Set keySet()
+      {
+         return marshalledMap.keySet();
+      }
+
+      public Object put(Object key, Object value)
+      {
+         return marshalledMap.put(key, value);
+      }
+
+      public void putAll(Map t)
+      {
+         marshalledMap.putAll(t);
+      }
+
+      public Object remove(Object key)
+      {
+         return marshalledMap.remove(key);
+      }
+
+      public int size()
+      {
+         return marshalledMap.size();
+      }
+
+      public Collection values()
+      {
+         unmarshallAllEntries();
+         return marshalledMap.values();
+      }
+      
+      private void unmarshallAllEntries()
+      {
+         if (haveUnmarshalledAllEntries)
+         {
+            return;
+         }
+         
+         Iterator keys = marshalledMap.keySet().iterator();
+         while (keys.hasNext())
+         {
+            //Make sure that each entry gets unmarshalled
+            unmarshallEntry(keys.next());
+         }
+         haveUnmarshalledAllEntries = true;
+      }
+      
+      private Object unmarshallEntry(Object key)
+      {
+         try
+         {
+            Object obj = marshalledMap.get(key);
+            if (obj instanceof SimpleMetaData.MetaDataValue)
+            {
+               Object realObj = ((SimpleMetaData.MetaDataValue)obj).get(); 
+               marshalledMap.put(key, realObj);
+               return realObj;
+            }
+            return obj;
+         }
+         catch (IOException e)
+         {
+            throw new RuntimeException(e);
+         }
+         catch (ClassNotFoundException e)
+         {
+            throw new RuntimeException(e);
+         }
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/ClientInterceptorUtil.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3.interceptor;
 
 import java.lang.reflect.Method;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3.interceptor;
 
 import java.lang.reflect.Method;

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,327 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.interceptor;
-
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-
-import org.jboss.ejb3.metamodel.Interceptor;
-
-/**
- * We cannot use annotation overrides for the interceptor stuff since they do not have a 
- * container associated with them
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorInfo
-{
-   Class clazz;
-   Interceptor xml;
-   
-   //interceptor methods defined by this class
-   protected Method aroundInvoke;
-   protected Method postConstruct;
-   protected Method postActivate;
-   protected Method preDestroy;
-   protected Method prePassivate;
-   
-   //Interceptor methods defined by this class and all superclasses
-   protected Method[] aroundInvokeHierarchy;
-   protected Method[] postConstructHierarchy;
-   protected Method[] postActivateHierarchy;
-   protected Method[] preDestroyHierarchy;
-   protected Method[] prePassivateHierarchy;
-   
-   boolean haveCalculatedHierarchy;
- 
-   protected InterceptorInfo()
-   {
-   }
-
-   public InterceptorInfo(Class clazz)
-   {
-      this.clazz = clazz;
-   }
-   
-   public InterceptorInfo(InterceptorInfo interceptorInfo)
-   {
-      this.clazz = interceptorInfo.clazz;
-      this.aroundInvoke = interceptorInfo.aroundInvoke;
-      this.postConstruct = interceptorInfo.postConstruct;
-      this.postActivate = interceptorInfo.postActivate;
-      this.preDestroy = interceptorInfo.preDestroy;
-      this.prePassivate = interceptorInfo.prePassivate;
-      this.aroundInvokeHierarchy = interceptorInfo.aroundInvokeHierarchy;
-      this.postConstructHierarchy = interceptorInfo.postConstructHierarchy;
-      this.postActivateHierarchy = interceptorInfo.postActivateHierarchy;
-      this.preDestroyHierarchy = interceptorInfo.preDestroyHierarchy;
-      this.prePassivateHierarchy = interceptorInfo.prePassivateHierarchy;
-   }
-
-   protected void setXml(Interceptor xml)
-   {
-      this.xml = xml;
-   }
-   
-   public Interceptor getXml()
-   {
-      return xml;
-   }
-   
-   public Method getAroundInvoke()
-   {
-      return aroundInvoke;
-   }
-
-   protected void setAroundInvoke(Method aroundInvoke)
-   {
-      if (aroundInvoke == null) return;
-      
-      if (this.aroundInvoke != null && !this.aroundInvoke.equals(aroundInvoke))
-      {
-         throw new RuntimeException("Interceptors can only have one around-invoke/@AroundInvoke method - " + clazz.getName());
-      }
-      this.aroundInvoke = makeAccessible(aroundInvoke);
-   }
-
-   public Class getClazz()
-   {
-      return clazz;
-   }
-
-   public boolean haveCalculatedHierarchy()
-   {
-      return haveCalculatedHierarchy;
-   }
-   
-   public Method getPostActivate()
-   {
-      return postActivate;
-   }
-
-   protected void setPostActivate(Method postActivate)
-   {
-      if (postActivate == null) return;
-      
-      if (this.postActivate != null && !this.postActivate.equals(postActivate))
-      {
-         throw new RuntimeException("Interceptors can only have one post-activate/@PostActivate method - " + clazz.getName());
-      }
-      this.postActivate = makeAccessible(postActivate);
-   }
-
-   public Method getPostConstruct()
-   {
-      return postConstruct;
-   }
-
-   protected void setPostConstruct(Method postConstruct)
-   {
-      if (postConstruct == null) return;
-      
-      if (this.postConstruct != null && !this.postConstruct.equals(postConstruct))
-      {
-         throw new RuntimeException("Interceptors can only have one post-construct/@PostConstruct method - " + clazz.getName());
-      }
-      this.postConstruct = makeAccessible(postConstruct);
-   }
-
-   public Method getPreDestroy()
-   {
-      return preDestroy;
-   }
-
-   protected void setPreDestroy(Method preDestroy)
-   {
-      if (preDestroy == null) return;
-      
-      if (this.preDestroy != null && !this.preDestroy.equals(preDestroy))
-      {
-         throw new RuntimeException("Interceptors can only have one pre-destroy/@PreDestroy method - " + clazz.getName());
-      }
-      this.preDestroy = makeAccessible(preDestroy);
-   }
-
-   public Method getPrePassivate()
-   {
-      return prePassivate;
-   }
-
-   protected void setPrePassivate(Method prePassivate)
-   {
-      if (prePassivate == null) return;
-      
-      if (this.prePassivate != null && !this.prePassivate.equals(prePassivate))
-      {
-         throw new RuntimeException("Interceptors can only have one pre-passivate/@PrePassivate method - " + clazz.getName());
-      }
-      this.prePassivate = makeAccessible(prePassivate);
-   }
-   
-   public Method[] getAroundInvokes()
-   {
-      return aroundInvokeHierarchy;
-   }
-
-   public Method[] getPostActivates()
-   {
-      return postActivateHierarchy;
-   }
-
-   public Method[] getPostConstructs()
-   {
-      return postConstructHierarchy;
-   }
-
-   public Method[] getPreDestroys()
-   {
-      return preDestroyHierarchy;
-   }
-
-   public Method[] getPrePassivates()
-   {
-      return prePassivateHierarchy;
-   }
-
-   private Method makeAccessible(final Method method)
-   {
-      try
-      {
-         AccessController.doPrivileged(new PrivilegedExceptionAction() {
-            public Object run()
-            {
-               method.setAccessible(true);
-               return null;
-            }
-         });
-      }
-      catch (PrivilegedActionException e)
-      {
-         throw new RuntimeException(e.getException());
-      }
-      
-      return method;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer("InterceptorInfo{class=" + clazz);
-      appendMethods(sb);
-      sb.append("}");
-      return sb.toString();
-   }
-
-   protected void appendMethods(StringBuffer sb)
-   {
-      appendMethodString(sb, "aroundInvoke", aroundInvoke);
-      appendMethodString(sb, "postConstruct", postConstruct);
-      appendMethodString(sb, "postActivate", postActivate);
-      appendMethodString(sb, "prePassivate", prePassivate);
-      appendMethodString(sb, "preDestroy", preDestroy);
-   }
-   
-   protected void appendMethodString(StringBuffer buf, String methodType, Method m)
-   {
-      if (m != null)
-      {
-         buf.append(", " + methodType + "=" + m.getName());
-      }
-   }
-   
-   public void calculateHierarchy(InterceptorInfo superInfo)
-   {
-      if (haveCalculatedHierarchy)
-      {
-         return;
-      }
-      
-      postConstructHierarchy = initaliseMethods((superInfo != null) ? superInfo.postConstructHierarchy : null, postConstruct);
-      postActivateHierarchy = initaliseMethods((superInfo != null) ? superInfo.postActivateHierarchy : null, postActivate);
-      aroundInvokeHierarchy = initaliseMethods((superInfo != null) ? superInfo.aroundInvokeHierarchy : null, aroundInvoke);
-      prePassivateHierarchy = initaliseMethods((superInfo != null) ? superInfo.prePassivateHierarchy : null, prePassivate);
-      preDestroyHierarchy = initaliseMethods((superInfo != null) ? superInfo.preDestroyHierarchy : null, preDestroy);
-      
-      haveCalculatedHierarchy = true;
-   }
-   
-   private Method[] initaliseMethods(Method[] superMethods, Method myMethod)
-   {
-      if (superMethods == null && myMethod == null)
-      {
-         return null;
-      }
-      ArrayList hierarchy = new ArrayList();
-      if (superMethods != null)
-      {
-         //We only want to add superclass interceptor/lifecycle methods if we do not override them
-         for (int i = 0 ; i < superMethods.length ; ++i)
-         {
-            if (!haveMethod(superMethods[i]))
-            {
-               hierarchy.add(superMethods[i]);
-            }
-         }
-      }
-      
-      if (myMethod != null)
-      {
-         hierarchy.add(myMethod);
-      }
-      
-      return (Method[])hierarchy.toArray(new Method[hierarchy.size()]);
-   }
-   
-   private boolean haveMethod(Method method)
-   {
-      try
-      {
-         clazz.getDeclaredMethod(method.getName(), method.getParameterTypes());
-         return true;
-      }
-      catch (NoSuchMethodException e)
-      {
-         return false;
-      }
-   }
-
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (obj instanceof InterceptorInfo)
-      {
-         return clazz.equals(((InterceptorInfo)obj).getClazz());
-      }
-      return false;
-   }
-
-   @Override
-   public int hashCode()
-   {
-      return clazz.getName().hashCode();
-   }
-   
-   
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,327 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.interceptor;
+
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+
+import org.jboss.ejb3.metamodel.Interceptor;
+
+/**
+ * We cannot use annotation overrides for the interceptor stuff since they do not have a 
+ * container associated with them
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InterceptorInfo
+{
+   Class clazz;
+   Interceptor xml;
+   
+   //interceptor methods defined by this class
+   protected Method aroundInvoke;
+   protected Method postConstruct;
+   protected Method postActivate;
+   protected Method preDestroy;
+   protected Method prePassivate;
+   
+   //Interceptor methods defined by this class and all superclasses
+   protected Method[] aroundInvokeHierarchy;
+   protected Method[] postConstructHierarchy;
+   protected Method[] postActivateHierarchy;
+   protected Method[] preDestroyHierarchy;
+   protected Method[] prePassivateHierarchy;
+   
+   boolean haveCalculatedHierarchy;
+ 
+   protected InterceptorInfo()
+   {
+   }
+
+   public InterceptorInfo(Class clazz)
+   {
+      this.clazz = clazz;
+   }
+   
+   public InterceptorInfo(InterceptorInfo interceptorInfo)
+   {
+      this.clazz = interceptorInfo.clazz;
+      this.aroundInvoke = interceptorInfo.aroundInvoke;
+      this.postConstruct = interceptorInfo.postConstruct;
+      this.postActivate = interceptorInfo.postActivate;
+      this.preDestroy = interceptorInfo.preDestroy;
+      this.prePassivate = interceptorInfo.prePassivate;
+      this.aroundInvokeHierarchy = interceptorInfo.aroundInvokeHierarchy;
+      this.postConstructHierarchy = interceptorInfo.postConstructHierarchy;
+      this.postActivateHierarchy = interceptorInfo.postActivateHierarchy;
+      this.preDestroyHierarchy = interceptorInfo.preDestroyHierarchy;
+      this.prePassivateHierarchy = interceptorInfo.prePassivateHierarchy;
+   }
+
+   protected void setXml(Interceptor xml)
+   {
+      this.xml = xml;
+   }
+   
+   public Interceptor getXml()
+   {
+      return xml;
+   }
+   
+   public Method getAroundInvoke()
+   {
+      return aroundInvoke;
+   }
+
+   protected void setAroundInvoke(Method aroundInvoke)
+   {
+      if (aroundInvoke == null) return;
+      
+      if (this.aroundInvoke != null && !this.aroundInvoke.equals(aroundInvoke))
+      {
+         throw new RuntimeException("Interceptors can only have one around-invoke/@AroundInvoke method - " + clazz.getName());
+      }
+      this.aroundInvoke = makeAccessible(aroundInvoke);
+   }
+
+   public Class getClazz()
+   {
+      return clazz;
+   }
+
+   public boolean haveCalculatedHierarchy()
+   {
+      return haveCalculatedHierarchy;
+   }
+   
+   public Method getPostActivate()
+   {
+      return postActivate;
+   }
+
+   protected void setPostActivate(Method postActivate)
+   {
+      if (postActivate == null) return;
+      
+      if (this.postActivate != null && !this.postActivate.equals(postActivate))
+      {
+         throw new RuntimeException("Interceptors can only have one post-activate/@PostActivate method - " + clazz.getName());
+      }
+      this.postActivate = makeAccessible(postActivate);
+   }
+
+   public Method getPostConstruct()
+   {
+      return postConstruct;
+   }
+
+   protected void setPostConstruct(Method postConstruct)
+   {
+      if (postConstruct == null) return;
+      
+      if (this.postConstruct != null && !this.postConstruct.equals(postConstruct))
+      {
+         throw new RuntimeException("Interceptors can only have one post-construct/@PostConstruct method - " + clazz.getName());
+      }
+      this.postConstruct = makeAccessible(postConstruct);
+   }
+
+   public Method getPreDestroy()
+   {
+      return preDestroy;
+   }
+
+   protected void setPreDestroy(Method preDestroy)
+   {
+      if (preDestroy == null) return;
+      
+      if (this.preDestroy != null && !this.preDestroy.equals(preDestroy))
+      {
+         throw new RuntimeException("Interceptors can only have one pre-destroy/@PreDestroy method - " + clazz.getName());
+      }
+      this.preDestroy = makeAccessible(preDestroy);
+   }
+
+   public Method getPrePassivate()
+   {
+      return prePassivate;
+   }
+
+   protected void setPrePassivate(Method prePassivate)
+   {
+      if (prePassivate == null) return;
+      
+      if (this.prePassivate != null && !this.prePassivate.equals(prePassivate))
+      {
+         throw new RuntimeException("Interceptors can only have one pre-passivate/@PrePassivate method - " + clazz.getName());
+      }
+      this.prePassivate = makeAccessible(prePassivate);
+   }
+   
+   public Method[] getAroundInvokes()
+   {
+      return aroundInvokeHierarchy;
+   }
+
+   public Method[] getPostActivates()
+   {
+      return postActivateHierarchy;
+   }
+
+   public Method[] getPostConstructs()
+   {
+      return postConstructHierarchy;
+   }
+
+   public Method[] getPreDestroys()
+   {
+      return preDestroyHierarchy;
+   }
+
+   public Method[] getPrePassivates()
+   {
+      return prePassivateHierarchy;
+   }
+
+   private Method makeAccessible(final Method method)
+   {
+      try
+      {
+         AccessController.doPrivileged(new PrivilegedExceptionAction() {
+            public Object run()
+            {
+               method.setAccessible(true);
+               return null;
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw new RuntimeException(e.getException());
+      }
+      
+      return method;
+   }
+   
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer("InterceptorInfo{class=" + clazz);
+      appendMethods(sb);
+      sb.append("}");
+      return sb.toString();
+   }
+
+   protected void appendMethods(StringBuffer sb)
+   {
+      appendMethodString(sb, "aroundInvoke", aroundInvoke);
+      appendMethodString(sb, "postConstruct", postConstruct);
+      appendMethodString(sb, "postActivate", postActivate);
+      appendMethodString(sb, "prePassivate", prePassivate);
+      appendMethodString(sb, "preDestroy", preDestroy);
+   }
+   
+   protected void appendMethodString(StringBuffer buf, String methodType, Method m)
+   {
+      if (m != null)
+      {
+         buf.append(", " + methodType + "=" + m.getName());
+      }
+   }
+   
+   public void calculateHierarchy(InterceptorInfo superInfo)
+   {
+      if (haveCalculatedHierarchy)
+      {
+         return;
+      }
+      
+      postConstructHierarchy = initaliseMethods((superInfo != null) ? superInfo.postConstructHierarchy : null, postConstruct);
+      postActivateHierarchy = initaliseMethods((superInfo != null) ? superInfo.postActivateHierarchy : null, postActivate);
+      aroundInvokeHierarchy = initaliseMethods((superInfo != null) ? superInfo.aroundInvokeHierarchy : null, aroundInvoke);
+      prePassivateHierarchy = initaliseMethods((superInfo != null) ? superInfo.prePassivateHierarchy : null, prePassivate);
+      preDestroyHierarchy = initaliseMethods((superInfo != null) ? superInfo.preDestroyHierarchy : null, preDestroy);
+      
+      haveCalculatedHierarchy = true;
+   }
+   
+   private Method[] initaliseMethods(Method[] superMethods, Method myMethod)
+   {
+      if (superMethods == null && myMethod == null)
+      {
+         return null;
+      }
+      ArrayList hierarchy = new ArrayList();
+      if (superMethods != null)
+      {
+         //We only want to add superclass interceptor/lifecycle methods if we do not override them
+         for (int i = 0 ; i < superMethods.length ; ++i)
+         {
+            if (!haveMethod(superMethods[i]))
+            {
+               hierarchy.add(superMethods[i]);
+            }
+         }
+      }
+      
+      if (myMethod != null)
+      {
+         hierarchy.add(myMethod);
+      }
+      
+      return (Method[])hierarchy.toArray(new Method[hierarchy.size()]);
+   }
+   
+   private boolean haveMethod(Method method)
+   {
+      try
+      {
+         clazz.getDeclaredMethod(method.getName(), method.getParameterTypes());
+         return true;
+      }
+      catch (NoSuchMethodException e)
+      {
+         return false;
+      }
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (obj instanceof InterceptorInfo)
+      {
+         return clazz.equals(((InterceptorInfo)obj).getClazz());
+      }
+      return false;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      return clazz.getName().hashCode();
+   }
+   
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfo.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,1063 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.interceptor;
-
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.metamodel.EjbJarDD;
-import org.jboss.ejb3.metamodel.Interceptor;
-import org.jboss.ejb3.metamodel.InterceptorBinding;
-import org.jboss.ejb3.metamodel.Interceptors;
-import org.jboss.logging.Logger;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.InvocationContext;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * A repository of interceptor details shared amongst all containers in this deployment.
- * Interceptors differ from other ejb 3 artifacts in that we can have annotations on the
- * interceptor classes which are not the ejb container, so we cannot use annotation overrides
- * on the interceptors themselves.<BR/>
- * <BR/>
- * The xml structures get added on deployment.<BR/>
- * Interceptors only declared by using @Interceptors on the bean class get added on demand.<BR/>
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorInfoRepository
-{
-   private static Logger log = Logger.getLogger(InterceptorInfoRepository.class);
-
-   private Set<String> beanClasses = new HashSet<String>();
-
-   private Interceptors interceptorsXml;
-
-   private List<InterceptorBinding> bindingsXml;
-
-   private ConcurrentMap<Class, InterceptorInfo> infos = new ConcurrentHashMap<Class, InterceptorInfo>();
-
-   private ConcurrentMap<String, InterceptorInfo> ejbInfos = new ConcurrentHashMap<String, InterceptorInfo>();
-
-   private LinkedHashSet<InterceptorInfo> defaultInterceptors = null;
-   
-   private InterceptorSorter sorter = new InterceptorSorter();
-
-   public InterceptorInfoRepository()
-   {
-   }
-
-   public void initialise(EjbJarDD dd)
-   {
-      this.interceptorsXml = dd.getInterceptors();
-
-      if (dd.getAssemblyDescriptor() != null)
-      {
-         this.bindingsXml = dd.getAssemblyDescriptor().getInterceptorBindings();
-      }
-      
-      initialiseInfosFromXml();
-      initialiseDefaultInterceptors();
-   }
-
-   public void addBeanClass(String classname)
-   {
-      beanClasses.add(classname);
-   }
-
-   public InterceptorInfo getInterceptorInfo(Class clazz)
-   {
-      initialiseInfosFromXml();
-      return infos.get(clazz);
-   }
-
-   public HashSet<InterceptorInfo> getDefaultInterceptors()
-   {
-      return defaultInterceptors;
-   }
-
-   public boolean hasDefaultInterceptors()
-   {
-      return defaultInterceptors.size() > 0;
-   }
-
-   public ArrayList<InterceptorInfo> getClassInterceptors(EJBContainer container)
-   {
-      javax.interceptor.Interceptors interceptors = (javax.interceptor.Interceptors) container
-            .resolveAnnotation(javax.interceptor.Interceptors.class);
-      ArrayList<InterceptorInfo> infos = getInterceptorsFromAnnotation(container, interceptors);
-
-      return infos;
-   }
-
-   public ArrayList<InterceptorInfo> getMethodInterceptors(EJBContainer container, Method m)
-   {
-      javax.interceptor.Interceptors interceptors = (javax.interceptor.Interceptors) container.resolveAnnotation(m,
-            javax.interceptor.Interceptors.class);
-      ArrayList<InterceptorInfo> infos = getInterceptorsFromAnnotation(container, interceptors);
-
-      return infos;
-   }
-
-   public Method[] getBeanClassAroundInvokes(EJBContainer container)
-   {
-      return getBeanClassInterceptors(container, AroundInvoke.class);
-   }
-
-   public Method[] getBeanClassPostConstructs(EJBContainer container)
-   {
-      return getBeanClassInterceptors(container, PostConstruct.class);
-   }
-
-   public Method[] getBeanClassPostActivates(EJBContainer container)
-   {
-      return getBeanClassInterceptors(container, PostActivate.class);
-   }
-
-   public Method[] getBeanClassPrePassivates(EJBContainer container)
-   {
-      return getBeanClassInterceptors(container, PrePassivate.class);
-   }
-
-   public Method[] getBeanClassPreDestroys(EJBContainer container)
-   {
-      return getBeanClassInterceptors(container, PreDestroy.class);
-   }
-
-   private Method[] getBeanClassInterceptors(EJBContainer container, Class type)
-   {
-      InterceptorInfo info = getOrInitialiseFromAnnotations(container);
-      return getMethodsForEvent(info, type);
-   }
-
-   public InterceptorInfo[] getBusinessInterceptors(EJBContainer container, Method method)
-   {
-      return getInterceptors(container, AroundInvoke.class, method);
-   }
-
-   public InterceptorInfo[] getPostConstructInterceptors(EJBContainer container)
-   {
-      return getInterceptors(container, PostConstruct.class, null);
-   }
-
-   public InterceptorInfo[] getPostActivateInterceptors(EJBContainer container)
-   {
-      return getInterceptors(container, PostActivate.class, null);
-   }
-
-   public InterceptorInfo[] getPrePassivateInterceptors(EJBContainer container)
-   {
-      return getInterceptors(container, PrePassivate.class, null);
-   }
-
-   public InterceptorInfo[] getPreDestroyInterceptors(EJBContainer container)
-   {
-      return getInterceptors(container, PreDestroy.class, null);
-   }
-
-   private InterceptorInfo[] getInterceptors(EJBContainer container, Class type, Method method)
-   {
-      ArrayList<InterceptorInfo> interceptors = new ArrayList<InterceptorInfo>();
-
-      if (!hasAnnotation(container, ExcludeDefaultInterceptors.class, method))
-      {
-         HashSet<InterceptorInfo> infos = getDefaultInterceptors();
-         if (infos != null)
-         {
-            interceptors.addAll(trimUnwanted(infos, type));
-         }
-         sorter.sortDefaultInterceptors(container, interceptors);
-      }
-
-      
-      if (!hasAnnotation(container, ExcludeClassInterceptors.class, method))
-      {
-         List<InterceptorInfo> infos = container.getClassInterceptors();
-         if (infos != null)
-         {
-            interceptors.addAll(trimUnwanted(infos, type));
-         }
-         
-         if (type != AroundInvoke.class)
-         {
-            List<InterceptorInfo> methodOnlyInterceptors = getMethodOnlyInterceptorsForLifecycle(container, type, interceptors);
-            if (infos != null)
-               interceptors.addAll(methodOnlyInterceptors);
-         }
-         sorter.sortClassInterceptors(container, interceptors);
-      }
-
-      if (type == AroundInvoke.class)
-      {
-         List<InterceptorInfo> infos = getMethodInterceptors(container, method);
-         if (infos != null)
-            interceptors.addAll(trimUnwanted(infos, type));
-         sorter.sortMethodInterceptors(container, method, interceptors);
-      }
-
-      InterceptorInfo[] ints = interceptors.toArray(new InterceptorInfo[interceptors.size()]);
-      return ints;
-   }
-
-   private List<InterceptorInfo> getMethodOnlyInterceptorsForLifecycle(EJBContainer container, Class type, List<InterceptorInfo> infos)
-   {
-      HashSet<InterceptorInfo> methodLevelInterceptors = (HashSet<InterceptorInfo>)container.getApplicableInterceptors().clone();
-      
-      for (InterceptorInfo info : infos)
-      {
-         if (methodLevelInterceptors.contains(info))
-         {
-            methodLevelInterceptors.remove(info);
-         }
-      }
-      
-      if (defaultInterceptors != null)
-      {
-         for (InterceptorInfo info : defaultInterceptors)
-         {
-            if (methodLevelInterceptors.contains(info))
-            {
-               methodLevelInterceptors.remove(info);
-            }
-         }
-      }
-      
-      List<InterceptorInfo> trimmedInfos = trimUnwanted(methodLevelInterceptors, type); 
-      return trimmedInfos;
-   }
-   
-   private boolean hasAnnotation(EJBContainer container, Class annotation, Method method)
-   {
-      if (container.resolveAnnotation(annotation) != null)
-      {
-         return true;
-      }
-
-      if (method != null)
-      {
-         return container.resolveAnnotation(method, annotation) != null;
-      }
-
-      return false;
-   }
-
-   private List<InterceptorInfo> trimUnwanted(Collection<InterceptorInfo> interceptors, Class type)
-   {
-      ArrayList<InterceptorInfo> ints = new ArrayList<InterceptorInfo>(interceptors.size());
-      ints.addAll(interceptors);
-
-      for (Iterator<InterceptorInfo> it = ints.iterator(); it.hasNext();)
-      {
-         InterceptorInfo info = it.next();
-         if (!hasMethodsForEvent(info, type))
-         {
-            it.remove();
-         }
-      }
-
-      return ints;
-   }
-
-   private boolean hasMethodsForEvent(InterceptorInfo info, Class type)
-   {
-      return getMethodsForEvent(info, type) != null;
-   }
-   
-   private Method[] getMethodsForEvent(InterceptorInfo info, Class type)
-   {
-      if (type == AroundInvoke.class)
-         return info.getAroundInvokes();
-      else if (type == PostConstruct.class)
-         return info.getPostConstructs();
-      else if (type == PostActivate.class)
-         return info.getPostActivates();
-      else if (type == PrePassivate.class)
-         return info.getPrePassivates();
-      else if (type == PreDestroy.class)
-         return info.getPreDestroys();
-      return null;
-   }
-
-   private ArrayList<InterceptorInfo> getInterceptorsFromAnnotation(EJBContainer container,
-         javax.interceptor.Interceptors interceptors)
-   {
-      ArrayList<InterceptorInfo> inters = new ArrayList<InterceptorInfo>();
-      if (interceptors == null)
-         return inters;
-
-      for (Class clazz : interceptors.value())
-      {
-         InterceptorInfo info = getOrInitialiseFromAnnotations(clazz);
-         validateInterceptorForContainer(container, info.getClazz());
-         inters.add(info);
-      }
-
-      return inters;
-   }
-
-   private void validateInterceptorForContainer(EJBContainer container, Class interceptor)
-   {
-      if (beanClasses.contains(interceptor.getName()))
-      {
-         if (!interceptor.equals(container.getClazz()))
-         {
-            throw new RuntimeException("Bean class " + interceptor.getName() + " cannot be used as an interceptor for "
-                  + container.getEjbName());
-         }
-      }
-   }
-
-   private void initialiseInfosFromXml()
-   {
-      if (interceptorsXml != null)
-      {
-         //Initialise all interceptor entries so we know which classes we have xml for
-         HashMap<String, AnnotationInitialiser> initialisers = new HashMap<String, AnnotationInitialiser>();
-         for (Interceptor xml : interceptorsXml.getInterceptors())
-         {
-            XmlInitialiser init = new XmlInitialiser(xml);
-            initialisers.put(xml.getInterceptorClass(), init);
-         }
-
-         //Create entries recursively, top classes first so we get the method hierarchies         
-         for (Interceptor xml : interceptorsXml.getInterceptors())
-         {
-            String clazz = xml.getInterceptorClass();
-            initialiseSuperClassesFirstFromXmlOrAnnotations(initialisers, clazz);
-         }
-
-      }
-   }
-
-   private InterceptorInfo initialiseSuperClassesFirstFromXmlOrAnnotations(
-         HashMap<String, AnnotationInitialiser> initialisers, String superClassName)
-   {
-      if ("java.lang.Object".equals(superClassName))
-      {
-         return null;
-      }
-
-      AnnotationInitialiser initialiser = initialisers.get(superClassName);
-      if (initialiser == null)
-      {
-         initialiser = new AnnotationInitialiser(superClassName, InterceptorSignatureValidator.instance);
-         initialisers.put(initialiser.getClazz().getName(), initialiser);
-      }
-      InterceptorInfo superInfo = initialiseSuperClassesFirstFromXmlOrAnnotations(
-            initialisers, initialiser.getClazz().getSuperclass().getName());
-
-      InterceptorInfo info = initialiser.getInfo();
-      info.calculateHierarchy(superInfo);
-      infos.put(info.getClazz(), info);
-      return info;
-   }
-
-   /*
-    * Default interceptors are defined using xml only
-    */
-   private void initialiseDefaultInterceptors()
-   {
-      defaultInterceptors = new LinkedHashSet<InterceptorInfo>();
-
-      if (bindingsXml != null)
-      {
-         for (InterceptorBinding bindingXml : bindingsXml)
-         {
-            if (bindingXml.getEjbName().equals("*")
-                  && (bindingXml.getMethodName() == null || bindingXml.getMethodName().length() == 0))
-            {
-               for (String classname : bindingXml.getInterceptorClasses())
-               {
-                  if (beanClasses.contains(classname))
-                  {
-                     throw new RuntimeException("Bean class defined in default binding " + classname);
-                  }
-                  InterceptorInfo info = getOrInitialiseFromAnnotations(classname);
-                  defaultInterceptors.add(info);
-               }
-            }
-         }
-      }
-   }
-
-   private InterceptorInfo getOrInitialiseFromAnnotations(String classname)
-   {
-      Class clazz = loadClass(classname);
-      return getOrInitialiseFromAnnotations(clazz);
-   }
-
-   private InterceptorInfo getOrInitialiseFromAnnotations(Class clazz)
-   {
-      InterceptorInfo info = infos.get(clazz);
-
-      if (info == null)
-      {
-         synchronized (this)
-         {
-            info = infos.get(clazz);
-            if (info == null)
-            {
-               info = initialiseFromAnnotations(clazz);
-               infos.put(clazz, info);
-            }
-         }
-      }
-
-      return info;
-   }
-
-   private InterceptorInfo initialiseFromAnnotations(Class clazz)
-   {
-      InterceptorInfo superInfo = null;
-      if (clazz.getSuperclass() != Object.class)
-      {
-         superInfo = getOrInitialiseFromAnnotations(clazz.getSuperclass());
-      }
-
-      AnnotationInitialiser init = new AnnotationInitialiser(clazz, InterceptorSignatureValidator.instance);
-      InterceptorInfo info = init.getInfo();
-      info.calculateHierarchy(superInfo);
-      return info;
-   }
-
-   private InterceptorInfo getOrInitialiseFromAnnotations(EJBContainer container)
-   {
-      InterceptorInfo info = ejbInfos.get(container.getEjbName());
-
-      if (info == null)
-      {
-         synchronized (this)
-         {
-            info = ejbInfos.get(container.getEjbName());
-            if (info == null)
-            {
-               info = initialiseFromAnnotations(container);
-               ejbInfos.put(container.getEjbName(), info);
-            }
-         }
-      }
-
-      return info;
-   }
-
-   private InterceptorInfo initialiseFromAnnotations(EJBContainer container)
-   {
-      //Currently I see no way in spec for specifying interceptors of an ejb super class using xml,
-      //use annotations only to initialise super classes, and don't store these
-      InterceptorInfo superInfo = initialiseContainerSuperClassFromAnnotationsOnly(container.getClazz().getSuperclass());
-      AnnotationInitialiser init = new ContainerInitialiser(container);
-      InterceptorInfo info = init.getInfo();
-      info.calculateHierarchy(superInfo);
-      return info;
-   }
-
-   private InterceptorInfo initialiseContainerSuperClassFromAnnotationsOnly(Class clazz)
-   {
-      InterceptorInfo superInfo = null;
-      if (clazz != Object.class)
-      {
-         superInfo = initialiseContainerSuperClassFromAnnotationsOnly(clazz.getSuperclass());
-      }
-
-      AnnotationInitialiser init = new AnnotationInitialiser(clazz, BeanSignatureValidator.instance);
-      InterceptorInfo info = init.getInfo();
-      info.calculateHierarchy(superInfo);
-      return info;
-   }
-   
-   
-   private Class loadClass(String name)
-   {
-      try
-      {
-         return Thread.currentThread().getContextClassLoader().loadClass(name);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException("Interceptor class not found: " + name);
-      }
-   }
-
-   public static boolean checkValidBusinessSignature(Method method)
-   {
-      int modifiers = method.getModifiers();
-
-      if (!Modifier.isStatic(modifiers))
-      {
-         if (method.getReturnType().equals(Object.class))
-         {
-            Class[] params = method.getParameterTypes();
-            if (params.length == 1 && params[0].equals(InvocationContext.class))
-            {
-               Class[] exceptions = method.getExceptionTypes();
-               if (exceptions.length == 1 && exceptions[0].equals(Exception.class))
-               {
-                  return true;
-               }
-            }
-         }
-      }
-      return false;
-   }
-
-   public static boolean checkValidLifecycleSignature(Method method)
-   {
-      int modifiers = method.getModifiers();
-
-      if (!Modifier.isStatic(modifiers))
-      {
-         if (method.getReturnType().equals(Void.TYPE))
-         {
-            Class[] params = method.getParameterTypes();
-            if (params.length == 1 && params[0].equals(InvocationContext.class))
-            {
-               return true;
-            }
-         }
-      }
-      return false;
-   }
-
-   public static boolean checkValidBeanLifecycleSignature(Method method)
-   {
-      int modifiers = method.getModifiers();
-      if (method.getName().equals("ejbCreate"))
-      {
-         // for public void ejbCreate() throws javax.ejb.CreateException
-         if (!Modifier.isStatic(modifiers) && method.getReturnType().equals(Void.TYPE)
-               && method.getParameterTypes().length == 0 && method.getExceptionTypes().length <= 1)
-            return true;
-      }
-      else if (!Modifier.isStatic(modifiers) && method.getReturnType().equals(Void.TYPE)
-            && method.getParameterTypes().length == 0 && method.getExceptionTypes().length == 0)
-      {
-         return true;
-      }
-      return false;
-   }
-
-   public static String simpleType(Class type)
-   {
-      Class ret = type;
-      if (ret.isArray())
-      {
-         Class arr = ret;
-         String array = "";
-         while (arr.isArray())
-         {
-            array += "[]";
-            arr = arr.getComponentType();
-         }
-         return arr.getName() + array;
-      }
-      return ret.getName();
-   }
-   
-
-   private interface SignatureValidator
-   {
-      boolean checkValidLifecycle(Method m);
-      boolean checkValidAround(Method m);
-   }
-
-   private static class InterceptorSignatureValidator implements SignatureValidator
-   {
-      static SignatureValidator instance = new InterceptorSignatureValidator();
-      public boolean checkValidAround(Method m)
-      {
-         return checkValidBusinessSignature(m);
-      }
-
-      public boolean checkValidLifecycle(Method m)
-      {
-         return checkValidLifecycleSignature(m);
-      }
-   }
-
-   private static class BeanSignatureValidator implements SignatureValidator
-   {
-      static SignatureValidator instance = new BeanSignatureValidator();
-      public boolean checkValidAround(Method m)
-      {
-         return checkValidBusinessSignature(m);
-      }
-
-      public boolean checkValidLifecycle(Method m)
-      {
-         return checkValidBeanLifecycleSignature(m);
-      }
-   }
-   
-   
-   private class AnnotationInitialiser
-   {
-      SignatureValidator signatureValidator;
-      Class clazz;
-
-      InterceptorInfo info;
-
-      AnnotationInitialiser(String classname, SignatureValidator signatureValidator)
-      {
-         clazz = loadClass(classname);
-         this.signatureValidator = signatureValidator;
-         info = new InterceptorInfo(clazz);
-      }
-
-      AnnotationInitialiser(Class clazz, SignatureValidator signatureValidator)
-      {
-         this.clazz = clazz;
-         this.signatureValidator = signatureValidator;
-         info = new InterceptorInfo(clazz);
-      }
-
-      public Class getClazz()
-      {
-         return clazz;
-      }
-
-      InterceptorInfo getInfo()
-      {
-         for (Method method : clazz.getDeclaredMethods())
-         {
-            info.setAroundInvoke(resolveAroundInvoke(method));
-            info.setPostConstruct(resolvePostConstruct(method));
-            info.setPostActivate(resolvePostActivate(method));
-            info.setPreDestroy(resolvePreDestroy(method));
-            info.setPrePassivate(resolvePrePassivate(method));
-         }
-         return info;
-      }
-
-      Method resolveAroundInvoke(Method method)
-      {
-         AroundInvoke ann = (AroundInvoke) getAnnotation(method, AroundInvoke.class);
-         if (ann != null)
-         {
-            if (!signatureValidator.checkValidAround(method))
-            {
-               throw new RuntimeException("@" + ((Annotation) ann).annotationType().getName()
-                     + " annotated method in has the wrong signature - " + method);
-            }
-            return method;
-         }
-         return null;
-      }
-
-      Method resolvePostConstruct(Method method)
-      {
-         PostConstruct ann = (PostConstruct) getAnnotation(method, PostConstruct.class);
-         return resolveLifecycleMethod(method, ann);
-      }
-
-      Method resolvePostActivate(Method method)
-      {
-         PostActivate ann = (PostActivate) getAnnotation(method, PostActivate.class);
-         return resolveLifecycleMethod(method, ann);
-      }
-
-      Method resolvePreDestroy(Method method)
-      {
-         PreDestroy ann = (PreDestroy) getAnnotation(method, PreDestroy.class);
-         return resolveLifecycleMethod(method, ann);
-      }
-
-      Method resolvePrePassivate(Method method)
-      {
-         PrePassivate ann = (PrePassivate) getAnnotation(method, PrePassivate.class);
-         return resolveLifecycleMethod(method, ann);
-      }
-
-      Method resolveLifecycleMethod(Method method, Annotation ann)
-      {
-         if (ann != null)
-         {
-            if (!signatureValidator.checkValidLifecycle(method))
-            {
-               throw new RuntimeException("@" + ((Annotation) ann).annotationType().getName()
-                     + " annotated method  has the wrong signature - " + method);
-            }
-            return method;
-         }
-         return null;
-      }
-
-      Object getAnnotation(Method method, Class annotation)
-      {
-         return method.getAnnotation(annotation);
-      }
-
-   }
-
-   private class ContainerInitialiser extends AnnotationInitialiser
-   {
-      EJBContainer container;
-
-      public ContainerInitialiser(EJBContainer container)
-      {
-         // FIXME ContainerInitialiser constructor
-         super(container.getBeanClass(), BeanSignatureValidator.instance);
-         this.container = container;
-      }
-
-      Object getAnnotation(Method method, Class annotation)
-      {
-         return container.resolveAnnotation(method, annotation);
-      }
-
-      /*
-       * Lifecycle methods on bean class have a different signature from those defined on
-       * 
-       */
-      Method resolveLifecycleMethod(Method method, Annotation ann)
-      {
-         if (ann != null)
-         {
-            if (!signatureValidator.checkValidLifecycle(method))
-            {
-               throw new RuntimeException("@" + ann.annotationType().getName()
-                     + " annotated method has the wrong signature - " + method);
-            }
-            return method;
-         }
-         return null;
-      }
-   }
-
-   private class XmlInitialiser extends AnnotationInitialiser
-   {
-      Interceptor xml;
-
-      XmlInitialiser(Interceptor xml)
-      {
-         super(xml.getInterceptorClass(), InterceptorSignatureValidator.instance);
-         this.xml = xml;
-      }
-
-      InterceptorInfo getInfo()
-      {
-         info.setAroundInvoke(findInterceptorMethodFromXml(clazz, "around-invoke-method", xml.getAroundInvoke()));
-         info.setPostConstruct(findInterceptorMethodFromXml(clazz, "post-construct-method", xml.getPostConstruct()));
-         info.setPostActivate(findInterceptorMethodFromXml(clazz, "post-activate-method", xml.getPostActivate()));
-         info.setPreDestroy(findInterceptorMethodFromXml(clazz, "pre-destroy-method", xml.getPreDestroy()));
-         info.setPrePassivate(findInterceptorMethodFromXml(clazz, "pre-passivate-method", xml.getPrePassivate()));
-         super.getInfo();
-         info.setXml(xml);
-         return info;
-      }
-
-      java.lang.reflect.Method findInterceptorMethodFromXml(Class clazz, String lookingFor, org.jboss.ejb3.metamodel.Method xml)
-      {
-         if (xml == null)
-            return null;
-         if (xml.getMethodName() == null || xml.getMethodName().trim().equals(""))
-         {
-            throw new RuntimeException(lookingFor + " must contain a valid method name for interceptor "
-                  + clazz.getName());
-         }
-         if (xml.getMethodParams() != null)
-         {
-            log.debug("Ignoring method parameters for " + lookingFor + " in interceptor " + clazz.getName());
-         }
-
-         ArrayList<Method> possible = new ArrayList<Method>();
-         for (java.lang.reflect.Method method : clazz.getDeclaredMethods())
-         {
-            if (xml.getMethodName().equals(method.getName()))
-            {
-               possible.add(method);
-            }
-         }
-
-         if (possible.size() == 0)
-         {
-            throw new RuntimeException(lookingFor + " must contain a valid method name for interceptor "
-                  + clazz.getName());
-         }
-
-         Method found = null;
-
-         for (Method method : possible)
-         {
-            if (lookingFor.equals("around-invoke-method"))
-            {
-               if (signatureValidator.checkValidAround(method))
-               {
-                  found = method;
-               }
-            }
-            else
-            {
-               if (signatureValidator.checkValidLifecycle(method))
-               {
-                  found = method;
-               }
-            }
-         }
-
-         if (found == null)
-         {
-            throw new RuntimeException(lookingFor + " has the wrong method signature for interceptor "
-                  + clazz.getName());
-         }
-
-         return found;
-      }
-   }
-
-   private class InterceptorSorter
-   {
-      boolean initialised;
-      List<InterceptorBinding> orderedBindings;
-      
-      void initialise()
-      {
-         if (!initialised)
-         {
-            synchronized(this)
-            {
-               if (bindingsXml != null)
-               {
-                  for (InterceptorBinding binding : bindingsXml)
-                  {
-                     if (binding.isOrdered())
-                     {
-                        //Validate each interceptor only occurs once
-                        HashSet names = new HashSet();
-                        for (Iterator it = binding.getInterceptorClasses().iterator() ; it.hasNext() ; )
-                        {
-                           String className = (String)it.next();
-                           if (names.contains(className))
-                           {
-                              throw new RuntimeException(className + " occurs more than once in ordered binding " + 
-                                    getInterceptorBindingString(binding));
-                           }
-                           names.add(className);
-                        }
-                        
-                        if (orderedBindings == null)
-                        {
-                           orderedBindings = new ArrayList<InterceptorBinding>();
-                        }
-                        orderedBindings.add(binding);
-                     }
-                  }
-               }
-            }
-            initialised = true;
-         }
-      }
-      
-      void sortDefaultInterceptors(EJBContainer container, ArrayList<InterceptorInfo> infos)
-      {
-         initialise();
-         if (orderedBindings == null)  return;
-         ArrayList<String> bindingOrder = null;
-         for (InterceptorBinding binding : orderedBindings)
-         {
-            if (binding.getEjbName().equals("*"))
-            {
-               if (bindingOrder != null)
-               {
-                  throw new RuntimeException("There should only be one interceptor-binding specifying " +
-                        "the order of default interceptors " + getInterceptorBindingString(binding));
-               }
-               bindingOrder = binding.getInterceptorClasses();
-            }
-         }
-         sortInterceptors(infos, bindingOrder);
-      }
-      
-      void sortClassInterceptors(EJBContainer container, ArrayList<InterceptorInfo> infos)
-      {
-         initialise();
-         if (orderedBindings == null)  return;
-         ArrayList<String> bindingOrder = null;
-         for (InterceptorBinding binding : orderedBindings)
-         {
-            if (binding.getMethodName() != null && binding.getMethodName().trim().length() > 0)
-            {
-               continue;
-            }
-            if (binding.getEjbName().equals(container.getEjbName()))
-            {
-               if (bindingOrder != null)
-               {
-                  throw new RuntimeException("There should only be one interceptor-binding specifying " +
-                        "the order of class interceptors: " + getInterceptorBindingString(binding));
-               }
-               bindingOrder = binding.getInterceptorClasses();
-            }
-         }
-         sortInterceptors(infos, bindingOrder);
-      }
-      
-      void sortMethodInterceptors(EJBContainer container, Method method, ArrayList<InterceptorInfo> infos)
-      {
-         initialise();
-         if (orderedBindings == null)  return;
-         ArrayList<String> methodNoParamsOrder = null;
-         ArrayList<String> methodParamsOrder = null;
-         for (InterceptorBinding binding : orderedBindings)
-         {
-            if (binding.getEjbName().equals(container.getEjbName()))
-            {
-               if (binding.getMethodName() != null && binding.getMethodName().equals(method.getName()))
-               {
-                  if (binding.getMethodParams() == null)
-                  {
-                     if (methodNoParamsOrder != null)
-                     {
-                        throw new RuntimeException("There should only be one interceptor-binding specifying " +
-                              "the order of method interceptors: "  + getInterceptorBindingString(binding));
-                     }
-                     methodNoParamsOrder = binding.getInterceptorClasses();
-                  }
-                  else
-                  {
-                     Class[] params = method.getParameterTypes();
-                     List<String> methodParams = binding.getMethodParams();
-                     if (methodParams.size() == params.length)
-                     {
-                        boolean matches = true;
-                        for (int i = 0 ; i < params.length ; i++)
-                        {
-                           if (!simpleType(params[i]).equals(methodParams.get(i)))
-                           {
-                              matches = false;
-                              break;
-                           }
-                        }
-                        
-                        if (matches)
-                        {
-                           if (methodParamsOrder != null)
-                           {
-                              boolean first = false;
-                              StringBuffer paramBuf = new StringBuffer();
-                              paramBuf.append("(");
-                              for (String par : methodParams)
-                              {
-                                 if (!first) paramBuf.append(",");
-                                 paramBuf.append(par);
-                              }
-                              paramBuf.append(")");
-                              throw new RuntimeException("There should only be one interceptor-binding specifying " +
-                                    "the order of method interceptors: " + getInterceptorBindingString(binding));
-                           }
-                           
-                           methodParamsOrder = binding.getInterceptorClasses();
-                        }
-                     }
-                  }
-               }
-            }
-         }
-         
-         if (methodParamsOrder != null)
-         {
-            sortInterceptors(infos, methodParamsOrder);
-            
-         }
-         else
-         {
-            sortInterceptors(infos, methodNoParamsOrder);
-         }
-      }
-      
-      void sortInterceptors(ArrayList<InterceptorInfo> infos, ArrayList<String> interceptorOrder)
-      {
-         if (interceptorOrder == null) return;
-         Collections.sort(infos, new InterceptorComparator(interceptorOrder));
-      }
-
-      String getInterceptorBindingString(InterceptorBinding binding)
-      {
-         StringBuffer buf = new StringBuffer();
-         List methodParams = binding.getMethodParams();
-         
-         buf.append(binding.getEjbName());
-         if (binding.getMethodName() != null)
-         {
-            buf.append("." + binding.getMethodName());
-            if (methodParams != null)
-            {
-               buf.append("(");
-               for (int i = 0 ; i < methodParams.size() ; )
-               {
-                  if (i == 0) buf.append(",");
-                  buf.append((String)methodParams.get(i));
-               }
-               buf.append(")");
-            }
-         }
-         
-         return buf.toString();
-      }
-   }
-   
-   private class InterceptorComparator implements Comparator<InterceptorInfo>
-   {
-      ArrayList<String> ordered;
-
-      InterceptorComparator(ArrayList<String> ordered)
-      {
-         this.ordered = ordered;
-      }
-      
-      public int compare(InterceptorInfo o1, InterceptorInfo o2)
-      {
-         int pos1 = ordered.indexOf(o1.getClazz().getName());
-         int pos2 = ordered.indexOf(o2.getClazz().getName());
-         
-         //Make anything not specified in the order come last
-         if (pos1 < 0) pos1 = Integer.MAX_VALUE;
-         if (pos2 < 0) pos2 = Integer.MAX_VALUE;
-         
-         if (pos1 < pos2)
-         {
-            return -1;
-         }
-         else if (pos1 > pos2)
-         {
-            return 1;
-         }
-         else
-         {
-            return 0;
-         }
-      }
-      
-      
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,1071 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.interceptor;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.metamodel.EjbJarDD;
+import org.jboss.ejb3.metamodel.Interceptor;
+import org.jboss.ejb3.metamodel.InterceptorBinding;
+import org.jboss.ejb3.metamodel.Interceptors;
+import org.jboss.logging.Logger;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.ExcludeClassInterceptors;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.InvocationContext;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * A repository of interceptor details shared amongst all containers in this deployment.
+ * Interceptors differ from other ejb 3 artifacts in that we can have annotations on the
+ * interceptor classes which are not the ejb container, so we cannot use annotation overrides
+ * on the interceptors themselves.<BR/>
+ * <BR/>
+ * The xml structures get added on deployment.<BR/>
+ * Interceptors only declared by using @Interceptors on the bean class get added on demand.<BR/>
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InterceptorInfoRepository
+{
+   private static Logger log = Logger.getLogger(InterceptorInfoRepository.class);
+
+   private Set<String> beanClasses = new HashSet<String>();
+
+   private Interceptors interceptorsXml;
+
+   private List<InterceptorBinding> bindingsXml;
+
+   private ConcurrentMap<Class, InterceptorInfo> infos = new ConcurrentHashMap<Class, InterceptorInfo>();
+
+   private ConcurrentMap<String, InterceptorInfo> ejbInfos = new ConcurrentHashMap<String, InterceptorInfo>();
+
+   private LinkedHashSet<InterceptorInfo> defaultInterceptors = null;
+   
+   private InterceptorSorter sorter = new InterceptorSorter();
+
+   public InterceptorInfoRepository()
+   {
+   }
+
+   public void initialise(EjbJarDD dd)
+   {
+      this.interceptorsXml = dd.getInterceptors();
+
+      if (dd.getAssemblyDescriptor() != null)
+      {
+         this.bindingsXml = dd.getAssemblyDescriptor().getInterceptorBindings();
+      }
+      
+      initialiseInfosFromXml();
+      initialiseDefaultInterceptors();
+   }
+
+   public void addBeanClass(String classname)
+   {
+      beanClasses.add(classname);
+   }
+
+   public InterceptorInfo getInterceptorInfo(Class clazz)
+   {
+      initialiseInfosFromXml();
+      return infos.get(clazz);
+   }
+
+   public HashSet<InterceptorInfo> getDefaultInterceptors()
+   {
+      return defaultInterceptors;
+   }
+
+   public boolean hasDefaultInterceptors()
+   {
+      return defaultInterceptors.size() > 0;
+   }
+
+   public ArrayList<InterceptorInfo> getClassInterceptors(EJBContainer container)
+   {
+      javax.interceptor.Interceptors interceptors = (javax.interceptor.Interceptors) container
+            .resolveAnnotation(javax.interceptor.Interceptors.class);
+      ArrayList<InterceptorInfo> infos = getInterceptorsFromAnnotation(container, interceptors);
+
+      return infos;
+   }
+
+   public ArrayList<InterceptorInfo> getMethodInterceptors(EJBContainer container, Method m)
+   {
+      javax.interceptor.Interceptors interceptors = (javax.interceptor.Interceptors) container.resolveAnnotation(m,
+            javax.interceptor.Interceptors.class);
+      ArrayList<InterceptorInfo> infos = getInterceptorsFromAnnotation(container, interceptors);
+
+      return infos;
+   }
+
+   public Method[] getBeanClassAroundInvokes(EJBContainer container)
+   {
+      return getBeanClassInterceptors(container, AroundInvoke.class);
+   }
+
+   public Method[] getBeanClassPostConstructs(EJBContainer container)
+   {
+      return getBeanClassInterceptors(container, PostConstruct.class);
+   }
+
+   public Method[] getBeanClassPostActivates(EJBContainer container)
+   {
+      return getBeanClassInterceptors(container, PostActivate.class);
+   }
+
+   public Method[] getBeanClassPrePassivates(EJBContainer container)
+   {
+      return getBeanClassInterceptors(container, PrePassivate.class);
+   }
+
+   public Method[] getBeanClassPreDestroys(EJBContainer container)
+   {
+      return getBeanClassInterceptors(container, PreDestroy.class);
+   }
+
+   private Method[] getBeanClassInterceptors(EJBContainer container, Class type)
+   {
+      InterceptorInfo info = getOrInitialiseFromAnnotations(container);
+      return getMethodsForEvent(info, type);
+   }
+
+   public InterceptorInfo[] getBusinessInterceptors(EJBContainer container, Method method)
+   {
+      return getInterceptors(container, AroundInvoke.class, method);
+   }
+
+   public InterceptorInfo[] getPostConstructInterceptors(EJBContainer container)
+   {
+      return getInterceptors(container, PostConstruct.class, null);
+   }
+
+   public InterceptorInfo[] getPostActivateInterceptors(EJBContainer container)
+   {
+      return getInterceptors(container, PostActivate.class, null);
+   }
+
+   public InterceptorInfo[] getPrePassivateInterceptors(EJBContainer container)
+   {
+      return getInterceptors(container, PrePassivate.class, null);
+   }
+
+   public InterceptorInfo[] getPreDestroyInterceptors(EJBContainer container)
+   {
+      return getInterceptors(container, PreDestroy.class, null);
+   }
+
+   private InterceptorInfo[] getInterceptors(EJBContainer container, Class type, Method method)
+   {
+      ArrayList<InterceptorInfo> interceptors = new ArrayList<InterceptorInfo>();
+
+      if (!hasAnnotation(container, ExcludeDefaultInterceptors.class, method))
+      {
+         HashSet<InterceptorInfo> infos = getDefaultInterceptors();
+         if (infos != null)
+         {
+            interceptors.addAll(trimUnwanted(infos, type));
+         }
+         sorter.sortDefaultInterceptors(container, interceptors);
+      }
+
+      
+      if (!hasAnnotation(container, ExcludeClassInterceptors.class, method))
+      {
+         List<InterceptorInfo> infos = container.getClassInterceptors();
+         if (infos != null)
+         {
+            interceptors.addAll(trimUnwanted(infos, type));
+         }
+         
+         if (type != AroundInvoke.class)
+         {
+            List<InterceptorInfo> methodOnlyInterceptors = getMethodOnlyInterceptorsForLifecycle(container, type, interceptors);
+            if (infos != null)
+               interceptors.addAll(methodOnlyInterceptors);
+         }
+         sorter.sortClassInterceptors(container, interceptors);
+      }
+
+      if (type == AroundInvoke.class)
+      {
+         List<InterceptorInfo> infos = getMethodInterceptors(container, method);
+         if (infos != null)
+            interceptors.addAll(trimUnwanted(infos, type));
+         sorter.sortMethodInterceptors(container, method, interceptors);
+      }
+
+      InterceptorInfo[] ints = interceptors.toArray(new InterceptorInfo[interceptors.size()]);
+      return ints;
+   }
+
+   private List<InterceptorInfo> getMethodOnlyInterceptorsForLifecycle(EJBContainer container, Class type, List<InterceptorInfo> infos)
+   {
+      HashSet<InterceptorInfo> methodLevelInterceptors = (HashSet<InterceptorInfo>)container.getApplicableInterceptors().clone();
+      
+      for (InterceptorInfo info : infos)
+      {
+         if (methodLevelInterceptors.contains(info))
+         {
+            methodLevelInterceptors.remove(info);
+         }
+      }
+      
+      if (defaultInterceptors != null)
+      {
+         for (InterceptorInfo info : defaultInterceptors)
+         {
+            if (methodLevelInterceptors.contains(info))
+            {
+               methodLevelInterceptors.remove(info);
+            }
+         }
+      }
+      
+      List<InterceptorInfo> trimmedInfos = trimUnwanted(methodLevelInterceptors, type); 
+      return trimmedInfos;
+   }
+   
+   private boolean hasAnnotation(EJBContainer container, Class annotation, Method method)
+   {
+      if (container.resolveAnnotation(annotation) != null)
+      {
+         return true;
+      }
+
+      if (method != null)
+      {
+         return container.resolveAnnotation(method, annotation) != null;
+      }
+
+      return false;
+   }
+
+   private List<InterceptorInfo> trimUnwanted(Collection<InterceptorInfo> interceptors, Class type)
+   {
+      ArrayList<InterceptorInfo> ints = new ArrayList<InterceptorInfo>(interceptors.size());
+      ints.addAll(interceptors);
+
+      for (Iterator<InterceptorInfo> it = ints.iterator(); it.hasNext();)
+      {
+         InterceptorInfo info = it.next();
+         if (!hasMethodsForEvent(info, type))
+         {
+            it.remove();
+         }
+      }
+
+      return ints;
+   }
+
+   private boolean hasMethodsForEvent(InterceptorInfo info, Class type)
+   {
+      return getMethodsForEvent(info, type) != null;
+   }
+   
+   private Method[] getMethodsForEvent(InterceptorInfo info, Class type)
+   {
+      if (type == AroundInvoke.class)
+         return info.getAroundInvokes();
+      else if (type == PostConstruct.class)
+         return info.getPostConstructs();
+      else if (type == PostActivate.class)
+         return info.getPostActivates();
+      else if (type == PrePassivate.class)
+         return info.getPrePassivates();
+      else if (type == PreDestroy.class)
+         return info.getPreDestroys();
+      return null;
+   }
+
+   private ArrayList<InterceptorInfo> getInterceptorsFromAnnotation(EJBContainer container,
+         javax.interceptor.Interceptors interceptors)
+   {
+      ArrayList<InterceptorInfo> inters = new ArrayList<InterceptorInfo>();
+      if (interceptors == null)
+         return inters;
+
+      for (Class clazz : interceptors.value())
+      {
+         InterceptorInfo info = getOrInitialiseFromAnnotations(clazz);
+         validateInterceptorForContainer(container, info.getClazz());
+         inters.add(info);
+      }
+
+      return inters;
+   }
+
+   private void validateInterceptorForContainer(EJBContainer container, Class interceptor)
+   {
+      if (beanClasses.contains(interceptor.getName()))
+      {
+         if (!interceptor.equals(container.getClazz()))
+         {
+            throw new RuntimeException("Bean class " + interceptor.getName() + " cannot be used as an interceptor for "
+                  + container.getEjbName());
+         }
+      }
+   }
+
+   private void initialiseInfosFromXml()
+   {
+      if (interceptorsXml != null)
+      {
+         //Initialise all interceptor entries so we know which classes we have xml for
+         HashMap<String, AnnotationInitialiser> initialisers = new HashMap<String, AnnotationInitialiser>();
+         for (Interceptor xml : interceptorsXml.getInterceptors())
+         {
+            XmlInitialiser init = new XmlInitialiser(xml);
+            initialisers.put(xml.getInterceptorClass(), init);
+         }
+
+         //Create entries recursively, top classes first so we get the method hierarchies         
+         for (Interceptor xml : interceptorsXml.getInterceptors())
+         {
+            String clazz = xml.getInterceptorClass();
+            initialiseSuperClassesFirstFromXmlOrAnnotations(initialisers, clazz);
+         }
+
+      }
+   }
+
+   private InterceptorInfo initialiseSuperClassesFirstFromXmlOrAnnotations(
+         HashMap<String, AnnotationInitialiser> initialisers, String superClassName)
+   {
+      if ("java.lang.Object".equals(superClassName))
+      {
+         return null;
+      }
+
+      AnnotationInitialiser initialiser = initialisers.get(superClassName);
+      if (initialiser == null)
+      {
+         initialiser = new AnnotationInitialiser(superClassName, InterceptorSignatureValidator.instance);
+         initialisers.put(initialiser.getClazz().getName(), initialiser);
+      }
+      InterceptorInfo superInfo = initialiseSuperClassesFirstFromXmlOrAnnotations(
+            initialisers, initialiser.getClazz().getSuperclass().getName());
+
+      InterceptorInfo info = initialiser.getInfo();
+      info.calculateHierarchy(superInfo);
+      infos.put(info.getClazz(), info);
+      return info;
+   }
+
+   /*
+    * Default interceptors are defined using xml only
+    */
+   private void initialiseDefaultInterceptors()
+   {
+      defaultInterceptors = new LinkedHashSet<InterceptorInfo>();
+
+      if (bindingsXml != null)
+      {
+         for (InterceptorBinding bindingXml : bindingsXml)
+         {
+            if (bindingXml.getEjbName().equals("*")
+                  && (bindingXml.getMethodName() == null || bindingXml.getMethodName().length() == 0))
+            {
+               for (String classname : bindingXml.getInterceptorClasses())
+               {
+                  if (beanClasses.contains(classname))
+                  {
+                     throw new RuntimeException("Bean class defined in default binding " + classname);
+                  }
+                  InterceptorInfo info = getOrInitialiseFromAnnotations(classname);
+                  defaultInterceptors.add(info);
+               }
+            }
+         }
+      }
+   }
+
+   private InterceptorInfo getOrInitialiseFromAnnotations(String classname)
+   {
+      Class clazz = loadClass(classname);
+      return getOrInitialiseFromAnnotations(clazz);
+   }
+
+   private InterceptorInfo getOrInitialiseFromAnnotations(Class clazz)
+   {
+      InterceptorInfo info = infos.get(clazz);
+
+      if (info == null)
+      {
+         synchronized (this)
+         {
+            info = infos.get(clazz);
+            if (info == null)
+            {
+               info = initialiseFromAnnotations(clazz);
+               infos.put(clazz, info);
+            }
+         }
+      }
+
+      return info;
+   }
+
+   private InterceptorInfo initialiseFromAnnotations(Class clazz)
+   {
+      InterceptorInfo superInfo = null;
+      if (clazz.getSuperclass() != Object.class)
+      {
+         superInfo = getOrInitialiseFromAnnotations(clazz.getSuperclass());
+      }
+
+      AnnotationInitialiser init = new AnnotationInitialiser(clazz, InterceptorSignatureValidator.instance);
+      InterceptorInfo info = init.getInfo();
+      info.calculateHierarchy(superInfo);
+      return info;
+   }
+
+   private InterceptorInfo getOrInitialiseFromAnnotations(EJBContainer container)
+   {
+      InterceptorInfo info = ejbInfos.get(container.getEjbName());
+
+      if (info == null)
+      {
+         synchronized (this)
+         {
+            info = ejbInfos.get(container.getEjbName());
+            if (info == null)
+            {
+               info = initialiseFromAnnotations(container);
+               ejbInfos.put(container.getEjbName(), info);
+            }
+         }
+      }
+
+      return info;
+   }
+
+   private InterceptorInfo initialiseFromAnnotations(EJBContainer container)
+   {
+      //Currently I see no way in spec for specifying interceptors of an ejb super class using xml,
+      //use annotations only to initialise super classes, and don't store these
+      InterceptorInfo superInfo = initialiseContainerSuperClassFromAnnotationsOnly(container.getClazz().getSuperclass());
+      AnnotationInitialiser init = new ContainerInitialiser(container);
+      InterceptorInfo info = init.getInfo();
+      info.calculateHierarchy(superInfo);
+      return info;
+   }
+
+   private InterceptorInfo initialiseContainerSuperClassFromAnnotationsOnly(Class clazz)
+   {
+      InterceptorInfo superInfo = null;
+      if (clazz != Object.class)
+      {
+         superInfo = initialiseContainerSuperClassFromAnnotationsOnly(clazz.getSuperclass());
+      }
+
+      AnnotationInitialiser init = new AnnotationInitialiser(clazz, BeanSignatureValidator.instance);
+      InterceptorInfo info = init.getInfo();
+      info.calculateHierarchy(superInfo);
+      return info;
+   }
+   
+   
+   private Class loadClass(String name)
+   {
+      try
+      {
+         return Thread.currentThread().getContextClassLoader().loadClass(name);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException("Interceptor class not found: " + name);
+      }
+   }
+
+   public static boolean checkValidBusinessSignature(Method method)
+   {
+      int modifiers = method.getModifiers();
+
+      if (!Modifier.isStatic(modifiers))
+      {
+         if (method.getReturnType().equals(Object.class))
+         {
+            Class[] params = method.getParameterTypes();
+            if (params.length == 1 && params[0].equals(InvocationContext.class))
+            {
+               Class[] exceptions = method.getExceptionTypes();
+               if (exceptions.length == 1 && exceptions[0].equals(Exception.class))
+               {
+                  return true;
+               }
+            }
+         }
+      }
+      return false;
+   }
+
+   public static boolean checkValidLifecycleSignature(Method method)
+   {
+      int modifiers = method.getModifiers();
+
+      if (!Modifier.isStatic(modifiers))
+      {
+         if (method.getReturnType().equals(Void.TYPE))
+         {
+            Class[] params = method.getParameterTypes();
+            if (params.length == 1 && params[0].equals(InvocationContext.class))
+            {
+               return true;
+            }
+         }
+      }
+      return false;
+   }
+
+   public static boolean checkValidBeanLifecycleSignature(Method method)
+   {
+      int modifiers = method.getModifiers();
+      if (method.getName().equals("ejbCreate"))
+      {
+         // for public void ejbCreate() throws javax.ejb.CreateException
+         if (!Modifier.isStatic(modifiers) && method.getReturnType().equals(Void.TYPE)
+               && method.getParameterTypes().length == 0 && method.getExceptionTypes().length <= 1)
+            return true;
+      }
+      else if (!Modifier.isStatic(modifiers) && method.getReturnType().equals(Void.TYPE)
+            && method.getParameterTypes().length == 0 && method.getExceptionTypes().length == 0)
+      {
+         return true;
+      }
+      return false;
+   }
+
+   public static String simpleType(Class type)
+   {
+      Class ret = type;
+      if (ret.isArray())
+      {
+         Class arr = ret;
+         String array = "";
+         while (arr.isArray())
+         {
+            array += "[]";
+            arr = arr.getComponentType();
+         }
+         return arr.getName() + array;
+      }
+      return ret.getName();
+   }
+   
+
+   private interface SignatureValidator
+   {
+      boolean checkValidLifecycle(Method m);
+      boolean checkValidAround(Method m);
+   }
+
+   private static class InterceptorSignatureValidator implements SignatureValidator
+   {
+      static SignatureValidator instance = new InterceptorSignatureValidator();
+      public boolean checkValidAround(Method m)
+      {
+         return checkValidBusinessSignature(m);
+      }
+
+      public boolean checkValidLifecycle(Method m)
+      {
+         return checkValidLifecycleSignature(m);
+      }
+   }
+
+   private static class BeanSignatureValidator implements SignatureValidator
+   {
+      static SignatureValidator instance = new BeanSignatureValidator();
+      public boolean checkValidAround(Method m)
+      {
+         return checkValidBusinessSignature(m);
+      }
+
+      public boolean checkValidLifecycle(Method m)
+      {
+         return checkValidBeanLifecycleSignature(m);
+      }
+   }
+   
+   
+   private class AnnotationInitialiser
+   {
+      SignatureValidator signatureValidator;
+      Class clazz;
+
+      InterceptorInfo info;
+
+      AnnotationInitialiser(String classname, SignatureValidator signatureValidator)
+      {
+         clazz = loadClass(classname);
+         this.signatureValidator = signatureValidator;
+         info = new InterceptorInfo(clazz);
+      }
+
+      AnnotationInitialiser(Class clazz, SignatureValidator signatureValidator)
+      {
+         this.clazz = clazz;
+         this.signatureValidator = signatureValidator;
+         info = new InterceptorInfo(clazz);
+      }
+
+      public Class getClazz()
+      {
+         return clazz;
+      }
+
+      InterceptorInfo getInfo()
+      {
+         for (Method method : clazz.getDeclaredMethods())
+         {
+            info.setAroundInvoke(resolveAroundInvoke(method));
+            info.setPostConstruct(resolvePostConstruct(method));
+            info.setPostActivate(resolvePostActivate(method));
+            info.setPreDestroy(resolvePreDestroy(method));
+            info.setPrePassivate(resolvePrePassivate(method));
+         }
+         return info;
+      }
+
+      Method resolveAroundInvoke(Method method)
+      {
+         AroundInvoke ann = (AroundInvoke) getAnnotation(method, AroundInvoke.class);
+         if (ann != null)
+         {
+            if (!signatureValidator.checkValidAround(method))
+            {
+               throw new RuntimeException("@" + ((Annotation) ann).annotationType().getName()
+                     + " annotated method in has the wrong signature - " + method);
+            }
+            return method;
+         }
+         return null;
+      }
+
+      Method resolvePostConstruct(Method method)
+      {
+         PostConstruct ann = (PostConstruct) getAnnotation(method, PostConstruct.class);
+         return resolveLifecycleMethod(method, ann);
+      }
+
+      Method resolvePostActivate(Method method)
+      {
+         PostActivate ann = (PostActivate) getAnnotation(method, PostActivate.class);
+         return resolveLifecycleMethod(method, ann);
+      }
+
+      Method resolvePreDestroy(Method method)
+      {
+         PreDestroy ann = (PreDestroy) getAnnotation(method, PreDestroy.class);
+         return resolveLifecycleMethod(method, ann);
+      }
+
+      Method resolvePrePassivate(Method method)
+      {
+         PrePassivate ann = (PrePassivate) getAnnotation(method, PrePassivate.class);
+         return resolveLifecycleMethod(method, ann);
+      }
+
+      Method resolveLifecycleMethod(Method method, Annotation ann)
+      {
+         if (ann != null)
+         {
+            if (!signatureValidator.checkValidLifecycle(method))
+            {
+               throw new RuntimeException("@" + ((Annotation) ann).annotationType().getName()
+                     + " annotated method  has the wrong signature - " + method);
+            }
+            return method;
+         }
+         return null;
+      }
+
+      Object getAnnotation(Method method, Class annotation)
+      {
+         return method.getAnnotation(annotation);
+      }
+
+   }
+
+   private class ContainerInitialiser extends AnnotationInitialiser
+   {
+      EJBContainer container;
+
+      public ContainerInitialiser(EJBContainer container)
+      {
+         // FIXME ContainerInitialiser constructor
+         super(container.getBeanClass(), BeanSignatureValidator.instance);
+         this.container = container;
+      }
+
+      Object getAnnotation(Method method, Class annotation)
+      {
+         return container.resolveAnnotation(method, annotation);
+      }
+
+      /*
+       * Lifecycle methods on bean class have a different signature from those defined on
+       * 
+       */
+      Method resolveLifecycleMethod(Method method, Annotation ann)
+      {
+         if (ann != null)
+         {
+            if (!signatureValidator.checkValidLifecycle(method))
+            {
+               // FIXME: JBCTS-322
+               // This is just a hack that prevents the RTE below. Please fix appropriately.
+               if (ann.annotationType() == PostConstruct.class && method.getName().equals("ejbCreate"))
+               {
+            	   return method;
+               }
+               
+               throw new RuntimeException("@" + ann.annotationType().getName()
+                       + " annotated method has the wrong signature - " + method);
+            }
+            return method;
+         }
+         return null;
+      }
+   }
+
+   private class XmlInitialiser extends AnnotationInitialiser
+   {
+      Interceptor xml;
+
+      XmlInitialiser(Interceptor xml)
+      {
+         super(xml.getInterceptorClass(), InterceptorSignatureValidator.instance);
+         this.xml = xml;
+      }
+
+      InterceptorInfo getInfo()
+      {
+         info.setAroundInvoke(findInterceptorMethodFromXml(clazz, "around-invoke-method", xml.getAroundInvoke()));
+         info.setPostConstruct(findInterceptorMethodFromXml(clazz, "post-construct-method", xml.getPostConstruct()));
+         info.setPostActivate(findInterceptorMethodFromXml(clazz, "post-activate-method", xml.getPostActivate()));
+         info.setPreDestroy(findInterceptorMethodFromXml(clazz, "pre-destroy-method", xml.getPreDestroy()));
+         info.setPrePassivate(findInterceptorMethodFromXml(clazz, "pre-passivate-method", xml.getPrePassivate()));
+         super.getInfo();
+         info.setXml(xml);
+         return info;
+      }
+
+      java.lang.reflect.Method findInterceptorMethodFromXml(Class clazz, String lookingFor, org.jboss.ejb3.metamodel.Method xml)
+      {
+         if (xml == null)
+            return null;
+         if (xml.getMethodName() == null || xml.getMethodName().trim().equals(""))
+         {
+            throw new RuntimeException(lookingFor + " must contain a valid method name for interceptor "
+                  + clazz.getName());
+         }
+         if (xml.getMethodParams() != null)
+         {
+            log.debug("Ignoring method parameters for " + lookingFor + " in interceptor " + clazz.getName());
+         }
+
+         ArrayList<Method> possible = new ArrayList<Method>();
+         for (java.lang.reflect.Method method : clazz.getDeclaredMethods())
+         {
+            if (xml.getMethodName().equals(method.getName()))
+            {
+               possible.add(method);
+            }
+         }
+
+         if (possible.size() == 0)
+         {
+            throw new RuntimeException(lookingFor + " must contain a valid method name for interceptor "
+                  + clazz.getName());
+         }
+
+         Method found = null;
+
+         for (Method method : possible)
+         {
+            if (lookingFor.equals("around-invoke-method"))
+            {
+               if (signatureValidator.checkValidAround(method))
+               {
+                  found = method;
+               }
+            }
+            else
+            {
+               if (signatureValidator.checkValidLifecycle(method))
+               {
+                  found = method;
+               }
+            }
+         }
+
+         if (found == null)
+         {
+            throw new RuntimeException(lookingFor + " has the wrong method signature for interceptor "
+                  + clazz.getName());
+         }
+
+         return found;
+      }
+   }
+
+   private class InterceptorSorter
+   {
+      boolean initialised;
+      List<InterceptorBinding> orderedBindings;
+      
+      private void initialise()
+      {
+         if (!initialised)
+         {
+            synchronized(this)
+            {
+               if (bindingsXml != null)
+               {
+                  for (InterceptorBinding binding : bindingsXml)
+                  {
+                     if (binding.isOrdered())
+                     {
+                        //Validate each interceptor only occurs once
+                        HashSet<String> names = new HashSet<String>();
+                        for (Iterator it = binding.getInterceptorClasses().iterator() ; it.hasNext() ; )
+                        {
+                           String className = (String)it.next();
+                           if (names.contains(className))
+                           {
+                              throw new RuntimeException(className + " occurs more than once in ordered binding " + 
+                                    getInterceptorBindingString(binding));
+                           }
+                           names.add(className);
+                        }
+                        
+                        if (orderedBindings == null)
+                        {
+                           orderedBindings = new ArrayList<InterceptorBinding>();
+                        }
+                        orderedBindings.add(binding);
+                     }
+                  }
+               }
+            }
+            log.trace("orderedBindings = " + orderedBindings);
+            initialised = true;
+         }
+      }
+      
+      void sortDefaultInterceptors(EJBContainer container, ArrayList<InterceptorInfo> infos)
+      {
+         initialise();
+         if (orderedBindings == null)  return;
+         ArrayList<String> bindingOrder = null;
+         for (InterceptorBinding binding : orderedBindings)
+         {
+            if (binding.getEjbName().equals("*"))
+            {
+               if (bindingOrder != null)
+               {
+                  throw new RuntimeException("There should only be one interceptor-binding specifying " +
+                        "the order of default interceptors " + getInterceptorBindingString(binding));
+               }
+               bindingOrder = binding.getInterceptorClasses();
+            }
+         }
+         sortInterceptors(infos, bindingOrder);
+      }
+      
+      void sortClassInterceptors(EJBContainer container, ArrayList<InterceptorInfo> infos)
+      {
+         initialise();
+         if (orderedBindings == null)  return;
+         ArrayList<String> bindingOrder = null;
+         for (InterceptorBinding binding : orderedBindings)
+         {
+            if (binding.getMethodName() != null && binding.getMethodName().trim().length() > 0)
+            {
+               continue;
+            }
+            if (binding.getEjbName().equals(container.getEjbName()))
+            {
+               if (bindingOrder != null)
+               {
+                  throw new RuntimeException("There should only be one interceptor-binding specifying " +
+                        "the order of class interceptors: " + getInterceptorBindingString(binding));
+               }
+               bindingOrder = binding.getInterceptorClasses();
+            }
+         }
+         sortInterceptors(infos, bindingOrder);
+      }
+      
+      void sortMethodInterceptors(EJBContainer container, Method method, ArrayList<InterceptorInfo> infos)
+      {
+         initialise();
+         if (orderedBindings == null)  return;
+         ArrayList<String> methodNoParamsOrder = null;
+         ArrayList<String> methodParamsOrder = null;
+         for (InterceptorBinding binding : orderedBindings)
+         {
+            if (binding.getEjbName().equals(container.getEjbName()))
+            {
+               if (binding.getMethodName() != null && binding.getMethodName().equals(method.getName()))
+               {
+                  if (binding.getMethodParams() == null)
+                  {
+                     if (methodNoParamsOrder != null)
+                     {
+                        throw new RuntimeException("There should only be one interceptor-binding specifying " +
+                              "the order of method interceptors: "  + getInterceptorBindingString(binding));
+                     }
+                     methodNoParamsOrder = binding.getInterceptorClasses();
+                  }
+                  else
+                  {
+                     Class[] params = method.getParameterTypes();
+                     List<String> methodParams = binding.getMethodParams();
+                     if (methodParams.size() == params.length)
+                     {
+                        boolean matches = true;
+                        for (int i = 0 ; i < params.length ; i++)
+                        {
+                           if (!simpleType(params[i]).equals(methodParams.get(i)))
+                           {
+                              matches = false;
+                              break;
+                           }
+                        }
+                        
+                        if (matches)
+                        {
+                           if (methodParamsOrder != null)
+                           {
+                              boolean first = false;
+                              StringBuffer paramBuf = new StringBuffer();
+                              paramBuf.append("(");
+                              for (String par : methodParams)
+                              {
+                                 if (!first) paramBuf.append(",");
+                                 paramBuf.append(par);
+                              }
+                              paramBuf.append(")");
+                              throw new RuntimeException("There should only be one interceptor-binding specifying " +
+                                    "the order of method interceptors: " + getInterceptorBindingString(binding));
+                           }
+                           
+                           methodParamsOrder = binding.getInterceptorClasses();
+                        }
+                     }
+                  }
+               }
+            }
+         }
+         
+         if (methodParamsOrder != null)
+         {
+            sortInterceptors(infos, methodParamsOrder);
+            
+         }
+         else
+         {
+            sortInterceptors(infos, methodNoParamsOrder);
+         }
+      }
+      
+      void sortInterceptors(ArrayList<InterceptorInfo> infos, ArrayList<String> interceptorOrder)
+      {
+         if (interceptorOrder == null) return;
+         Collections.sort(infos, new InterceptorComparator(interceptorOrder));
+      }
+
+      String getInterceptorBindingString(InterceptorBinding binding)
+      {
+         StringBuffer buf = new StringBuffer();
+         List methodParams = binding.getMethodParams();
+         
+         buf.append(binding.getEjbName());
+         if (binding.getMethodName() != null)
+         {
+            buf.append("." + binding.getMethodName());
+            if (methodParams != null)
+            {
+               buf.append("(");
+               for (int i = 0 ; i < methodParams.size() ; )
+               {
+                  if (i == 0) buf.append(",");
+                  buf.append((String)methodParams.get(i));
+               }
+               buf.append(")");
+            }
+         }
+         
+         return buf.toString();
+      }
+   }
+   
+   private class InterceptorComparator implements Comparator<InterceptorInfo>
+   {
+      ArrayList<String> ordered;
+
+      InterceptorComparator(ArrayList<String> ordered)
+      {
+         this.ordered = ordered;
+      }
+      
+      public int compare(InterceptorInfo o1, InterceptorInfo o2)
+      {
+         int pos1 = ordered.indexOf(o1.getClazz().getName());
+         int pos2 = ordered.indexOf(o2.getClazz().getName());
+         
+         //Make anything not specified in the order come last
+         if (pos1 < 0) pos1 = Integer.MAX_VALUE;
+         if (pos2 < 0) pos2 = Integer.MAX_VALUE;
+         
+         if (pos1 < pos2)
+         {
+            return -1;
+         }
+         else if (pos1 > pos2)
+         {
+            return 1;
+         }
+         else
+         {
+            return 0;
+         }
+      }
+      
+      
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInfoRepository.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.interceptor;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.injection.Injector;
-import org.jboss.injection.PojoInjector;
-import org.jboss.ejb3.metamodel.Interceptor;
-
-import java.lang.reflect.AccessibleObject;
-import java.util.Map;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorInjector
-{
-   EJBContainer container;
-   InterceptorInfo info;
-   PojoInjector[] injectors;
-   protected Map<AccessibleObject, Injector> encInjections;
-   
-   public InterceptorInjector(Container container, InterceptorInfo info, Map<AccessibleObject, Injector> injections)
-   {
-      this.container = (EJBContainer)container;
-      this.info = info;
-      injectors = injections.values().toArray(new PojoInjector[injections.size()]);
-   }
-
-   public Interceptor getXml()
-   {
-      return info.getXml();
-   }
-   
-   public Class getClazz()
-   {
-      return info.getClazz();
-   }
-   
-   public Container getContainer()
-   {
-      return container;
-   }
-   
-   public void inject(BeanContext ctx, Object instance)
-   {
-      for (PojoInjector injector : injectors)
-      {
-         injector.inject(ctx, instance);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.interceptor;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.injection.Injector;
+import org.jboss.injection.PojoInjector;
+import org.jboss.ejb3.metamodel.Interceptor;
+
+import java.lang.reflect.AccessibleObject;
+import java.util.Map;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InterceptorInjector
+{
+   EJBContainer container;
+   InterceptorInfo info;
+   PojoInjector[] injectors;
+   protected Map<AccessibleObject, Injector> encInjections;
+   
+   public InterceptorInjector(Container container, InterceptorInfo info, Map<AccessibleObject, Injector> injections)
+   {
+      this.container = (EJBContainer)container;
+      this.info = info;
+      injectors = injections.values().toArray(new PojoInjector[injections.size()]);
+   }
+
+   public Interceptor getXml()
+   {
+      return info.getXml();
+   }
+   
+   public Class getClazz()
+   {
+      return info.getClazz();
+   }
+   
+   public Container getContainer()
+   {
+      return container;
+   }
+   
+   public void inject(BeanContext ctx, Object instance)
+   {
+      for (PojoInjector injector : injectors)
+      {
+         injector.inject(ctx, instance);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InterceptorInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InvocationContextImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InvocationContextImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/InvocationContextImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3.interceptor;
 
 import java.lang.reflect.InvocationTargetException;

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,218 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.interceptor;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.stateful.StatefulBeanContext;
-import org.jboss.util.MethodHashing;
-import org.jboss.logging.Logger;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class LifecycleInterceptorHandler
-{
-   private static final Logger log = Logger.getLogger(LifecycleInterceptorHandler.class);
-
-   private EJBContainer container;
-   private InterceptorInfo[] postConstructs;
-   private InterceptorInfo[] postActivates;
-   private InterceptorInfo[] prePassivates;
-   private InterceptorInfo[] preDestroys;
-   private Method[] beanPostConstructs;
-   private Method[] beanPostActivates;
-   private Method[] beanPrePassivates;
-   private Method[] beanPreDestroys;
-   private Method timeoutCallbackMethod;
-   private long timeoutCalllbackHash;
-
-   public LifecycleInterceptorHandler(EJBContainer container, Class[] handledCallbacks)
-   {
-      this.container = container;
-      InterceptorInfoRepository repostitory = container.getInterceptorRepository();
-      for (Class clazz : handledCallbacks)
-      {
-         if (clazz == PostConstruct.class)
-         {
-            postConstructs = repostitory.getPostConstructInterceptors(container);
-            beanPostConstructs = repostitory.getBeanClassPostConstructs(container);
-         }
-         else if (clazz == PostActivate.class)
-         {
-            postActivates = repostitory.getPostActivateInterceptors(container);
-            beanPostActivates = repostitory.getBeanClassPostActivates(container);
-         }
-         else if (clazz == PrePassivate.class)
-         {
-            prePassivates = repostitory.getPrePassivateInterceptors(container);
-            beanPrePassivates = repostitory.getBeanClassPrePassivates(container);
-         }
-         else if (clazz == PreDestroy.class)
-         {
-            preDestroys = repostitory.getPreDestroyInterceptors(container);
-            beanPreDestroys = repostitory.getBeanClassPreDestroys(container);
-         }
-         else if (clazz == Timeout.class)
-         {
-            resolveTimeoutCallback();
-         }
-      }
-   }
-
-   public long getTimeoutCalllbackHash()
-   {
-      return timeoutCalllbackHash;
-   }
-
-   public void postConstruct(BeanContext ctx)
-   {
-      try
-      {
-         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
-               PostConstruct.class,
-               ctx,
-               postConstructs,
-               beanPostConstructs);
-         ic.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void preDestroy(BeanContext ctx)
-   {
-      Object id = null;
-      if (ctx instanceof StatefulBeanContext)
-      {
-         id = ((StatefulBeanContext)ctx).getId();
-      }
-      try
-      {
-         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
-               PreDestroy.class,
-               ctx,
-               preDestroys,
-               beanPreDestroys);
-         ic.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void postActivate(BeanContext ctx)
-   {
-      try
-      {
-         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
-               PostActivate.class,
-               ctx,
-               postActivates,
-               beanPostActivates);
-         ic.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void prePassivate(BeanContext ctx)
-   {
-      try
-      {
-         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
-               PrePassivate.class,
-               ctx,
-               prePassivates,
-               beanPrePassivates);
-         ic.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public Method getTimeoutCallback()
-   {
-      return timeoutCallbackMethod;
-   }
-
-
-   private void resolveTimeoutCallback()
-   {
-      for (Method method : container.getBeanClass().getMethods())
-      {
-         if (container.resolveAnnotation(method, Timeout.class) != null)
-         {
-            if (Modifier.isPublic(method.getModifiers()) &&
-                  method.getReturnType().equals(Void.TYPE) &&
-                  method.getParameterTypes().length == 1 &&
-                  method.getParameterTypes()[0].equals(Timer.class))
-            {
-               timeoutCallbackMethod = method;
-            }
-            else
-            {
-               throw new RuntimeException("@Timeout methods must have the signature: public void <METHOD>(javax.ejb.Timer timer) - " + method);
-            }
-         }
-      }
-
-      try
-      {
-         if (timeoutCallbackMethod == null && javax.ejb.TimedObject.class.isAssignableFrom(container.getBeanClass()))
-         {
-            Class[] params = new Class[]{Timer.class};
-            timeoutCallbackMethod = container.getBeanClass().getMethod("ejbTimeout", params);
-         }
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-
-      if (timeoutCallbackMethod != null)
-      {
-         timeoutCalllbackHash = MethodHashing.calculateHash(timeoutCallbackMethod);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,218 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.interceptor;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+import javax.ejb.Timeout;
+import javax.ejb.Timer;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.stateful.StatefulBeanContext;
+import org.jboss.util.MethodHashing;
+import org.jboss.logging.Logger;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class LifecycleInterceptorHandler
+{
+   private static final Logger log = Logger.getLogger(LifecycleInterceptorHandler.class);
+
+   private EJBContainer container;
+   private InterceptorInfo[] postConstructs;
+   private InterceptorInfo[] postActivates;
+   private InterceptorInfo[] prePassivates;
+   private InterceptorInfo[] preDestroys;
+   private Method[] beanPostConstructs;
+   private Method[] beanPostActivates;
+   private Method[] beanPrePassivates;
+   private Method[] beanPreDestroys;
+   private Method timeoutCallbackMethod;
+   private long timeoutCalllbackHash;
+
+   public LifecycleInterceptorHandler(EJBContainer container, Class[] handledCallbacks)
+   {
+      this.container = container;
+      InterceptorInfoRepository repostitory = container.getInterceptorRepository();
+      for (Class clazz : handledCallbacks)
+      {
+         if (clazz == PostConstruct.class)
+         {
+            postConstructs = repostitory.getPostConstructInterceptors(container);
+            beanPostConstructs = repostitory.getBeanClassPostConstructs(container);
+         }
+         else if (clazz == PostActivate.class)
+         {
+            postActivates = repostitory.getPostActivateInterceptors(container);
+            beanPostActivates = repostitory.getBeanClassPostActivates(container);
+         }
+         else if (clazz == PrePassivate.class)
+         {
+            prePassivates = repostitory.getPrePassivateInterceptors(container);
+            beanPrePassivates = repostitory.getBeanClassPrePassivates(container);
+         }
+         else if (clazz == PreDestroy.class)
+         {
+            preDestroys = repostitory.getPreDestroyInterceptors(container);
+            beanPreDestroys = repostitory.getBeanClassPreDestroys(container);
+         }
+         else if (clazz == Timeout.class)
+         {
+            resolveTimeoutCallback();
+         }
+      }
+   }
+
+   public long getTimeoutCalllbackHash()
+   {
+      return timeoutCalllbackHash;
+   }
+
+   public void postConstruct(BeanContext ctx)
+   {
+      try
+      {
+         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
+               PostConstruct.class,
+               ctx,
+               postConstructs,
+               beanPostConstructs);
+         ic.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void preDestroy(BeanContext ctx)
+   {
+      Object id = null;
+      if (ctx instanceof StatefulBeanContext)
+      {
+         id = ((StatefulBeanContext)ctx).getId();
+      }
+      try
+      {
+         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
+               PreDestroy.class,
+               ctx,
+               preDestroys,
+               beanPreDestroys);
+         ic.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void postActivate(BeanContext ctx)
+   {
+      try
+      {
+         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
+               PostActivate.class,
+               ctx,
+               postActivates,
+               beanPostActivates);
+         ic.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void prePassivate(BeanContext ctx)
+   {
+      try
+      {
+         InvocationContext ic = LifecycleInvocationContextImpl.getLifecycleInvocationContext(
+               PrePassivate.class,
+               ctx,
+               prePassivates,
+               beanPrePassivates);
+         ic.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public Method getTimeoutCallback()
+   {
+      return timeoutCallbackMethod;
+   }
+
+
+   private void resolveTimeoutCallback()
+   {
+      for (Method method : container.getBeanClass().getMethods())
+      {
+         if (container.resolveAnnotation(method, Timeout.class) != null)
+         {
+            if (Modifier.isPublic(method.getModifiers()) &&
+                  method.getReturnType().equals(Void.TYPE) &&
+                  method.getParameterTypes().length == 1 &&
+                  method.getParameterTypes()[0].equals(Timer.class))
+            {
+               timeoutCallbackMethod = method;
+            }
+            else
+            {
+               throw new RuntimeException("@Timeout methods must have the signature: public void <METHOD>(javax.ejb.Timer timer) - " + method);
+            }
+         }
+      }
+
+      try
+      {
+         if (timeoutCallbackMethod == null && javax.ejb.TimedObject.class.isAssignableFrom(container.getBeanClass()))
+         {
+            Class[] params = new Class[]{Timer.class};
+            timeoutCallbackMethod = container.getBeanClass().getMethod("ejbTimeout", params);
+         }
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+
+      if (timeoutCallbackMethod != null)
+      {
+         timeoutCalllbackHash = MethodHashing.calculateHash(timeoutCallbackMethod);
+      }
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInterceptorHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,214 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.interceptor;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-
-import org.jboss.ejb3.BeanContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public abstract class LifecycleInvocationContextImpl implements InvocationContext
-{
-   
-   private int currentInterceptor;
-   private int currentMethod;
-   BeanContext beanContext;
-   InterceptorInfo[] interceptorInfos;
-   Object[] instances;
-   private Method[] beanMethods;
-   private HashMap metadata;
-
-   protected LifecycleInvocationContextImpl()
-   {
-   }
-   
-   public static InvocationContext getLifecycleInvocationContext(Class type, BeanContext beanContext, InterceptorInfo[] interceptorInfos, Method[] beanMethods)
-   {
-      LifecycleInvocationContextImpl ic = null;
-      if (type == PostConstruct.class) ic = new PostConstructICtxImpl();
-      else if (type == PostActivate.class) ic = new PostActivateICtxImpl();
-      else if (type == PrePassivate.class) ic = new PrePassivateICtxImpl();
-      else if (type == PreDestroy.class) ic = new PreDestroyICtxImpl();
-      else throw new RuntimeException("Unsupported lifecycle event: " + type);
-      
-      ic.instances = beanContext.getInterceptorInstances(interceptorInfos);
-      if (interceptorInfos.length != ic.instances.length)
-      {
-         throw new RuntimeException("interceptorInfos and instances have different length");
-      }
-      
-      ic.beanContext = beanContext;
-      ic.beanMethods = beanMethods;
-      ic.interceptorInfos = interceptorInfos;
-      
-      return ic;
-   }
-
-   public Object getTarget()
-   {
-      return beanContext.getInstance();
-   }
-
-   public Method getMethod()
-   {
-      return null;
-   }
-
-   public Object[] getParameters()
-   {
-      return new Object[0];
-   }
-
-   public void setParameters(Object[] params)
-   {
-      //Do nothing
-   }
-
-
-   public java.util.Map getContextData()
-   {
-      if (metadata == null) {
-         metadata = new HashMap();
-      }
-      return metadata;
-   }
-
-   public Object proceed() throws Exception
-   {
-      if (currentInterceptor < interceptorInfos.length)
-      {
-         int oldInterceptor = currentInterceptor;
-         int oldMethod = currentMethod;
-         try
-         {
-            int curr = currentInterceptor;
-            int currMethod = currentMethod++;
-            InterceptorInfo info = interceptorInfos[curr];
-            if (currMethod == getLifecycleMethods(info).length)
-            {
-               curr = ++currentInterceptor;
-               currentMethod = 0;
-               currMethod = currentMethod++;
-               info = (curr < interceptorInfos.length) ? interceptorInfos[curr] : null;
-            }
-            
-            if (info != null)
-            {
-               try
-               {
-                  Method[] methods = getLifecycleMethods(info);
-                  return methods[currMethod].invoke(instances[curr], this);
-               }
-               catch (InvocationTargetException e)
-               {
-                  if (e.getTargetException() instanceof Exception)
-                  {
-                     throw ((Exception) e.getCause());
-                  }
-                  else
-                  {
-                     throw new RuntimeException(e.getCause());
-                  }
-               }
-            }
-         }
-         finally
-         {
-            // so that interceptors like clustering can reinvoke down the chain
-            currentInterceptor = oldInterceptor;
-            currentMethod = oldMethod;
-         }
-      }
-      if (beanMethods != null)
-      {
-         try
-         {
-            for (Method beanMethod : beanMethods)
-            {
-               beanMethod.invoke(getTarget(), new Object[0]);
-            }
-         }
-         catch (InvocationTargetException e)
-         {
-            if (e.getTargetException() instanceof Exception)
-            {
-               throw ((Exception) e.getCause());
-            }
-            else
-            {
-               throw new RuntimeException(e.getCause());
-            }
-         }
-         finally
-         {
-         }
-      }
-      
-      return null;
-   }
-   
-   abstract Method[] getLifecycleMethods(InterceptorInfo info);
-   
-   public static class PostConstructICtxImpl extends LifecycleInvocationContextImpl
-   {
-      Method[] getLifecycleMethods(InterceptorInfo info)
-      {
-         return info.getPostConstructs();
-      }
-   }
-
-   public static class PostActivateICtxImpl extends LifecycleInvocationContextImpl
-   {
-      Method[] getLifecycleMethods(InterceptorInfo info)
-      {
-         return info.getPostActivates();
-      }
-   }
-
-   public static class PrePassivateICtxImpl extends LifecycleInvocationContextImpl
-   {
-      Method[] getLifecycleMethods(InterceptorInfo info)
-      {
-         return info.getPrePassivates();
-      }
-   }
-
-   public static class PreDestroyICtxImpl extends LifecycleInvocationContextImpl
-   {
-      Method[] getLifecycleMethods(InterceptorInfo info)
-      {
-         return info.getPreDestroys();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,214 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.interceptor;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+
+import org.jboss.ejb3.BeanContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public abstract class LifecycleInvocationContextImpl implements InvocationContext
+{
+   
+   private int currentInterceptor;
+   private int currentMethod;
+   BeanContext beanContext;
+   InterceptorInfo[] interceptorInfos;
+   Object[] instances;
+   private Method[] beanMethods;
+   private HashMap metadata;
+
+   protected LifecycleInvocationContextImpl()
+   {
+   }
+   
+   public static InvocationContext getLifecycleInvocationContext(Class type, BeanContext beanContext, InterceptorInfo[] interceptorInfos, Method[] beanMethods)
+   {
+      LifecycleInvocationContextImpl ic = null;
+      if (type == PostConstruct.class) ic = new PostConstructICtxImpl();
+      else if (type == PostActivate.class) ic = new PostActivateICtxImpl();
+      else if (type == PrePassivate.class) ic = new PrePassivateICtxImpl();
+      else if (type == PreDestroy.class) ic = new PreDestroyICtxImpl();
+      else throw new RuntimeException("Unsupported lifecycle event: " + type);
+      
+      ic.instances = beanContext.getInterceptorInstances(interceptorInfos);
+      if (interceptorInfos.length != ic.instances.length)
+      {
+         throw new RuntimeException("interceptorInfos and instances have different length");
+      }
+      
+      ic.beanContext = beanContext;
+      ic.beanMethods = beanMethods;
+      ic.interceptorInfos = interceptorInfos;
+      
+      return ic;
+   }
+
+   public Object getTarget()
+   {
+      return beanContext.getInstance();
+   }
+
+   public Method getMethod()
+   {
+      return null;
+   }
+
+   public Object[] getParameters()
+   {
+      return new Object[0];
+   }
+
+   public void setParameters(Object[] params)
+   {
+      //Do nothing
+   }
+
+
+   public java.util.Map getContextData()
+   {
+      if (metadata == null) {
+         metadata = new HashMap();
+      }
+      return metadata;
+   }
+
+   public Object proceed() throws Exception
+   {
+      if (currentInterceptor < interceptorInfos.length)
+      {
+         int oldInterceptor = currentInterceptor;
+         int oldMethod = currentMethod;
+         try
+         {
+            int curr = currentInterceptor;
+            int currMethod = currentMethod++;
+            InterceptorInfo info = interceptorInfos[curr];
+            if (currMethod == getLifecycleMethods(info).length)
+            {
+               curr = ++currentInterceptor;
+               currentMethod = 0;
+               currMethod = currentMethod++;
+               info = (curr < interceptorInfos.length) ? interceptorInfos[curr] : null;
+            }
+            
+            if (info != null)
+            {
+               try
+               {
+                  Method[] methods = getLifecycleMethods(info);
+                  return methods[currMethod].invoke(instances[curr], this);
+               }
+               catch (InvocationTargetException e)
+               {
+                  if (e.getTargetException() instanceof Exception)
+                  {
+                     throw ((Exception) e.getCause());
+                  }
+                  else
+                  {
+                     throw new RuntimeException(e.getCause());
+                  }
+               }
+            }
+         }
+         finally
+         {
+            // so that interceptors like clustering can reinvoke down the chain
+            currentInterceptor = oldInterceptor;
+            currentMethod = oldMethod;
+         }
+      }
+      if (beanMethods != null)
+      {
+         try
+         {
+            for (Method beanMethod : beanMethods)
+            {
+               beanMethod.invoke(getTarget(), new Object[0]);
+            }
+         }
+         catch (InvocationTargetException e)
+         {
+            if (e.getTargetException() instanceof Exception)
+            {
+               throw ((Exception) e.getCause());
+            }
+            else
+            {
+               throw new RuntimeException(e.getCause());
+            }
+         }
+         finally
+         {
+         }
+      }
+      
+      return null;
+   }
+   
+   abstract Method[] getLifecycleMethods(InterceptorInfo info);
+   
+   public static class PostConstructICtxImpl extends LifecycleInvocationContextImpl
+   {
+      Method[] getLifecycleMethods(InterceptorInfo info)
+      {
+         return info.getPostConstructs();
+      }
+   }
+
+   public static class PostActivateICtxImpl extends LifecycleInvocationContextImpl
+   {
+      Method[] getLifecycleMethods(InterceptorInfo info)
+      {
+         return info.getPostActivates();
+      }
+   }
+
+   public static class PrePassivateICtxImpl extends LifecycleInvocationContextImpl
+   {
+      Method[] getLifecycleMethods(InterceptorInfo info)
+      {
+         return info.getPrePassivates();
+      }
+   }
+
+   public static class PreDestroyICtxImpl extends LifecycleInvocationContextImpl
+   {
+      Method[] getLifecycleMethods(InterceptorInfo info)
+      {
+         return info.getPreDestroys();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/interceptor/LifecycleInvocationContextImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/jms)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.jms;
-
-import javax.jms.Destination;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class JMSDestinationFactory
-{
-   private static final JMSDestinationFactory instance = new ServerPeerJMSDestinationFactory();
-   
-   public static JMSDestinationFactory getInstance()
-   {
-      // TODO: implement proper plugin point
-      return instance;
-   }
-   
-   public abstract void createDestination(Class<? extends Destination> type, String jndiSuffix) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/JMSDestinationFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.jms;
+
+import javax.jms.Destination;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public abstract class JMSDestinationFactory
+{
+   private static final JMSDestinationFactory instance = new ServerPeerJMSDestinationFactory();
+   
+   public static JMSDestinationFactory getInstance()
+   {
+      // TODO: implement proper plugin point
+      return instance;
+   }
+   
+   public abstract void createDestination(Class<? extends Destination> type, String jndiSuffix) throws Exception;
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,86 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.jms;
-
-import javax.jms.Destination;
-import javax.jms.Queue;
-import javax.jms.Topic;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.KernelAbstraction;
-import org.jboss.ejb3.KernelAbstractionFactory;
-import org.jboss.logging.Logger;
-
-/**
- * Use ServerPeer for creation of destinations.
- * 
- * JBoss AS 5.0
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ServerPeerJMSDestinationFactory extends JMSDestinationFactory
-{
-   private static final Logger log = Logger.getLogger(ServerPeerJMSDestinationFactory.class);
-   
-   // Do not instantiate outside package
-   ServerPeerJMSDestinationFactory()
-   {
-      
-   }
-   
-   public void createDestination(Class<? extends Destination> type, String jndiSuffix) throws Exception
-   {
-      String methodName;
-      String destinationContext;
-      if (type == Topic.class)
-      {
-         destinationContext = "topic";
-         methodName = "createTopic";
-      }
-      else if (type == Queue.class)
-      {
-         destinationContext = "queue";
-         methodName = "createQueue";
-      }
-      else
-      {
-         // type was not a Topic or Queue, bad user
-         throw new IllegalArgumentException
-                 ("Expected javax.jms.Queue or javax.jms.Topic: " + type);
-      }
-      
-      String name = jndiSuffix;
-      String jndiName = destinationContext + "/" + jndiSuffix;
-      
-      ObjectName serverPeerName = new ObjectName("jboss.messaging:service=ServerPeer");
-      
-      KernelAbstraction kernel = KernelAbstractionFactory.getInstance();
-      // invoke the server to create the destination
-      Object result = kernel.invoke(serverPeerName,
-              methodName,
-              new Object[]{name, jndiName},
-              new String[]{"java.lang.String", "java.lang.String"});
-      
-      log.debug("result = " + result);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/ServerPeerJMSDestinationFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.jms;
+
+import javax.jms.Destination;
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.KernelAbstraction;
+import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.logging.Logger;
+
+/**
+ * Use ServerPeer for creation of destinations.
+ * 
+ * JBoss AS 5.0
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ServerPeerJMSDestinationFactory extends JMSDestinationFactory
+{
+   private static final Logger log = Logger.getLogger(ServerPeerJMSDestinationFactory.class);
+   
+   // Do not instantiate outside package
+   ServerPeerJMSDestinationFactory()
+   {
+      
+   }
+   
+   public void createDestination(Class<? extends Destination> type, String jndiSuffix) throws Exception
+   {
+      String methodName;
+      String destinationContext;
+      if (type == Topic.class)
+      {
+         destinationContext = "topic";
+         methodName = "createTopic";
+      }
+      else if (type == Queue.class)
+      {
+         destinationContext = "queue";
+         methodName = "createQueue";
+      }
+      else
+      {
+         // type was not a Topic or Queue, bad user
+         throw new IllegalArgumentException
+                 ("Expected javax.jms.Queue or javax.jms.Topic: " + type);
+      }
+      
+      String name = jndiSuffix;
+      String jndiName = destinationContext + "/" + jndiSuffix;
+      
+      ObjectName serverPeerName = new ObjectName("jboss.messaging:service=ServerPeer");
+      
+      KernelAbstraction kernel = KernelAbstractionFactory.getInstance();
+      // invoke the server to create the destination
+      Object result = kernel.invoke(serverPeerName,
+              methodName,
+              new Object[]{name, jndiName},
+              new String[]{"java.lang.String", "java.lang.String"});
+      
+      log.debug("result = " + result);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/package.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/jms/package.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,8 +0,0 @@
-<html>
-	<head>
-		<title>org.jboss.ejb3.jms</title>
-	</head>
-	<body>
-		This package provides a custom JBoss interface to JBoss Messaging.
-	</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/package.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/jms/package.html)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/package.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/jms/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>org.jboss.ejb3.jms</title>
+	</head>
+	<body>
+		This package provides a custom JBoss interface to JBoss Messaging.
+	</body>
+</html>
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,48 +18,11 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3.mdb;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.Connection;
-import javax.jms.ConnectionConsumer;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.ServerSessionPool;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.transaction.Transaction;
-import org.jboss.annotation.ejb.AcknowledgementMode;
 import org.jboss.annotation.ejb.Consumer;
 import org.jboss.annotation.ejb.DefaultActivationSpecs;
-import org.jboss.annotation.ejb.Durability;
 import org.jboss.annotation.ejb.Local;
 import org.jboss.annotation.ejb.MessageProperties;
 import org.jboss.annotation.ejb.MessagePropertiesImpl;
@@ -71,27 +34,23 @@
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.InvocationResponse;
 import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.aop.util.MethodHashing;
 import org.jboss.aop.util.PayloadKey;
-import org.jboss.deployment.DeploymentException;
 import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.EJBContainerInvocation;
-import org.jboss.ejb3.Ejb3Module;
-import org.jboss.ejb3.ProxyFactoryHelper;
-import org.jboss.ejb3.ThreadLocalENCFactory;
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.ejb3.mdb.inflow.JBossMessageEndpointFactory;
-import org.jboss.ejb3.timerservice.TimedObjectInvoker;
-import org.jboss.ejb3.timerservice.TimerServiceFactory;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.jms.ConnectionFactoryHelper;
-import org.jboss.jms.asf.ServerSessionPoolFactory;
-import org.jboss.jms.asf.StdServerSessionPool;
-import org.jboss.jms.jndi.JMSProviderAdapter;
 import org.jboss.logging.Logger;
 
+import javax.ejb.ActivationConfigProperty;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.ObjectMessage;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
 /**
  * Comment
  *
@@ -133,7 +92,7 @@
    {
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
       EJBContainerInvocation newSi = null;
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          Thread.currentThread().setContextClassLoader(classloader);
@@ -144,8 +103,7 @@
             throw new RuntimeException("Could not resolve beanClass method from proxy call");
          }
        
-         Interceptor[] aspects = info.getInterceptors();
-         newSi = new EJBContainerInvocation(info, aspects);
+         newSi = new EJBContainerInvocation(info);
          newSi.setArguments(si.getArguments());
          newSi.setMetaData(si.getMetaData());
          newSi.setAdvisor(this);
@@ -157,7 +115,7 @@
       finally
       {
          Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
    }
    
@@ -185,7 +143,7 @@
       if (info.getAdvisedMethod().equals(getOnMessage()))
       {
          ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-         ThreadLocalENCFactory.push(enc);
+         pushEnc();
          
          try
          {
@@ -197,7 +155,7 @@
          finally
          {
             Thread.currentThread().setContextClassLoader(oldLoader);
-            ThreadLocalENCFactory.pop();
+            popEnc();
          }
       }
       else

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,114 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class CurrentMessageInjectorInterceptor implements Interceptor
-{
-   protected final static Logger log = Logger.getLogger(CurrentMessageInjectorInterceptor.class);
-   
-   private Field[] fields;
-   private Method[] methods;
-
-   public CurrentMessageInjectorInterceptor(Field[] fields, Method[] methods)
-   {
-      this.fields = fields;
-      if (fields != null)
-      {
-         for (Field field : fields)
-         {
-            field.setAccessible(true);
-         }
-      }
-      this.methods = methods;
-      if (methods != null)
-      {
-         for (Method method : methods)
-         {
-            method.setAccessible(true);
-         }
-      }
-   }
-
-
-   public String getName()
-   {
-      return this.getClass().getName();
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      Object target = invocation.getTargetObject();
-      Object message = invocation.getMetaData().getMetaData(ConsumerContainer.CONSUMER_MESSAGE, ConsumerContainer.CONSUMER_MESSAGE);
-      if (fields != null)
-      {
-         for (Field field : fields)
-         {
-            field.set(target, message);
-         }
-      }
-      if (methods != null)
-      {
-         for (Method method : methods)
-         {
-            method.invoke(target, message);
-         }
-
-      }
-      try
-      {
-      return invocation.invokeNext();
-      }
-      finally
-      {
-         // clear so we don't leak.
-         if (fields != null)
-         {
-            for (Field field : fields)
-            {
-               field.set(target, null);
-            }
-         }
-         if (methods != null)
-         {
-            for (Method method : methods)
-            {
-               Object[] args = new Object[method.getParameterTypes().length];
-               for (int i = 0 ; i < args.length; ++i)
-                  args[i] = null;
-               method.invoke(target, args);
-            }
-         }
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class CurrentMessageInjectorInterceptor implements Interceptor
+{
+   protected final static Logger log = Logger.getLogger(CurrentMessageInjectorInterceptor.class);
+   
+   private Field[] fields;
+   private Method[] methods;
+
+   public CurrentMessageInjectorInterceptor(Field[] fields, Method[] methods)
+   {
+      this.fields = fields;
+      if (fields != null)
+      {
+         for (Field field : fields)
+         {
+            field.setAccessible(true);
+         }
+      }
+      this.methods = methods;
+      if (methods != null)
+      {
+         for (Method method : methods)
+         {
+            method.setAccessible(true);
+         }
+      }
+   }
+
+
+   public String getName()
+   {
+      return this.getClass().getName();
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      Object target = invocation.getTargetObject();
+      Object message = invocation.getMetaData().getMetaData(ConsumerContainer.CONSUMER_MESSAGE, ConsumerContainer.CONSUMER_MESSAGE);
+      if (fields != null)
+      {
+         for (Field field : fields)
+         {
+            field.set(target, message);
+         }
+      }
+      if (methods != null)
+      {
+         for (Method method : methods)
+         {
+            method.invoke(target, message);
+         }
+
+      }
+      try
+      {
+      return invocation.invokeNext();
+      }
+      finally
+      {
+         // clear so we don't leak.
+         if (fields != null)
+         {
+            for (Field field : fields)
+            {
+               field.set(target, null);
+            }
+         }
+         if (methods != null)
+         {
+            for (Method method : methods)
+            {
+               Object[] args = new Object[method.getParameterTypes().length];
+               for (int i = 0 ; i < args.length; ++i)
+                  args[i] = null;
+               method.invoke(target, args);
+            }
+         }
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import org.jboss.aop.advice.AspectFactory;
-import org.jboss.aop.Advisor;
-import org.jboss.aop.InstanceAdvisor;
-import org.jboss.aop.joinpoint.Joinpoint;
-import org.jboss.annotation.ejb.CurrentMessage;
-
-import org.jboss.ejb3.Container;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class CurrentMessageInjectorInterceptorFactory implements AspectFactory
-{
-   public Object createPerVM()
-   {
-      return null;
-   }
-
-   public Object createPerClass(Advisor advisor)
-   {
-      Class clazz = advisor.getClazz();
-      ArrayList<Field> fs = new ArrayList<Field>();
-      ArrayList<Method> ms = new ArrayList<Method>();
-
-      search(advisor,clazz, fs, ms);
-
-      Method[] methods = ms.toArray(new Method[ms.size()]);
-      Field[] fields = fs.toArray(new Field[fs.size()]);
-      if (methods.length == 0) methods = null;
-      if (fields.length == 0) fields = null;
-      return new CurrentMessageInjectorInterceptor(fields, methods);
-   }
-
-   protected void search(Advisor advisor, Class clazz, ArrayList<Field> fs, ArrayList<Method> ms)
-   {
-      Method[] methods = clazz.getDeclaredMethods();
-      Field[] fields = clazz.getDeclaredFields();
-      for (Field field : fields)
-      {
-         if (advisor.resolveAnnotation(field, CurrentMessage.class) != null)
-            fs.add(field);
-      }
-      for (Method method : methods)
-      {
-         if (advisor.resolveAnnotation(method, CurrentMessage.class) != null)
-            ms.add(method);
-      }
-      if (clazz.getSuperclass() != null && !clazz.getSuperclass().equals(Object.class))
-      {
-         search(advisor, clazz.getSuperclass(), fs, ms);
-      }
-   }
-
-   public Object createPerInstance(Advisor advisor, InstanceAdvisor instanceAdvisor)
-   {
-      throw new IllegalArgumentException("NOT LEGAL");
-   }
-
-   public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
-   {
-      throw new IllegalArgumentException("NOT LEGAL");
-   }
-
-   public Object createPerJoinpoint(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
-   {
-      throw new IllegalArgumentException("NOT LEGAL");
-   }
-
-   public String getName()
-   {
-      return CurrentMessageInjectorInterceptor.class.getName();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import org.jboss.aop.advice.AspectFactory;
+import org.jboss.aop.Advisor;
+import org.jboss.aop.InstanceAdvisor;
+import org.jboss.aop.joinpoint.Joinpoint;
+import org.jboss.annotation.ejb.CurrentMessage;
+
+import org.jboss.ejb3.Container;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class CurrentMessageInjectorInterceptorFactory implements AspectFactory
+{
+   public Object createPerVM()
+   {
+      return null;
+   }
+
+   public Object createPerClass(Advisor advisor)
+   {
+      Class clazz = advisor.getClazz();
+      ArrayList<Field> fs = new ArrayList<Field>();
+      ArrayList<Method> ms = new ArrayList<Method>();
+
+      search(advisor,clazz, fs, ms);
+
+      Method[] methods = ms.toArray(new Method[ms.size()]);
+      Field[] fields = fs.toArray(new Field[fs.size()]);
+      if (methods.length == 0) methods = null;
+      if (fields.length == 0) fields = null;
+      return new CurrentMessageInjectorInterceptor(fields, methods);
+   }
+
+   protected void search(Advisor advisor, Class clazz, ArrayList<Field> fs, ArrayList<Method> ms)
+   {
+      Method[] methods = clazz.getDeclaredMethods();
+      Field[] fields = clazz.getDeclaredFields();
+      for (Field field : fields)
+      {
+         if (advisor.resolveAnnotation(field, CurrentMessage.class) != null)
+            fs.add(field);
+      }
+      for (Method method : methods)
+      {
+         if (advisor.resolveAnnotation(method, CurrentMessage.class) != null)
+            ms.add(method);
+      }
+      if (clazz.getSuperclass() != null && !clazz.getSuperclass().equals(Object.class))
+      {
+         search(advisor, clazz.getSuperclass(), fs, ms);
+      }
+   }
+
+   public Object createPerInstance(Advisor advisor, InstanceAdvisor instanceAdvisor)
+   {
+      throw new IllegalArgumentException("NOT LEGAL");
+   }
+
+   public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
+   {
+      throw new IllegalArgumentException("NOT LEGAL");
+   }
+
+   public Object createPerJoinpoint(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
+   {
+      throw new IllegalArgumentException("NOT LEGAL");
+   }
+
+   public String getName()
+   {
+      return CurrentMessageInjectorInterceptor.class.getName();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/DLQHandler.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/DLQHandler.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/DLQHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,425 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.naming.Context;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.Transaction;
-import org.jboss.jms.jndi.JMSProviderAdapter;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Places redeliveded messages on a Dead Letter Queue.
- * <p/>
- * <p/>
- * The Dead Letter Queue handler is used to not set JBoss in an endles loop
- * when a message is resent on and on due to transaction rollback for
- * message receipt.
- * <p/>
- * <p/>
- * It sends message to a dead letter queue (configurable, defaults to
- * queue/DLQ) when the message has been resent a configurable amount of times,
- * defaults to 10.
- * <p/>
- * <p/>
- * The handler is configured through the element MDBConfig in
- * container-invoker-conf.
- * <p/>
- * <p/>
- * The JMS property JBOSS_ORIG_DESTINATION in the resent message is set
- * to the name of the original destination (Destionation.toString()).
- * <p/>
- * <p/>
- * The JMS property JBOSS_ORIG_MESSAGEID in the resent message is set
- * to the id of the original message.
- * <p/>
- * Created: Thu Aug 23 21:17:26 2001
- *
- * @author ???
- * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
- * @version <tt>$Revision$</tt>
- */
-public class DLQHandler
-        extends ServiceMBeanSupport
-{
-   /**
-    * JMS property name holding original destination.
-    */
-   public static final String JBOSS_ORIG_DESTINATION = "JBOSS_ORIG_DESTINATION";
-
-   /**
-    * JMS property name holding original JMS message id.
-    */
-   public static final String JBOSS_ORIG_MESSAGEID = "JBOSS_ORIG_MESSAGEID";
-
-   /**
-    * Properties copied from org.jboss.mq.SpyMessage
-    */
-   private static final String JMS_JBOSS_REDELIVERY_COUNT = "JMS_JBOSS_REDELIVERY_COUNT";
-   private static final String JMS_JBOSS_REDELIVERY_LIMIT = "JMS_JBOSS_REDELIVERY_LIMIT";
-   
-   // Configuratable stuff
-
-   // May become configurable
-   
-   /**
-    * Delivery mode for message, Message.DEFAULT_DELIVERY_MODE.
-    */
-   private int deliveryMode = Message.DEFAULT_DELIVERY_MODE;
-
-   /**
-    * Priority for the message, Message.DEFAULT_PRIORITY
-    */
-   private int priority = Message.DEFAULT_PRIORITY;
-
-   // Private stuff
-   private QueueConnection connection;
-   private Queue dlq;
-   private JMSProviderAdapter providerAdapter;
-   private Hashtable resentBuffer = new Hashtable();
-
-   private MDBConfig config;
-
-   public DLQHandler(final JMSProviderAdapter providerAdapter, MDBConfig config)
-   {
-      this.providerAdapter = providerAdapter;
-      this.config = config;
-   }
-
-   //--- Service
-   
-   /**
-    * Initalize the service.
-    *
-    * @throws Exception Service failed to initalize.
-    */
-   protected void createService() throws Exception
-   {
-      Context ctx = providerAdapter.getInitialContext();
-
-      try
-      {
-         String factoryName = providerAdapter.getQueueFactoryRef();
-         QueueConnectionFactory factory = (QueueConnectionFactory)
-                 ctx.lookup(factoryName);
-         log.debug("Using factory: " + factory);
-
-         if (config.getDlqUser() == null)
-            connection = factory.createQueueConnection();
-         else
-            connection = factory.createQueueConnection(config.getDlqUser(), config.getDlqPassword());
-         log.debug("Created connection: " + connection);
-
-         dlq = (Queue) ctx.lookup(config.getDlq());
-         log.debug("Using Queue: " + dlq);
-      }
-      catch (Exception e)
-      {
-         if (e instanceof JMSException)
-            throw e;
-         else
-         {
-            JMSException x = new JMSException("Error creating the dlq connection: " + e.getMessage());
-            x.setLinkedException(e);
-            throw x;
-         }
-      }
-      finally
-      {
-         ctx.close();
-      }
-   }
-
-   protected void startService() throws Exception
-   {
-      connection.start();
-   }
-
-   protected void stopService() throws Exception
-   {
-      connection.stop();
-   }
-
-   protected void destroyService() throws Exception
-   {
-      // Help the GC
-      if (connection != null)
-         connection.close();
-      connection = null;
-      dlq = null;
-      providerAdapter = null;
-   }
-   
-   //--- Logic
-   
-   /**
-    * Check if a message has been redelivered to many times.
-    * <p/>
-    * If message has been redelivered to many times, send it to the
-    * dead letter queue (default to queue/DLQ).
-    *
-    * @return true if message is handled (i.e resent), false if not.
-    */
-   public boolean handleRedeliveredMessage(final Message msg, final Transaction tx)
-   {
-      boolean handled = false;
-      int max = config.getDlqMaxTimesRedelivered();
-      String id = null;
-      boolean jbossmq = true;
-      int count = 0;
-
-      try
-      {
-
-         if (msg.propertyExists(JMS_JBOSS_REDELIVERY_LIMIT))
-            max = msg.getIntProperty(JMS_JBOSS_REDELIVERY_LIMIT);
-
-         if (msg.propertyExists(JMS_JBOSS_REDELIVERY_COUNT))
-            count = msg.getIntProperty(JMS_JBOSS_REDELIVERY_COUNT);
-         else
-         {
-            id = msg.getJMSMessageID();
-            if (id == null)
-            {
-               // if we can't get the id we are basically fucked
-               log.error("Message id is null, can't handle message");
-               return false;
-            }
-            count = incrementResentCount(id);
-            jbossmq = false;
-         }
-
-         if (count > max)
-         {
-            id = msg.getJMSMessageID();
-            log.warn("Message resent too many times; sending it to DLQ; message id=" + id);
-
-            sendMessage(msg);
-            deleteFromBuffer(id);
-
-            handled = true;
-         }
-         else if (jbossmq == false && tx != null)
-         {
-            // Register a synchronization to remove the buffer entry
-            // should the transaction commit
-            DLQSynchronization synch = new DLQSynchronization(id);
-            try
-            {
-               tx.registerSynchronization(synch);
-            }
-            catch (Exception e)
-            {
-               log.warn("Error registering DlQ Synchronization with transaction " + tx, e);
-            }
-         }
-      }
-      catch (JMSException e)
-      {
-         // If we can't send it ahead, we do not dare to just drop it...or?
-         log.error("Could not send message to Dead Letter Queue", e);
-      }
-
-      return handled;
-   }
-
-   /**
-    * Send message to the configured dead letter queue, defaults to queue/DLQ.
-    */
-   protected void sendMessage(Message msg) throws JMSException
-   {
-      boolean trace = log.isTraceEnabled();
-
-      QueueSession session = null;
-      QueueSender sender = null;
-
-      try
-      {
-         msg = makeWritable(msg, trace); // Don't know yet if we are gona clone or not
-         
-         // Set the properties
-         msg.setStringProperty(JBOSS_ORIG_MESSAGEID, msg.getJMSMessageID());
-         // Some providers (say Websphere MQ) don't set this to something we can use
-         Destination d = msg.getJMSDestination();
-         if (d != null)
-            msg.setStringProperty(JBOSS_ORIG_DESTINATION, d.toString());
-
-         session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-         sender = session.createSender(dlq);
-         if (trace)
-         {
-            log.trace("Sending message to DLQ; destination=" +
-                      dlq + ", session=" + session + ", sender=" + sender);
-         }
-
-         sender.send(msg, deliveryMode, priority, config.getDlqTimeToLive());
-
-         if (trace)
-         {
-            log.trace("Message sent.");
-         }
-
-      }
-      finally
-      {
-         try
-         {
-            if (sender != null) sender.close();
-            if (session != null) session.close();
-         }
-         catch (Exception e)
-         {
-            log.warn("Failed to close sender or session; ignoring", e);
-         }
-      }
-   }
-
-   /**
-    * Increment the counter for the specific JMS message id.
-    *
-    * @return the new counter value.
-    */
-   protected int incrementResentCount(String id)
-   {
-      BufferEntry entry = null;
-      boolean trace = log.isTraceEnabled();
-      if (!resentBuffer.containsKey(id))
-      {
-         if (trace)
-            log.trace("Making new entry for id " + id);
-         entry = new BufferEntry();
-         entry.id = id;
-         entry.count = 1;
-         resentBuffer.put(id, entry);
-      }
-      else
-      {
-         entry = (BufferEntry) resentBuffer.get(id);
-         entry.count++;
-         if (trace)
-            log.trace("Incremented old entry for id " + id + " count " + entry.count);
-      }
-      return entry.count;
-   }
-
-   /**
-    * Delete the entry in the message counter buffer for specifyed JMS id.
-    */
-   protected void deleteFromBuffer(String id)
-   {
-      resentBuffer.remove(id);
-   }
-
-   /**
-    * Make the Message properties writable.
-    *
-    * @return the writable message.
-    */
-   protected Message makeWritable(Message msg, boolean trace) throws JMSException
-   {
-      Hashtable tmp = new Hashtable();
-
-      // Save properties
-      for (Enumeration en = msg.getPropertyNames(); en.hasMoreElements();)
-      {
-         String key = (String) en.nextElement();
-         tmp.put(key, msg.getObjectProperty(key));
-      }
-      
-      // Make them writable
-      msg.clearProperties();
-
-      Enumeration keys = tmp.keys();
-      while (keys.hasMoreElements())
-      {
-         String key = (String) keys.nextElement();
-         try
-         {
-            msg.setObjectProperty(key, tmp.get(key));
-         }
-         catch (JMSException ignored)
-         {
-            if (trace)
-               log.trace("Could not copy message property " + key, ignored);
-         }
-      }
-
-      return msg;
-   }
-
-   public String toString()
-   {
-      return super.toString() +
-             "{ destinationJNDI=" + config.getDlq() +
-             ", maxResent=" + config.getDlqMaxTimesRedelivered() +
-             ", timeToLive=" + config.getDlqTimeToLive() +
-             " }";
-   }
-
-   private class BufferEntry
-   {
-      int count;
-      String id;
-   }
-
-   /**
-    * Remove a redelivered message from the DLQ's buffer when it is acknowledged
-    */
-   protected class DLQSynchronization
-           implements Synchronization
-   {
-      /**
-       * The message id
-       */
-      String id;
-
-      public DLQSynchronization(String id)
-      {
-         this.id = id;
-      }
-
-      public void beforeCompletion()
-      {
-      }
-
-      /**
-       * Forget the message when the transaction commits
-       */
-      public void afterCompletion(int status)
-      {
-         if (status == Status.STATUS_COMMITTED)
-            deleteFromBuffer(id);
-      }
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MDBConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,387 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.beans.PropertyEditor;
-import java.beans.PropertyEditorManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class MDBConfig
-{
-   protected int minPoolSize = 1;
-   protected int maxPoolSize = 15;
-   protected int keepAlive = 30000;
-   protected int maxMessages = 1;
-   protected String serverSessionPoolFactoryJNDI = "java:/StdJMSPool";
-   protected String providerAdapterJNDI = "java:/DefaultJMSProvider";
-   protected long reconnectInterval = 10000;
-
-   protected boolean useDLQ = true;
-   protected String dlq = "queue/DLQ";
-   protected int dlqMaxTimesRedelivered = 10;
-   protected int dlqTimeToLive = 0;
-   protected String dlqUser;
-   protected String dlqPassword;
-
-   protected String messageSelector;
-   protected String destinationType;
-   protected String user;
-   protected String password;
-   protected String destination;
-   protected String acknowledgeMode;
-   protected String clientID;
-   protected String durability;
-   protected String subscriptionName;
-   protected String messagingType;
-   protected String resourceAdaptorName;
-
-   public String getDlqUser()
-   {
-      return dlqUser;
-   }
-
-   public void setDlqUser(String dlqUser)
-   {
-      this.dlqUser = dlqUser;
-   }
-
-   public String getDlqPassword()
-   {
-      return dlqPassword;
-   }
-
-   public void setDlqPassword(String dlqPassword)
-   {
-      this.dlqPassword = dlqPassword;
-   }
-
-   /**
-    * Use a Dead-letter queue for undeliverable messages?
-    *
-    * @return
-    */
-   public boolean isUseDLQ()
-   {
-      return useDLQ;
-   }
-
-   public void setUseDLQ(boolean useDLQ)
-   {
-      this.useDLQ = useDLQ;
-   }
-
-   /**
-    * JNDI name of the DLQ
-    *
-    * @return
-    */
-   public String getDlq()
-   {
-      return dlq;
-   }
-
-   public void setDlq(String dlq)
-   {
-      this.dlq = dlq;
-   }
-
-   /**
-    * How many times should a message be redelivered before it is put into the DLQ
-    *
-    * @return
-    */
-   public int getDlqMaxTimesRedelivered()
-   {
-      return dlqMaxTimesRedelivered;
-   }
-
-   public void setDlqMaxTimesRedelivered(int dlqMaxTimesRedelivered)
-   {
-      this.dlqMaxTimesRedelivered = dlqMaxTimesRedelivered;
-   }
-
-   public int getDlqTimeToLive()
-   {
-      return dlqTimeToLive;
-   }
-
-   public void setDlqTimeToLive(int dlqTimeToLive)
-   {
-      this.dlqTimeToLive = dlqTimeToLive;
-   }
-
-   public String getProviderAdapterJNDI()
-   {
-      return providerAdapterJNDI;
-   }
-
-   public void setProviderAdapterJNDI(String providerAdapterJNDI)
-   {
-      this.providerAdapterJNDI = providerAdapterJNDI;
-   }
-
-   public String getAcknowledgeMode()
-   {
-      return acknowledgeMode;
-   }
-
-   public void setAcknowledgeMode(String acknowledgeMode)
-   {
-      this.acknowledgeMode = acknowledgeMode;
-   }
-
-   public String getClientID()
-   {
-      return clientID;
-   }
-
-   public void setClientID(String clientID)
-   {
-      this.clientID = clientID;
-   }
-
-   /**
-    * Set to "Durable" or "NonDurable"
-    * <p/>
-    * Specify wether or not the topic should be durable.
-    *
-    * @return
-    */
-   public String getDurability()
-   {
-      return durability;
-   }
-
-   public void setDurability(String durability)
-   {
-      this.durability = durability;
-   }
-
-   public String getSubscriptionName()
-   {
-      return subscriptionName;
-   }
-
-   public void setSubscriptionName(String subscriptionName)
-   {
-      this.subscriptionName = subscriptionName;
-   }
-
-   public String getDestination()
-   {
-      return destination;
-   }
-
-   public void setDestination(String destination)
-   {
-      this.destination = destination;
-   }
-
-   public String getUser()
-   {
-      return user;
-   }
-
-   public void setUser(String user)
-   {
-      this.user = user;
-   }
-
-   public String getPassword()
-   {
-      return password;
-   }
-
-   public void setPassword(String password)
-   {
-      this.password = password;
-   }
-
-   public String getMessageSelector()
-   {
-      return messageSelector;
-   }
-
-   public void setMessageSelector(String messageSelector)
-   {
-      this.messageSelector = messageSelector;
-   }
-   
-   public String getMessagingType()
-   {
-      return messagingType;
-   }
-
-   public void setMessagingType(String messagingType)
-   {
-      this.messagingType = messagingType;
-   }
-   
-   public String getResourceAdaptorName()
-   {
-      return resourceAdaptorName;
-   }
-
-   public void setResourceAdaptorName(String resourceAdaptorName)
-   {
-      this.resourceAdaptorName = resourceAdaptorName;
-   }
-
-   public String getDestinationType()
-   {
-      return destinationType;
-   }
-
-   public void setDestinationType(String destinationType)
-   {
-      this.destinationType = destinationType;
-   }
-
-   public int getMinPoolSize()
-   {
-      return minPoolSize;
-   }
-
-   public void setMinPoolSize(int minPoolSize)
-   {
-      this.minPoolSize = minPoolSize;
-   }
-
-   public int getMaxPoolSize()
-   {
-      return maxPoolSize;
-   }
-
-   public void setMaxPoolSize(int maxPoolSize)
-   {
-      this.maxPoolSize = maxPoolSize;
-   }
-
-   public int getKeepAlive()
-   {
-      return keepAlive;
-   }
-
-   public void setKeepAlive(int keepAlive)
-   {
-      this.keepAlive = keepAlive;
-   }
-
-   public int getMaxMessages()
-   {
-      return maxMessages;
-   }
-
-   public void setMaxMessages(int maxMessages)
-   {
-      this.maxMessages = maxMessages;
-   }
-
-   public String getServerSessionPoolFactoryJNDI()
-   {
-      return serverSessionPoolFactoryJNDI;
-   }
-
-   public void setServerSessionPoolFactoryJNDI(String serverSessionPoolFactoryJNDI)
-   {
-      this.serverSessionPoolFactoryJNDI = serverSessionPoolFactoryJNDI;
-   }
-
-   public long getReconnectInterval()
-   {
-      return reconnectInterval;
-   }
-
-   public void setReconnectInterval(long reconnectInterval)
-   {
-      this.reconnectInterval = reconnectInterval;
-   }
-
-   public static MDBConfig createMDBConfig(ActivationSpec spec)
-   {
-      MDBConfig instance = new MDBConfig();
-      BeanInfo beanInfo = null;
-      try
-      {
-         beanInfo = Introspector.getBeanInfo(MDBConfig.class);
-      }
-      catch (IntrospectionException e)
-      {
-         throw new RuntimeException(e.getMessage(), e);
-      }
-      PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
-      if (descriptors == null)
-      {
-         descriptors = new PropertyDescriptor[0];
-      }
-
-      for (String name : spec.keySet())
-      {
-         setAttribute(instance, descriptors, name, spec.get(name));
-
-      }
-      return instance;
-   }
-
-   private static void setAttribute(Object instance, PropertyDescriptor[] descriptors, String attributeName, String attributeText)
-   {
-      for (int i = 0; i < descriptors.length; i++)
-      {
-         if (attributeName.equalsIgnoreCase(descriptors[i].getName()))
-         {
-            Class typeClass = descriptors[i].getPropertyType();
-
-            Object value;
-            PropertyEditor editor = PropertyEditorManager.findEditor(typeClass);
-            if (editor == null)
-            {
-               throw new RuntimeException
-                       ("No property editor for attribute: " + attributeName +
-                        "; type=" + typeClass);
-            }
-
-            editor.setAsText(attributeText);
-            value = editor.getValue();
-            try
-            {
-               descriptors[i].getWriteMethod().invoke(instance, new Object[]{value});
-            }
-            catch (Exception e)
-            {
-               throw new RuntimeException("Error setting attribute '" +
-                                          attributeName + "' in MDBConfig", e);
-            }
-            break;
-         }
-      }//for descriptors
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessageInflowLocalProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessageInflowLocalProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessageInflowLocalProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import org.jboss.aspects.asynch.AsynchMixin;
-import org.jboss.aspects.asynch.AsynchProvider;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.JBossProxy;
-import org.jboss.ejb3.LocalProxy;
-import org.jboss.ejb3.ProxyUtils;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class MessageInflowLocalProxy extends LocalProxy
-{
-   private static final Logger log = Logger.getLogger(MessageInflowLocalProxy.class);
-   
-   AsynchProvider provider;
-
-   protected MessageInflowLocalProxy()
-   {
-   }
-
-   public MessageInflowLocalProxy(Container container)
-   {
-      super(container);
-   }
-
-   public MessageInflowLocalProxy(AsynchProvider provider, Container container)
-   {
-      super(container);
-      this.provider = provider;
-   }
-
-   public Object invoke(Object proxy, Method method, Object[] args)
-           throws Throwable
-   {
-      if (method.getDeclaringClass() == AsynchProvider.class)
-      {
-         return provider.getFuture();
-      }
-
-      Object ret = ProxyUtils.handleCallLocally((JBossProxy) proxy, this, method, args);
-      if (ret != null)
-      {
-         return ret;
-      }
-
-      MDB mdb = (MDB) container;
-
-      return mdb.localInvoke(method, args);
-   }
-
-   public Object getAsynchronousProxy(Object proxy)
-   {
-      Class[] infs = proxy.getClass().getInterfaces();
-      if (!ProxyUtils.isAsynchronous(infs))
-      {
-         Class[] interfaces = ProxyUtils.addAsynchProviderInterface(infs);
-         AsynchMixin mixin = new AsynchMixin();
-         MessageInflowLocalProxy handler = new MessageInflowLocalProxy(mixin, container);
-         return Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), interfaces, handler);
-      }
-
-      //I was already asynchronous
-      return proxy;
-   }
-
-
-   public String toString()
-   {
-      return container.getEjbName().toString();
-   }
-}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,623 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import org.jboss.annotation.ejb.ResourceAdapter;
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.deployment.DeploymentException;
-import org.jboss.ejb3.*;
-import org.jboss.ejb3.mdb.inflow.JBossMessageEndpointFactory;
-import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.ejb3.timerservice.TimedObjectInvoker;
-import org.jboss.ejb3.timerservice.TimerServiceFactory;
-import org.jboss.jms.jndi.JMSProviderAdapter;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ActivationConfigPropertyMetaData;
-
-import javax.ejb.*;
-import javax.ejb.Timer;
-import javax.jms.*;
-import javax.jms.Queue;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * @version <tt>$Revision: 56518 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public abstract class MessagingContainer extends EJBContainer implements TimedObjectInvoker
-{
-   private static final Logger log = Logger.getLogger(MessagingContainer.class);
-   
-   protected TimerService timerService;
-   protected ActivationSpec activationSpec = new ActivationSpec();
-   protected JBossMessageEndpointFactory messageEndpointFactory;
-
-   /**
-    * Default destination type. Used when no message-driven-destination is given
-    * in ejb-jar, and a lookup of destinationJNDI from jboss.xml is not
-    * successfull. Default value: javax.jms.Topic.
-    */
-   protected final static String DEFAULT_DESTINATION_TYPE = "javax.jms.Topic";
-
-   public MessagingContainer(String ejbName, AspectManager manager, ClassLoader cl, String beanClassName, Hashtable ctxProperties,
-              InterceptorInfoRepository interceptorRepository, Ejb3Deployment deployment)
-   {
-      super(Ejb3Module.BASE_EJB3_JMX_NAME + ",name=" + ejbName, manager, cl, beanClassName, ejbName, ctxProperties, interceptorRepository, deployment);
-      
-      beanContextClass = MDBContext.class;
-      
-      messageEndpointFactory = new JBossMessageEndpointFactory();
-      messageEndpointFactory.setContainer(this);
-   }
-   
-   public abstract Class getMessagingType();
-   
-   public abstract Map getActivationConfigProperties();
-   
-   protected abstract void populateActivationSpec();
-   
-   public abstract MethodInfo getMethodInfo(Method method);
-
-   public void setMessageEndpointFactory(JBossMessageEndpointFactory messageEndpointFactory)
-   {
-      this.messageEndpointFactory = messageEndpointFactory;
-   }
-   
-   public String getResourceAdaptorName()
-   {
-      ResourceAdapter annotation = (ResourceAdapter) resolveAnnotation(ResourceAdapter.class);
-      if (annotation == null)
-         return JMS_ADAPTOR;
-      
-      return annotation.value();
-   }
-   
-   protected void addActivationSpecProperty(Map result, ActivationConfigProperty property)
-   {
-      if (!property.propertyName().equals("messagingType"))
-      {
-         ActivationConfigPropertyMetaData metaData = new ActivationConfigPropertyMetaData();
-         try
-         {
-            Field nameField = ActivationConfigPropertyMetaData.class.getDeclaredField("name");
-            nameField.setAccessible(true);
-            nameField.set(metaData, property.propertyName());
-            Field valueField = ActivationConfigPropertyMetaData.class.getDeclaredField("value");
-            valueField.setAccessible(true);
-            valueField.set(metaData, property.propertyValue());
-         }
-         catch (Exception e)
-         {
-            throw new RuntimeException(e);
-         }
-   
-         /*
-          * Older versions don't have this
-          * TODO revert to this after we ditch 4.0.3SP1 as supported EJB3 platform
-         metaData.setName(property.propertyName());
-         metaData.setValue(property.propertyValue());
-         */
-         result.put(property.propertyName(), metaData);
-      }
-   }
-
-   /**
-    * Initialize the container invoker. Sets up a connection, a server session
-    * pool and a connection consumer for the configured destination.
-    * <p/>
-    * Any JMSExceptions produced while initializing will be assumed to be
-    * caused due to JMS Provider failure.
-    *
-    * @throws Exception Failed to initalize.
-    */
-   public void start() throws Exception
-   {
-      super.start();
-
-      populateActivationSpec();
-         
-      innerStart();
-
-      timerService = TimerServiceFactory.getInstance().createTimerService(this.getObjectName(), this);
-
-      startProxies();
-      
-      TimerServiceFactory.getInstance().restoreTimerService(timerService);
-   }
-
-   protected void innerStart() throws Exception
-   {
-      log.debug("Initializing");
-
-      if (getResourceAdaptorName().equals(JMS_ADAPTOR))
-         jmsCreate();
-   }
-
-   public ObjectName getJmxName()
-   {
-      ObjectName jmxName = null;
-      String jndiName = ProxyFactoryHelper.getLocalJndiName(this);
-      // The name must be escaped since the jndiName may be arbitrary
-      String name = org.jboss.ejb.Container.BASE_EJB_CONTAINER_NAME + ",jndiName=" + jndiName;
-      try
-      {
-         jmxName = org.jboss.mx.util.ObjectNameConverter.convert(name);
-      }
-      catch (MalformedObjectNameException e)
-      {
-         e.printStackTrace();
-         throw new RuntimeException("Failed to create ObjectName, msg=" + e.getMessage());
-      }
-
-      return jmxName;
-   }
-
-   protected void startProxies() throws Exception
-   {
-      messageEndpointFactory.start();
-   }
-
-   /**
-    * Parse the JNDI suffix from the given JNDI name.
-    *
-    * @param jndiname     The JNDI name used to lookup the destination.
-    * @param defautSuffix Description of Parameter
-    * @return The parsed suffix or the defaultSuffix
-    */
-   protected String parseJndiSuffix(final String jndiname,
-                                    final String defautSuffix)
-   {
-      // jndiSuffix is merely the name that the user has given the MDB.
-      // since the jndi name contains the message type I have to split
-      // at the "/" if there is no slash then I use the entire jndi name...
-      String jndiSuffix = "";
-
-      if (jndiname != null)
-      {
-         int indexOfSlash = jndiname.indexOf("/");
-         if (indexOfSlash != -1)
-         {
-            jndiSuffix = jndiname.substring(indexOfSlash + 1);
-         }
-         else
-         {
-            jndiSuffix = jndiname;
-         }
-      }
-      else
-      {
-         // if the jndi name from jboss.xml is null then lets use the ejbName
-         jndiSuffix = defautSuffix;
-      }
-
-      return jndiSuffix;
-   }
-
-   public Object localInvoke(Method method, Object[] args) throws Throwable
-   {
-      MethodInfo info = getMethodInfo(method);
-      if (info == null)
-      {
-         throw new RuntimeException("Could not resolve beanClass method from proxy call: " + method.toString());
-      }
-      return localInvoke(info, args);
-
-   }
-
-   public Object localInvoke(MethodInfo info, Object[] args) throws Throwable
-   {     
-      ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-      ThreadLocalENCFactory.push(enc);
-      try
-      {
-         Interceptor[] aspects = info.getInterceptors();
-         EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info, aspects);
-         nextInvocation.setAdvisor(this);
-         nextInvocation.setArguments(args);
-         return nextInvocation.invokeNext();
-      }
-      finally
-      {
-         Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
-      }
-   }
-
-   public TimerService getTimerService()
-   {
-      return timerService;
-   }
-
-   public TimerService getTimerService(Object pKey)
-   {
-      assert timerService != null : "Timer Service not yet initialized";
-      return timerService;
-   }
-   
-   public void callTimeout(Timer timer) throws Exception
-   {
-      Method timeout = callbackHandler.getTimeoutCallback();
-      if (timeout == null) throw new EJBException("No method has been annotated with @Timeout");
-      Object[] args = {timer};
-      try
-      {
-         localInvoke(timeout, args);
-      }
-      catch (Throwable throwable)
-      {
-         if (throwable instanceof Exception) throw (Exception) throwable;
-         throw new RuntimeException(throwable);
-      }
-   }
-
-
-   public void stop() throws Exception
-   {
-      if (timerService != null)
-      {
-         TimerServiceFactory.getInstance().removeTimerService(timerService);
-      }
-
-      stopProxies();
-   }
-
-   protected void stopProxies() throws Exception
-   {
-      messageEndpointFactory.stop();
-   }
-
-   public void destroy() throws Exception
-   {
-   }
-   
-   // ********* JMS Specific
-   protected static final String JMS_ADAPTOR = "jms-ra.rar";
-   protected static final String DESTINATION = "destination";
-   protected static final String DESTINATION_TYPE = "destinationType";
-   protected static final String PROVIDER_ADAPTER_JNDI = "providerAdapterJNDI";
-   protected static final String MAX_SESSION = "maxSession";
-   
-   public void initializePool() throws Exception
-   {
-     super.initializePool();
-     
-     String maxSession = getMaxSession();
-     if (maxSession != null)
-     {
-        pool.setMaxSize(Integer.parseInt(maxSession));
-     }
-   }
-   
-   protected String getProviderAdapterJNDI()
-   {
-      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(PROVIDER_ADAPTER_JNDI);
-      if (property != null)
-         return property.getValue();
-      return "java:/DefaultJMSProvider";
-   }
-   
-   protected String getMaxSession()
-   {
-      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(MAX_SESSION);
-      if (property != null)
-         return property.getValue();
-      return null;
-   }
-   
-   protected String getDestination()
-   {
-      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(DESTINATION);
-      if (property != null)
-         return property.getValue();
-      return null;
-   }
-   
-   protected String getDestinationType()
-   {
-      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(DESTINATION_TYPE);
-      if (property != null)
-         return property.getValue();
-      return null;
-   }
-
-   protected void jmsCreate() throws Exception
-   {
-      //    Get the JMS provider
-      // todo get rid of server module dependency
-      JMSProviderAdapter adapter = getJMSProviderAdapter();
-      log.debug("Provider adapter: " + adapter);
-  
-      // Connect to the JNDI server and get a reference to root context
-      Context context = adapter.getInitialContext();
-      log.debug("context: " + context);
-
-      // if we can't get the root context then exit with an exception
-      if (context == null)
-      {
-         throw new RuntimeException("Failed to get the root context");
-      }
-
-      // Unfortunately the destination is optional, so if we do not have one
-      // here we have to look it up if we have a destinationJNDI, else give it
-      // a default.
-      String destinationType = getDestinationType();
-      if (destinationType == null)
-      {
-         log.warn("No message-driven-destination given; using; guessing type");
-         destinationType = getDestinationType(context, getDestination());
-      }
-
-      if ("javax.jms.Topic".equals(destinationType))
-      {
-         innerCreateTopic(context);
-
-      }
-      else if ("javax.jms.Queue".equals(destinationType))
-      {
-         innerCreateQueue(context);
-
-      }
-      else
-         throw new DeploymentException("Unknown destination-type " + destinationType);
-
-      log.debug("Initialized with config " + toString());
-
-      context.close();
-   }
-   
-   protected void innerCreateQueue(Context context)
-           throws Exception
-   {
-      log.debug("Got destination type Queue for " + ejbName);
-
-      // Get the JNDI suffix of the destination
-      String jndiSuffix = parseJndiSuffix(getDestination(), ejbName);
-      log.debug("jndiSuffix: " + jndiSuffix);
-
-      // lookup or create the destination queue
-      Queue queue = null;
-      try
-      {
-         // First we try the specified queue
-         if (getDestination() != null)
-            queue = (Queue) context.lookup(getDestination());
-      }
-      catch (NamingException e)
-      {
-         log.warn("Could not find the queue destination-jndi-name=" + getDestination());
-      }
-      catch (ClassCastException e)
-      {
-         throw new DeploymentException("Expected a Queue destination-jndi-name=" + getDestination());
-      }
-
-      if (queue == null)
-         queue = (Queue) createDestination(Queue.class,
-                 context,
-                 "queue/" + jndiSuffix,
-                 jndiSuffix);
-   }
-
-   protected void innerCreateTopic(Context context)
-           throws Exception
-   {
-      log.debug("Got destination type Topic for " + ejbName);
-
-      // Get the JNDI suffix of the destination
-      String jndiSuffix = parseJndiSuffix(getDestination(), ejbName);
-      log.debug("jndiSuffix: " + jndiSuffix);
-
-      // lookup or create the destination topic
-      Topic topic = null;
-      try
-      {
-         // First we try the specified topic
-         if (getDestination() != null)
-            topic = (Topic) context.lookup(getDestination());
-      }
-      catch (NamingException e)
-      {
-         log.warn("Could not find the topic destination-jndi-name=" + getDestination());
-      }
-      catch (ClassCastException e)
-      {
-         throw new DeploymentException("Expected a Topic destination-jndi-name=" + getDestination());
-      }
-
-      if (topic == null)
-         topic = (Topic) createDestination(Topic.class,
-                 context,
-                 "topic/" + jndiSuffix,
-                 jndiSuffix);
-   }
-
-   /**
-    * Create and or lookup a JMS destination.
-    *
-    * @param type       Either javax.jms.Queue or javax.jms.Topic.
-    * @param ctx        The naming context to lookup destinations from.
-    * @param jndiName   The name to use when looking up destinations.
-    * @param jndiSuffix The name to use when creating destinations.
-    * @return The destination.
-    * @throws IllegalArgumentException Type is not Queue or Topic.
-    * @throws Exception                Description of Exception
-    */
-   protected Destination createDestination(final Class type,
-                                           final Context ctx,
-                                           final String jndiName,
-                                           final String jndiSuffix)
-           throws Exception
-   {
-      try
-      {
-         // first try to look it up
-         return (Destination) ctx.lookup(jndiName);
-      }
-      catch (NamingException e)
-      {
-         // is JMS?
-         if (getDestination() == null)
-         {
-            return null;
-         }
-         else
-         {
-            // if the lookup failes, the try to create it
-            log.warn("destination not found: " + jndiName + " reason: " + e);
-            log.warn("creating a new temporary destination: " + jndiName);
-            
-            createTemporaryDestination(type, jndiSuffix);
-       
-            // try to look it up again
-            return (Destination) ctx.lookup(jndiName);
-         }
-      }
-   }
-   
-   protected void createTemporaryDestination(Class type, String jndiSuffix) throws Exception
-   {
-      //
-      // jason: we should do away with this...
-      //
-      // attempt to create the destination (note, this is very
-      // very, very unportable).
-      //
-
-      // MBeanServer server = org.jboss.mx.util.MBeanServerLocator.locateJBoss();
-      
-      String methodName;
-      String destinationContext;
-      if (type == Topic.class)
-      {
-         destinationContext = "topic";
-         methodName = "createTopic";
-      }
-      else if (type == Queue.class)
-      {
-         destinationContext = "queue";
-         methodName = "createQueue";
-      }
-      else
-      {
-         // type was not a Topic or Queue, bad user
-         throw new IllegalArgumentException
-                 ("Expected javax.jms.Queue or javax.jms.Topic: " + type);
-      }
-      
-      ObjectName destinationManagerName = new ObjectName("jboss.mq:service=DestinationManager");
-      
-      KernelAbstraction kernel = KernelAbstractionFactory.getInstance();
-      // invoke the server to create the destination
-      Object result = kernel.invoke(destinationManagerName,
-              methodName,
-              new Object[]{jndiSuffix},
-              new String[]{"java.lang.String"});
-      
-      InitialContext jndiContext = InitialContextFactory.getInitialContext();
-      String binding = destinationContext + "/" + jndiSuffix;
-      try
-      {
-         jndiContext.lookup(binding);
-      }
-      catch (NamingException e)
-      {
-         jndiContext.rebind(binding, result);
-      }
-   }
-   
-   /**
-    * Return the JMSProviderAdapter that should be used.
-    *
-    * @return The JMSProviderAdapter to use.
-    */
-   protected JMSProviderAdapter getJMSProviderAdapter()
-           throws NamingException
-   {
-      Context context = getInitialContext();
-      //todo make this pluggable
-      String providerAdapterJNDI = getProviderAdapterJNDI();
-      try
-      {
-         log.debug("Looking up provider adapter: " + providerAdapterJNDI);
-     
-         return (JMSProviderAdapter) context.lookup(providerAdapterJNDI);
-      }
-      finally
-      {
-         context.close();
-      }
-   }
-
-   /**
-    * Try to get a destination type by looking up the destination JNDI, or
-    * provide a default if there is not destinationJNDI or if it is not possible
-    * to lookup.
-    *
-    * @param ctx             The naming context to lookup destinations from.
-    * @param destinationJNDI The name to use when looking up destinations.
-    * @return The destination type, either derived from destinationJDNI or
-    *         DEFAULT_DESTINATION_TYPE
-    */
-   protected String getDestinationType(Context ctx, String destinationJNDI)
-   {
-      String destType = null;
-
-      if (destinationJNDI != null)
-      {
-         try
-         {
-            Destination dest = (Destination) ctx.lookup(destinationJNDI);
-            if (dest instanceof javax.jms.Topic)
-            {
-               destType = "javax.jms.Topic";
-            }
-            else if (dest instanceof javax.jms.Queue)
-            {
-               destType = "javax.jms.Queue";
-            }
-         }
-         catch (NamingException ex)
-         {
-            log.debug("Could not do heristic lookup of destination ", ex);
-         }
-
-      }
-      if (destType == null)
-      {
-         log.warn("Could not determine destination type, defaults to: " +
-                 DEFAULT_DESTINATION_TYPE);
-
-         destType = DEFAULT_DESTINATION_TYPE;
-      }
-
-      return destType;
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,628 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb;
+
+import org.jboss.annotation.ejb.ResourceAdapter;
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.MethodInfo;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.ejb3.*;
+import org.jboss.ejb3.mdb.inflow.JBossMessageEndpointFactory;
+import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
+import org.jboss.ejb3.jms.JMSDestinationFactory;
+import org.jboss.ejb3.timerservice.TimedObjectInvoker;
+import org.jboss.ejb3.timerservice.TimerServiceFactory;
+import org.jboss.jms.jndi.JMSProviderAdapter;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ActivationConfigPropertyMetaData;
+
+import javax.ejb.*;
+import javax.ejb.Timer;
+import javax.jms.*;
+import javax.jms.Queue;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public abstract class MessagingContainer extends EJBContainer implements TimedObjectInvoker
+{
+   private static final Logger log = Logger.getLogger(MessagingContainer.class);
+   
+   protected TimerService timerService;
+   protected ActivationSpec activationSpec = new ActivationSpec();
+   protected JBossMessageEndpointFactory messageEndpointFactory;
+
+   /**
+    * Default destination type. Used when no message-driven-destination is given
+    * in ejb-jar, and a lookup of destinationJNDI from jboss.xml is not
+    * successfull. Default value: javax.jms.Topic.
+    */
+   protected final static String DEFAULT_DESTINATION_TYPE = "javax.jms.Topic";
+
+   public MessagingContainer(String ejbName, AspectManager manager, ClassLoader cl, String beanClassName, Hashtable ctxProperties,
+              InterceptorInfoRepository interceptorRepository, Ejb3Deployment deployment)
+   {
+      super(Ejb3Module.BASE_EJB3_JMX_NAME + ",name=" + ejbName, manager, cl, beanClassName, ejbName, ctxProperties, interceptorRepository, deployment);
+      
+      beanContextClass = MDBContext.class;
+      
+      messageEndpointFactory = new JBossMessageEndpointFactory();
+      messageEndpointFactory.setContainer(this);
+   }
+   
+   public abstract Class getMessagingType();
+   
+   public abstract Map getActivationConfigProperties();
+   
+   protected abstract void populateActivationSpec();
+   
+   public abstract MethodInfo getMethodInfo(Method method);
+
+   public void setMessageEndpointFactory(JBossMessageEndpointFactory messageEndpointFactory)
+   {
+      this.messageEndpointFactory = messageEndpointFactory;
+   }
+   
+   public String getResourceAdaptorName()
+   {
+      ResourceAdapter annotation = (ResourceAdapter) resolveAnnotation(ResourceAdapter.class);
+      if (annotation == null)
+         return JMS_ADAPTOR;
+      
+      return annotation.value();
+   }
+   
+   protected void addActivationSpecProperty(Map result, ActivationConfigProperty property)
+   {
+      if (!property.propertyName().equals("messagingType"))
+      {
+         ActivationConfigPropertyMetaData metaData = new ActivationConfigPropertyMetaData();
+         try
+         {
+            Field nameField = ActivationConfigPropertyMetaData.class.getDeclaredField("name");
+            nameField.setAccessible(true);
+            nameField.set(metaData, property.propertyName());
+            Field valueField = ActivationConfigPropertyMetaData.class.getDeclaredField("value");
+            valueField.setAccessible(true);
+            valueField.set(metaData, property.propertyValue());
+         }
+         catch (Exception e)
+         {
+            throw new RuntimeException(e);
+         }
+   
+         /*
+          * Older versions don't have this
+          * TODO revert to this after we ditch 4.0.3SP1 as supported EJB3 platform
+         metaData.setName(property.propertyName());
+         metaData.setValue(property.propertyValue());
+         */
+         result.put(property.propertyName(), metaData);
+      }
+   }
+
+   /**
+    * Initialize the container invoker. Sets up a connection, a server session
+    * pool and a connection consumer for the configured destination.
+    * <p/>
+    * Any JMSExceptions produced while initializing will be assumed to be
+    * caused due to JMS Provider failure.
+    *
+    * @throws Exception Failed to initalize.
+    */
+   public void start() throws Exception
+   {
+      super.start();
+
+      populateActivationSpec();
+         
+      innerStart();
+
+      timerService = TimerServiceFactory.getInstance().createTimerService(this.getObjectName(), this);
+
+      startProxies();
+      
+      TimerServiceFactory.getInstance().restoreTimerService(timerService);
+   }
+
+   protected void innerStart() throws Exception
+   {
+      log.debug("Initializing");
+
+      if (getResourceAdaptorName().equals(JMS_ADAPTOR))
+         jmsCreate();
+   }
+
+   public ObjectName getJmxName()
+   {
+      ObjectName jmxName = null;
+      String jndiName = ProxyFactoryHelper.getLocalJndiName(this);
+      // The name must be escaped since the jndiName may be arbitrary
+      String name = org.jboss.ejb.Container.BASE_EJB_CONTAINER_NAME + ",jndiName=" + jndiName;
+      try
+      {
+         jmxName = org.jboss.mx.util.ObjectNameConverter.convert(name);
+      }
+      catch (MalformedObjectNameException e)
+      {
+         e.printStackTrace();
+         throw new RuntimeException("Failed to create ObjectName, msg=" + e.getMessage());
+      }
+
+      return jmxName;
+   }
+
+   protected void startProxies() throws Exception
+   {
+      messageEndpointFactory.start();
+   }
+
+   /**
+    * Parse the JNDI suffix from the given JNDI name.
+    *
+    * @param jndiname     The JNDI name used to lookup the destination.
+    * @param defautSuffix Description of Parameter
+    * @return The parsed suffix or the defaultSuffix
+    */
+   protected String parseJndiSuffix(final String jndiname,
+                                    final String defautSuffix)
+   {
+      // jndiSuffix is merely the name that the user has given the MDB.
+      // since the jndi name contains the message type I have to split
+      // at the "/" if there is no slash then I use the entire jndi name...
+      String jndiSuffix = "";
+
+      if (jndiname != null)
+      {
+         int indexOfSlash = jndiname.indexOf("/");
+         if (indexOfSlash != -1)
+         {
+            jndiSuffix = jndiname.substring(indexOfSlash + 1);
+         }
+         else
+         {
+            jndiSuffix = jndiname;
+         }
+      }
+      else
+      {
+         // if the jndi name from jboss.xml is null then lets use the ejbName
+         jndiSuffix = defautSuffix;
+      }
+
+      return jndiSuffix;
+   }
+
+   public Object localInvoke(Method method, Object[] args) throws Throwable
+   {
+      MethodInfo info = getMethodInfo(method);
+      if (info == null)
+      {
+         throw new RuntimeException("Could not resolve beanClass method from proxy call: " + method.toString());
+      }
+      return localInvoke(info, args);
+
+   }
+
+   public Object localInvoke(MethodInfo info, Object[] args) throws Throwable
+   {     
+      ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+      pushEnc();
+      try
+      {
+         EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info);
+         nextInvocation.setAdvisor(this);
+         nextInvocation.setArguments(args);
+         return nextInvocation.invokeNext();
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(oldLoader);
+         popEnc();
+      }
+   }
+
+   public TimerService getTimerService()
+   {
+      return timerService;
+   }
+
+   public TimerService getTimerService(Object pKey)
+   {
+      assert timerService != null : "Timer Service not yet initialized";
+      return timerService;
+   }
+   
+   public void callTimeout(Timer timer) throws Exception
+   {
+      Method timeout = callbackHandler.getTimeoutCallback();
+      if (timeout == null) throw new EJBException("No method has been annotated with @Timeout");
+      Object[] args = {timer};
+      try
+      {
+         localInvoke(timeout, args);
+      }
+      catch (Throwable throwable)
+      {
+         if (throwable instanceof Exception) throw (Exception) throwable;
+         throw new RuntimeException(throwable);
+      }
+   }
+
+
+   public void stop() throws Exception
+   {
+      if (timerService != null)
+      {
+         TimerServiceFactory.getInstance().removeTimerService(timerService);
+      }
+
+      stopProxies();
+   }
+
+   protected void stopProxies() throws Exception
+   {
+      messageEndpointFactory.stop();
+   }
+
+   public void destroy() throws Exception
+   {
+   }
+   
+   // ********* JMS Specific
+   protected static final String JMS_ADAPTOR = "jms-ra.rar";
+   protected static final String DESTINATION = "destination";
+   protected static final String DESTINATION_TYPE = "destinationType";
+   protected static final String PROVIDER_ADAPTER_JNDI = "providerAdapterJNDI";
+   protected static final String MAX_SESSION = "maxSession";
+   
+   public void initializePool() throws Exception
+   {
+     super.initializePool();
+     
+     String maxSession = getMaxSession();
+     if (maxSession != null)
+     {
+        pool.setMaxSize(Integer.parseInt(maxSession));
+     }
+   }
+   
+   protected String getProviderAdapterJNDI()
+   {
+      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(PROVIDER_ADAPTER_JNDI);
+      if (property != null)
+         return property.getValue();
+      return "java:/DefaultJMSProvider";
+   }
+   
+   protected String getMaxSession()
+   {
+      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(MAX_SESSION);
+      if (property != null)
+         return property.getValue();
+      return null;
+   }
+   
+   protected String getDestination()
+   {
+      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(DESTINATION);
+      if (property != null)
+         return property.getValue();
+      return null;
+   }
+   
+   protected String getDestinationType()
+   {
+      ActivationConfigPropertyMetaData property = (ActivationConfigPropertyMetaData)getActivationConfigProperties().get(DESTINATION_TYPE);
+      if (property != null)
+         return property.getValue();
+      return null;
+   }
+
+   protected void jmsCreate() throws Exception
+   {
+      //    Get the JMS provider
+      // todo get rid of server module dependency
+      JMSProviderAdapter adapter = getJMSProviderAdapter();
+      log.debug("Provider adapter: " + adapter);
+  
+      // Connect to the JNDI server and get a reference to root context
+      Context context = adapter.getInitialContext();
+      log.debug("context: " + context);
+
+      // if we can't get the root context then exit with an exception
+      if (context == null)
+      {
+         throw new RuntimeException("Failed to get the root context");
+      }
+
+      // Unfortunately the destination is optional, so if we do not have one
+      // here we have to look it up if we have a destinationJNDI, else give it
+      // a default.
+      String destinationType = getDestinationType();
+      if (destinationType == null)
+      {
+         log.warn("No message-driven-destination given; using; guessing type");
+         destinationType = getDestinationType(context, getDestination());
+      }
+
+      if ("javax.jms.Topic".equals(destinationType))
+      {
+         innerCreateTopic(context);
+
+      }
+      else if ("javax.jms.Queue".equals(destinationType))
+      {
+         innerCreateQueue(context);
+
+      }
+      else
+         throw new DeploymentException("Unknown destination-type " + destinationType);
+
+      log.debug("Initialized with config " + toString());
+
+      context.close();
+   }
+   
+   protected void innerCreateQueue(Context context)
+           throws Exception
+   {
+      log.debug("Got destination type Queue for " + ejbName);
+
+      // Get the JNDI suffix of the destination
+      String jndiSuffix = parseJndiSuffix(getDestination(), ejbName);
+      log.debug("jndiSuffix: " + jndiSuffix);
+
+      // lookup or create the destination queue
+      Queue queue = null;
+      try
+      {
+         // First we try the specified queue
+         if (getDestination() != null)
+            queue = (Queue) context.lookup(getDestination());
+      }
+      catch (NamingException e)
+      {
+         log.warn("Could not find the queue destination-jndi-name=" + getDestination());
+      }
+      catch (ClassCastException e)
+      {
+         throw new DeploymentException("Expected a Queue destination-jndi-name=" + getDestination());
+      }
+
+      if (queue == null)
+         queue = (Queue) createDestination(Queue.class,
+                 context,
+                 "queue/" + jndiSuffix,
+                 jndiSuffix);
+   }
+
+   protected void innerCreateTopic(Context context)
+           throws Exception
+   {
+      log.debug("Got destination type Topic for " + ejbName);
+
+      // Get the JNDI suffix of the destination
+      String jndiSuffix = parseJndiSuffix(getDestination(), ejbName);
+      log.debug("jndiSuffix: " + jndiSuffix);
+
+      // lookup or create the destination topic
+      Topic topic = null;
+      try
+      {
+         // First we try the specified topic
+         if (getDestination() != null)
+            topic = (Topic) context.lookup(getDestination());
+      }
+      catch (NamingException e)
+      {
+         log.warn("Could not find the topic destination-jndi-name=" + getDestination());
+      }
+      catch (ClassCastException e)
+      {
+         throw new DeploymentException("Expected a Topic destination-jndi-name=" + getDestination());
+      }
+
+      if (topic == null)
+         topic = (Topic) createDestination(Topic.class,
+                 context,
+                 "topic/" + jndiSuffix,
+                 jndiSuffix);
+   }
+
+   /**
+    * Create and or lookup a JMS destination.
+    *
+    * @param type       Either javax.jms.Queue or javax.jms.Topic.
+    * @param ctx        The naming context to lookup destinations from.
+    * @param jndiName   The name to use when looking up destinations.
+    * @param jndiSuffix The name to use when creating destinations.
+    * @return The destination.
+    * @throws IllegalArgumentException Type is not Queue or Topic.
+    * @throws Exception                Description of Exception
+    */
+   private Destination createDestination(final Class<? extends Destination> type,
+                                           final Context ctx,
+                                           final String jndiName,
+                                           final String jndiSuffix)
+           throws Exception
+   {
+      try
+      {
+         // first try to look it up
+         return (Destination) ctx.lookup(jndiName);
+      }
+      catch (NamingException e)
+      {
+         // is JMS?
+         if (getDestination() == null)
+         {
+            return null;
+         }
+         else
+         {
+            // if the lookup failes, the try to create it
+            log.warn("destination not found: " + jndiName + " reason: " + e);
+            log.warn("creating a new temporary destination: " + jndiName);
+            
+            createTemporaryDestination(type, jndiSuffix);
+       
+            // try to look it up again
+            return (Destination) ctx.lookup(jndiName);
+         }
+      }
+   }
+   
+   private void createTemporaryDestination(Class<? extends Destination> type, String jndiSuffix) throws Exception
+   {
+      //
+      // jason: we should do away with this...
+      //
+      // attempt to create the destination (note, this is very
+      // very, very unportable).
+      //
+
+      // MBeanServer server = org.jboss.mx.util.MBeanServerLocator.locateJBoss();
+      
+//      String methodName;
+//      String destinationContext;
+//      if (type == Topic.class)
+//      {
+//         destinationContext = "topic";
+//         methodName = "createTopic";
+//      }
+//      else if (type == Queue.class)
+//      {
+//         destinationContext = "queue";
+//         methodName = "createQueue";
+//      }
+//      else
+//      {
+//         // type was not a Topic or Queue, bad user
+//         throw new IllegalArgumentException
+//                 ("Expected javax.jms.Queue or javax.jms.Topic: " + type);
+//      }
+      
+      /* No longer supported (AS 4.x)
+      ObjectName destinationManagerName = new ObjectName("jboss.mq:service=DestinationManager");
+      
+      KernelAbstraction kernel = KernelAbstractionFactory.getInstance();
+      // invoke the server to create the destination
+      Object result = kernel.invoke(destinationManagerName,
+              methodName,
+              new Object[]{jndiSuffix},
+              new String[]{"java.lang.String"});
+      
+      InitialContext jndiContext = InitialContextFactory.getInitialContext();
+      String binding = destinationContext + "/" + jndiSuffix;
+      try
+      {
+         jndiContext.lookup(binding);
+      }
+      catch (NamingException e)
+      {
+         jndiContext.rebind(binding, result);
+      }
+      */
+      
+      //throw new UnsupportedOperationException("Can't create destination " + destinationContext + "/" + jndiSuffix);
+      JMSDestinationFactory.getInstance().createDestination(type, jndiSuffix);
+   }
+   
+   /**
+    * Return the JMSProviderAdapter that should be used.
+    *
+    * @return The JMSProviderAdapter to use.
+    */
+   protected JMSProviderAdapter getJMSProviderAdapter()
+           throws NamingException
+   {
+      Context context = getInitialContext();
+      //todo make this pluggable
+      String providerAdapterJNDI = getProviderAdapterJNDI();
+      try
+      {
+         log.debug("Looking up provider adapter: " + providerAdapterJNDI);
+     
+         return (JMSProviderAdapter) context.lookup(providerAdapterJNDI);
+      }
+      finally
+      {
+         context.close();
+      }
+   }
+
+   /**
+    * Try to get a destination type by looking up the destination JNDI, or
+    * provide a default if there is not destinationJNDI or if it is not possible
+    * to lookup.
+    *
+    * @param ctx             The naming context to lookup destinations from.
+    * @param destinationJNDI The name to use when looking up destinations.
+    * @return The destination type, either derived from destinationJDNI or
+    *         DEFAULT_DESTINATION_TYPE
+    */
+   protected String getDestinationType(Context ctx, String destinationJNDI)
+   {
+      String destType = null;
+
+      if (destinationJNDI != null)
+      {
+         try
+         {
+            Destination dest = (Destination) ctx.lookup(destinationJNDI);
+            if (dest instanceof javax.jms.Topic)
+            {
+               destType = "javax.jms.Topic";
+            }
+            else if (dest instanceof javax.jms.Queue)
+            {
+               destType = "javax.jms.Queue";
+            }
+         }
+         catch (NamingException ex)
+         {
+            log.debug("Could not do heristic lookup of destination ", ex);
+         }
+
+      }
+      if (destType == null)
+      {
+         log.warn("Could not determine destination type, defaults to: " +
+                 DEFAULT_DESTINATION_TYPE);
+
+         destType = DEFAULT_DESTINATION_TYPE;
+      }
+
+      return destType;
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import javax.jms.JMSException;
-
-/**
- * Helper class for setting all @Producer settings
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ProducerConfig
-{
-   public static void setUsername(Object producer, String user)
-   {
-      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
-      manager.setUsername(user);
-   }
-
-   public static void setPassword(Object producer, String passwd)
-   {
-      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
-      manager.setPassword(passwd);
-   }
-
-
-   public static void connect(Object producer) throws JMSException
-   {
-      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
-      manager.connect();
-   }
-
-   public static void close(Object producer) throws JMSException
-   {
-      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
-      manager.close();
-   }
-
-
-   public static void commit(Object producer) throws JMSException
-   {
-      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
-      manager.commit();
-   }
-
-   public static void rollback(Object producer) throws JMSException
-   {
-      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
-      manager.rollback();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb;
+
+import javax.jms.JMSException;
+
+/**
+ * Helper class for setting all @Producer settings
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ProducerConfig
+{
+   public static void setUsername(Object producer, String user)
+   {
+      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
+      manager.setUsername(user);
+   }
+
+   public static void setPassword(Object producer, String passwd)
+   {
+      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
+      manager.setPassword(passwd);
+   }
+
+
+   public static void connect(Object producer) throws JMSException
+   {
+      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
+      manager.connect();
+   }
+
+   public static void close(Object producer) throws JMSException
+   {
+      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
+      manager.close();
+   }
+
+
+   public static void commit(Object producer) throws JMSException
+   {
+      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
+      manager.commit();
+   }
+
+   public static void rollback(Object producer) throws JMSException
+   {
+      ProducerManager manager = ((ProducerObject) producer).getProducerManager();
+      manager.rollback();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerConfig.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -234,8 +234,11 @@
    public void close() throws JMSException
    {
       msgProducer.close();
+      msgProducer = null;
       session.close();
+      session = null;
       connection.close();
+      connection = null;
    }
 
    public void commit() throws JMSException

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/ProducerProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,6 +36,8 @@
  */
 public class ProducerProxy implements InvocationHandler, Serializable
 {
+   private static final long serialVersionUID = -2077140072365253007L;
+   
    protected ProducerManager producer;
    protected Interceptor[] interceptors;
 

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.mdb.inflow;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revison:$
- */
-public class GetTCLAction implements PrivilegedAction
-{
-   static PrivilegedAction ACTION = new GetTCLAction(null);
-   Thread t;
-
-   GetTCLAction(Thread t)
-   {
-      this.t = t;
-   }
-   public Object run()
-   {
-      Thread thread = t;
-      if (thread == null)
-         thread = Thread.currentThread();
-      ClassLoader loader = thread.getContextClassLoader();
-      return loader;
-   }
-
-   static ClassLoader getContextClassLoader()
-   {
-      ClassLoader loader = (ClassLoader) AccessController.doPrivileged(ACTION);
-      return loader;
-   }
-   static ClassLoader getContextClassLoader(Thread t)
-   {
-      GetTCLAction action = new GetTCLAction(t);
-      ClassLoader loader = (ClassLoader) AccessController.doPrivileged(action);
-      return loader;
-   }
-
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb.inflow;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revison:$
+ */
+public class GetTCLAction implements PrivilegedAction
+{
+   static PrivilegedAction ACTION = new GetTCLAction(null);
+   Thread t;
+
+   GetTCLAction(Thread t)
+   {
+      this.t = t;
+   }
+   public Object run()
+   {
+      Thread thread = t;
+      if (thread == null)
+         thread = Thread.currentThread();
+      ClassLoader loader = thread.getContextClassLoader();
+      return loader;
+   }
+
+   static ClassLoader getContextClassLoader()
+   {
+      ClassLoader loader = (ClassLoader) AccessController.doPrivileged(ACTION);
+      return loader;
+   }
+   static ClassLoader getContextClassLoader(Thread t)
+   {
+      GetTCLAction action = new GetTCLAction(t);
+      ClassLoader loader = (ClassLoader) AccessController.doPrivileged(action);
+      return loader;
+   }
+
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/GetTCLAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,332 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.mdb.inflow;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-
-import javax.ejb.TransactionManagementType;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.UnavailableException;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.xa.XAResource;
-
-import org.jboss.deployment.DeploymentException;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.KernelAbstractionFactory;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.mdb.MessagingContainer;
-import org.jboss.mx.util.JMXExceptionDecoder;
-import org.jboss.logging.Logger;
-
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
-/**
- * EJBProxyFactory for inflow message driven beans
- *
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
- */
-public class JBossMessageEndpointFactory implements MessageEndpointFactory
-{
-   private static final Logger log = Logger.getLogger(JBossMessageEndpointFactory.class);
-
-   /** Whether trace is enabled */
-   protected boolean trace = log.isTraceEnabled();
-   
-   /** Our container */
-   protected MessagingContainer container;
-   
-   /** The activation properties */
-   protected HashMap properties = new HashMap();
-   
-   /** The messaging type class */
-   protected Class messagingTypeClass;
-   
-   /** The resource adapter name */
-   protected String resourceAdapterName;
-   
-   protected ObjectName resourceAdapterObjectName;
-     
-   /** The activation spec */
-   protected ActivationSpec activationSpec;
-   
-   /** The interfaces */
-   protected Class[] interfaces;
-
-   /** The next proxy id */
-   protected SynchronizedInt nextProxyId = new SynchronizedInt(0);
-    
-   // Static --------------------------------------------------------
-   
-   /** The signature for createActivationSpec */
-   protected String[] createActivationSpecSig = new String[]
-   {
-      Class.class.getName(),
-      Collection.class.getName()
-   };              
-   
-   /** The signature for activate/deactivateEndpint */
-   protected String[] activationSig = new String[]
-   {
-      MessageEndpointFactory.class.getName(),
-      ActivationSpec.class.getName()
-   };              
-         
-   // Constructors --------------------------------------------------
-   
-   public JBossMessageEndpointFactory()
-   {
-   }
-   
-   // Public --------------------------------------------------------
-   
-   /**
-    * Get the message driven container
-    * 
-    * @return the container
-    */
-   public MessagingContainer getContainer()
-   {
-      return container;
-   }
-   
-   // MessageEndpointFactory implementation -------------------------
-
-   public MessageEndpoint createEndpoint(XAResource resource) throws UnavailableException
-   {   
-      trace = log.isTraceEnabled(); 
-      
-      if (trace)
-         log.trace("createEndpoint " + this + " xaResource=" + resource);
-          
-      MessageEndpoint endpoint = createProxy(resource);
-        
-      if (trace)
-         log.trace("Created endpoint " + endpoint + " from " + this);
-
-      return endpoint;
-   }
-   
-   protected MessageEndpoint createProxy(XAResource resource)
-   {
-      try 
-      {
-         Class proxyClass = java.lang.reflect.Proxy.getProxyClass(container.getBeanClass().getClassLoader(), interfaces);
-            
-         final Class[] constructorParams = {InvocationHandler.class};
-         java.lang.reflect.Constructor proxyConstructor = proxyClass.getConstructor(constructorParams);
-         
-         MessageInflowLocalProxy proxy = new MessageInflowLocalProxy(container);
-         proxy.setXaResource(resource);
-         proxy.setMessageEndpointFactory(this);
-         
-         Object[] args = {proxy};
-         MessageEndpoint endpoint = (MessageEndpoint)proxyConstructor.newInstance(args);
-         return endpoint;
-         
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-
-   public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException
-   {
-      TransactionManagementType mtype = TxUtil.getTransactionManagementType(container);
-      if (mtype == javax.ejb.TransactionManagementType.BEAN) return false;
-
-
-      TransactionAttribute attr = (TransactionAttribute)container.resolveAnnotation(method, TransactionAttribute.class);
-      if (attr == null)
-      {
-         attr =(TransactionAttribute)container.resolveAnnotation(TransactionAttribute.class);
-      }
-      TransactionAttributeType type = TransactionAttributeType.REQUIRED;
-      if (attr != null) type = attr.value();
-      return type == javax.ejb.TransactionAttributeType.REQUIRED;
-   }
-   
-   // ServiceMBeanSupport overrides ---------------------------------
-   
-   public void start() throws Exception
-   {
-      // Resolve the message listener
-      resolveMessageListener();
-      resolveResourceAdapterName();
-      // Resolve the resource adapter
-      resolveResourceAdapter();
-      // Create the activation config
-      createActivationSpec();
-      // Set up proxy parameters
-      // Set the interfaces
-      interfaces = new Class[] { MessageEndpoint.class, messagingTypeClass};
-      // Activate
-      activate();
-   }
-   
-   public void stop() throws Exception
-   {
-      // Deactivate
-      deactivate();
-   }
-   // ContainerService implementation -------------------------------
-   
-   /**
-    * Set the container for which this is an invoker to.
-    *
-    * @param container  The container for which this is an invoker to.
-    */
-   public void setContainer(final Container container)
-   {
-      this.container = (MessagingContainer) container;
-   }
-   
-   // Object overrides ----------------------------------------------
-   
-   /**
-    * Return a string representation of the current config state.
-    */
-   public String toString()
-   {
-      StringBuffer buffer = new StringBuffer(100);
-      buffer.append(super.toString());
-      buffer.append("{ resourceAdapter=").append(resourceAdapterName);
-      buffer.append(", messagingType=").append(container.getMessagingType());
-      buffer.append(", ejbName=").append(container.getEjbName());
-      buffer.append(", activationConfig=").append(properties.values());
-      buffer.append(", activationSpec=").append(activationSpec);
-      buffer.append("}");
-      return buffer.toString();
-   }   
-   
-   // Protected -----------------------------------------------------
-
-   /**
-    * Resolve message listener class
-    * 
-    * @throws DeploymentException for any error
-    */
-   protected void resolveMessageListener() throws DeploymentException
-   {
-      messagingTypeClass = container.getMessagingType();
-   }
-
-   /**
-    * Resolve the resource adapter name
-    * 
-    * @return the resource adapter name
-    * @throws DeploymentException for any error
-    */
-   protected void resolveResourceAdapterName() throws DeploymentException
-   {
-      resourceAdapterName = container.getResourceAdaptorName();
-   }
-
-   protected void resolveResourceAdapter()
-   {
-      try
-      {
-         resourceAdapterObjectName = new ObjectName("jboss.jca:service=RARDeployment,name='" + resourceAdapterName + "'");
-         // todo register with kernel and push dependencies to kernel
-      }
-      catch (MalformedObjectNameException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   /**
-    * Create the activation spec
-    * 
-    * @throws DeploymentException for any error
-    */
-   protected void createActivationSpec() throws DeploymentException
-   {
-      properties = new HashMap(container.getActivationConfigProperties());
-         
-      Object[] params = new Object[] 
-      {
-         messagingTypeClass,
-         properties.values()
-      };
-    
-      try
-      {
-         activationSpec = (ActivationSpec) KernelAbstractionFactory.getInstance().invoke(resourceAdapterObjectName, "createActivationSpec", params, createActivationSpecSig);
-      }
-      catch (Throwable t)
-      {
-         t = JMXExceptionDecoder.decode(t);
-         DeploymentException.rethrowAsDeploymentException("Unable to create activation spec ra=" + resourceAdapterObjectName + 
-               " messaging-type=" + messagingTypeClass.getName() + " properties=" + container.getActivationConfigProperties(), t);
-      }
-   }
-   
-   /**
-    * Activate
-    * 
-    * @throws DeploymentException for any error
-    */
-   protected void activate() throws DeploymentException
-   {   
-      Object[] params = new Object[] { this, activationSpec };
-      try
-      {
-         KernelAbstractionFactory.getInstance().invoke(resourceAdapterObjectName, "endpointActivation", params, activationSig);
-      }
-      catch (Throwable t)
-      {
-         t = JMXExceptionDecoder.decode(t);
-         DeploymentException.rethrowAsDeploymentException("Endpoint activation failed ra=" + resourceAdapterObjectName + 
-               " activationSpec=" + activationSpec, t);
-      }
-   }
-   
-   /**
-    * Deactivate
-    */
-   protected void deactivate()
-   {
-      Object[] params = new Object[] { this, activationSpec };
-      try
-      {
-         KernelAbstractionFactory.getInstance().invoke(resourceAdapterObjectName, "endpointDeactivation", params, activationSig);
-      }
-      catch (Throwable t)
-      {
-         t = JMXExceptionDecoder.decode(t);
-         log.warn("Endpoint activation failed ra=" + resourceAdapterObjectName + 
-               " activationSpec=" + activationSpec, t);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,332 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb.inflow;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashMap;
+
+import javax.ejb.TransactionManagementType;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.management.ObjectName;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.resource.spi.ActivationSpec;
+import javax.resource.spi.UnavailableException;
+import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.transaction.xa.XAResource;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.mx.util.JMXExceptionDecoder;
+import org.jboss.logging.Logger;
+
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
+
+/**
+ * EJBProxyFactory for inflow message driven beans
+ *
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
+ */
+public class JBossMessageEndpointFactory implements MessageEndpointFactory
+{
+   private static final Logger log = Logger.getLogger(JBossMessageEndpointFactory.class);
+
+   /** Whether trace is enabled */
+   protected boolean trace = log.isTraceEnabled();
+   
+   /** Our container */
+   protected MessagingContainer container;
+   
+   /** The activation properties */
+   protected HashMap properties = new HashMap();
+   
+   /** The messaging type class */
+   protected Class messagingTypeClass;
+   
+   /** The resource adapter name */
+   protected String resourceAdapterName;
+   
+   protected ObjectName resourceAdapterObjectName;
+     
+   /** The activation spec */
+   protected ActivationSpec activationSpec;
+   
+   /** The interfaces */
+   protected Class[] interfaces;
+
+   /** The next proxy id */
+   protected SynchronizedInt nextProxyId = new SynchronizedInt(0);
+    
+   // Static --------------------------------------------------------
+   
+   /** The signature for createActivationSpec */
+   protected String[] createActivationSpecSig = new String[]
+   {
+      Class.class.getName(),
+      Collection.class.getName()
+   };              
+   
+   /** The signature for activate/deactivateEndpint */
+   protected String[] activationSig = new String[]
+   {
+      MessageEndpointFactory.class.getName(),
+      ActivationSpec.class.getName()
+   };              
+         
+   // Constructors --------------------------------------------------
+   
+   public JBossMessageEndpointFactory()
+   {
+   }
+   
+   // Public --------------------------------------------------------
+   
+   /**
+    * Get the message driven container
+    * 
+    * @return the container
+    */
+   public MessagingContainer getContainer()
+   {
+      return container;
+   }
+   
+   // MessageEndpointFactory implementation -------------------------
+
+   public MessageEndpoint createEndpoint(XAResource resource) throws UnavailableException
+   {   
+      trace = log.isTraceEnabled(); 
+      
+      if (trace)
+         log.trace("createEndpoint " + this + " xaResource=" + resource);
+          
+      MessageEndpoint endpoint = createProxy(resource);
+        
+      if (trace)
+         log.trace("Created endpoint " + endpoint + " from " + this);
+
+      return endpoint;
+   }
+   
+   protected MessageEndpoint createProxy(XAResource resource)
+   {
+      try 
+      {
+         Class proxyClass = java.lang.reflect.Proxy.getProxyClass(container.getBeanClass().getClassLoader(), interfaces);
+            
+         final Class[] constructorParams = {InvocationHandler.class};
+         java.lang.reflect.Constructor proxyConstructor = proxyClass.getConstructor(constructorParams);
+         
+         MessageInflowLocalProxy proxy = new MessageInflowLocalProxy(container);
+         proxy.setXaResource(resource);
+         proxy.setMessageEndpointFactory(this);
+         
+         Object[] args = {proxy};
+         MessageEndpoint endpoint = (MessageEndpoint)proxyConstructor.newInstance(args);
+         return endpoint;
+         
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+
+   public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException
+   {
+      TransactionManagementType mtype = TxUtil.getTransactionManagementType(container);
+      if (mtype == javax.ejb.TransactionManagementType.BEAN) return false;
+
+
+      TransactionAttribute attr = (TransactionAttribute)container.resolveAnnotation(method, TransactionAttribute.class);
+      if (attr == null)
+      {
+         attr =(TransactionAttribute)container.resolveAnnotation(TransactionAttribute.class);
+      }
+      TransactionAttributeType type = TransactionAttributeType.REQUIRED;
+      if (attr != null) type = attr.value();
+      return type == javax.ejb.TransactionAttributeType.REQUIRED;
+   }
+   
+   // ServiceMBeanSupport overrides ---------------------------------
+   
+   public void start() throws Exception
+   {
+      // Resolve the message listener
+      resolveMessageListener();
+      resolveResourceAdapterName();
+      // Resolve the resource adapter
+      resolveResourceAdapter();
+      // Create the activation config
+      createActivationSpec();
+      // Set up proxy parameters
+      // Set the interfaces
+      interfaces = new Class[] { MessageEndpoint.class, messagingTypeClass};
+      // Activate
+      activate();
+   }
+   
+   public void stop() throws Exception
+   {
+      // Deactivate
+      deactivate();
+   }
+   // ContainerService implementation -------------------------------
+   
+   /**
+    * Set the container for which this is an invoker to.
+    *
+    * @param container  The container for which this is an invoker to.
+    */
+   public void setContainer(final Container container)
+   {
+      this.container = (MessagingContainer) container;
+   }
+   
+   // Object overrides ----------------------------------------------
+   
+   /**
+    * Return a string representation of the current config state.
+    */
+   public String toString()
+   {
+      StringBuffer buffer = new StringBuffer(100);
+      buffer.append(super.toString());
+      buffer.append("{ resourceAdapter=").append(resourceAdapterName);
+      buffer.append(", messagingType=").append(container.getMessagingType());
+      buffer.append(", ejbName=").append(container.getEjbName());
+      buffer.append(", activationConfig=").append(properties.values());
+      buffer.append(", activationSpec=").append(activationSpec);
+      buffer.append("}");
+      return buffer.toString();
+   }   
+   
+   // Protected -----------------------------------------------------
+
+   /**
+    * Resolve message listener class
+    * 
+    * @throws DeploymentException for any error
+    */
+   protected void resolveMessageListener() throws DeploymentException
+   {
+      messagingTypeClass = container.getMessagingType();
+   }
+
+   /**
+    * Resolve the resource adapter name
+    * 
+    * @return the resource adapter name
+    * @throws DeploymentException for any error
+    */
+   protected void resolveResourceAdapterName() throws DeploymentException
+   {
+      resourceAdapterName = container.getResourceAdaptorName();
+   }
+
+   protected void resolveResourceAdapter()
+   {
+      try
+      {
+         resourceAdapterObjectName = new ObjectName("jboss.jca:service=RARDeployment,name='" + resourceAdapterName + "'");
+         // todo register with kernel and push dependencies to kernel
+      }
+      catch (MalformedObjectNameException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   /**
+    * Create the activation spec
+    * 
+    * @throws DeploymentException for any error
+    */
+   protected void createActivationSpec() throws DeploymentException
+   {
+      properties = new HashMap(container.getActivationConfigProperties());
+         
+      Object[] params = new Object[] 
+      {
+         messagingTypeClass,
+         properties.values()
+      };
+    
+      try
+      {
+         activationSpec = (ActivationSpec) KernelAbstractionFactory.getInstance().invoke(resourceAdapterObjectName, "createActivationSpec", params, createActivationSpecSig);
+      }
+      catch (Throwable t)
+      {
+         t = JMXExceptionDecoder.decode(t);
+         DeploymentException.rethrowAsDeploymentException("Unable to create activation spec ra=" + resourceAdapterObjectName + 
+               " messaging-type=" + messagingTypeClass.getName() + " properties=" + container.getActivationConfigProperties(), t);
+      }
+   }
+   
+   /**
+    * Activate
+    * 
+    * @throws DeploymentException for any error
+    */
+   protected void activate() throws DeploymentException
+   {   
+      Object[] params = new Object[] { this, activationSpec };
+      try
+      {
+         KernelAbstractionFactory.getInstance().invoke(resourceAdapterObjectName, "endpointActivation", params, activationSig);
+      }
+      catch (Throwable t)
+      {
+         t = JMXExceptionDecoder.decode(t);
+         DeploymentException.rethrowAsDeploymentException("Endpoint activation failed ra=" + resourceAdapterObjectName + 
+               " activationSpec=" + activationSpec, t);
+      }
+   }
+   
+   /**
+    * Deactivate
+    */
+   protected void deactivate()
+   {
+      Object[] params = new Object[] { this, activationSpec };
+      try
+      {
+         KernelAbstractionFactory.getInstance().invoke(resourceAdapterObjectName, "endpointDeactivation", params, activationSig);
+      }
+      catch (Throwable t)
+      {
+         t = JMXExceptionDecoder.decode(t);
+         log.warn("Endpoint activation failed ra=" + resourceAdapterObjectName + 
+               " activationSpec=" + activationSpec, t);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,531 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.mdb.inflow;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationHandler;
-
-import javax.resource.ResourceException;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.Status;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAResource;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.aop.MethodInfo;
-import org.jboss.ejb3.mdb.MessagingContainer;
-import org.jboss.ejb3.mdb.MDB;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.logging.Logger;
-
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class MessageInflowLocalProxy implements InvocationHandler
-{
-   private static final Logger log = Logger.getLogger(MessageInflowLocalProxy.class);
-   
-   /** The key for the factory */
-   public static final String MESSAGE_ENDPOINT_FACTORY = "MessageEndpoint.Factory";
-
-   /** The key for the xa resource */
-   public static final String MESSAGE_ENDPOINT_XARESOURCE = "MessageEndpoint.XAResource";
-   
-   /** Whether trace is enabled */
-   private boolean trace = log.isTraceEnabled(); 
-   
-   /** Cached version of our proxy string */
-   private String cachedProxyString = null;
-   
-   /** Whether this proxy has been released */
-   protected SynchronizedBoolean released = new SynchronizedBoolean(false);
-   
-   /** Whether we have delivered a message */
-   protected boolean delivered = false;
-   
-   /** The in use thread */
-   protected Thread inUseThread = null;
-   
-   /** The old classloader of the thread */
-   protected ClassLoader oldClassLoader = null;
-   
-   /** Any transaction we started */
-   protected Transaction transaction = null;
-   
-   /** Any suspended transaction */
-   protected Transaction suspended = null;
-
-   /** The message endpoint factory */
-   private JBossMessageEndpointFactory endpointFactory;
-   
-   private XAResource resource;
-   private MessageEndpointFactory messageEndpointFactory;
-   
-   MessagingContainer container;
-
-   protected MessageInflowLocalProxy(MessagingContainer container)
-   {
-      this.container = container;
-   }
-
-   public void setMessageEndpointFactory(MessageEndpointFactory messageEndpointFactory)
-   {
-      this.messageEndpointFactory = messageEndpointFactory;
-   }
-   
-   public void setXaResource(XAResource resource)
-   {
-      this.resource = resource;
-   }
-
-   public Object invoke(Object proxy, Method method, Object[] args)
-           throws Throwable
-   {   
-      // Are we still useable?
-      if (released.get())
-         throw new IllegalStateException("This message endpoint + " + getProxyString(proxy) + " has been released");
-
-      // Concurrent invocation?
-      Thread currentThread = Thread.currentThread();
-      if (inUseThread != null && inUseThread.equals(currentThread) == false)
-         throw new IllegalStateException("This message endpoint + " + getProxyString(proxy) + " is already in use by another thread " + inUseThread);
-      inUseThread = currentThread;
-      
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " in use by " + method + " " + inUseThread);
-      
-      // Which operation?
-      if (method.getName().equals("release"))
-      {
-         release(proxy);
-         return null;
-      }
-      else if (method.getName().equals("beforeDelivery"))
-      {
-         before(proxy, container, method, args);
-         return null;
-      }
-      else if (method.getName().equals("afterDelivery"))
-      {
-         after(proxy);
-         return null;
-      }
-      else
-         return delivery(proxy, container, method, args);
-   }
-
-   public String toString()
-   {
-      return container.getEjbName().toString();
-   }
-   
-   // -----------------------------------------------------------
-   
-   /**
-    * Release this message endpoint.
-    * 
-    * @param mi the invocation
-    * @throws Throwable for any error
-    */
-   protected void release(Object proxy) throws Throwable
-   {
-      // We are now released
-      released.set(true);
-
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " released");
-      
-      // Tidyup any outstanding delivery
-      if (oldClassLoader != null)
-      {
-         try
-         {
-            finish("release", proxy, false);
-         }
-         catch (Throwable t)
-         {
-            log.warn("Error in release ", t);
-         }
-      }
-   }
-   
-   /**
-    * Before delivery processing.
-    * 
-    * @param mi the invocation
-    * @throws Throwable for any error
-    */
-   protected void before(Object proxy, MessagingContainer container, Method method, Object[] args) throws Throwable
-   {
-      // Called out of sequence
-      if (oldClassLoader != null)
-         throw new IllegalStateException("Missing afterDelivery from the previous beforeDelivery for message endpoint " + getProxyString(proxy));
-
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " released");
-
-      // Set the classloader
-      oldClassLoader = GetTCLAction.getContextClassLoader(inUseThread);
-      SetTCLAction.setContextClassLoader(inUseThread, container.getClassloader());
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " set context classloader to " + container.getClassloader());
-
-      // start any transaction
-      try
-      {
-         // Is the delivery transacted?
-         MethodInfo methodInfo = container.getMethodInfo((Method)args[0]);
-         boolean isTransacted = messageEndpointFactory.isDeliveryTransacted(methodInfo.getAdvisedMethod());
-
-         startTransaction("beforeDelivery", proxy, container, method, args, isTransacted);
-      }
-      catch (Throwable t)
-      {
-         resetContextClassLoader(proxy);
-         throw new ResourceException(t);
-      }
-   }
-   
-   /**
-    * After delivery processing.
-    * 
-    * @param mi the invocation
-    * @throws Throwable for any error
-    */
-   protected void after(Object proxy) throws Throwable
-   {
-      // Called out of sequence
-      if (oldClassLoader == null)
-         throw new IllegalStateException("afterDelivery without a previous beforeDelivery for message endpoint " + getProxyString(proxy));
-
-      // Finish this delivery committing if we can
-      try
-      {
-         finish("afterDelivery", proxy, true);
-      }
-      catch (Throwable t)
-      {
-         throw new ResourceException(t);
-      }
-   }
-   
-   /**
-    * Delivery.
-    * 
-    * @param mi the invocation
-    * @return the result of the delivery
-    * @throws Throwable for any error
-    */
-   protected Object delivery(Object proxy, MessagingContainer container, Method method, Object[] args) throws Throwable
-   {
-      // Have we already delivered a message?
-      if (delivered)
-         throw new IllegalStateException("Multiple message delivery between before and after delivery is not allowed for message endpoint " + getProxyString(proxy));
-
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " delivering");
-      
-      // Mark delivery if beforeDelivery was invoked
-      if (oldClassLoader != null)
-         delivered = true;
-
-      boolean commit = true;
-      // Is the delivery transacted?
-      MethodInfo methodInfo = container.getMethodInfo(method);
-
-      try
-      {
-         // Check for starting a transaction
-         if (oldClassLoader == null)
-         {
-            boolean isTransacted = messageEndpointFactory.isDeliveryTransacted(methodInfo.getAdvisedMethod());
-            startTransaction("delivery", proxy, container, method, args, isTransacted);
-         }
-         return container.localInvoke(methodInfo, args);
-      }
-      catch (Throwable t)
-      {
-         if (trace)
-            log.trace("MessageEndpoint " + getProxyString(proxy) + " delivery error", t);
-         if (t instanceof Error || t instanceof RuntimeException)
-         {
-            if (transaction != null)
-               transaction.setRollbackOnly();
-            commit = false;
-         }
-         throw t;
-      }
-      finally
-      {
-         // No before/after delivery, end any transaction and release the lock
-         if (oldClassLoader == null)
-         {
-            try
-            {
-               // Finish any transaction we started
-               endTransaction(proxy, commit);
-            }
-            finally
-            {
-               releaseThreadLock(proxy);
-            }
-         }
-      }
-   }
-   
-   /**
-    * Finish the current delivery
-    * 
-    * @param context the lifecycle method
-    * @param mi the invocation
-    * @param commit whether to commit
-    * @throws Throwable for any error
-    */
-   protected void finish(String context, Object proxy, boolean commit) throws Throwable
-   {
-      try
-      {
-         endTransaction(proxy, commit);
-      }
-      finally
-      {
-         // Reset delivered flag
-         delivered = false;
-         // Change back to the original context classloader
-         resetContextClassLoader(proxy);
-         // We no longer hold the lock
-         releaseThreadLock(proxy);
-      }
-   }
-
-   /**
-    * Start a transaction
-    *  
-    * @param context the lifecycle method
-    * @param mi the invocation
-    * @param container the container
-    * @throws Throwable for any error
-    */
-   protected void startTransaction(String context, Object proxy, MessagingContainer container, Method m, Object[] args, boolean isTransacted) throws Throwable
-   { 
-      Method method;
-      
-      // Normal delivery      
-      if ("delivery".equals(context))
-         method = m;
-      // Before delivery
-      else
-         method = (Method)args[0];
-
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " " + context + " method=" + method + " xaResource=" + resource + " transacted=" + isTransacted);
-
-      // Get the transaction status
-      TransactionManager tm = TxUtil.getTransactionManager(); //container.getTransactionManager();
-      suspended = tm.suspend();
-
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " " + context + " currentTx=" + suspended);
-
-      // Delivery is transacted
-      if (isTransacted)
-      {
-         // No transaction means we start a new transaction and enlist the resource
-         if (suspended == null)
-         {
-            tm.begin();
-            transaction = tm.getTransaction();
-            if (trace)
-               log.trace("MessageEndpoint " + getProxyString(proxy) + " started transaction=" + transaction);
-      
-            // Enlist the XAResource in the transaction
-            if (resource != null)
-            {
-               transaction.enlistResource(resource);
-               if (trace)
-                  log.trace("MessageEndpoint " + getProxyString(proxy) + " enlisted=" + resource);
-            }
-         }
-         else
-         {
-            // If there is already a transaction we ignore the XAResource (by spec 12.5.9)
-            try
-            {
-               tm.resume(suspended);
-            }
-            finally
-            {
-               suspended = null;
-               if (trace)
-                  log.trace("MessageEndpoint " + getProxyString(proxy) + " transaction=" + suspended + " already active, IGNORED=" + resource);
-            }
-         }
-      }
-   }
-   
-   /**
-    * End the transaction
-    * 
-    * @param mi the invocation
-    * @param commit whether to try to commit
-    * @throws Throwable for any error
-    */
-   protected void endTransaction(Object proxy, boolean commit) throws Throwable
-   {
-      TransactionManager tm = null;
-      Transaction currentTx = null;
-      try
-      {
-         // If we started the transaction, commit it
-         if (transaction != null)
-         {
-            tm = TxUtil.getTransactionManager(); //getContainer(mi).getTransactionManager();
-            currentTx = tm.getTransaction();
-            
-            // Suspend any bad transaction - there is bug somewhere, but we will try to tidy things up
-            if (currentTx != null && currentTx.equals(transaction) == false)
-            {
-               log.warn("Current transaction " + currentTx + " is not the expected transaction.");
-               tm.suspend();
-               tm.resume(transaction);
-            }
-            else
-            {
-               // We have the correct transaction
-               currentTx = null;
-            }
-            
-            // Commit or rollback depending on the status
-            if (commit == false || transaction.getStatus() == Status.STATUS_MARKED_ROLLBACK)
-            {
-               if (trace)
-                  log.trace("MessageEndpoint " + getProxyString(proxy) + " rollback");
-               tm.rollback();
-            }
-            else
-            {
-               if (trace)
-                  log.trace("MessageEndpoint " + getProxyString(proxy) + " commit");
-               tm.commit();
-            }
-         }
-
-         // If we suspended the incoming transaction, resume it
-         if (suspended != null)
-         {
-            try
-            {
-               tm = TxUtil.getTransactionManager(); //getContainer(mi).getTransactionManager();
-               tm.resume(suspended);
-            }
-            finally
-            {
-               suspended = null;
-            }
-         }
-      }
-      finally
-      {
-         // Resume any suspended transaction
-         if (currentTx != null)
-         {
-            try
-            {
-               tm.resume(currentTx);
-            }
-            catch (Throwable t)
-            {
-               log.warn("MessageEndpoint " + getProxyString(proxy) + " failed to resume old transaction " + currentTx);
-               
-            }
-         }
-      }
-   }
-   
-   /**
-    * Reset the context classloader
-    * 
-    * @param mi the invocation
-    */
-   protected void resetContextClassLoader(Object proxy)
-   {
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " reset classloader " + oldClassLoader);
-      SetTCLAction.setContextClassLoader(inUseThread, oldClassLoader);
-      oldClassLoader = null;
-   }
-
-   /**
-    * Release the thread lock
-    * 
-    * @param mi the invocation
-    */
-   protected void releaseThreadLock(Object proxy)
-   {
-      if (trace)
-         log.trace("MessageEndpoint " + getProxyString(proxy) + " no longer in use by " + inUseThread);
-      inUseThread = null;
-   }
-   
-   /**
-    * Get our proxy's string value.
-    * 
-    * @param mi the invocation
-    * @return the string
-    */
-   protected String getProxyString(Object proxy)
-   {
-      if (cachedProxyString == null)
-         cachedProxyString = container.getEjbName();
-      return cachedProxyString;
-   }
-
-   /**
-    * Get the message endpoint factory
-    *
-    * @return the message endpoint factory
-    */
-   protected JBossMessageEndpointFactory getMessageEndpointFactory(Invocation invocation)
-   {
-      if (endpointFactory == null)
-      {
-         MethodInvocation mi = (MethodInvocation)invocation;
-         endpointFactory = (JBossMessageEndpointFactory) mi.getResponseAttachment(MESSAGE_ENDPOINT_FACTORY);
-      }
-      return endpointFactory;
-   }
-   
-   /**
-    * Get the container
-    *
-    * @return the container
-    */
-   protected MessagingContainer getContainer(Invocation mi)
-   {
-      return getMessageEndpointFactory(mi).getContainer();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,531 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb.inflow;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationHandler;
+
+import javax.resource.ResourceException;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.transaction.Status;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.xa.XAResource;
+
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.MethodInvocation;
+import org.jboss.aop.MethodInfo;
+import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.ejb3.mdb.MDB;
+import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.logging.Logger;
+
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class MessageInflowLocalProxy implements InvocationHandler
+{
+   private static final Logger log = Logger.getLogger(MessageInflowLocalProxy.class);
+   
+   /** The key for the factory */
+   public static final String MESSAGE_ENDPOINT_FACTORY = "MessageEndpoint.Factory";
+
+   /** The key for the xa resource */
+   public static final String MESSAGE_ENDPOINT_XARESOURCE = "MessageEndpoint.XAResource";
+   
+   /** Whether trace is enabled */
+   private boolean trace = log.isTraceEnabled(); 
+   
+   /** Cached version of our proxy string */
+   private String cachedProxyString = null;
+   
+   /** Whether this proxy has been released */
+   protected SynchronizedBoolean released = new SynchronizedBoolean(false);
+   
+   /** Whether we have delivered a message */
+   protected boolean delivered = false;
+   
+   /** The in use thread */
+   protected Thread inUseThread = null;
+   
+   /** The old classloader of the thread */
+   protected ClassLoader oldClassLoader = null;
+   
+   /** Any transaction we started */
+   protected Transaction transaction = null;
+   
+   /** Any suspended transaction */
+   protected Transaction suspended = null;
+
+   /** The message endpoint factory */
+   private JBossMessageEndpointFactory endpointFactory;
+   
+   private XAResource resource;
+   private MessageEndpointFactory messageEndpointFactory;
+   
+   MessagingContainer container;
+
+   protected MessageInflowLocalProxy(MessagingContainer container)
+   {
+      this.container = container;
+   }
+
+   public void setMessageEndpointFactory(MessageEndpointFactory messageEndpointFactory)
+   {
+      this.messageEndpointFactory = messageEndpointFactory;
+   }
+   
+   public void setXaResource(XAResource resource)
+   {
+      this.resource = resource;
+   }
+
+   public Object invoke(Object proxy, Method method, Object[] args)
+           throws Throwable
+   {   
+      // Are we still useable?
+      if (released.get())
+         throw new IllegalStateException("This message endpoint + " + getProxyString(proxy) + " has been released");
+
+      // Concurrent invocation?
+      Thread currentThread = Thread.currentThread();
+      if (inUseThread != null && inUseThread.equals(currentThread) == false)
+         throw new IllegalStateException("This message endpoint + " + getProxyString(proxy) + " is already in use by another thread " + inUseThread);
+      inUseThread = currentThread;
+      
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " in use by " + method + " " + inUseThread);
+      
+      // Which operation?
+      if (method.getName().equals("release"))
+      {
+         release(proxy);
+         return null;
+      }
+      else if (method.getName().equals("beforeDelivery"))
+      {
+         before(proxy, container, method, args);
+         return null;
+      }
+      else if (method.getName().equals("afterDelivery"))
+      {
+         after(proxy);
+         return null;
+      }
+      else
+         return delivery(proxy, container, method, args);
+   }
+
+   public String toString()
+   {
+      return container.getEjbName().toString();
+   }
+   
+   // -----------------------------------------------------------
+   
+   /**
+    * Release this message endpoint.
+    * 
+    * @param mi the invocation
+    * @throws Throwable for any error
+    */
+   protected void release(Object proxy) throws Throwable
+   {
+      // We are now released
+      released.set(true);
+
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " released");
+      
+      // Tidyup any outstanding delivery
+      if (oldClassLoader != null)
+      {
+         try
+         {
+            finish("release", proxy, false);
+         }
+         catch (Throwable t)
+         {
+            log.warn("Error in release ", t);
+         }
+      }
+   }
+   
+   /**
+    * Before delivery processing.
+    * 
+    * @param mi the invocation
+    * @throws Throwable for any error
+    */
+   protected void before(Object proxy, MessagingContainer container, Method method, Object[] args) throws Throwable
+   {
+      // Called out of sequence
+      if (oldClassLoader != null)
+         throw new IllegalStateException("Missing afterDelivery from the previous beforeDelivery for message endpoint " + getProxyString(proxy));
+
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " released");
+
+      // Set the classloader
+      oldClassLoader = GetTCLAction.getContextClassLoader(inUseThread);
+      SetTCLAction.setContextClassLoader(inUseThread, container.getClassloader());
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " set context classloader to " + container.getClassloader());
+
+      // start any transaction
+      try
+      {
+         // Is the delivery transacted?
+         MethodInfo methodInfo = container.getMethodInfo((Method)args[0]);
+         boolean isTransacted = messageEndpointFactory.isDeliveryTransacted(methodInfo.getAdvisedMethod());
+
+         startTransaction("beforeDelivery", proxy, container, method, args, isTransacted);
+      }
+      catch (Throwable t)
+      {
+         resetContextClassLoader(proxy);
+         throw new ResourceException(t);
+      }
+   }
+   
+   /**
+    * After delivery processing.
+    * 
+    * @param mi the invocation
+    * @throws Throwable for any error
+    */
+   protected void after(Object proxy) throws Throwable
+   {
+      // Called out of sequence
+      if (oldClassLoader == null)
+         throw new IllegalStateException("afterDelivery without a previous beforeDelivery for message endpoint " + getProxyString(proxy));
+
+      // Finish this delivery committing if we can
+      try
+      {
+         finish("afterDelivery", proxy, true);
+      }
+      catch (Throwable t)
+      {
+         throw new ResourceException(t);
+      }
+   }
+   
+   /**
+    * Delivery.
+    * 
+    * @param mi the invocation
+    * @return the result of the delivery
+    * @throws Throwable for any error
+    */
+   protected Object delivery(Object proxy, MessagingContainer container, Method method, Object[] args) throws Throwable
+   {
+      // Have we already delivered a message?
+      if (delivered)
+         throw new IllegalStateException("Multiple message delivery between before and after delivery is not allowed for message endpoint " + getProxyString(proxy));
+
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " delivering");
+      
+      // Mark delivery if beforeDelivery was invoked
+      if (oldClassLoader != null)
+         delivered = true;
+
+      boolean commit = true;
+      // Is the delivery transacted?
+      MethodInfo methodInfo = container.getMethodInfo(method);
+
+      try
+      {
+         // Check for starting a transaction
+         if (oldClassLoader == null)
+         {
+            boolean isTransacted = messageEndpointFactory.isDeliveryTransacted(methodInfo.getAdvisedMethod());
+            startTransaction("delivery", proxy, container, method, args, isTransacted);
+         }
+         return container.localInvoke(methodInfo, args);
+      }
+      catch (Throwable t)
+      {
+         if (trace)
+            log.trace("MessageEndpoint " + getProxyString(proxy) + " delivery error", t);
+         if (t instanceof Error || t instanceof RuntimeException)
+         {
+            if (transaction != null)
+               transaction.setRollbackOnly();
+            commit = false;
+         }
+         throw t;
+      }
+      finally
+      {
+         // No before/after delivery, end any transaction and release the lock
+         if (oldClassLoader == null)
+         {
+            try
+            {
+               // Finish any transaction we started
+               endTransaction(proxy, commit);
+            }
+            finally
+            {
+               releaseThreadLock(proxy);
+            }
+         }
+      }
+   }
+   
+   /**
+    * Finish the current delivery
+    * 
+    * @param context the lifecycle method
+    * @param mi the invocation
+    * @param commit whether to commit
+    * @throws Throwable for any error
+    */
+   protected void finish(String context, Object proxy, boolean commit) throws Throwable
+   {
+      try
+      {
+         endTransaction(proxy, commit);
+      }
+      finally
+      {
+         // Reset delivered flag
+         delivered = false;
+         // Change back to the original context classloader
+         resetContextClassLoader(proxy);
+         // We no longer hold the lock
+         releaseThreadLock(proxy);
+      }
+   }
+
+   /**
+    * Start a transaction
+    *  
+    * @param context the lifecycle method
+    * @param mi the invocation
+    * @param container the container
+    * @throws Throwable for any error
+    */
+   protected void startTransaction(String context, Object proxy, MessagingContainer container, Method m, Object[] args, boolean isTransacted) throws Throwable
+   { 
+      Method method;
+      
+      // Normal delivery      
+      if ("delivery".equals(context))
+         method = m;
+      // Before delivery
+      else
+         method = (Method)args[0];
+
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " " + context + " method=" + method + " xaResource=" + resource + " transacted=" + isTransacted);
+
+      // Get the transaction status
+      TransactionManager tm = TxUtil.getTransactionManager(); //container.getTransactionManager();
+      suspended = tm.suspend();
+
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " " + context + " currentTx=" + suspended);
+
+      // Delivery is transacted
+      if (isTransacted)
+      {
+         // No transaction means we start a new transaction and enlist the resource
+         if (suspended == null)
+         {
+            tm.begin();
+            transaction = tm.getTransaction();
+            if (trace)
+               log.trace("MessageEndpoint " + getProxyString(proxy) + " started transaction=" + transaction);
+      
+            // Enlist the XAResource in the transaction
+            if (resource != null)
+            {
+               transaction.enlistResource(resource);
+               if (trace)
+                  log.trace("MessageEndpoint " + getProxyString(proxy) + " enlisted=" + resource);
+            }
+         }
+         else
+         {
+            // If there is already a transaction we ignore the XAResource (by spec 12.5.9)
+            try
+            {
+               tm.resume(suspended);
+            }
+            finally
+            {
+               suspended = null;
+               if (trace)
+                  log.trace("MessageEndpoint " + getProxyString(proxy) + " transaction=" + suspended + " already active, IGNORED=" + resource);
+            }
+         }
+      }
+   }
+   
+   /**
+    * End the transaction
+    * 
+    * @param mi the invocation
+    * @param commit whether to try to commit
+    * @throws Throwable for any error
+    */
+   protected void endTransaction(Object proxy, boolean commit) throws Throwable
+   {
+      TransactionManager tm = null;
+      Transaction currentTx = null;
+      try
+      {
+         // If we started the transaction, commit it
+         if (transaction != null)
+         {
+            tm = TxUtil.getTransactionManager(); //getContainer(mi).getTransactionManager();
+            currentTx = tm.getTransaction();
+            
+            // Suspend any bad transaction - there is bug somewhere, but we will try to tidy things up
+            if (currentTx != null && currentTx.equals(transaction) == false)
+            {
+               log.warn("Current transaction " + currentTx + " is not the expected transaction.");
+               tm.suspend();
+               tm.resume(transaction);
+            }
+            else
+            {
+               // We have the correct transaction
+               currentTx = null;
+            }
+            
+            // Commit or rollback depending on the status
+            if (commit == false || transaction.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+            {
+               if (trace)
+                  log.trace("MessageEndpoint " + getProxyString(proxy) + " rollback");
+               tm.rollback();
+            }
+            else
+            {
+               if (trace)
+                  log.trace("MessageEndpoint " + getProxyString(proxy) + " commit");
+               tm.commit();
+            }
+         }
+
+         // If we suspended the incoming transaction, resume it
+         if (suspended != null)
+         {
+            try
+            {
+               tm = TxUtil.getTransactionManager(); //getContainer(mi).getTransactionManager();
+               tm.resume(suspended);
+            }
+            finally
+            {
+               suspended = null;
+            }
+         }
+      }
+      finally
+      {
+         // Resume any suspended transaction
+         if (currentTx != null)
+         {
+            try
+            {
+               tm.resume(currentTx);
+            }
+            catch (Throwable t)
+            {
+               log.warn("MessageEndpoint " + getProxyString(proxy) + " failed to resume old transaction " + currentTx);
+               
+            }
+         }
+      }
+   }
+   
+   /**
+    * Reset the context classloader
+    * 
+    * @param mi the invocation
+    */
+   protected void resetContextClassLoader(Object proxy)
+   {
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " reset classloader " + oldClassLoader);
+      SetTCLAction.setContextClassLoader(inUseThread, oldClassLoader);
+      oldClassLoader = null;
+   }
+
+   /**
+    * Release the thread lock
+    * 
+    * @param mi the invocation
+    */
+   protected void releaseThreadLock(Object proxy)
+   {
+      if (trace)
+         log.trace("MessageEndpoint " + getProxyString(proxy) + " no longer in use by " + inUseThread);
+      inUseThread = null;
+   }
+   
+   /**
+    * Get our proxy's string value.
+    * 
+    * @param mi the invocation
+    * @return the string
+    */
+   protected String getProxyString(Object proxy)
+   {
+      if (cachedProxyString == null)
+         cachedProxyString = container.getEjbName();
+      return cachedProxyString;
+   }
+
+   /**
+    * Get the message endpoint factory
+    *
+    * @return the message endpoint factory
+    */
+   protected JBossMessageEndpointFactory getMessageEndpointFactory(Invocation invocation)
+   {
+      if (endpointFactory == null)
+      {
+         MethodInvocation mi = (MethodInvocation)invocation;
+         endpointFactory = (JBossMessageEndpointFactory) mi.getResponseAttachment(MESSAGE_ENDPOINT_FACTORY);
+      }
+      return endpointFactory;
+   }
+   
+   /**
+    * Get the container
+    *
+    * @return the container
+    */
+   protected MessagingContainer getContainer(Invocation mi)
+   {
+      return getMessageEndpointFactory(mi).getContainer();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.mdb.inflow;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revison:$
- */
-public class SetTCLAction implements PrivilegedAction
-{
-   Thread t;
-   ClassLoader loader;
-
-   SetTCLAction(Thread t, ClassLoader loader)
-   {
-      this.t = t;
-      this.loader = loader;
-   }
-   public Object run()
-   {
-      t.setContextClassLoader(loader);
-      loader = null;
-      return null;
-   }
-
-   static void setContextClassLoader(Thread t, ClassLoader loader)
-   {
-      SetTCLAction action = new SetTCLAction(t, loader);
-      AccessController.doPrivileged(action);
-   }
-
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.mdb.inflow;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revison:$
+ */
+public class SetTCLAction implements PrivilegedAction
+{
+   Thread t;
+   ClassLoader loader;
+
+   SetTCLAction(Thread t, ClassLoader loader)
+   {
+      this.t = t;
+      this.loader = loader;
+   }
+   public Object run()
+   {
+      t.setContextClassLoader(loader);
+      loader = null;
+      return null;
+   }
+
+   static void setContextClassLoader(Thread t, ClassLoader loader)
+   {
+      SetTCLAction action = new SetTCLAction(t, loader);
+      AccessController.doPrivileged(action);
+   }
+
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/mdb/inflow/SetTCLAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel)


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel
___________________________________________________________________
Name: svn:ignore
   + Callback.java


Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-Callback.java

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+Callback.java


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jboss.metamodel.descriptor.NameValuePair;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a activation-config element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ActivationConfig
-{
-   private static final Logger log = Logger.getLogger(ActivationConfig.class);
-
-   // ejb-jar.xml
-   private List properties = new ArrayList();
-
-   public List getActivationConfigProperties()
-   {
-      return properties;
-   }
-
-   public void addActivationConfigProperty(NameValuePair property)
-   {
-      properties.add(property);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("activationConfigProperties=").append(properties);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.jboss.metamodel.descriptor.NameValuePair;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a activation-config element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ActivationConfig
+{
+   private static final Logger log = Logger.getLogger(ActivationConfig.class);
+
+   // ejb-jar.xml
+   private List properties = new ArrayList();
+
+   public List getActivationConfigProperties()
+   {
+      return properties;
+   }
+
+   public void addActivationConfigProperty(NameValuePair property)
+   {
+      properties.add(property);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append('[');
+      sb.append("activationConfigProperties=").append(properties);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ActivationConfig.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,130 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-
-/**
- * This represents a application client deployment descriptor.
- * 
- * FIXME: should not extend EnviromentRefGroup, but InjectionHandler wants this
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ApplicationClientDD extends EnvironmentRefGroup
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(ApplicationClientDD.class);
-   
-   private String displayName;
-   
-//   protected HashMap<String, EnvEntry> envEntries = new HashMap<String, EnvEntry>();
-//   protected HashMap<String, EjbRef> ejbRefs = new HashMap<String, EjbRef>();
-//   // TODO: javaee:service-refGroup
-//   protected HashMap<String, ResourceRef> resourceRefs = new HashMap<String, ResourceRef>();
-//   protected HashMap<String, ResourceEnvRef> resourceEnvRefs = new HashMap<String, ResourceEnvRef>();
-//   protected HashMap<String, MessageDestinationRef> messageDestinationRefs = new HashMap<String, MessageDestinationRef>();
-//   protected List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
-   
-   private List<LifecycleCallback> postConstructs = new ArrayList<LifecycleCallback>();
-   private List<LifecycleCallback> preDestroys = new ArrayList<LifecycleCallback>();
-   private String callbackHandlerClass = null;
-   
-   private String version = null;
-   private boolean metadataComplete = false;
-   
-   // from jboss-client.xml 
-   
-   private String jndiName;
-   
-   private Collection<String> dependencies = new HashSet<String>();
-   
-   public void addDependency(String depends)
-   {
-      dependencies.add(depends);
-   }
-   
-   public Collection<String> getDependencies()
-   {
-      return dependencies;
-   }
-   
-   public String getDisplayName()
-   {
-      return displayName;
-   }
-   
-   public void setDisplayName(String displayName)
-   {
-      this.displayName = displayName;
-   }
-   
-   public String getJndiName()
-   {
-      // this doesn't work in CTS
-//      if(jndiName == null)
-//         return getDisplayName();
-      return jndiName;
-   }
-   
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-   
-   public boolean isMetaDataComplete()
-   {
-      return metadataComplete;
-   }
-   
-   public void setMetadataComplete(boolean metadataComplete)
-   {
-      this.metadataComplete = metadataComplete;
-   }
-   
-   public List<LifecycleCallback> getPostConstructs()
-   {
-      return postConstructs;
-   }
-   
-   public List<LifecycleCallback> getPreDestroys()
-   {
-      return preDestroys;
-   }
-   
-   public String getVersion()
-   {
-      return version;
-   }
-   
-   public void setVersion(String version)
-   {
-      this.version = version;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+
+/**
+ * This represents a application client deployment descriptor.
+ * 
+ * FIXME: should not extend EnviromentRefGroup, but InjectionHandler wants this
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ApplicationClientDD extends EnvironmentRefGroup
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(ApplicationClientDD.class);
+   
+   private String displayName;
+   
+//   protected HashMap<String, EnvEntry> envEntries = new HashMap<String, EnvEntry>();
+//   protected HashMap<String, EjbRef> ejbRefs = new HashMap<String, EjbRef>();
+//   // TODO: javaee:service-refGroup
+//   protected HashMap<String, ResourceRef> resourceRefs = new HashMap<String, ResourceRef>();
+//   protected HashMap<String, ResourceEnvRef> resourceEnvRefs = new HashMap<String, ResourceEnvRef>();
+//   protected HashMap<String, MessageDestinationRef> messageDestinationRefs = new HashMap<String, MessageDestinationRef>();
+//   protected List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
+   
+   private List<LifecycleCallback> postConstructs = new ArrayList<LifecycleCallback>();
+   private List<LifecycleCallback> preDestroys = new ArrayList<LifecycleCallback>();
+   private String callbackHandlerClass = null;
+   
+   private String version = null;
+   private boolean metadataComplete = false;
+   
+   // from jboss-client.xml 
+   
+   private String jndiName;
+   
+   private Collection<String> dependencies = new HashSet<String>();
+   
+   public void addDependency(String depends)
+   {
+      dependencies.add(depends);
+   }
+   
+   public Collection<String> getDependencies()
+   {
+      return dependencies;
+   }
+   
+   public String getDisplayName()
+   {
+      return displayName;
+   }
+   
+   public void setDisplayName(String displayName)
+   {
+      this.displayName = displayName;
+   }
+   
+   public String getJndiName()
+   {
+      // this doesn't work in CTS
+//      if(jndiName == null)
+//         return getDisplayName();
+      return jndiName;
+   }
+   
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+   
+   public boolean isMetaDataComplete()
+   {
+      return metadataComplete;
+   }
+   
+   public void setMetadataComplete(boolean metadataComplete)
+   {
+      this.metadataComplete = metadataComplete;
+   }
+   
+   public List<LifecycleCallback> getPostConstructs()
+   {
+      return postConstructs;
+   }
+   
+   public List<LifecycleCallback> getPreDestroys()
+   {
+      return preDestroys;
+   }
+   
+   public String getVersion()
+   {
+      return version;
+   }
+   
+   public void setVersion(String version)
+   {
+      this.version = version;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,178 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metamodel;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.DDObjectFactory;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.EnvEntry;
-import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * A JBossXB object factory for parsing application client descriptor files.
- * 
- * http://java.sun.com/xml/ns/javaee/application-client_5.xsd
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ApplicationClientDDObjectFactory extends DDObjectFactory
-{
-   private static final Logger log = Logger.getLogger(ApplicationClientDDObjectFactory.class);
-
-   // made public for the parsing deployer
-   public ApplicationClientDDObjectFactory()
-   {
-
-   }
-
-   public static ApplicationClientDD parse(URL ddResource) throws JBossXBException, IOException
-   {
-      if (ddResource == null)
-         return null;
-
-      log.debug("found application-client.xml " + ddResource);
-
-      ApplicationClientDDObjectFactory factory = new ApplicationClientDDObjectFactory();
-      UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
-      Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
-      unmarshaller.setEntityResolver(new JBossEntityResolver());
-      unmarshaller.setNamespaceAware(true);
-      unmarshaller.setSchemaValidation(true);
-      unmarshaller.setValidation(true);
-
-      ApplicationClientDD dd = (ApplicationClientDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
-
-      return dd;
-   }
-
-   public void addChild(ApplicationClientDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(ApplicationClientDD parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnvEntry(entry);
-   }
-
-   public void addChild(ApplicationClientDD parent, LifecycleCallback lifecycleCallback, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (localName.equals("post-construct"))
-         parent.getPostConstructs().add(lifecycleCallback);
-      else if (localName.equals("pre-destroy"))
-         parent.getPreDestroys().add(lifecycleCallback);
-      else throw new IllegalArgumentException(localName);
-   }
-
-   public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
-   {
-      throw new RuntimeException("NYI");
-   }
-
-   public Object newChild(ApplicationClientDD parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = super.newEnvRefGroupChild(localName);
-      if (child != null)
-         return child;
-
-      if (localName.equals("post-construct") || localName.equals("pre-destroy"))
-      {
-         child = new LifecycleCallback();
-      }
-
-      // ignore things like display-name & description
-
-      return child;
-   }
-
-   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      final ApplicationClientDD dd;
-      if (root == null)
-         root = dd = new ApplicationClientDD();
-      else dd = (ApplicationClientDD)root;
-
-      if (attrs.getLength() > 0)
-      {
-         for (int i = 0; i < attrs.getLength(); ++i)
-         {
-            if (attrs.getLocalName(i).equals("version"))
-            {
-               dd.setVersion(attrs.getValue(i));
-            }
-            else if (attrs.getLocalName(i).equals("metadata-complete"))
-            {
-               dd.setMetadataComplete(Boolean.parseBoolean(attrs.getValue(i)));
-            }
-            else if (attrs.getLocalName(i).equals("schemaLocation"))
-            {
-               // ignore
-            }
-            else if (attrs.getLocalName(i).equals("id"))
-            {
-               // ignore
-            }
-            else throw new IllegalArgumentException(attrs.getLocalName(i));
-         }
-      }
-
-      return root;
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("display-name"))
-      {
-         dd.setDisplayName(getValue(localName, value));
-      }
-      //      else if(localName.equals("description"))
-      //      {
-      //         // ignore
-      //      }
-      //      else
-      //         throw new IllegalArgumentException(localName);
-   }
-
-   public void setValue(LifecycleCallback lifecycleCallback, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("lifecycle-callback-class"))
-         lifecycleCallback.setLifecycleCallbackClass(value);
-      else if (localName.equals("lifecycle-callback-method"))
-         lifecycleCallback.setLifecycleCallbackMethod(value);
-      else throw new IllegalArgumentException(localName);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,178 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.DDObjectFactory;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.EnvEntry;
+import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+/**
+ * A JBossXB object factory for parsing application client descriptor files.
+ * 
+ * http://java.sun.com/xml/ns/javaee/application-client_5.xsd
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ApplicationClientDDObjectFactory extends DDObjectFactory
+{
+   private static final Logger log = Logger.getLogger(ApplicationClientDDObjectFactory.class);
+
+   // made public for the parsing deployer
+   public ApplicationClientDDObjectFactory()
+   {
+
+   }
+
+   public static ApplicationClientDD parse(URL ddResource) throws JBossXBException, IOException
+   {
+      if (ddResource == null)
+         return null;
+
+      log.debug("found application-client.xml " + ddResource);
+
+      ApplicationClientDDObjectFactory factory = new ApplicationClientDDObjectFactory();
+      UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+      Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+      unmarshaller.setEntityResolver(new JBossEntityResolver());
+      unmarshaller.setNamespaceAware(true);
+      unmarshaller.setSchemaValidation(true);
+      unmarshaller.setValidation(true);
+
+      ApplicationClientDD dd = (ApplicationClientDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
+
+      return dd;
+   }
+
+   public void addChild(ApplicationClientDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(ApplicationClientDD parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEnvEntry(entry);
+   }
+
+   public void addChild(ApplicationClientDD parent, LifecycleCallback lifecycleCallback, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      if (localName.equals("post-construct"))
+         parent.getPostConstructs().add(lifecycleCallback);
+      else if (localName.equals("pre-destroy"))
+         parent.getPreDestroys().add(lifecycleCallback);
+      else throw new IllegalArgumentException(localName);
+   }
+
+   public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
+   {
+      throw new RuntimeException("NYI");
+   }
+
+   public Object newChild(ApplicationClientDD parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = super.newEnvRefGroupChild(localName);
+      if (child != null)
+         return child;
+
+      if (localName.equals("post-construct") || localName.equals("pre-destroy"))
+      {
+         child = new LifecycleCallback();
+      }
+
+      // ignore things like display-name & description
+
+      return child;
+   }
+
+   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      final ApplicationClientDD dd;
+      if (root == null)
+         root = dd = new ApplicationClientDD();
+      else dd = (ApplicationClientDD)root;
+
+      if (attrs.getLength() > 0)
+      {
+         for (int i = 0; i < attrs.getLength(); ++i)
+         {
+            if (attrs.getLocalName(i).equals("version"))
+            {
+               dd.setVersion(attrs.getValue(i));
+            }
+            else if (attrs.getLocalName(i).equals("metadata-complete"))
+            {
+               dd.setMetadataComplete(Boolean.parseBoolean(attrs.getValue(i)));
+            }
+            else if (attrs.getLocalName(i).equals("schemaLocation"))
+            {
+               // ignore
+            }
+            else if (attrs.getLocalName(i).equals("id"))
+            {
+               // ignore
+            }
+            else throw new IllegalArgumentException(attrs.getLocalName(i));
+         }
+      }
+
+      return root;
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("display-name"))
+      {
+         dd.setDisplayName(getValue(localName, value));
+      }
+      //      else if(localName.equals("description"))
+      //      {
+      //         // ignore
+      //      }
+      //      else
+      //         throw new IllegalArgumentException(localName);
+   }
+
+   public void setValue(LifecycleCallback lifecycleCallback, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("lifecycle-callback-class"))
+         lifecycleCallback.setLifecycleCallbackClass(value);
+      else if (localName.equals("lifecycle-callback-method"))
+         lifecycleCallback.setLifecycleCallbackMethod(value);
+      else throw new IllegalArgumentException(localName);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <application-exception> element of the ejb-jar.xml deployment descriptor
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ApplicationException
-{
-   private static final Logger log = Logger.getLogger(ApplicationException.class);
-
-   private String clazz;
-   private boolean rollback;
-
-   public String getExceptionClass()
-   {
-      return clazz;
-   }
-   
-   public void setExceptionClass(String clazz)
-   {
-      this.clazz = clazz;
-   }
-   
-   public boolean getRollback()
-   {
-      return rollback;
-   }
-
-   public void setRollback(boolean rollback)
-   {
-      this.rollback = rollback;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("class=").append(clazz);
-      sb.append(", rollback=").append(rollback);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents an <application-exception> element of the ejb-jar.xml deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ApplicationException
+{
+   private static final Logger log = Logger.getLogger(ApplicationException.class);
+
+   private String clazz;
+   private boolean rollback;
+
+   public String getExceptionClass()
+   {
+      return clazz;
+   }
+   
+   public void setExceptionClass(String clazz)
+   {
+      this.clazz = clazz;
+   }
+   
+   public boolean getRollback()
+   {
+      return rollback;
+   }
+
+   public void setRollback(boolean rollback)
+   {
+      this.rollback = rollback;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("class=").append(clazz);
+      sb.append(", rollback=").append(rollback);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationException.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,243 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
- 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.logging.Logger;
- 
-import org.jboss.metadata.SecurityRoleMetaData;
-import org.jboss.metamodel.descriptor.SecurityRole;
-
-/**
- * Represents <assembly-descriptor> elements of the ejb-jar.xml deployment descriptor for the 1.4
- * schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @author Anil.Saldhana at jboss.org
- * @version <tt>$Revision$</tt>
- */
-public class AssemblyDescriptor
-{
-   private static final Logger log = Logger.getLogger(AssemblyDescriptor.class);
-
-   private List securityRoles = new ArrayList();
-   
-   private Map<String, SecurityRoleMetaData> securityRoleMetaData = new HashMap();
-
-   private List methodPermissions = new ArrayList();
-
-   private List containerTransactions = new ArrayList();
-   
-   private HashMap<String, MessageDestination> messageDestinations = new HashMap();
-
-   private ExcludeList excludeList;
-
-   private List applicationExceptions = new ArrayList();
-
-   private InitList initList;
-
-   private List injects = new ArrayList();
-   
-   public Collection getMessageDestinations()
-   {
-      return messageDestinations.values();
-   }
-
-   public void addMessageDestination(MessageDestination messageDestination)
-   {
-      messageDestinations.put(messageDestination.getMessageDestinationName(), messageDestination);
-   }
-   
-   public MessageDestination findMessageDestination(String name)
-   {
-      return messageDestinations.get(name);
-   }
-
-   private List interceptorBindings = new ArrayList();
-
-   public InitList getInitList()
-   {
-      return initList;
-   }
-
-   public void setInitList(InitList initList)
-   {
-      this.initList = initList;
-   }
-
-   public ExcludeList getExcludeList()
-   {
-      return excludeList;
-   }
-
-   public void setExcludeList(ExcludeList excludeList)
-   {
-      this.excludeList = excludeList;
-   }
-   
-   public List getApplicationExceptions()
-   {
-      return applicationExceptions;
-   }
-
-   public void addApplicationException(ApplicationException applicationException)
-   {
-      applicationExceptions.add(applicationException);
-   }
-
-   public List getSecurityRoles()
-   {
-      return securityRoles;
-   }
-
-   public void setSecurityRoles(List securityRoles)
-   {
-      this.securityRoles = securityRoles;
-   }
-
-   public void addSecurityRole(SecurityRole securityRole)
-   {
-      securityRoles.add(securityRole);
-   }
-
-   public List<InterceptorBinding> getInterceptorBindings()
-   {
-      return interceptorBindings;
-   }
-
-   public void addInterceptorBinding(InterceptorBinding binding)
-   {
-      interceptorBindings.add(binding);
-   }
-
-   public List getInjects()
-   {
-      return injects;
-   }
-
-   public void addInject(Inject inject)
-   {
-      injects.add(inject);
-   }
-
-   public List getMethodPermissions()
-   {
-      return methodPermissions;
-   }
-
-   public void setMethodPermissions(List methodPermissions)
-   {
-      this.methodPermissions = methodPermissions;
-   }
-
-   public void addMethodPermission(MethodPermission methodPermission)
-   {
-      methodPermissions.add(methodPermission);
-   }
-
-   public List getContainerTransactions()
-   {
-      return containerTransactions;
-   }
-
-   public void setContainerTransactions(List containerTransactions)
-   {
-      this.containerTransactions = containerTransactions;
-   }
-
-   public void addContainerTransaction(ContainerTransaction containerTransaction)
-   {
-      containerTransactions.add(containerTransaction);
-   }
-   
-   public void addSecurityRoleMetaData(SecurityRoleMetaData srm)
-   {
-      this.securityRoleMetaData.put(srm.getRoleName(), srm);
-   }
-   
-   public Set getSecurityRolesGivenPrincipal(String userName)
-   {
-      HashSet roleNames = new HashSet();
-      Iterator it = securityRoleMetaData.values().iterator();
-      while (it.hasNext())
-      {
-         SecurityRoleMetaData srMetaData = (SecurityRoleMetaData) it.next();
-         if (srMetaData.getPrincipals().contains(userName))
-            roleNames.add(srMetaData.getRoleName());
-      }
-      return roleNames;
-   }
-   
-   /**
-    * Get a map of principals versus set of roles
-    * that may be configured by the user at the deployment level
-    * @return
-    */
-   public Map getPrincipalVersusRolesMap()
-   {
-      Map principalRolesMap = null;
-      
-      Iterator iter = securityRoleMetaData.keySet().iterator();
-      while(iter.hasNext())
-      {
-         if(principalRolesMap == null)
-            principalRolesMap = new HashMap(); 
-         String rolename = (String)iter.next();
-         SecurityRoleMetaData srm = (SecurityRoleMetaData) securityRoleMetaData.get(rolename);
-         Iterator principalIter = srm.getPrincipals().iterator();
-         while(principalIter.hasNext())
-         {
-            String pr = (String)principalIter.next(); 
-            Set roleset = (Set)principalRolesMap.get(pr);
-            if(roleset == null)
-               roleset = new HashSet();
-            if(!roleset.contains(rolename))
-               roleset.add(rolename);
-            principalRolesMap.put(pr, roleset);
-         } 
-      } 
-      return principalRolesMap;
-   }
-   
-   public Map<String,SecurityRoleMetaData> getSecurityRoleMetaData()
-   {
-      return this.securityRoleMetaData;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("securityRoles=").append(securityRoles);
-      sb.append(", applicationExceptions=").append(applicationExceptions);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,245 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+ 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.logging.Logger;
+ 
+//import org.jboss.metadata.SecurityRoleMetaData;
+import org.jboss.metamodel.descriptor.SecurityRole;
+
+/**
+ * Represents <assembly-descriptor> elements of the ejb-jar.xml deployment descriptor for the 1.4
+ * schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author Anil.Saldhana at jboss.org
+ * @version <tt>$Revision$</tt>
+ */
+public class AssemblyDescriptor
+{
+   private static final Logger log = Logger.getLogger(AssemblyDescriptor.class);
+
+   private List securityRoles = new ArrayList();
+   
+//   private Map<String, SecurityRoleMetaData> securityRoleMetaData = new HashMap();
+
+   private List methodPermissions = new ArrayList();
+
+   private List containerTransactions = new ArrayList();
+   
+   private HashMap<String, MessageDestination> messageDestinations = new HashMap();
+
+   private ExcludeList excludeList;
+
+   private List applicationExceptions = new ArrayList();
+
+   private InitList initList;
+
+   private List injects = new ArrayList();
+   
+   public Collection getMessageDestinations()
+   {
+      return messageDestinations.values();
+   }
+
+   public void addMessageDestination(MessageDestination messageDestination)
+   {
+      messageDestinations.put(messageDestination.getMessageDestinationName(), messageDestination);
+   }
+   
+   public MessageDestination findMessageDestination(String name)
+   {
+      return messageDestinations.get(name);
+   }
+
+   private List interceptorBindings = new ArrayList();
+
+   public InitList getInitList()
+   {
+      return initList;
+   }
+
+   public void setInitList(InitList initList)
+   {
+      this.initList = initList;
+   }
+
+   public ExcludeList getExcludeList()
+   {
+      return excludeList;
+   }
+
+   public void setExcludeList(ExcludeList excludeList)
+   {
+      this.excludeList = excludeList;
+   }
+   
+   public List getApplicationExceptions()
+   {
+      return applicationExceptions;
+   }
+
+   public void addApplicationException(ApplicationException applicationException)
+   {
+      applicationExceptions.add(applicationException);
+   }
+
+   public List getSecurityRoles()
+   {
+      return securityRoles;
+   }
+
+   public void setSecurityRoles(List securityRoles)
+   {
+      this.securityRoles = securityRoles;
+   }
+
+   public void addSecurityRole(SecurityRole securityRole)
+   {
+      securityRoles.add(securityRole);
+   }
+
+   public List<InterceptorBinding> getInterceptorBindings()
+   {
+      return interceptorBindings;
+   }
+
+   public void addInterceptorBinding(InterceptorBinding binding)
+   {
+      interceptorBindings.add(binding);
+   }
+
+   public List getInjects()
+   {
+      return injects;
+   }
+
+   public void addInject(Inject inject)
+   {
+      injects.add(inject);
+   }
+
+   public List getMethodPermissions()
+   {
+      return methodPermissions;
+   }
+
+   public void setMethodPermissions(List methodPermissions)
+   {
+      this.methodPermissions = methodPermissions;
+   }
+
+   public void addMethodPermission(MethodPermission methodPermission)
+   {
+      methodPermissions.add(methodPermission);
+   }
+
+   public List getContainerTransactions()
+   {
+      return containerTransactions;
+   }
+
+   public void setContainerTransactions(List containerTransactions)
+   {
+      this.containerTransactions = containerTransactions;
+   }
+
+   public void addContainerTransaction(ContainerTransaction containerTransaction)
+   {
+      containerTransactions.add(containerTransaction);
+   }
+
+   // FIXME: NYI
+//   public void addSecurityRoleMetaData(SecurityRoleMetaData srm)
+//   {
+//      this.securityRoleMetaData.put(srm.getRoleName(), srm);
+//   }
+//   
+//   public Set getSecurityRolesGivenPrincipal(String userName)
+//   {
+//      HashSet roleNames = new HashSet();
+//      Iterator it = securityRoleMetaData.values().iterator();
+//      while (it.hasNext())
+//      {
+//         SecurityRoleMetaData srMetaData = (SecurityRoleMetaData) it.next();
+//         if (srMetaData.getPrincipals().contains(userName))
+//            roleNames.add(srMetaData.getRoleName());
+//      }
+//      return roleNames;
+//   }
+   
+   /**
+    * Get a map of principals versus set of roles
+    * that may be configured by the user at the deployment level
+    * @return
+    */
+   // FIXME: NYI
+//   public Map getPrincipalVersusRolesMap()
+//   {
+//      Map principalRolesMap = null;
+//      
+//      Iterator iter = securityRoleMetaData.keySet().iterator();
+//      while(iter.hasNext())
+//      {
+//         if(principalRolesMap == null)
+//            principalRolesMap = new HashMap(); 
+//         String rolename = (String)iter.next();
+//         SecurityRoleMetaData srm = (SecurityRoleMetaData) securityRoleMetaData.get(rolename);
+//         Iterator principalIter = srm.getPrincipals().iterator();
+//         while(principalIter.hasNext())
+//         {
+//            String pr = (String)principalIter.next(); 
+//            Set roleset = (Set)principalRolesMap.get(pr);
+//            if(roleset == null)
+//               roleset = new HashSet();
+//            if(!roleset.contains(rolename))
+//               roleset.add(rolename);
+//            principalRolesMap.put(pr, roleset);
+//         } 
+//      } 
+//      return principalRolesMap;
+//   }
+//   
+//   public Map<String,SecurityRoleMetaData> getSecurityRoleMetaData()
+//   {
+//      return this.securityRoleMetaData;
+//   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("securityRoles=").append(securityRoles);
+      sb.append(", applicationExceptions=").append(applicationExceptions);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,101 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-
-/**
- * Represents an <cache-config> element of the jboss.xml deployment descriptor
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class CacheConfig
-{
-   private String cacheClass = null;
-   private String maxSize = null;
-   private String idleTimeoutSeconds = null;
-   private String name = null;
-   private String persistenceManager = null;
-
-   public String getPersistenceManager()
-   {
-      return persistenceManager;
-   }
-
-   public void setPersistenceManager(String persistenceManager)
-   {
-      this.persistenceManager = persistenceManager;
-   }
-   
-   public String getCacheClass()
-   {
-      return cacheClass;
-   }
-
-   public void setCacheClass(String cacheClass)
-   {
-      this.cacheClass = cacheClass;
-   }
-
-   public String getMaxSize()
-   {
-      return maxSize;
-   }
-
-   public void setMaxSize(String maxSize)
-   {
-      this.maxSize = maxSize;
-   }
-   
-   public String getIdleTimeoutSeconds()
-   {
-      return idleTimeoutSeconds;
-   }
-
-   public void setIdleTimeoutSeconds(String idleTimeoutSeconds)
-   {
-      this.idleTimeoutSeconds = idleTimeoutSeconds;
-   }
-   
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("cacheClass=").append(cacheClass);
-      sb.append(", maxSize=").append(maxSize);
-      sb.append(", idleTimeoutSeconds=").append(idleTimeoutSeconds);
-      sb.append(", name=").append(name);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+
+/**
+ * Represents an <cache-config> element of the jboss.xml deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class CacheConfig
+{
+   private String cacheClass = null;
+   private String maxSize = null;
+   private String idleTimeoutSeconds = null;
+   private String name = null;
+   private String persistenceManager = null;
+
+   public String getPersistenceManager()
+   {
+      return persistenceManager;
+   }
+
+   public void setPersistenceManager(String persistenceManager)
+   {
+      this.persistenceManager = persistenceManager;
+   }
+   
+   public String getCacheClass()
+   {
+      return cacheClass;
+   }
+
+   public void setCacheClass(String cacheClass)
+   {
+      this.cacheClass = cacheClass;
+   }
+
+   public String getMaxSize()
+   {
+      return maxSize;
+   }
+
+   public void setMaxSize(String maxSize)
+   {
+      this.maxSize = maxSize;
+   }
+   
+   public String getIdleTimeoutSeconds()
+   {
+      return idleTimeoutSeconds;
+   }
+
+   public void setIdleTimeoutSeconds(String idleTimeoutSeconds)
+   {
+      this.idleTimeoutSeconds = idleTimeoutSeconds;
+   }
+   
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("cacheClass=").append(cacheClass);
+      sb.append(", maxSize=").append(maxSize);
+      sb.append(", idleTimeoutSeconds=").append(idleTimeoutSeconds);
+      sb.append(", name=").append(name);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-
-/**
- * Represents an <cluster-config> element of the jboss.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ClusterConfig
-{
-   private String loadBalancePolicy = null;
-
-   private String partition = null;
-
-   public String getLoadBalancePolicy()
-   {
-      return loadBalancePolicy;
-   }
-
-   public void setLoadBalancePolicy(String loadBalancePolicy)
-   {
-      this.loadBalancePolicy = loadBalancePolicy;
-   }
-
-   public String getPartition()
-   {
-      return partition;
-   }
-
-   public void setPartition(String partition)
-   {
-      this.partition = partition;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("loadBalancePolicy=").append(loadBalancePolicy);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+
+/**
+ * Represents an <cluster-config> element of the jboss.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ClusterConfig
+{
+   private String loadBalancePolicy = null;
+
+   private String partition = null;
+
+   public String getLoadBalancePolicy()
+   {
+      return loadBalancePolicy;
+   }
+
+   public void setLoadBalancePolicy(String loadBalancePolicy)
+   {
+      this.loadBalancePolicy = loadBalancePolicy;
+   }
+
+   public String getPartition()
+   {
+      return partition;
+   }
+
+   public void setPartition(String partition)
+   {
+      this.partition = partition;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("loadBalancePolicy=").append(loadBalancePolicy);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ClusterConfig.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-/**
- * Represents an cmp-field element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class CmpField
-{
-
-   private String fieldName;
-
-   public String getFieldName()
-   {
-      return fieldName;
-   }
-
-   public void setFieldName(String fieldName)
-   {
-      this.fieldName = fieldName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("fieldName=").append(fieldName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+/**
+ * Represents an cmp-field element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class CmpField
+{
+
+   private String fieldName;
+
+   public String getFieldName()
+   {
+      return fieldName;
+   }
+
+   public void setFieldName(String fieldName)
+   {
+      this.fieldName = fieldName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("fieldName=").append(fieldName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmpField.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-/**
- * Represents an <cmr-field> element of the ejb-jar.xml deployment
- * descriptor for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class CmrField
-{
-
-   private String cmrFieldName;
-
-   private String cmrFieldType;
-
-   public String getCmrFieldName()
-   {
-      return cmrFieldName;
-   }
-
-   public void setCmrFieldName(String cmrFieldName)
-   {
-      this.cmrFieldName = cmrFieldName;
-   }
-
-   public String getCmrFieldType()
-   {
-      return cmrFieldType;
-   }
-
-   public void setCmrFieldType(String cmrFieldType)
-   {
-      this.cmrFieldType = cmrFieldType;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("cmrFieldName=").append(cmrFieldName);
-      sb.append(",cmrFieldType=").append(cmrFieldType);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+/**
+ * Represents an <cmr-field> element of the ejb-jar.xml deployment
+ * descriptor for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class CmrField
+{
+
+   private String cmrFieldName;
+
+   private String cmrFieldType;
+
+   public String getCmrFieldName()
+   {
+      return cmrFieldName;
+   }
+
+   public void setCmrFieldName(String cmrFieldName)
+   {
+      this.cmrFieldName = cmrFieldName;
+   }
+
+   public String getCmrFieldType()
+   {
+      return cmrFieldType;
+   }
+
+   public void setCmrFieldType(String cmrFieldType)
+   {
+      this.cmrFieldType = cmrFieldType;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("cmrFieldName=").append(cmrFieldName);
+      sb.append(",cmrFieldType=").append(cmrFieldType);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CmrField.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,113 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import org.jboss.logging.Logger;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Consumer extends EnterpriseBean
-{
-   private static final Logger log = Logger.getLogger(Consumer.class);
-   
-   private String destination = null;
-   private String destinationType = null;
-   private CurrentMessage currentMessage = null;
-   private MessageProperties messageProperties = null;
-   private List producers = new ArrayList();
-   private List localProducers = new ArrayList();
-   
-   public String getDestination()
-   {
-      return destination;
-   }
-   
-   public void setDestination(String destination)
-   {
-      this.destination = destination;
-   }
-   
-   public String getDestinationType()
-   {
-      return destinationType;
-   }
-   
-   public void setDestinationType(String destinationType)
-   {
-      this.destinationType = destinationType;
-   }
-   
-   public CurrentMessage getCurrentMessage()
-   {
-      return currentMessage;
-   }
-   
-   public void setCurrentMessage(CurrentMessage currentMessage)
-   {
-      this.currentMessage = currentMessage;
-   }
-   
-   public MessageProperties getMessageProperties()
-   {
-      return messageProperties;
-   }
-   
-   public void setMessageProperties(MessageProperties messageProperties)
-   {
-      this.messageProperties = messageProperties;
-   }
-   
-   public List getProducers()
-   {
-      return producers;
-   }
-   
-   public void addProducer(Producer producer)
-   {
-      producers.add(producer);
-   }
-   
-   public List getLocalProducers()
-   {
-      return localProducers;
-   }
-   
-   public void addLocalProducer(Producer producer)
-   {
-      localProducers.add(producer);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[Consumer:");
-      sb.append(super.toString());
-      sb.append(", destination=" + destination);
-      sb.append(", destinationType=" + destinationType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import org.jboss.logging.Logger;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Consumer extends EnterpriseBean
+{
+   private static final Logger log = Logger.getLogger(Consumer.class);
+   
+   private String destination = null;
+   private String destinationType = null;
+   private CurrentMessage currentMessage = null;
+   private MessageProperties messageProperties = null;
+   private List producers = new ArrayList();
+   private List localProducers = new ArrayList();
+   
+   public String getDestination()
+   {
+      return destination;
+   }
+   
+   public void setDestination(String destination)
+   {
+      this.destination = destination;
+   }
+   
+   public String getDestinationType()
+   {
+      return destinationType;
+   }
+   
+   public void setDestinationType(String destinationType)
+   {
+      this.destinationType = destinationType;
+   }
+   
+   public CurrentMessage getCurrentMessage()
+   {
+      return currentMessage;
+   }
+   
+   public void setCurrentMessage(CurrentMessage currentMessage)
+   {
+      this.currentMessage = currentMessage;
+   }
+   
+   public MessageProperties getMessageProperties()
+   {
+      return messageProperties;
+   }
+   
+   public void setMessageProperties(MessageProperties messageProperties)
+   {
+      this.messageProperties = messageProperties;
+   }
+   
+   public List getProducers()
+   {
+      return producers;
+   }
+   
+   public void addProducer(Producer producer)
+   {
+      producers.add(producer);
+   }
+   
+   public List getLocalProducers()
+   {
+      return localProducers;
+   }
+   
+   public void addLocalProducer(Producer producer)
+   {
+      localProducers.add(producer);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[Consumer:");
+      sb.append(super.toString());
+      sb.append(", destination=" + destination);
+      sb.append(", destinationType=" + destinationType);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Consumer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-
-/**
- * Represents an <container-transaction> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ContainerTransaction
-{
-
-   private String transAttribute;
-
-   private Method method;
-
-   public String getTransAttribute()
-   {
-      return transAttribute;
-   }
-
-   public void setTransAttribute(String transAttribute)
-   {
-      this.transAttribute = transAttribute;
-   }
-
-   public Method getMethod()
-   {
-      return method;
-   }
-
-   public void setMethod(Method method)
-   {
-      this.method = method;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRelationName=").append(transAttribute);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+
+/**
+ * Represents an <container-transaction> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ContainerTransaction
+{
+
+   private String transAttribute;
+
+   private Method method;
+
+   public String getTransAttribute()
+   {
+      return transAttribute;
+   }
+
+   public void setTransAttribute(String transAttribute)
+   {
+      this.transAttribute = transAttribute;
+   }
+
+   public Method getMethod()
+   {
+      return method;
+   }
+
+   public void setMethod(Method method)
+   {
+      this.method = method;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbRelationName=").append(transAttribute);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ContainerTransaction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class CurrentMessage
-{
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-   
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class CurrentMessage
+{
+   private List methods = new ArrayList();
+
+   public List getMethods()
+   {
+      return methods;
+   }
+   
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbName=").append(methods);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/CurrentMessage.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,174 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import java.util.HashMap;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * Represents the ejb-jar.xml deployment descriptor for the 2.1 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbJarDD
-{
-   private static final Logger log = Logger.getLogger(EjbJarDD.class);
-   
-   // ejb-jar.xml
-   private String version;
-
-   private String displayName;
-
-   private Relationships relationships;
-
-   private AssemblyDescriptor assemblyDescriptor;
-   
-   private Interceptors interceptors;
-
-   // jboss.xml
-   private String securityDomain;
-   private String unauthenticatedPrincipal;
-   private String jmxName;
-
-   private HashMap<String, ResourceManager> resourceManagers = new HashMap();
-
-   // both
-   private EnterpriseBeans enterpriseBeans;
-   
-   public void addResourceManager(ResourceManager manager)
-   {
-      resourceManagers.put(manager.getResourceName(), manager);
-   }
-   
-   public String resolveResourceManager(String resourceName)
-   {
-      ResourceManager manager = resourceManagers.get(resourceName);
-      if (manager != null)
-         return manager.getResourceJndiName();
-      
-      return null;
-   }
-
-   public String getSecurityDomain()
-   {
-      return securityDomain;
-   }
-
-   public void setSecurityDomain(String securityDomain)
-   {
-      this.securityDomain = securityDomain;
-   }
-   
-   public String getUnauthenticatedPrincipal()
-   {
-      return unauthenticatedPrincipal;
-   }
-
-   public void setUnauthenticatedPrincipal(String unauthenticatedPrincipal)
-   {
-      this.unauthenticatedPrincipal = unauthenticatedPrincipal;
-   }
-   
-   public String getJmxName()
-   {
-      return jmxName;
-   }
-
-   public void setJmxName(String jmxName)
-   {
-      this.jmxName = jmxName;
-   }
-
-   public String getVersion()
-   {
-      return version;
-   }
-
-   public void setVersion(String version)
-   {
-      this.version = version;
-   }
-
-   public String getDisplayName()
-   {
-      return displayName;
-   }
-
-   public void setDisplayName(String displayName)
-   {
-      this.displayName = displayName;
-   }
-
-   public EnterpriseBeans getEnterpriseBeans()
-   {
-      return enterpriseBeans;
-   }
-
-   public void setEnterpriseBeans(EnterpriseBeans enterpriseBeans)
-   {
-      this.enterpriseBeans = enterpriseBeans;
-   }
-   
-   public Interceptors getInterceptors()
-   {
-      return interceptors;
-   }
-
-   public void setInterceptors(Interceptors interceptors)
-   {
-      this.interceptors = interceptors;
-   }
-
-   public Relationships getRelationships()
-   {
-      return relationships;
-   }
-
-   public void setRelationships(Relationships relationships)
-   {
-      this.relationships = relationships;
-   }
-
-   public AssemblyDescriptor getAssemblyDescriptor()
-   {
-      return assemblyDescriptor;
-   }
-
-   public void setAssemblyDescriptor(AssemblyDescriptor assemblyDescriptor)
-   {
-      this.assemblyDescriptor = assemblyDescriptor;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("version=").append(version);
-      sb.append(",");
-      sb.append("displayName=").append(displayName);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,174 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import java.util.HashMap;
+
+import org.jboss.logging.Logger;
+
+
+/**
+ * Represents the ejb-jar.xml deployment descriptor for the 2.1 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EjbJarDD
+{
+   private static final Logger log = Logger.getLogger(EjbJarDD.class);
+   
+   // ejb-jar.xml
+   private String version;
+
+   private String displayName;
+
+   private Relationships relationships;
+
+   private AssemblyDescriptor assemblyDescriptor;
+   
+   private Interceptors interceptors;
+
+   // jboss.xml
+   private String securityDomain;
+   private String unauthenticatedPrincipal;
+   private String jmxName;
+
+   private HashMap<String, ResourceManager> resourceManagers = new HashMap();
+
+   // both
+   private EnterpriseBeans enterpriseBeans;
+   
+   public void addResourceManager(ResourceManager manager)
+   {
+      resourceManagers.put(manager.getResourceName(), manager);
+   }
+   
+   public String resolveResourceManager(String resourceName)
+   {
+      ResourceManager manager = resourceManagers.get(resourceName);
+      if (manager != null)
+         return manager.getResourceJndiName();
+      
+      return null;
+   }
+
+   public String getSecurityDomain()
+   {
+      return securityDomain;
+   }
+
+   public void setSecurityDomain(String securityDomain)
+   {
+      this.securityDomain = securityDomain;
+   }
+   
+   public String getUnauthenticatedPrincipal()
+   {
+      return unauthenticatedPrincipal;
+   }
+
+   public void setUnauthenticatedPrincipal(String unauthenticatedPrincipal)
+   {
+      this.unauthenticatedPrincipal = unauthenticatedPrincipal;
+   }
+   
+   public String getJmxName()
+   {
+      return jmxName;
+   }
+
+   public void setJmxName(String jmxName)
+   {
+      this.jmxName = jmxName;
+   }
+
+   public String getVersion()
+   {
+      return version;
+   }
+
+   public void setVersion(String version)
+   {
+      this.version = version;
+   }
+
+   public String getDisplayName()
+   {
+      return displayName;
+   }
+
+   public void setDisplayName(String displayName)
+   {
+      this.displayName = displayName;
+   }
+
+   public EnterpriseBeans getEnterpriseBeans()
+   {
+      return enterpriseBeans;
+   }
+
+   public void setEnterpriseBeans(EnterpriseBeans enterpriseBeans)
+   {
+      this.enterpriseBeans = enterpriseBeans;
+   }
+   
+   public Interceptors getInterceptors()
+   {
+      return interceptors;
+   }
+
+   public void setInterceptors(Interceptors interceptors)
+   {
+      this.interceptors = interceptors;
+   }
+
+   public Relationships getRelationships()
+   {
+      return relationships;
+   }
+
+   public void setRelationships(Relationships relationships)
+   {
+      this.relationships = relationships;
+   }
+
+   public AssemblyDescriptor getAssemblyDescriptor()
+   {
+      return assemblyDescriptor;
+   }
+
+   public void setAssemblyDescriptor(AssemblyDescriptor assemblyDescriptor)
+   {
+      this.assemblyDescriptor = assemblyDescriptor;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append('[');
+      sb.append("version=").append(version);
+      sb.append(",");
+      sb.append("displayName=").append(displayName);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDD.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,1512 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metamodel;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.KernelAbstraction;
-import org.jboss.ejb3.KernelAbstractionFactory;
-import org.jboss.logging.Logger;
-import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-import org.jboss.metadata.SecurityRoleRefMetaData;
-import org.jboss.metamodel.descriptor.DDObjectFactory;
-import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.EnvEntry;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.PersistenceUnitRef;
-import org.jboss.metamodel.descriptor.NameValuePair;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.RunAs;
-import org.jboss.metamodel.descriptor.ServiceRef;
-import org.jboss.metamodel.descriptor.SecurityRole;
-import org.jboss.metamodel.descriptor.PersistenceContextRef;
-
-/**
- * org.jboss.xb.binding.ObjectModelFactory implementation that accepts data
- * chuncks from unmarshaller and assembles them into an EjbJarDD instance.
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @author Anil.Saldhana at jboss.org
- * @version <tt>$Revision$</tt>
- */
-public class EjbJarDDObjectFactory extends DDObjectFactory
-{
-
-   private static final Logger log = Logger.getLogger(EjbJarDDObjectFactory.class);
-
-   public static EjbJarDD parse(URL ddResource) throws JBossXBException, IOException
-   {
-      ObjectModelFactory factory = null;
-      Unmarshaller unmarshaller = null;
-      EjbJarDD dd = null;
-
-      if (ddResource != null)
-      {
-         log.debug("found ejb-jar.xml " + ddResource);
-
-         factory = new EjbJarDDObjectFactory();
-         UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
-         unmarshaller = unmarshallerFactory.newUnmarshaller();
-         unmarshaller.setEntityResolver(new JBossEntityResolver());
-         unmarshaller.setNamespaceAware(true);
-         unmarshaller.setSchemaValidation(true);
-         unmarshaller.setValidation(true);
-
-         dd = (EjbJarDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
-      }
-
-      return dd;
-   }
-
-   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-
-      final EjbJarDD dd;
-      if (root == null)
-      {
-         root = dd = new EjbJarDD();
-      }
-      else
-      {
-         dd = (EjbJarDD)root;
-      }
-
-      if (attrs.getLength() > 0)
-      {
-         for (int i = 0; i < attrs.getLength(); ++i)
-         {
-            if (attrs.getLocalName(i).equals("version"))
-            {
-               dd.setVersion(attrs.getValue(i));
-            }
-         }
-      }
-
-      return root;
-   }
-
-   public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
-   {
-      return root;
-   }
-
-   // Methods discovered by introspection
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("enterprise-beans"))
-      {
-         child = new EnterpriseBeans();
-      }
-      if (localName.equals("interceptors"))
-      {
-         child = new Interceptors();
-      }
-      else if (localName.equals("relationships"))
-      {
-         child = new Relationships();
-      }
-      else if (localName.equals("assembly-descriptor"))
-      {
-         child = new AssemblyDescriptor();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("session"))
-      {
-         child = new SessionEnterpriseBean();
-      }
-      else if (localName.equals("entity"))
-      {
-         child = new EntityEnterpriseBean();
-      }
-      else if (localName.equals("message-driven"))
-      {
-         child = new MessageDrivenBean();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   private Object newEjbChild(EnterpriseBean parent, String localName)
-   {
-      Object child = null;
-
-      if ((child = super.newEnvRefGroupChild(localName)) != null)
-         return child;
-      return child;
-   }
-
-   private Object newEjbHasInterceptorsChild(EnterpriseBean parent, String localName)
-   {
-      Object child = null;
-
-      if (localName.equals("around-invoke"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("post-construct"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("post-activate"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         child = new Method();
-      }
-      return child;
-   }
-
-   public Object newChild(MessageDrivenBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = newEjbChild(parent, localName);
-      if (child != null)
-         return child;
-
-      child = newEjbHasInterceptorsChild(parent, localName);
-      if (child != null)
-         return child;
-
-      if (localName.equals("message-driven-destination"))
-      {
-         child = new MessageDrivenDestination();
-      }
-      else if (localName.equals("activation-config"))
-      {
-         child = new ActivationConfig();
-      }
-
-      return child;
-   }
-
-   public Object newChild(ActivationConfig parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("activation-config-property"))
-      {
-         child = new NameValuePair();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(SessionEnterpriseBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = newEjbChild(parent, localName);
-      if (child != null)
-         return child;
-
-      child = newEjbHasInterceptorsChild(parent, localName);
-      if (child != null)
-         return child;
-
-      if (localName.equals("security-role-ref"))
-      {
-         child = new SecurityRoleRefMetaData();
-      }
-      else if (localName.equals("security-identity"))
-      {
-         child = new SecurityIdentity();
-      }
-      else if (localName.equals("remove-method"))
-      {
-         RemoveMethod method = new RemoveMethod();
-         parent.addRemoveMethod(method);
-         child = method;
-      }
-      else if (localName.equals("init-method"))
-      {
-         InitMethod method = new InitMethod();
-         parent.addInitMethod(method);
-         child = method;
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EntityEnterpriseBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      child = newEjbChild(parent, localName);
-      if (child == null)
-      {
-         if (localName.equals("security-role-ref"))
-         {
-            child = new SecurityRoleRefMetaData();
-         }
-         else if (localName.equals("cmp-field"))
-         {
-            child = new CmpField();
-         }
-         else if (localName.equals("query"))
-         {
-            child = new Query();
-         }
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(SecurityIdentity parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("run-as"))
-      {
-         child = new RunAs();
-      }
-      else if (localName.equals("use-caller-identity"))
-      {
-         parent.setUseCallerIdentity(true);
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(RemoveMethod parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("bean-method"))
-      {
-         parent.setBeanMethod(new Method());
-         child = parent.getBeanMethod();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(InitMethod parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("bean-method"))
-      {
-         parent.setBeanMethod(new Method());
-         child = parent.getBeanMethod();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(RemoveMethod dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("retain-if-exception"))
-      {
-         dd.setRetainIfException(Boolean.parseBoolean(getValue(localName, value)));
-      }
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Relationships relationships, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("ejb-relation"))
-      {
-         child = new EjbRelation();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("ejb-relationship-role"))
-      {
-         child = new EjbRelationshipRole();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbRelationshipRole parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("cascade-delete"))
-      {
-         parent.setCascadeDelete(true);
-      }
-      else if (localName.equals("relationship-role-source"))
-      {
-         child = new RelationshipRoleSource();
-      }
-      else if (localName.equals("cmr-field"))
-      {
-         child = new CmrField();
-      }
-
-      return child;
-   }
-
-   public Object newChild(Interceptors interceptors, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("interceptor"))
-      {
-         return new Interceptor();
-      }
-
-      return child;
-   }
-
-   public Object newChild(Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if ((child = this.newEnvRefGroupChild(localName)) != null)
-         return child;
-
-      if (localName.equals("around-invoke"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("post-construct"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("post-activate"))
-      {
-         return new Method();
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         return new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(AssemblyDescriptor relationships, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("security-role"))
-      {
-         child = new SecurityRole();
-      }
-      else if (localName.equals("method-permission"))
-      {
-         child = new MethodPermission();
-      }
-      if (localName.equals("container-transaction"))
-      {
-         child = new ContainerTransaction();
-      }
-      else if (localName.equals("inject"))
-      {
-         child = new Inject();
-      }
-      else if (localName.equals("exclude-list"))
-      {
-         child = new ExcludeList();
-      }
-      else if (localName.equals("application-exception"))
-      {
-         child = new ApplicationException();
-      }
-      else if (localName.equals("interceptor-binding"))
-      {
-         child = new InterceptorBinding();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-      else if (localName.equals("unchecked"))
-      {
-         permission.setUnchecked(true);
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ExcludeList list, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(InitList list, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   public Object newChild(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method-params"))
-      {
-         method.setHasParameters();
-      }
-
-      return child;
-   }
-
-   public Object newChild(InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("interceptor-order"))
-      {
-         child = new InterceptorOrder();
-      }
-      else if (localName.equals("exclude-default-interceptors"))
-      {
-         child = new ExcludeDefaultInterceptors();
-      }
-      else if (localName.equals("exclude-class-interceptors"))
-      {
-         child = new ExcludeClassInterceptors();
-      }
-      else if (localName.equals("method-params"))
-      {
-         binding.setHasParameters();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, ActivationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setActivationConfig(config);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnvEntry(entry);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(envRef);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, ResourceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(envRef);
-   }
-
-   public void addChild(MessageDrivenBean parent, ServiceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addServiceRef(envRef);
-   }
-
-   public void addChild(MessageDrivenBean parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestinationRef(ref);
-   }
-
-   public void addChild(ActivationConfig parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addActivationConfigProperty(property);
-   }
-
-   public void addChild(EjbJarDD parent, EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setEnterpriseBeans(ejbs);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnterpriseBean(ejb);
-   }
-
-   public void addChild(SessionEnterpriseBean parent, SecurityRoleRefMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addSecurityRoleReference(child);
-   }
-
-   public void addChild(SessionEnterpriseBean parent, SecurityIdentity si, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setSecurityIdentity(si);
-   }
-
-   public void addChild(SecurityIdentity parent, RunAs runAs, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setRunAs(runAs);
-   }
-
-   public void addChild(SessionEnterpriseBean parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   public void addChild(SessionEnterpriseBean parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   public void addChild(SessionEnterpriseBean parent, PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceContextRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceUnitRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestinationRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnvEntry(entry);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(envRef);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, ResourceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(envRef);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, ServiceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addServiceRef(envRef);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(SessionEnterpriseBean parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (localName.equals("around-invoke"))
-      {
-         parent.setAroundInvoke(method);
-      }
-      else if (localName.equals("post-construct"))
-      {
-         parent.setPostConstruct(method);
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         parent.setPreDestroy(method);
-      }
-      else if (localName.equals("post-activate"))
-      {
-         parent.setPostActivate(method);
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         parent.setPrePassivate(method);
-      }
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EntityEnterpriseBean parent, CmpField field, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addCmpField(field);
-   }
-
-   public void addChild(EntityEnterpriseBean parent, SecurityRoleRefMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addSecurityRoleReference(child);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EntityEnterpriseBean parent, Query query, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addQuery(query);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbJarDD parent, Relationships relationships, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setRelationships(relationships);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Relationships parent, EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRelation(relation);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbRelation parent, EjbRelationshipRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRelationshipRole(role);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbRelationshipRole parent, RelationshipRoleSource source, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setRelationshipRoleSource(source);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbRelationshipRole parent, CmrField field, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setCmrField(field);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbJarDD parent, AssemblyDescriptor descriptor, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setAssemblyDescriptor(descriptor);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addSecurityRole(role);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethodPermission(permission);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, ExcludeList list, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setExcludeList(list);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, ApplicationException exception, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addApplicationException(exception);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, InitList list, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInitList(list);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addInject(inject);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addInterceptorBinding(binding);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(ExcludeList parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InitList parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MethodPermission parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Inject parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   public void addChild(EjbJarDD parent, Interceptors interceptors, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInterceptors(interceptors);
-   }
-
-   public void addChild(Interceptors parent, Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addInterceptor(interceptor);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceContextRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addPersistenceUnitRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestinationRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnvEntry(entry);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Interceptor parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addServiceRef(ref);
-   }
-
-   public void addChild(Interceptor parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (localName.equals("around-invoke"))
-      {
-         parent.setAroundInvoke(method);
-      }
-      else if (localName.equals("post-construct"))
-      {
-         parent.setPostConstruct(method);
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         parent.setPreDestroy(method);
-      }
-      else if (localName.equals("post-activate"))
-      {
-         parent.setPostActivate(method);
-      }
-      else if (localName.equals("pre-passivate"))
-      {
-         parent.setPrePassivate(method);
-      }
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InterceptorBinding parent, InterceptorOrder order, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setOrderedInterceptorClasses(order);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InterceptorBinding parent, ExcludeDefaultInterceptors exclude, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setExcludeDefaultInterceptors(true);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(InterceptorBinding parent, ExcludeClassInterceptors exclude, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setExcludeClassInterceptors(true);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(ContainerTransaction parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, MessageDrivenDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMessageDrivenDestination(destination);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageDrivenBean parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (localName.equals("around-invoke"))
-      {
-         parent.setAroundInvoke(method);
-      }
-      else if (localName.equals("post-construct"))
-      {
-         parent.setPostConstruct(method);
-      }
-      else if (localName.equals("pre-destroy"))
-      {
-         parent.setPreDestroy(method);
-      }
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(AssemblyDescriptor parent, ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addContainerTransaction(transaction);
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("display-name"))
-      {
-         dd.setDisplayName(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("activation-config-property-name"))
-      {
-         property.setName(getValue(localName, value));
-      }
-      else if (localName.equals("activation-config-property-value"))
-      {
-         property.setValue(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   private boolean isEjbParentName(EnterpriseBean ejb, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         ejb.setEjbName(getValue(localName, value));
-         return true;
-      }
-      else if (localName.equals("home"))
-      {
-         ejb.setHome(getValue(localName, value));
-         return true;
-      }
-      else if (localName.equals("remote") || localName.equals("business-remote"))
-      {
-         ejb.setRemote(getValue(localName, value));
-         return true;
-      }
-      else if (localName.equals("local-home"))
-      {
-         ejb.setLocalHome(getValue(localName, value));
-         return true;
-      }
-      else if (localName.equals("local") || localName.equals("business-local"))
-      {
-         ejb.setLocal(getValue(localName, value));
-         return true;
-      }
-      else if (localName.equals("ejb-class"))
-      {
-         ejb.setEjbClass(getValue(localName, value));
-         return true;
-      }
-
-      return false;
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDrivenBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (!isEjbParentName(ejb, localName, value))
-      {
-         if (localName.equals("acknowledge-mode"))
-         {
-            ejb.setAcknowledgeMode(getValue(localName, value));
-         }
-         else if (localName.equals("transaction-type"))
-         {
-            ejb.setTransactionType(getValue(localName, value));
-         }
-         else if (localName.equals("messaging-type"))
-         {
-            ejb.setMessagingType(getValue(localName, value));
-         }
-         else if (localName.equals("message-destination-type"))
-         {
-            MessageDrivenDestination destination = ejb.getMessageDrivenDestination();
-            if (destination == null)
-            {
-               destination = new MessageDrivenDestination();
-               ejb.setMessageDrivenDestination(destination);
-            }
-
-            destination.setDestinationType(getValue(localName, value));
-         }
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDrivenDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("destination-type"))
-      {
-         destination.setDestinationType(getValue(localName, value));
-      }
-      else if (localName.equals("subscription-durability"))
-      {
-         destination.setSubscriptionDurability(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(SessionEnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (!isEjbParentName(ejb, localName, value))
-      {
-         if (localName.equals("session-type"))
-         {
-            ejb.setSessionType(getValue(localName, value));
-         }
-         else if (localName.equals("transaction-type"))
-         {
-            ejb.setTransactionManagementType(getValue(localName, value));
-         }
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ApplicationException exception, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("exception-class"))
-      {
-         exception.setExceptionClass(getValue(localName, value));
-      }
-      else if (localName.equals("rollback"))
-      {
-         exception.setRollback(Boolean.valueOf(getValue(localName, value)));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EntityEnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (!isEjbParentName(ejb, localName, value))
-      {
-         if (localName.equals("persistence-type"))
-         {
-            ejb.setPersistenceType(getValue(localName, value));
-         }
-      }
-   }
-
-   /**
-    * <!ELEMENT security-role-ref (rolename,role-link))>
-    */
-   public void setValue(SecurityRoleRefMetaData parent, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         parent.setName(value);
-      }
-      else if (localName.equals("role-link"))
-      {
-         parent.setLink(value);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(SecurityIdentity si, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("use-caller-identity"))
-      {
-         si.setUseCallerIdentity(true);
-      }
-   }
-
-   public void setValue(Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("interceptor-class"))
-      {
-         interceptor.setInterceptorClass(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-relation-name"))
-      {
-         relation.setEjbRelationName(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbRelationshipRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-relationship-role-name"))
-      {
-         role.setEjbRelationshipRoleName(getValue(localName, value));
-      }
-      else if (localName.equals("multiplicity"))
-      {
-         role.setMultiplicity(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(RelationshipRoleSource source, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         source.setEjbName(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(CmrField field, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("cmr-field-name"))
-      {
-         field.setCmrFieldName(getValue(localName, value));
-      }
-      else if (localName.equals("cmr-field-type"))
-      {
-         field.setCmrFieldType(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         role.setRoleName(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         permission.addRoleName(getValue(localName, value));
-      }
-      else if (localName.equals("unchecked"))
-      {
-         permission.setUnchecked(true);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("trans-attribute"))
-      {
-         transaction.setTransAttribute(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         method.setEjbName(getValue(localName, value));
-      }
-      else if (localName.equals("method-name"))
-      {
-         method.setMethodName(getValue(localName, value));
-      }
-      else if (localName.equals("method-param"))
-      {
-         method.addMethodParam(getValue(localName, value));
-      }
-      else if (localName.equals("lifecycle-callback-method"))
-      {
-         method.setMethodName(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("jndi-name"))
-      {
-         inject.setJndiName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         binding.setEjbName(getValue(localName, value));
-      }
-      else if (localName.equals("interceptor-class"))
-      {
-         binding.addInterceptorClass(getValue(localName, value));
-      }
-      else if (localName.equals("method-name"))
-      {
-         binding.setMethodName(getValue(localName, value));
-      }
-      else if (localName.equals("method-param"))
-      {
-         binding.addMethodParam(getValue(localName, value));
-      }
-      else if (localName.equals("exclude-default-interceptors"))
-      {
-         binding.setExcludeDefaultInterceptors(true);
-      }
-      else if (localName.equals("exclude-class-interceptors"))
-      {
-         binding.setExcludeClassInterceptors(true);
-      }
-   }
-
-   public void setValue(InterceptorOrder order, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("interceptor-class"))
-      {
-         order.addInterceptorClass(getValue(localName, value));
-      }
-   }
-
-   protected String getValue(String name, String value)
-   {
-      if (value.startsWith("${") && value.endsWith("}"))
-      {
-         try
-         {
-            String propertyName = value.substring(2, value.length() - 1);
-            ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
-            KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
-            String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
-            log.debug("Replaced ejb-jar.xml element " + name + " with value " + propertyValue);
-            return propertyValue;
-         }
-         catch (Exception e)
-         {
-            log.warn("Unable to look up property service for ejb-jar.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
-                  + e.getMessage());
-         }
-      }
-
-      return value;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,1515 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.io.IOException;
+import java.net.URL;
+
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.KernelAbstraction;
+import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.logging.Logger;
+import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+import org.jboss.metadata.SecurityRoleRefMetaData;
+import org.jboss.metamodel.descriptor.DDObjectFactory;
+import org.jboss.metamodel.descriptor.EjbLocalRef;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.EnvEntry;
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
+import org.jboss.metamodel.descriptor.PersistenceUnitRef;
+import org.jboss.metamodel.descriptor.NameValuePair;
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.RunAs;
+import org.jboss.metamodel.descriptor.ServiceRef;
+import org.jboss.metamodel.descriptor.SecurityRole;
+import org.jboss.metamodel.descriptor.PersistenceContextRef;
+
+/**
+ * org.jboss.xb.binding.ObjectModelFactory implementation that accepts data
+ * chuncks from unmarshaller and assembles them into an EjbJarDD instance.
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author Anil.Saldhana at jboss.org
+ * @version <tt>$Revision$</tt>
+ */
+public class EjbJarDDObjectFactory extends DDObjectFactory
+{
+
+   private static final Logger log = Logger.getLogger(EjbJarDDObjectFactory.class);
+
+   public static EjbJarDD parse(URL ddResource) throws JBossXBException, IOException
+   {
+      ObjectModelFactory factory = null;
+      Unmarshaller unmarshaller = null;
+      EjbJarDD dd = null;
+
+      if (ddResource != null)
+      {
+         log.debug("found ejb-jar.xml " + ddResource);
+
+         factory = new EjbJarDDObjectFactory();
+         UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+         unmarshaller = unmarshallerFactory.newUnmarshaller();
+         unmarshaller.setEntityResolver(new JBossEntityResolver());
+         unmarshaller.setNamespaceAware(true);
+         unmarshaller.setSchemaValidation(true);
+         unmarshaller.setValidation(true);
+
+         dd = (EjbJarDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
+      }
+
+      return dd;
+   }
+
+   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+
+      final EjbJarDD dd;
+      if (root == null)
+      {
+         root = dd = new EjbJarDD();
+      }
+      else
+      {
+         dd = (EjbJarDD)root;
+      }
+
+      if (attrs.getLength() > 0)
+      {
+         for (int i = 0; i < attrs.getLength(); ++i)
+         {
+            if (attrs.getLocalName(i).equals("version"))
+            {
+               dd.setVersion(attrs.getValue(i));
+            }
+         }
+      }
+
+      return root;
+   }
+
+   public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
+   {
+      return root;
+   }
+
+   // Methods discovered by introspection
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("enterprise-beans"))
+      {
+         child = new EnterpriseBeans();
+      }
+      if (localName.equals("interceptors"))
+      {
+         child = new Interceptors();
+      }
+      else if (localName.equals("relationships"))
+      {
+         child = new Relationships();
+      }
+      else if (localName.equals("assembly-descriptor"))
+      {
+         child = new AssemblyDescriptor();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("session"))
+      {
+         child = new SessionEnterpriseBean();
+      }
+      else if (localName.equals("entity"))
+      {
+         child = new EntityEnterpriseBean();
+      }
+      else if (localName.equals("message-driven"))
+      {
+         child = new MessageDrivenBean();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   private Object newEjbChild(EnterpriseBean parent, String localName)
+   {
+      Object child = null;
+
+      if ((child = super.newEnvRefGroupChild(localName)) != null)
+         return child;
+      return child;
+   }
+
+   private Object newEjbHasInterceptorsChild(EnterpriseBean parent, String localName)
+   {
+      Object child = null;
+
+      if (localName.equals("around-invoke"))
+      {
+         child = new Method();
+      }
+      else if (localName.equals("post-construct"))
+      {
+         child = new Method();
+      }
+      else if (localName.equals("pre-destroy"))
+      {
+         child = new Method();
+      }
+      else if (localName.equals("post-activate"))
+      {
+         child = new Method();
+      }
+      else if (localName.equals("pre-passivate"))
+      {
+         child = new Method();
+      }
+      return child;
+   }
+
+   public Object newChild(MessageDrivenBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = newEjbChild(parent, localName);
+      if (child != null)
+         return child;
+
+      child = newEjbHasInterceptorsChild(parent, localName);
+      if (child != null)
+         return child;
+
+      if (localName.equals("message-driven-destination"))
+      {
+         child = new MessageDrivenDestination();
+      }
+      else if (localName.equals("activation-config"))
+      {
+         child = new ActivationConfig();
+      }
+
+      return child;
+   }
+
+   public Object newChild(ActivationConfig parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("activation-config-property"))
+      {
+         child = new NameValuePair();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(SessionEnterpriseBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = newEjbChild(parent, localName);
+      if (child != null)
+         return child;
+
+      child = newEjbHasInterceptorsChild(parent, localName);
+      if (child != null)
+         return child;
+
+      if (localName.equals("security-role-ref"))
+      {
+         child = new SecurityRoleRefMetaData();
+      }
+      else if (localName.equals("security-identity"))
+      {
+         child = new SecurityIdentity();
+      }
+      else if (localName.equals("remove-method"))
+      {
+         RemoveMethod method = new RemoveMethod();
+         parent.addRemoveMethod(method);
+         child = method;
+      }
+      else if (localName.equals("init-method"))
+      {
+         InitMethod method = new InitMethod();
+         parent.addInitMethod(method);
+         child = method;
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(EntityEnterpriseBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      child = newEjbChild(parent, localName);
+      if (child == null)
+      {
+         if (localName.equals("security-role-ref"))
+         {
+            child = new SecurityRoleRefMetaData();
+         }
+         else if (localName.equals("cmp-field"))
+         {
+            child = new CmpField();
+         }
+         else if (localName.equals("query"))
+         {
+            child = new Query();
+         }
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(SecurityIdentity parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("run-as"))
+      {
+         child = new RunAs();
+      }
+      else if (localName.equals("use-caller-identity"))
+      {
+         parent.setUseCallerIdentity(true);
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(RemoveMethod parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("bean-method"))
+      {
+         parent.setBeanMethod(new Method());
+         child = parent.getBeanMethod();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(InitMethod parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("bean-method"))
+      {
+         parent.setBeanMethod(new Method());
+         child = parent.getBeanMethod();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(RemoveMethod dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("retain-if-exception"))
+      {
+         dd.setRetainIfException(Boolean.parseBoolean(getValue(localName, value)));
+      }
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(Relationships relationships, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("ejb-relation"))
+      {
+         child = new EjbRelation();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("ejb-relationship-role"))
+      {
+         child = new EjbRelationshipRole();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(EjbRelationshipRole parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("cascade-delete"))
+      {
+         parent.setCascadeDelete(true);
+      }
+      else if (localName.equals("relationship-role-source"))
+      {
+         child = new RelationshipRoleSource();
+      }
+      else if (localName.equals("cmr-field"))
+      {
+         child = new CmrField();
+      }
+
+      return child;
+   }
+
+   public Object newChild(Interceptors interceptors, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("interceptor"))
+      {
+         return new Interceptor();
+      }
+
+      return child;
+   }
+
+   public Object newChild(Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if ((child = this.newEnvRefGroupChild(localName)) != null)
+         return child;
+
+      if (localName.equals("around-invoke"))
+      {
+         return new Method();
+      }
+      else if (localName.equals("post-construct"))
+      {
+         return new Method();
+      }
+      else if (localName.equals("pre-destroy"))
+      {
+         return new Method();
+      }
+      else if (localName.equals("post-activate"))
+      {
+         return new Method();
+      }
+      else if (localName.equals("pre-passivate"))
+      {
+         return new Method();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(AssemblyDescriptor relationships, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("security-role"))
+      {
+         child = new SecurityRole();
+      }
+      else if (localName.equals("method-permission"))
+      {
+         child = new MethodPermission();
+      }
+      if (localName.equals("container-transaction"))
+      {
+         child = new ContainerTransaction();
+      }
+      else if (localName.equals("inject"))
+      {
+         child = new Inject();
+      }
+      else if (localName.equals("exclude-list"))
+      {
+         child = new ExcludeList();
+      }
+      else if (localName.equals("application-exception"))
+      {
+         child = new ApplicationException();
+      }
+      else if (localName.equals("interceptor-binding"))
+      {
+         child = new InterceptorBinding();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+      else if (localName.equals("unchecked"))
+      {
+         permission.setUnchecked(true);
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(ExcludeList list, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(InitList list, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+
+      return child;
+   }
+
+   public Object newChild(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method-params"))
+      {
+         method.setHasParameters();
+      }
+
+      return child;
+   }
+
+   public Object newChild(InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("interceptor-order"))
+      {
+         child = new InterceptorOrder();
+      }
+      else if (localName.equals("exclude-default-interceptors"))
+      {
+         child = new ExcludeDefaultInterceptors();
+      }
+      else if (localName.equals("exclude-class-interceptors"))
+      {
+         child = new ExcludeClassInterceptors();
+      }
+      else if (localName.equals("method-params"))
+      {
+         binding.setHasParameters();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, ActivationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setActivationConfig(config);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbLocalRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEnvEntry(entry);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceEnvRef(envRef);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, ResourceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceRef(envRef);
+   }
+
+   public void addChild(MessageDrivenBean parent, ServiceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addServiceRef(envRef);
+   }
+
+   public void addChild(MessageDrivenBean parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMessageDestinationRef(ref);
+   }
+
+   public void addChild(ActivationConfig parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addActivationConfigProperty(property);
+   }
+
+   public void addChild(EjbJarDD parent, EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setEnterpriseBeans(ejbs);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, EnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEnterpriseBean(ejb);
+   }
+
+   public void addChild(SessionEnterpriseBean parent, SecurityRoleRefMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addSecurityRoleReference(child);
+   }
+
+   public void addChild(SessionEnterpriseBean parent, SecurityIdentity si, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setSecurityIdentity(si);
+   }
+
+   public void addChild(SecurityIdentity parent, RunAs runAs, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setRunAs(runAs);
+   }
+
+   public void addChild(SessionEnterpriseBean parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbLocalRef(ref);
+   }
+
+   public void addChild(SessionEnterpriseBean parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRef(ref);
+   }
+
+   public void addChild(SessionEnterpriseBean parent, PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addPersistenceContextRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(SessionEnterpriseBean parent, PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addPersistenceUnitRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(SessionEnterpriseBean parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMessageDestinationRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(SessionEnterpriseBean parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEnvEntry(entry);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(SessionEnterpriseBean parent, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceEnvRef(envRef);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(SessionEnterpriseBean parent, ResourceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceRef(envRef);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(SessionEnterpriseBean parent, ServiceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addServiceRef(envRef);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(SessionEnterpriseBean parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      if (localName.equals("around-invoke"))
+      {
+         parent.setAroundInvoke(method);
+      }
+      else if (localName.equals("post-construct"))
+      {
+         parent.setPostConstruct(method);
+      }
+      else if (localName.equals("pre-destroy"))
+      {
+         parent.setPreDestroy(method);
+      }
+      else if (localName.equals("post-activate"))
+      {
+         parent.setPostActivate(method);
+      }
+      else if (localName.equals("pre-passivate"))
+      {
+         parent.setPrePassivate(method);
+      }
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EntityEnterpriseBean parent, CmpField field, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addCmpField(field);
+   }
+
+   public void addChild(EntityEnterpriseBean parent, SecurityRoleRefMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addSecurityRoleReference(child);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EntityEnterpriseBean parent, Query query, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addQuery(query);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EjbJarDD parent, Relationships relationships, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setRelationships(relationships);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Relationships parent, EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRelation(relation);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EjbRelation parent, EjbRelationshipRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRelationshipRole(role);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EjbRelationshipRole parent, RelationshipRoleSource source, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setRelationshipRoleSource(source);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EjbRelationshipRole parent, CmrField field, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setCmrField(field);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EjbJarDD parent, AssemblyDescriptor descriptor, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setAssemblyDescriptor(descriptor);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addSecurityRole(role);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethodPermission(permission);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, ExcludeList list, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setExcludeList(list);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, ApplicationException exception, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addApplicationException(exception);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, InitList list, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInitList(list);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addInject(inject);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addInterceptorBinding(binding);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(ExcludeList parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethod(method);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(InitList parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethod(method);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MethodPermission parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethod(method);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Inject parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethod(method);
+   }
+
+   public void addChild(EjbJarDD parent, Interceptors interceptors, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInterceptors(interceptors);
+   }
+
+   public void addChild(Interceptors parent, Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addInterceptor(interceptor);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbLocalRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addPersistenceContextRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addPersistenceUnitRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMessageDestinationRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEnvEntry(entry);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceEnvRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Interceptor parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addServiceRef(ref);
+   }
+
+   public void addChild(Interceptor parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      if (localName.equals("around-invoke"))
+      {
+         parent.setAroundInvoke(method);
+      }
+      else if (localName.equals("post-construct"))
+      {
+         parent.setPostConstruct(method);
+      }
+      else if (localName.equals("pre-destroy"))
+      {
+         parent.setPreDestroy(method);
+      }
+      else if (localName.equals("post-activate"))
+      {
+         parent.setPostActivate(method);
+      }
+      else if (localName.equals("pre-passivate"))
+      {
+         parent.setPrePassivate(method);
+      }
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(InterceptorBinding parent, InterceptorOrder order, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setOrderedInterceptorClasses(order);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(InterceptorBinding parent, ExcludeDefaultInterceptors exclude, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setExcludeDefaultInterceptors(true);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(InterceptorBinding parent, ExcludeClassInterceptors exclude, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setExcludeClassInterceptors(true);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(ContainerTransaction parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setMethod(method);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, MessageDrivenDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setMessageDrivenDestination(destination);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageDrivenBean parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      if (localName.equals("around-invoke"))
+      {
+         parent.setAroundInvoke(method);
+      }
+      else if (localName.equals("post-construct"))
+      {
+         parent.setPostConstruct(method);
+      }
+      else if (localName.equals("pre-destroy"))
+      {
+         parent.setPreDestroy(method);
+      }
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(AssemblyDescriptor parent, ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addContainerTransaction(transaction);
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("display-name"))
+      {
+         dd.setDisplayName(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("activation-config-property-name"))
+      {
+         property.setName(getValue(localName, value));
+      }
+      else if (localName.equals("activation-config-property-value"))
+      {
+         property.setValue(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   private boolean isEjbParentName(EnterpriseBean ejb, String localName, String value)
+   {
+      if (localName.equals("ejb-name"))
+      {
+         ejb.setEjbName(getValue(localName, value));
+         return true;
+      }
+      else if (localName.equals("home"))
+      {
+         ejb.setHome(getValue(localName, value));
+         return true;
+      }
+      else if (localName.equals("remote") || localName.equals("business-remote"))
+      {
+         ejb.setRemote(getValue(localName, value));
+         return true;
+      }
+      else if (localName.equals("local-home"))
+      {
+         ejb.setLocalHome(getValue(localName, value));
+         return true;
+      }
+      else if (localName.equals("local") || localName.equals("business-local"))
+      {
+         ejb.setLocal(getValue(localName, value));
+         return true;
+      }
+      else if (localName.equals("ejb-class"))
+      {
+         ejb.setEjbClass(getValue(localName, value));
+         return true;
+      }
+
+      return false;
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(MessageDrivenBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (!isEjbParentName(ejb, localName, value))
+      {
+         if (localName.equals("acknowledge-mode"))
+         {
+            ejb.setAcknowledgeMode(getValue(localName, value));
+         }
+         else if (localName.equals("transaction-type"))
+         {
+            ejb.setTransactionType(getValue(localName, value));
+         }
+         else if (localName.equals("messaging-type"))
+         {
+            ejb.setMessagingType(getValue(localName, value));
+         }
+         else if (localName.equals("message-destination-type"))
+         {
+            MessageDrivenDestination destination = ejb.getMessageDrivenDestination();
+            if (destination == null)
+            {
+               destination = new MessageDrivenDestination();
+               ejb.setMessageDrivenDestination(destination);
+            }
+
+            destination.setDestinationType(getValue(localName, value));
+         }
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(MessageDrivenDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("destination-type"))
+      {
+         destination.setDestinationType(getValue(localName, value));
+      }
+      else if (localName.equals("subscription-durability"))
+      {
+         destination.setSubscriptionDurability(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(SessionEnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (!isEjbParentName(ejb, localName, value))
+      {
+         if (localName.equals("session-type"))
+         {
+            ejb.setSessionType(getValue(localName, value));
+         }
+         else if (localName.equals("transaction-type"))
+         {
+            ejb.setTransactionManagementType(getValue(localName, value));
+         }
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(ApplicationException exception, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("exception-class"))
+      {
+         exception.setExceptionClass(getValue(localName, value));
+      }
+      else if (localName.equals("rollback"))
+      {
+         exception.setRollback(Boolean.valueOf(getValue(localName, value)));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(EntityEnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (!isEjbParentName(ejb, localName, value))
+      {
+         if (localName.equals("persistence-type"))
+         {
+            ejb.setPersistenceType(getValue(localName, value));
+         }
+      }
+   }
+
+   /**
+    * <!ELEMENT security-role-ref (rolename,role-link))>
+    */
+   public void setValue(SecurityRoleRefMetaData parent, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      /* FIXME: NYI
+      if (localName.equals("role-name"))
+      {
+         parent.setName(value);
+      }
+      else if (localName.equals("role-link"))
+      {
+         parent.setLink(value);
+      }
+      */
+      throw new RuntimeException("NYI");
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(SecurityIdentity si, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("use-caller-identity"))
+      {
+         si.setUseCallerIdentity(true);
+      }
+   }
+
+   public void setValue(Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("interceptor-class"))
+      {
+         interceptor.setInterceptorClass(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-relation-name"))
+      {
+         relation.setEjbRelationName(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(EjbRelationshipRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-relationship-role-name"))
+      {
+         role.setEjbRelationshipRoleName(getValue(localName, value));
+      }
+      else if (localName.equals("multiplicity"))
+      {
+         role.setMultiplicity(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(RelationshipRoleSource source, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-name"))
+      {
+         source.setEjbName(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(CmrField field, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("cmr-field-name"))
+      {
+         field.setCmrFieldName(getValue(localName, value));
+      }
+      else if (localName.equals("cmr-field-type"))
+      {
+         field.setCmrFieldType(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("role-name"))
+      {
+         role.setRoleName(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("role-name"))
+      {
+         permission.addRoleName(getValue(localName, value));
+      }
+      else if (localName.equals("unchecked"))
+      {
+         permission.setUnchecked(true);
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("trans-attribute"))
+      {
+         transaction.setTransAttribute(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-name"))
+      {
+         method.setEjbName(getValue(localName, value));
+      }
+      else if (localName.equals("method-name"))
+      {
+         method.setMethodName(getValue(localName, value));
+      }
+      else if (localName.equals("method-param"))
+      {
+         method.addMethodParam(getValue(localName, value));
+      }
+      else if (localName.equals("lifecycle-callback-method"))
+      {
+         method.setMethodName(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("jndi-name"))
+      {
+         inject.setJndiName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-name"))
+      {
+         binding.setEjbName(getValue(localName, value));
+      }
+      else if (localName.equals("interceptor-class"))
+      {
+         binding.addInterceptorClass(getValue(localName, value));
+      }
+      else if (localName.equals("method-name"))
+      {
+         binding.setMethodName(getValue(localName, value));
+      }
+      else if (localName.equals("method-param"))
+      {
+         binding.addMethodParam(getValue(localName, value));
+      }
+      else if (localName.equals("exclude-default-interceptors"))
+      {
+         binding.setExcludeDefaultInterceptors(true);
+      }
+      else if (localName.equals("exclude-class-interceptors"))
+      {
+         binding.setExcludeClassInterceptors(true);
+      }
+   }
+
+   public void setValue(InterceptorOrder order, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("interceptor-class"))
+      {
+         order.addInterceptorClass(getValue(localName, value));
+      }
+   }
+
+   protected String getValue(String name, String value)
+   {
+      if (value.startsWith("${") && value.endsWith("}"))
+      {
+         try
+         {
+            String propertyName = value.substring(2, value.length() - 1);
+            ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
+            KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
+            String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
+            log.debug("Replaced ejb-jar.xml element " + name + " with value " + propertyValue);
+            return propertyValue;
+         }
+         catch (Exception e)
+         {
+            log.warn("Unable to look up property service for ejb-jar.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
+                  + e.getMessage());
+         }
+      }
+
+      return value;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an ejb-relation element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbRelation
-{
-
-   private String ejbRelationName = null;
-
-   private List ejbRelationshipRoles = new ArrayList();
-
-   public String getEjbRelationName()
-   {
-      return ejbRelationName;
-   }
-
-   public void setEjbRelationName(String ejbRelationName)
-   {
-      this.ejbRelationName = ejbRelationName;
-   }
-
-   public List getEjbRelationshipRoles()
-   {
-      return ejbRelationshipRoles;
-   }
-
-   public void setEjbRelationshipRoles(List ejbRelationshipRoles)
-   {
-      this.ejbRelationshipRoles = ejbRelationshipRoles;
-   }
-
-   public void addEjbRelationshipRole(EjbRelationshipRole role)
-   {
-      ejbRelationshipRoles.add(role);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRelationName=").append(ejbRelationName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents an ejb-relation element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EjbRelation
+{
+
+   private String ejbRelationName = null;
+
+   private List ejbRelationshipRoles = new ArrayList();
+
+   public String getEjbRelationName()
+   {
+      return ejbRelationName;
+   }
+
+   public void setEjbRelationName(String ejbRelationName)
+   {
+      this.ejbRelationName = ejbRelationName;
+   }
+
+   public List getEjbRelationshipRoles()
+   {
+      return ejbRelationshipRoles;
+   }
+
+   public void setEjbRelationshipRoles(List ejbRelationshipRoles)
+   {
+      this.ejbRelationshipRoles = ejbRelationshipRoles;
+   }
+
+   public void addEjbRelationshipRole(EjbRelationshipRole role)
+   {
+      ejbRelationshipRoles.add(role);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbRelationName=").append(ejbRelationName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelation.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,120 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an ejb-relationship-role element of the ejb-jar.xml deployment
- * descriptor for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EjbRelationshipRole
-{
-
-   private String ejbRelationshipRoleName;
-
-   private String multiplicity;
-
-   private boolean cascadeDelete = false;
-
-   private List ejbRelationshipRoles = new ArrayList();
-
-   private RelationshipRoleSource relationshipRoleSource;;
-
-   private CmrField cmrField;
-
-   public String getEjbRelationshipRoleName()
-   {
-      return ejbRelationshipRoleName;
-   }
-
-   public void setEjbRelationshipRoleName(String ejbRelationName)
-   {
-      this.ejbRelationshipRoleName = ejbRelationName;
-   }
-
-   public String getMultiplicity()
-   {
-      return multiplicity;
-   }
-
-   public void setMultiplicity(String multiplicity)
-   {
-      this.multiplicity = multiplicity;
-   }
-
-   public boolean isCascadeDelete()
-   {
-      return cascadeDelete;
-   }
-
-   public void setCascadeDelete(boolean cascadeDelete)
-   {
-      this.cascadeDelete = cascadeDelete;
-   }
-
-   public List getEjbRelationshipRoles()
-   {
-      return ejbRelationshipRoles;
-   }
-
-   public void setEjbRelationshipRoles(List ejbRelationshipRoles)
-   {
-      this.ejbRelationshipRoles = ejbRelationshipRoles;
-   }
-
-   public void addEjbRelationshipRole(EjbRelationshipRole role)
-   {
-      ejbRelationshipRoles.add(role);
-   }
-
-   public RelationshipRoleSource getRelationshipRoleSource()
-   {
-      return relationshipRoleSource;
-   }
-
-   public void setRelationshipRoleSource(RelationshipRoleSource relationshipRoleSource)
-   {
-      this.relationshipRoleSource = relationshipRoleSource;
-   }
-
-   public CmrField getCmrField()
-   {
-      return cmrField;
-   }
-
-   public void setCmrField(CmrField cmrField)
-   {
-      this.cmrField = cmrField;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("ejbRelationshipRoleName=").append(ejbRelationshipRoleName);
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents an ejb-relationship-role element of the ejb-jar.xml deployment
+ * descriptor for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EjbRelationshipRole
+{
+
+   private String ejbRelationshipRoleName;
+
+   private String multiplicity;
+
+   private boolean cascadeDelete = false;
+
+   private List ejbRelationshipRoles = new ArrayList();
+
+   private RelationshipRoleSource relationshipRoleSource;;
+
+   private CmrField cmrField;
+
+   public String getEjbRelationshipRoleName()
+   {
+      return ejbRelationshipRoleName;
+   }
+
+   public void setEjbRelationshipRoleName(String ejbRelationName)
+   {
+      this.ejbRelationshipRoleName = ejbRelationName;
+   }
+
+   public String getMultiplicity()
+   {
+      return multiplicity;
+   }
+
+   public void setMultiplicity(String multiplicity)
+   {
+      this.multiplicity = multiplicity;
+   }
+
+   public boolean isCascadeDelete()
+   {
+      return cascadeDelete;
+   }
+
+   public void setCascadeDelete(boolean cascadeDelete)
+   {
+      this.cascadeDelete = cascadeDelete;
+   }
+
+   public List getEjbRelationshipRoles()
+   {
+      return ejbRelationshipRoles;
+   }
+
+   public void setEjbRelationshipRoles(List ejbRelationshipRoles)
+   {
+      this.ejbRelationshipRoles = ejbRelationshipRoles;
+   }
+
+   public void addEjbRelationshipRole(EjbRelationshipRole role)
+   {
+      ejbRelationshipRoles.add(role);
+   }
+
+   public RelationshipRoleSource getRelationshipRoleSource()
+   {
+      return relationshipRoleSource;
+   }
+
+   public void setRelationshipRoleSource(RelationshipRoleSource relationshipRoleSource)
+   {
+      this.relationshipRoleSource = relationshipRoleSource;
+   }
+
+   public CmrField getCmrField()
+   {
+      return cmrField;
+   }
+
+   public void setCmrField(CmrField cmrField)
+   {
+      this.cmrField = cmrField;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("ejbRelationshipRoleName=").append(ejbRelationshipRoleName);
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbRelationshipRole.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,386 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collection;
-import java.util.HashSet;
-import javax.ejb.TransactionManagementType;
-import org.jboss.logging.Logger;
-
-import org.jboss.metadata.SecurityRoleRefMetaData;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.metamodel.descriptor.InjectionTarget;
-import org.jboss.metamodel.descriptor.MessageDestinationRef; 
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef; 
-
-/**
- * Represents an EJB element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public abstract class EnterpriseBean
-   extends EnvironmentRefGroup implements Injectable
-{
-   private static final Logger log = Logger.getLogger(EnterpriseBean.class);
-
-   public static final String BEAN = "Bean";
-
-   public static final String CONTAINER = "Container";
-
-   // ejb-jar.xml
-   private String ejbName = null;
-
-   private String home = null;
-
-   private String remote = null;
-
-   private String localHome = null;
-
-   private String local = null;
-
-   private String ejbClass = null;
-
-   private List<RemoteBinding> remoteBindings = new ArrayList();
-
-   private SecurityIdentity securityIdentity;
-
-   protected TransactionManagementType tmType = null;
-
-   // jboss.xml
-   private String jndiName;
-
-   private String localJndiName;
-
-   private String securityDomain;
-
-   private boolean callByValue = false;
-
-   private String aopDomainName = null;
-
-   private MethodAttributes methodAttributes = null;
-
-   private Collection<String> dependencies = new HashSet<String>();
-
-   private Collection<InjectionTarget> ignoreDependencies = new HashSet<InjectionTarget>();
-   
-   private Collection<XmlAnnotation> xmlAnnotations = new HashSet<XmlAnnotation>();
-
-   private PoolConfig poolConfig = null;
-   
-   /** The security-role-ref element(s) info */
-   private ArrayList<SecurityRoleRefMetaData> securityRoleReferences = new ArrayList<SecurityRoleRefMetaData>();
-   
-   
-   public void addXmlAnnotation(XmlAnnotation annotation)
-   {
-      xmlAnnotations.add(annotation);
-   }
-
-   public Collection<XmlAnnotation> getXmlAnnotations()
-   {
-      return xmlAnnotations;
-   }
-
-   public void setPoolConfig(PoolConfig poolConfig)
-   {
-      this.poolConfig = poolConfig;
-   }
-
-   public PoolConfig getPoolConfig()
-   {
-      return poolConfig;
-   }
-
-   public void addRemoteBinding(RemoteBinding binding)
-   {
-      remoteBindings.add(binding);
-   }
-
-   public List<RemoteBinding> getRemoteBindings()
-   {
-      return remoteBindings;
-   }
-
-   public void addDependency(String depends)
-   {
-      dependencies.add(depends);
-   }
-
-   public Collection<String> getDependencies()
-   {
-      return dependencies;
-   }
-
-   public void addIgnoreDependency(InjectionTarget ignore)
-   {
-      ignoreDependencies.add(ignore);
-   }
-
-   public Collection<InjectionTarget> getIgnoreDependencies()
-   {
-      return ignoreDependencies;
-   }
-
-   public void mergeMessageDestinationRef(MessageDestinationRef ref)
-   {
-      MessageDestinationRef tmpRef = (MessageDestinationRef)messageDestinationRefs.get(ref.getMessageDestinationRefName());
-      if (tmpRef != null)
-         tmpRef.merge(ref);
-   }
-
-   public void mergeResourceRef(ResourceRef ref)
-   {
-      ResourceRef tmpRef = (ResourceRef)resourceRefs.get(ref.getResRefName());
-      if (tmpRef != null)
-         tmpRef.merge(ref);
-   }
-
-   public void mergeResourceEnvRef(ResourceEnvRef ref)
-   {
-      ResourceEnvRef tmpRef = (ResourceEnvRef)resourceEnvRefs.get(ref.getResRefName());
-      if (tmpRef != null)
-         tmpRef.merge(ref);
-   }
-
-   public void setMethodAttributes(MethodAttributes methodAttributes)
-   {
-      this.methodAttributes = methodAttributes;
-   }
-
-   public MethodAttributes getMethodAttributes()
-   {
-      return methodAttributes;
-   }
-
-   public void setAopDomainName(String aopDomainName)
-   {
-      this.aopDomainName = aopDomainName;
-   }
-
-   public String getAopDomainName()
-   {
-      return aopDomainName;
-   }
-
-   public void setRunAsPrincipal(String principal)
-   {
-      /**
-       * A case where the RunAs is defined in annotations and the 
-       * RunAsPrincipal is specified in jboss.xml
-       */
-      if (securityIdentity == null)
-      {
-         securityIdentity = new SecurityIdentity();
-      }
-      securityIdentity.setRunAsPrincipal(principal);
-   }
-
-   public void setCallByValue(boolean callByValue)
-   {
-      this.callByValue = callByValue;
-   }
-
-   public boolean isCallByValue()
-   {
-      return callByValue;
-   }
-
-   public String getSecurityDomain()
-   {
-      return securityDomain;
-   }
-
-   public void setSecurityDomain(String securityDomain)
-   {
-      this.securityDomain = securityDomain;
-   }
-
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getLocalJndiName()
-   {
-      return localJndiName;
-   }
-
-   public void setLocalJndiName(String localJndiName)
-   {
-      this.localJndiName = localJndiName;
-   }
-
-   public TransactionManagementType getTransactionManagementType()
-   {
-      return tmType;
-   }
-
-   public void setTransactionManagementType(String transactionType)
-   {
-      if (transactionType.equals(BEAN))
-         tmType = TransactionManagementType.BEAN;
-      else if (transactionType.equals(CONTAINER))
-         tmType = TransactionManagementType.CONTAINER;
-   }
-
-   public boolean isSessionBean()
-   {
-      return this instanceof SessionEnterpriseBean;
-   }
-
-   public boolean isConsumer()
-   {
-      return this instanceof Consumer;
-   }
-
-   public boolean isEntityBean()
-   {
-      return this instanceof EntityEnterpriseBean;
-   }
-
-   public boolean isMessageDrivenBean()
-   {
-      return this instanceof MessageDrivenBean;
-   }
-
-   public boolean isService()
-   {
-      return this instanceof Service;
-   }
-
-   public String getEjbName()
-   {
-      return ejbName;
-   }
-
-   public void setEjbName(String ejbName)
-   {
-      this.ejbName = ejbName;
-   }
-
-   public String getHome()
-   {
-      return home;
-   }
-
-   public void setHome(String home)
-   {
-      this.home = home;
-   }
-
-   public String getRemote()
-   {
-      return remote;
-   }
-
-   public void setRemote(String remote)
-   {
-      this.remote = remote;
-   }
-
-   public String getLocalHome()
-   {
-      return localHome;
-   }
-
-   public void setLocalHome(String localHome)
-   {
-      this.localHome = localHome;
-   }
-
-   public String getLocal()
-   {
-      return local;
-   }
-
-   public void setLocal(String local)
-   {
-      this.local = local;
-   }
-
-   public String getEjbClass()
-   {
-      return ejbClass;
-   }
-
-   public void setEjbClass(String ejbClass)
-   {
-      this.ejbClass = ejbClass;
-   }
-
-   public SecurityIdentity getSecurityIdentity()
-   {
-      return securityIdentity;
-   }
-
-   public void setSecurityIdentity(SecurityIdentity securityIdentity)
-   {
-      this.securityIdentity = securityIdentity;
-   }
-   
-   public void addSecurityRoleReference(SecurityRoleRefMetaData srmd)
-   {
-      this.securityRoleReferences.add(srmd);
-   }
-
-   public ArrayList<SecurityRoleRefMetaData> getSecurityRoleReferences()
-   {
-      return securityRoleReferences;
-   }
-
-   public void setSecurityRoleReferences(ArrayList<SecurityRoleRefMetaData> securityRoleReferences)
-   {
-      this.securityRoleReferences = securityRoleReferences;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("ejbName=").append(ejbName);
-      sb.append(",remoteBindings=").append(remoteBindings);
-      sb.append(",jndiName=").append(jndiName);
-      sb.append(",local=").append(local);
-      sb.append(",remote=").append(remote);
-      sb.append(",home=").append(home);
-      sb.append(",localHome=").append(localHome);
-      sb.append(",ejbClass=").append(ejbClass);
-      sb.append(",ejbRefs=").append(ejbRefs);
-      sb.append(",ejbLocalRefs=").append(ejbLocalRefs);
-      sb.append(",resourceRefs=").append(resourceRefs);
-      sb.append(",resourceEnvRefs=").append(resourceEnvRefs);
-      sb.append(",methodAttributes=").append(methodAttributes);
-      sb.append(",aopDomainName=").append(aopDomainName);
-      sb.append(",dependencies=").append(dependencies);
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,386 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Collection;
+import java.util.HashSet;
+import javax.ejb.TransactionManagementType;
+import org.jboss.logging.Logger;
+
+import org.jboss.metadata.SecurityRoleRefMetaData;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+import org.jboss.metamodel.descriptor.InjectionTarget;
+import org.jboss.metamodel.descriptor.MessageDestinationRef; 
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef; 
+
+/**
+ * Represents an EJB element of the ejb-jar.xml deployment descriptor for the
+ * 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public abstract class EnterpriseBean
+   extends EnvironmentRefGroup implements Injectable
+{
+   private static final Logger log = Logger.getLogger(EnterpriseBean.class);
+
+   public static final String BEAN = "Bean";
+
+   public static final String CONTAINER = "Container";
+
+   // ejb-jar.xml
+   private String ejbName = null;
+
+   private String home = null;
+
+   private String remote = null;
+
+   private String localHome = null;
+
+   private String local = null;
+
+   private String ejbClass = null;
+
+   private List<RemoteBinding> remoteBindings = new ArrayList();
+
+   private SecurityIdentity securityIdentity;
+
+   protected TransactionManagementType tmType = null;
+
+   // jboss.xml
+   private String jndiName;
+
+   private String localJndiName;
+
+   private String securityDomain;
+
+   private boolean callByValue = false;
+
+   private String aopDomainName = null;
+
+   private MethodAttributes methodAttributes = null;
+
+   private Collection<String> dependencies = new HashSet<String>();
+
+   private Collection<InjectionTarget> ignoreDependencies = new HashSet<InjectionTarget>();
+   
+   private Collection<XmlAnnotation> xmlAnnotations = new HashSet<XmlAnnotation>();
+
+   private PoolConfig poolConfig = null;
+   
+   /** The security-role-ref element(s) info */
+   private ArrayList<SecurityRoleRefMetaData> securityRoleReferences = new ArrayList<SecurityRoleRefMetaData>();
+   
+   
+   public void addXmlAnnotation(XmlAnnotation annotation)
+   {
+      xmlAnnotations.add(annotation);
+   }
+
+   public Collection<XmlAnnotation> getXmlAnnotations()
+   {
+      return xmlAnnotations;
+   }
+
+   public void setPoolConfig(PoolConfig poolConfig)
+   {
+      this.poolConfig = poolConfig;
+   }
+
+   public PoolConfig getPoolConfig()
+   {
+      return poolConfig;
+   }
+
+   public void addRemoteBinding(RemoteBinding binding)
+   {
+      remoteBindings.add(binding);
+   }
+
+   public List<RemoteBinding> getRemoteBindings()
+   {
+      return remoteBindings;
+   }
+
+   public void addDependency(String depends)
+   {
+      dependencies.add(depends);
+   }
+
+   public Collection<String> getDependencies()
+   {
+      return dependencies;
+   }
+
+   public void addIgnoreDependency(InjectionTarget ignore)
+   {
+      ignoreDependencies.add(ignore);
+   }
+
+   public Collection<InjectionTarget> getIgnoreDependencies()
+   {
+      return ignoreDependencies;
+   }
+
+   public void mergeMessageDestinationRef(MessageDestinationRef ref)
+   {
+      MessageDestinationRef tmpRef = (MessageDestinationRef)messageDestinationRefs.get(ref.getMessageDestinationRefName());
+      if (tmpRef != null)
+         tmpRef.merge(ref);
+   }
+
+   public void mergeResourceRef(ResourceRef ref)
+   {
+      ResourceRef tmpRef = (ResourceRef)resourceRefs.get(ref.getResRefName());
+      if (tmpRef != null)
+         tmpRef.merge(ref);
+   }
+
+   public void mergeResourceEnvRef(ResourceEnvRef ref)
+   {
+      ResourceEnvRef tmpRef = (ResourceEnvRef)resourceEnvRefs.get(ref.getResRefName());
+      if (tmpRef != null)
+         tmpRef.merge(ref);
+   }
+
+   public void setMethodAttributes(MethodAttributes methodAttributes)
+   {
+      this.methodAttributes = methodAttributes;
+   }
+
+   public MethodAttributes getMethodAttributes()
+   {
+      return methodAttributes;
+   }
+
+   public void setAopDomainName(String aopDomainName)
+   {
+      this.aopDomainName = aopDomainName;
+   }
+
+   public String getAopDomainName()
+   {
+      return aopDomainName;
+   }
+
+   public void setRunAsPrincipal(String principal)
+   {
+      /**
+       * A case where the RunAs is defined in annotations and the 
+       * RunAsPrincipal is specified in jboss.xml
+       */
+      if (securityIdentity == null)
+      {
+         securityIdentity = new SecurityIdentity();
+      }
+      securityIdentity.setRunAsPrincipal(principal);
+   }
+
+   public void setCallByValue(boolean callByValue)
+   {
+      this.callByValue = callByValue;
+   }
+
+   public boolean isCallByValue()
+   {
+      return callByValue;
+   }
+
+   public String getSecurityDomain()
+   {
+      return securityDomain;
+   }
+
+   public void setSecurityDomain(String securityDomain)
+   {
+      this.securityDomain = securityDomain;
+   }
+
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+
+   public String getLocalJndiName()
+   {
+      return localJndiName;
+   }
+
+   public void setLocalJndiName(String localJndiName)
+   {
+      this.localJndiName = localJndiName;
+   }
+
+   public TransactionManagementType getTransactionManagementType()
+   {
+      return tmType;
+   }
+
+   public void setTransactionManagementType(String transactionType)
+   {
+      if (transactionType.equals(BEAN))
+         tmType = TransactionManagementType.BEAN;
+      else if (transactionType.equals(CONTAINER))
+         tmType = TransactionManagementType.CONTAINER;
+   }
+
+   public boolean isSessionBean()
+   {
+      return this instanceof SessionEnterpriseBean;
+   }
+
+   public boolean isConsumer()
+   {
+      return this instanceof Consumer;
+   }
+
+   public boolean isEntityBean()
+   {
+      return this instanceof EntityEnterpriseBean;
+   }
+
+   public boolean isMessageDrivenBean()
+   {
+      return this instanceof MessageDrivenBean;
+   }
+
+   public boolean isService()
+   {
+      return this instanceof Service;
+   }
+
+   public String getEjbName()
+   {
+      return ejbName;
+   }
+
+   public void setEjbName(String ejbName)
+   {
+      this.ejbName = ejbName;
+   }
+
+   public String getHome()
+   {
+      return home;
+   }
+
+   public void setHome(String home)
+   {
+      this.home = home;
+   }
+
+   public String getRemote()
+   {
+      return remote;
+   }
+
+   public void setRemote(String remote)
+   {
+      this.remote = remote;
+   }
+
+   public String getLocalHome()
+   {
+      return localHome;
+   }
+
+   public void setLocalHome(String localHome)
+   {
+      this.localHome = localHome;
+   }
+
+   public String getLocal()
+   {
+      return local;
+   }
+
+   public void setLocal(String local)
+   {
+      this.local = local;
+   }
+
+   public String getEjbClass()
+   {
+      return ejbClass;
+   }
+
+   public void setEjbClass(String ejbClass)
+   {
+      this.ejbClass = ejbClass;
+   }
+
+   public SecurityIdentity getSecurityIdentity()
+   {
+      return securityIdentity;
+   }
+
+   public void setSecurityIdentity(SecurityIdentity securityIdentity)
+   {
+      this.securityIdentity = securityIdentity;
+   }
+   
+   public void addSecurityRoleReference(SecurityRoleRefMetaData srmd)
+   {
+      this.securityRoleReferences.add(srmd);
+   }
+
+   public ArrayList<SecurityRoleRefMetaData> getSecurityRoleReferences()
+   {
+      return securityRoleReferences;
+   }
+
+   public void setSecurityRoleReferences(ArrayList<SecurityRoleRefMetaData> securityRoleReferences)
+   {
+      this.securityRoleReferences = securityRoleReferences;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("ejbName=").append(ejbName);
+      sb.append(",remoteBindings=").append(remoteBindings);
+      sb.append(",jndiName=").append(jndiName);
+      sb.append(",local=").append(local);
+      sb.append(",remote=").append(remote);
+      sb.append(",home=").append(home);
+      sb.append(",localHome=").append(localHome);
+      sb.append(",ejbClass=").append(ejbClass);
+      sb.append(",ejbRefs=").append(ejbRefs);
+      sb.append(",ejbLocalRefs=").append(ejbLocalRefs);
+      sb.append(",resourceRefs=").append(resourceRefs);
+      sb.append(",resourceEnvRefs=").append(resourceEnvRefs);
+      sb.append(",methodAttributes=").append(methodAttributes);
+      sb.append(",aopDomainName=").append(aopDomainName);
+      sb.append(",dependencies=").append(dependencies);
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,330 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.InjectionTarget;
-import org.jboss.metamodel.descriptor.JndiRef;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.ServiceRef;
-
-/**
- * Represents EJB elements of the ejb-jar.xml deployment descriptor for the 1.4
- * schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- *         ejbs.setCurrentEjbName(value); } else if
- *         (localName.equals("jndi-name")){ ejbs.setJndiName(value);
- * @version <tt>$Revision$</tt>
- */
-public class EnterpriseBeans
-{
-   private static final Logger log = Logger.getLogger(EnterpriseBeans.class);
-
-   private HashMap<String, EnterpriseBean> enterpriseBeans = new HashMap();
-
-   private EnterpriseBean currentEjb;
-   
-   public void setPoolConfig(PoolConfig config)
-   {
-      currentEjb.setPoolConfig(config);
-   }
-   
-   public void setDefaultActivationConfig(ActivationConfig config)
-   {
-      ((MessageDrivenBean)currentEjb).setDefaultActivationConfig(config);
-   }
-   
-   public void setCacheConfig(CacheConfig config)
-   {
-      ((SessionEnterpriseBean)currentEjb).setCacheConfig(config);
-   }
-   
-   public void setClustered(String clustered)
-   {
-      ((SessionEnterpriseBean)currentEjb).setClustered(clustered);
-   }
-   
-   public void setConcurrent(String concurrent)
-   {
-      ((SessionEnterpriseBean)currentEjb).setConcurrent(concurrent);
-   }
-   
-   public void addJndiRef(JndiRef ref)
-   {
-      currentEjb.addJndiRef(ref);
-   }
-   
-   public void addXmlAnnotation(XmlAnnotation xmlAnnotation)
-   {
-      currentEjb.addXmlAnnotation(xmlAnnotation);
-   }
-   
-   public void addRemoteBinding(RemoteBinding binding)
-   {
-      currentEjb.addRemoteBinding(binding);
-   }
-   
-   public void addIgnoreDependency(InjectionTarget ignore)
-   {
-      currentEjb.addIgnoreDependency(ignore);
-   }
-   
-   public void addResourceRef(ResourceRef ref)
-   {
-      currentEjb.mergeResourceRef(ref);
-   }
-   
-   public void addResourceEnvRef(ResourceEnvRef ref)
-   {
-      currentEjb.mergeResourceEnvRef(ref);
-   }
-   
-   public void addMessageDestinationRef(MessageDestinationRef ref)
-   {
-      currentEjb.mergeMessageDestinationRef(ref);
-   }
-   
-   public void addServiceRef(ServiceRef ref)
-   {
-      currentEjb.addServiceRef(ref);
-   }
-   
-   public void setMethodAttributes(MethodAttributes attributes)
-   {
-      currentEjb.setMethodAttributes(attributes);
-   }
-
-   public void setCurrentEjbName(String currentEjbName, Class ejbClass)
-   {
-      currentEjb = createEjbByEjbName(currentEjbName, ejbClass);
-   }
-
-   public void addDependency(String depends)
-   {
-      currentEjb.addDependency(depends);
-   }
-
-   public void updateEjbRef(EjbRef ref)
-   {
-      currentEjb.updateEjbRef(ref);
-   }
-
-   public void updateEjbLocalRef(EjbLocalRef ref)
-   {
-      currentEjb.updateEjbLocalRef(ref);
-   }
-   
-   public void updateResourceRef(ResourceRef ref)
-   {
-      currentEjb.updateResourceRef(ref);
-   }
-   
-   public void updateResourceEnvRef(ResourceEnvRef ref)
-   {
-      currentEjb.updateResourceEnvRef(ref);
-   }
-   
-   public void updateMessageDestinationRef(MessageDestinationRef ref)
-   {
-      currentEjb.updateMessageDestinationRef(ref);
-   }
-   
-   public void setResourceAdapterName(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setResourceAdaptorName(name);
-   }
-
-   public void setDestinationJndiName(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setDestinationJndiName(name);
-   }
-
-   public void setMdbUser(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setMdbUser(name);
-   }
-
-   public void setMdbPassword(String name)
-   {
-      ((MessageDrivenBean)currentEjb).setMdbPassword(name);
-   }
-   
-   public void setMdbSubscriptionId(String id)
-   {
-      ((MessageDrivenBean)currentEjb).setMdbSubscriptionId(id);
-   }
-
-   public void setAopDomainName(String aopDomainName)
-   {
-      currentEjb.setAopDomainName(aopDomainName);
-   }
-
-   public void setRunAsPrincipal(String principal)
-   {
-      currentEjb.setRunAsPrincipal(principal);
-   }
-
-   public void setClusterConfig(ClusterConfig config)
-   {
-      ((SessionEnterpriseBean)currentEjb).setClusterConfig(config);
-   }
-
-   public void setCallByValue(boolean callByValue)
-   {
-      currentEjb.setCallByValue(callByValue);
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      currentEjb.setJndiName(jndiName);
-   }
-
-   public void setSecurityDomain(String securityDomain)
-   {
-      currentEjb.setSecurityDomain(securityDomain);
-   }
-
-   public void setLocalJndiName(String jndiName)
-   {
-      currentEjb.setLocalJndiName(jndiName);
-   }
-
-   public EnterpriseBean createEjbByEjbName(String ejbName, Class ejbClass)
-   {
-      EnterpriseBean ejb = (EnterpriseBean) enterpriseBeans.get(ejbName);
-      if (ejb != null)
-         return ejb;
-      
-      try 
-      {
-         ejb = (EnterpriseBean)ejbClass.newInstance();
-         ejb.setEjbName(ejbName);
-         enterpriseBeans.put(ejbName, ejb);
-      }
-      catch (Exception e){}
-      
-      return ejb;
-   }
-   
-   public EnterpriseBean findEjbByEjbName(String ejbName)
-   {
-      return enterpriseBeans.get(ejbName);
-   }
-
-   public List<EnterpriseBean> findEjbsByClass(String className)
-   {
-      ArrayList<EnterpriseBean> result = new ArrayList<EnterpriseBean>();
-
-      Iterator ejbs = enterpriseBeans.values().iterator();
-      while (ejbs.hasNext())
-      {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
-         String ejbClassName = ejb.getEjbClass();
-         if (ejbClassName != null && ejbClassName.equals(className))
-            result.add(ejb);
-      }
-      return result;
-   }
-
-   public EnterpriseBean findEjbByRemote(String remote)
-   {
-      Iterator ejbs = enterpriseBeans.values().iterator();
-      while (ejbs.hasNext())
-      {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
-         if (ejb.getRemote() != null && ejb.getRemote().equals(remote))
-            return ejb;
-      }
-      return null;
-   }
-
-   public EnterpriseBean findEjbByLocal(String local)
-   {
-      Iterator ejbs = enterpriseBeans.values().iterator();
-      while (ejbs.hasNext())
-      {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
-         if (ejb.getLocal() != null && ejb.getLocal().equals(local))
-            return ejb;
-      }
-      return null;
-   }
-
-   public Collection<EnterpriseBean> getEnterpriseBeans()
-   {
-      return enterpriseBeans.values();
-   }
-
-/*   public void setEnterpriseBeans(List enterpriseBeans)
-   {
-      this.enterpriseBeans = enterpriseBeans;
-   }*/
-
-   public void addEnterpriseBean(EnterpriseBean ejb)
-   {
-      enterpriseBeans.put(ejb.getEjbName(), ejb);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("enterpriseBeans=").append(enterpriseBeans);
-      sb.append("]");
-      return sb.toString();
-   }
-
-   public boolean equals(Object o)
-   {
-      if (this == o)
-         return true;
-      if (!(o instanceof EnterpriseBeans))
-         return false;
-
-      final EnterpriseBeans ejbs = (EnterpriseBeans) o;
-
-      if (enterpriseBeans != null ? !enterpriseBeans
-              .equals(ejbs.enterpriseBeans) : ejbs.enterpriseBeans != null)
-         return false;
-
-      return true;
-   }
-
-   public int hashCode()
-   {
-      int result;
-      result = (enterpriseBeans != null ? enterpriseBeans.hashCode() : 0);
-      // result = 29 * result + (version != null ? version.hashCode() : 0);
-      return result;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,330 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+import org.jboss.metamodel.descriptor.EjbLocalRef;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.InjectionTarget;
+import org.jboss.metamodel.descriptor.JndiRef;
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.ServiceRef;
+
+/**
+ * Represents EJB elements of the ejb-jar.xml deployment descriptor for the 1.4
+ * schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ *         ejbs.setCurrentEjbName(value); } else if
+ *         (localName.equals("jndi-name")){ ejbs.setJndiName(value);
+ * @version <tt>$Revision$</tt>
+ */
+public class EnterpriseBeans
+{
+   private static final Logger log = Logger.getLogger(EnterpriseBeans.class);
+
+   private HashMap<String, EnterpriseBean> enterpriseBeans = new HashMap();
+
+   private EnterpriseBean currentEjb;
+   
+   public void setPoolConfig(PoolConfig config)
+   {
+      currentEjb.setPoolConfig(config);
+   }
+   
+   public void setDefaultActivationConfig(ActivationConfig config)
+   {
+      ((MessageDrivenBean)currentEjb).setDefaultActivationConfig(config);
+   }
+   
+   public void setCacheConfig(CacheConfig config)
+   {
+      ((SessionEnterpriseBean)currentEjb).setCacheConfig(config);
+   }
+   
+   public void setClustered(String clustered)
+   {
+      ((SessionEnterpriseBean)currentEjb).setClustered(clustered);
+   }
+   
+   public void setConcurrent(String concurrent)
+   {
+      ((SessionEnterpriseBean)currentEjb).setConcurrent(concurrent);
+   }
+   
+   public void addJndiRef(JndiRef ref)
+   {
+      currentEjb.addJndiRef(ref);
+   }
+   
+   public void addXmlAnnotation(XmlAnnotation xmlAnnotation)
+   {
+      currentEjb.addXmlAnnotation(xmlAnnotation);
+   }
+   
+   public void addRemoteBinding(RemoteBinding binding)
+   {
+      currentEjb.addRemoteBinding(binding);
+   }
+   
+   public void addIgnoreDependency(InjectionTarget ignore)
+   {
+      currentEjb.addIgnoreDependency(ignore);
+   }
+   
+   public void addResourceRef(ResourceRef ref)
+   {
+      currentEjb.mergeResourceRef(ref);
+   }
+   
+   public void addResourceEnvRef(ResourceEnvRef ref)
+   {
+      currentEjb.mergeResourceEnvRef(ref);
+   }
+   
+   public void addMessageDestinationRef(MessageDestinationRef ref)
+   {
+      currentEjb.mergeMessageDestinationRef(ref);
+   }
+   
+   public void addServiceRef(ServiceRef ref)
+   {
+      currentEjb.addServiceRef(ref);
+   }
+   
+   public void setMethodAttributes(MethodAttributes attributes)
+   {
+      currentEjb.setMethodAttributes(attributes);
+   }
+
+   public void setCurrentEjbName(String currentEjbName, Class ejbClass)
+   {
+      currentEjb = createEjbByEjbName(currentEjbName, ejbClass);
+   }
+
+   public void addDependency(String depends)
+   {
+      currentEjb.addDependency(depends);
+   }
+
+   public void updateEjbRef(EjbRef ref)
+   {
+      currentEjb.updateEjbRef(ref);
+   }
+
+   public void updateEjbLocalRef(EjbLocalRef ref)
+   {
+      currentEjb.updateEjbLocalRef(ref);
+   }
+   
+   public void updateResourceRef(ResourceRef ref)
+   {
+      currentEjb.updateResourceRef(ref);
+   }
+   
+   public void updateResourceEnvRef(ResourceEnvRef ref)
+   {
+      currentEjb.updateResourceEnvRef(ref);
+   }
+   
+   public void updateMessageDestinationRef(MessageDestinationRef ref)
+   {
+      currentEjb.updateMessageDestinationRef(ref);
+   }
+   
+   public void setResourceAdapterName(String name)
+   {
+      ((MessageDrivenBean)currentEjb).setResourceAdaptorName(name);
+   }
+
+   public void setDestinationJndiName(String name)
+   {
+      ((MessageDrivenBean)currentEjb).setDestinationJndiName(name);
+   }
+
+   public void setMdbUser(String name)
+   {
+      ((MessageDrivenBean)currentEjb).setMdbUser(name);
+   }
+
+   public void setMdbPassword(String name)
+   {
+      ((MessageDrivenBean)currentEjb).setMdbPassword(name);
+   }
+   
+   public void setMdbSubscriptionId(String id)
+   {
+      ((MessageDrivenBean)currentEjb).setMdbSubscriptionId(id);
+   }
+
+   public void setAopDomainName(String aopDomainName)
+   {
+      currentEjb.setAopDomainName(aopDomainName);
+   }
+
+   public void setRunAsPrincipal(String principal)
+   {
+      currentEjb.setRunAsPrincipal(principal);
+   }
+
+   public void setClusterConfig(ClusterConfig config)
+   {
+      ((SessionEnterpriseBean)currentEjb).setClusterConfig(config);
+   }
+
+   public void setCallByValue(boolean callByValue)
+   {
+      currentEjb.setCallByValue(callByValue);
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      currentEjb.setJndiName(jndiName);
+   }
+
+   public void setSecurityDomain(String securityDomain)
+   {
+      currentEjb.setSecurityDomain(securityDomain);
+   }
+
+   public void setLocalJndiName(String jndiName)
+   {
+      currentEjb.setLocalJndiName(jndiName);
+   }
+
+   public EnterpriseBean createEjbByEjbName(String ejbName, Class ejbClass)
+   {
+      EnterpriseBean ejb = (EnterpriseBean) enterpriseBeans.get(ejbName);
+      if (ejb != null)
+         return ejb;
+      
+      try 
+      {
+         ejb = (EnterpriseBean)ejbClass.newInstance();
+         ejb.setEjbName(ejbName);
+         enterpriseBeans.put(ejbName, ejb);
+      }
+      catch (Exception e){}
+      
+      return ejb;
+   }
+   
+   public EnterpriseBean findEjbByEjbName(String ejbName)
+   {
+      return enterpriseBeans.get(ejbName);
+   }
+
+   public List<EnterpriseBean> findEjbsByClass(String className)
+   {
+      ArrayList<EnterpriseBean> result = new ArrayList<EnterpriseBean>();
+
+      Iterator ejbs = enterpriseBeans.values().iterator();
+      while (ejbs.hasNext())
+      {
+         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
+         String ejbClassName = ejb.getEjbClass();
+         if (ejbClassName != null && ejbClassName.equals(className))
+            result.add(ejb);
+      }
+      return result;
+   }
+
+   public EnterpriseBean findEjbByRemote(String remote)
+   {
+      Iterator ejbs = enterpriseBeans.values().iterator();
+      while (ejbs.hasNext())
+      {
+         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
+         if (ejb.getRemote() != null && ejb.getRemote().equals(remote))
+            return ejb;
+      }
+      return null;
+   }
+
+   public EnterpriseBean findEjbByLocal(String local)
+   {
+      Iterator ejbs = enterpriseBeans.values().iterator();
+      while (ejbs.hasNext())
+      {
+         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
+         if (ejb.getLocal() != null && ejb.getLocal().equals(local))
+            return ejb;
+      }
+      return null;
+   }
+
+   public Collection<EnterpriseBean> getEnterpriseBeans()
+   {
+      return enterpriseBeans.values();
+   }
+
+/*   public void setEnterpriseBeans(List enterpriseBeans)
+   {
+      this.enterpriseBeans = enterpriseBeans;
+   }*/
+
+   public void addEnterpriseBean(EnterpriseBean ejb)
+   {
+      enterpriseBeans.put(ejb.getEjbName(), ejb);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("enterpriseBeans=").append(enterpriseBeans);
+      sb.append("]");
+      return sb.toString();
+   }
+
+   public boolean equals(Object o)
+   {
+      if (this == o)
+         return true;
+      if (!(o instanceof EnterpriseBeans))
+         return false;
+
+      final EnterpriseBeans ejbs = (EnterpriseBeans) o;
+
+      if (enterpriseBeans != null ? !enterpriseBeans
+              .equals(ejbs.enterpriseBeans) : ejbs.enterpriseBeans != null)
+         return false;
+
+      return true;
+   }
+
+   public int hashCode()
+   {
+      int result;
+      result = (enterpriseBeans != null ? enterpriseBeans.hashCode() : 0);
+      // result = 29 * result + (version != null ? version.hashCode() : 0);
+      return result;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an Entity EJB element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EntityEnterpriseBean extends EnterpriseBean
-{
-
-   private String persistenceType;
-
-   private List cmpFields = new ArrayList();
-
-   private List queries = new ArrayList();
-
-   public String getPersistenceType()
-   {
-      return persistenceType;
-   }
-
-   public void setPersistenceType(String persistenceType)
-   {
-      this.persistenceType = persistenceType;
-   }
-
-   public List getCmpFields()
-   {
-      return cmpFields;
-   }
-
-   public void setCmpFields(List cmpFields)
-   {
-      this.cmpFields = cmpFields;
-   }
-
-   public void addCmpField(CmpField cmpField)
-   {
-      cmpFields.add(cmpField);
-   }
-
-   public List getQueries()
-   {
-      return queries;
-   }
-
-   public void setQueries(List queries)
-   {
-      this.queries = queries;
-   }
-
-   public void addQuery(Query query)
-   {
-      queries.add(query);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append(super.toString());
-      sb.append(",");
-      sb.append("persistenceType=").append(persistenceType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents an Entity EJB element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EntityEnterpriseBean extends EnterpriseBean
+{
+
+   private String persistenceType;
+
+   private List cmpFields = new ArrayList();
+
+   private List queries = new ArrayList();
+
+   public String getPersistenceType()
+   {
+      return persistenceType;
+   }
+
+   public void setPersistenceType(String persistenceType)
+   {
+      this.persistenceType = persistenceType;
+   }
+
+   public List getCmpFields()
+   {
+      return cmpFields;
+   }
+
+   public void setCmpFields(List cmpFields)
+   {
+      this.cmpFields = cmpFields;
+   }
+
+   public void addCmpField(CmpField cmpField)
+   {
+      cmpFields.add(cmpField);
+   }
+
+   public List getQueries()
+   {
+      return queries;
+   }
+
+   public void setQueries(List queries)
+   {
+      this.queries = queries;
+   }
+
+   public void addQuery(Query query)
+   {
+      queries.add(query);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append('[');
+      sb.append(super.toString());
+      sb.append(",");
+      sb.append("persistenceType=").append(persistenceType);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EntityEnterpriseBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeClassInterceptors
-{
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ExcludeClassInterceptors
+{
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeClassInterceptors.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeDefaultInterceptors
-{
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class ExcludeDefaultInterceptors
+{
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeDefaultInterceptors.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <exlude-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ExcludeList
-{
-   private static final Logger log = Logger.getLogger(ExcludeList.class);
-
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents an <exlude-list> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ExcludeList
+{
+   private static final Logger log = Logger.getLogger(ExcludeList.class);
+
+   private List methods = new ArrayList();
+
+   public List getMethods()
+   {
+      return methods;
+   }
+
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("methods=").append(methods);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ExcludeList.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <init-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class InitList
-{
-   private static final Logger log = Logger.getLogger(InitList.class);
-
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents an <init-list> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class InitList
+{
+   private static final Logger log = Logger.getLogger(InitList.class);
+
+   private List methods = new ArrayList();
+
+   public List getMethods()
+   {
+      return methods;
+   }
+
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("methods=").append(methods);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitList.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-/**
- * Represents an <init-method> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class InitMethod
-{
-   private Method beanMethod;
-   private Method createMethod;
-
-   public Method getBeanMethod()
-   {
-      return beanMethod;
-   }
-
-   public void setBeanMethod(Method beanMethod)
-   {
-      this.beanMethod = beanMethod;
-   }
-
-   public Method getCreateMethod()
-   {
-      return createMethod;
-   }
-
-   public void setCreateMethod(Method createMethod)
-   {
-      this.createMethod = createMethod;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("method=").append(beanMethod);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+/**
+ * Represents an <init-method> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class InitMethod
+{
+   private Method beanMethod;
+   private Method createMethod;
+
+   public Method getBeanMethod()
+   {
+      return beanMethod;
+   }
+
+   public void setBeanMethod(Method beanMethod)
+   {
+      this.beanMethod = beanMethod;
+   }
+
+   public Method getCreateMethod()
+   {
+      return createMethod;
+   }
+
+   public void setCreateMethod(Method createMethod)
+   {
+      this.createMethod = createMethod;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("method=").append(beanMethod);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InitMethod.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <inject> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Inject
-{
-   private static final Logger log = Logger.getLogger(Inject.class);
-
-   private List methods = new ArrayList();
-   private String jndiName;
-
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("jndiName=").append(jndiName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents an <inject> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Inject
+{
+   private static final Logger log = Logger.getLogger(Inject.class);
+
+   private List methods = new ArrayList();
+   private String jndiName;
+
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+
+   public List getMethods()
+   {
+      return methods;
+   }
+
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("jndiName=").append(jndiName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Inject.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metamodel;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.JndiRef;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.PersistenceUnitRef;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.ServiceRef;
-import org.jboss.metamodel.descriptor.PersistenceContextRef;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface Injectable
-{
-
-   Collection<EjbLocalRef> getEjbLocalRefs();
-
-   Collection<EjbRef> getEjbRefs();
-
-   Collection<ResourceEnvRef> getResourceEnvRefs();
-
-   Collection<ResourceRef> getResourceRefs();
-
-   Collection<ServiceRef> getServiceRefs();
-
-   Collection<MessageDestinationRef> getMessageDestinationRefs();
-
-   List<PersistenceUnitRef> getPersistenceUnitRefs();
-
-   List<PersistenceContextRef> getPersistenceContextRefs();
-
-   Collection<JndiRef> getJndiRefs();
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.jboss.metamodel.descriptor.EjbLocalRef;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.JndiRef;
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
+import org.jboss.metamodel.descriptor.PersistenceUnitRef;
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.ServiceRef;
+import org.jboss.metamodel.descriptor.PersistenceContextRef;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface Injectable
+{
+
+   Collection<EjbLocalRef> getEjbLocalRefs();
+
+   Collection<EjbRef> getEjbRefs();
+
+   Collection<ResourceEnvRef> getResourceEnvRefs();
+
+   Collection<ResourceRef> getResourceRefs();
+
+   Collection<ServiceRef> getServiceRefs();
+
+   Collection<MessageDestinationRef> getMessageDestinationRefs();
+
+   List<PersistenceUnitRef> getPersistenceUnitRefs();
+
+   List<PersistenceContextRef> getPersistenceContextRefs();
+
+   Collection<JndiRef> getJndiRefs();
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,133 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.metamodel.descriptor.PersistenceUnitRef;
-import org.jboss.metamodel.descriptor.PersistenceContextRef;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class Interceptor
-   extends EnvironmentRefGroup implements Injectable
-{
-   String interceptorClass;
-   Method aroundInvoke;
-   Method postConstruct;
-   Method postActivate;
-   Method preDestroy;
-   Method prePassivate;
-
-   public Interceptor()
-   {
-   }
-
-   public Method getAroundInvoke()
-   {
-      return aroundInvoke;
-   }
-
-   public void setAroundInvoke(Method aroundInvoke)
-   {
-      this.aroundInvoke = aroundInvoke;
-   }
-
-   public String getInterceptorClass()
-   {
-      return interceptorClass;
-   }
-
-   public void setInterceptorClass(String interceptorClass)
-   {
-      this.interceptorClass = interceptorClass;
-   }
-
-   public Method getPostActivate()
-   {
-      return postActivate;
-   }
-
-   public void setPostActivate(Method postActivate)
-   {
-      this.postActivate = postActivate;
-   }
-
-   public Method getPostConstruct()
-   {
-      return postConstruct;
-   }
-
-   public void setPostConstruct(Method postConstruct)
-   {
-      this.postConstruct = postConstruct;
-   }
-
-   public Method getPreDestroy()
-   {
-      return preDestroy;
-   }
-
-   public void setPreDestroy(Method preDestroy)
-   {
-      this.preDestroy = preDestroy;
-   }
-
-   public Method getPrePassivate()
-   {
-      return prePassivate;
-   }
-
-   public void setPrePassivate(Method prePassivate)
-   {
-      this.prePassivate = prePassivate;
-   }
-
-   private List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
-   private List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
-
-   public List<PersistenceContextRef> getPersistenceContextRefs()
-   {
-      return persistenceContextRefs;
-   }
-
-   public List<PersistenceUnitRef> getPersistenceUnitRefs()
-   {
-      return persistenceUnitRefs;
-   }
-
-   public void addPersistenceContextRef(PersistenceContextRef ref)
-   {
-      persistenceContextRefs.add(ref);
-   }
-
-   public void addPersistenceUnitRef(PersistenceUnitRef ref)
-   {
-      persistenceUnitRefs.add(ref);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+import org.jboss.metamodel.descriptor.PersistenceUnitRef;
+import org.jboss.metamodel.descriptor.PersistenceContextRef;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class Interceptor
+   extends EnvironmentRefGroup implements Injectable
+{
+   String interceptorClass;
+   Method aroundInvoke;
+   Method postConstruct;
+   Method postActivate;
+   Method preDestroy;
+   Method prePassivate;
+
+   public Interceptor()
+   {
+   }
+
+   public Method getAroundInvoke()
+   {
+      return aroundInvoke;
+   }
+
+   public void setAroundInvoke(Method aroundInvoke)
+   {
+      this.aroundInvoke = aroundInvoke;
+   }
+
+   public String getInterceptorClass()
+   {
+      return interceptorClass;
+   }
+
+   public void setInterceptorClass(String interceptorClass)
+   {
+      this.interceptorClass = interceptorClass;
+   }
+
+   public Method getPostActivate()
+   {
+      return postActivate;
+   }
+
+   public void setPostActivate(Method postActivate)
+   {
+      this.postActivate = postActivate;
+   }
+
+   public Method getPostConstruct()
+   {
+      return postConstruct;
+   }
+
+   public void setPostConstruct(Method postConstruct)
+   {
+      this.postConstruct = postConstruct;
+   }
+
+   public Method getPreDestroy()
+   {
+      return preDestroy;
+   }
+
+   public void setPreDestroy(Method preDestroy)
+   {
+      this.preDestroy = preDestroy;
+   }
+
+   public Method getPrePassivate()
+   {
+      return prePassivate;
+   }
+
+   public void setPrePassivate(Method prePassivate)
+   {
+      this.prePassivate = prePassivate;
+   }
+
+   private List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
+   private List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
+
+   public List<PersistenceContextRef> getPersistenceContextRefs()
+   {
+      return persistenceContextRefs;
+   }
+
+   public List<PersistenceUnitRef> getPersistenceUnitRefs()
+   {
+      return persistenceUnitRefs;
+   }
+
+   public void addPersistenceContextRef(PersistenceContextRef ref)
+   {
+      persistenceContextRefs.add(ref);
+   }
+
+   public void addPersistenceUnitRef(PersistenceUnitRef ref)
+   {
+      persistenceUnitRefs.add(ref);
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,104 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorBinding extends Method
-{
-   Boolean ordered = null;
-   private ArrayList<String> interceptorClasses = new ArrayList<String>();
-   private boolean excludeDefaultInterceptors;
-   private boolean excludeClassInterceptors;
-   
-   public InterceptorBinding()
-   {
-      super();
-   }
-
-   public boolean getExcludeClassInterceptors()
-   {
-      return excludeClassInterceptors;
-   }
-
-   public void setExcludeClassInterceptors(boolean excludeClassInterceptors)
-   {
-      this.excludeClassInterceptors = excludeClassInterceptors;
-   }
-
-   public boolean getExcludeDefaultInterceptors()
-   {
-      return excludeDefaultInterceptors;
-   }
-
-   public void setExcludeDefaultInterceptors(boolean excludeDefaultInterceptors)
-   {
-      this.excludeDefaultInterceptors = excludeDefaultInterceptors;
-   }
-
-   public ArrayList<String> getInterceptorClasses()
-   {
-      return interceptorClasses;
-   }
-
-   public void addInterceptorClass(String interceptorClass)
-   {
-      if (ordered == null)
-      {
-         ordered = false;
-      }
-      if (ordered) throw new RuntimeException("Cannot have both interceptor-class and interceptor-order in interceptor-binding");
-      this.interceptorClasses.add(interceptorClass);
-   }
-
-   public void setOrderedInterceptorClasses(InterceptorOrder order)
-   {
-      if (ordered == null)
-      {
-         ordered = true;
-      }
-      if (!ordered) throw new RuntimeException("Cannot have both interceptor-class and interceptor-order in interceptor-binding");
-      this.interceptorClasses.addAll(order.getInterceptorClasses());
-   }
-
-   public boolean isOrdered()
-   {
-      if (ordered == null) return false;
-      return ordered;
-   }
-
-   public String toString()
-   {
-      return InterceptorBinding.class.getName() + "[ejbName=" + getEjbName() +
-         ",methodName=" + getMethodName() +
-         ",ordered=" + isOrdered() + 
-         ",excludeClassInterceptors=" + excludeClassInterceptors + 
-         ",excludeDefaultInterceptors=" + excludeDefaultInterceptors +
-         ",interceptorClasses=" + interceptorClasses +
-         "]";
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InterceptorBinding extends Method
+{
+   Boolean ordered = null;
+   private ArrayList<String> interceptorClasses = new ArrayList<String>();
+   private boolean excludeDefaultInterceptors;
+   private boolean excludeClassInterceptors;
+   
+   public InterceptorBinding()
+   {
+      super();
+   }
+
+   public boolean getExcludeClassInterceptors()
+   {
+      return excludeClassInterceptors;
+   }
+
+   public void setExcludeClassInterceptors(boolean excludeClassInterceptors)
+   {
+      this.excludeClassInterceptors = excludeClassInterceptors;
+   }
+
+   public boolean getExcludeDefaultInterceptors()
+   {
+      return excludeDefaultInterceptors;
+   }
+
+   public void setExcludeDefaultInterceptors(boolean excludeDefaultInterceptors)
+   {
+      this.excludeDefaultInterceptors = excludeDefaultInterceptors;
+   }
+
+   public ArrayList<String> getInterceptorClasses()
+   {
+      return interceptorClasses;
+   }
+
+   public void addInterceptorClass(String interceptorClass)
+   {
+      if (ordered == null)
+      {
+         ordered = false;
+      }
+      if (ordered) throw new RuntimeException("Cannot have both interceptor-class and interceptor-order in interceptor-binding");
+      this.interceptorClasses.add(interceptorClass);
+   }
+
+   public void setOrderedInterceptorClasses(InterceptorOrder order)
+   {
+      if (ordered == null)
+      {
+         ordered = true;
+      }
+      if (!ordered) throw new RuntimeException("Cannot have both interceptor-class and interceptor-order in interceptor-binding");
+      this.interceptorClasses.addAll(order.getInterceptorClasses());
+   }
+
+   public boolean isOrdered()
+   {
+      if (ordered == null) return false;
+      return ordered;
+   }
+
+   public String toString()
+   {
+      return InterceptorBinding.class.getName() + "[ejbName=" + getEjbName() +
+         ",methodName=" + getMethodName() +
+         ",ordered=" + isOrdered() + 
+         ",excludeClassInterceptors=" + excludeClassInterceptors + 
+         ",excludeDefaultInterceptors=" + excludeDefaultInterceptors +
+         ",interceptorClasses=" + interceptorClasses +
+         "]";
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorBinding.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorOrder
-{
-   private ArrayList<String> interceptorClasses = new ArrayList<String>();
-
-   public InterceptorOrder()
-   {
-      // FIXME InterceptorOrder constructor
-      super();
-   }
-
-   public void addInterceptorClass(String interceptorClass)
-   {
-      this.interceptorClasses.add(interceptorClass);
-   }
-
-   public ArrayList<String> getInterceptorClasses()
-   {
-      return interceptorClasses;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InterceptorOrder
+{
+   private ArrayList<String> interceptorClasses = new ArrayList<String>();
+
+   public InterceptorOrder()
+   {
+      // FIXME InterceptorOrder constructor
+      super();
+   }
+
+   public void addInterceptorClass(String interceptorClass)
+   {
+      this.interceptorClasses.add(interceptorClass);
+   }
+
+   public ArrayList<String> getInterceptorClasses()
+   {
+      return interceptorClasses;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/InterceptorOrder.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class Interceptors
-{
-   ArrayList<Interceptor> interceptors = new ArrayList<Interceptor>();
-   
-   public Interceptors()
-   {
-      // FIXME Interceptors constructor
-      super();
-   }
-   
-   public void addInterceptor(Interceptor interceptor)
-   {
-      interceptors.add(interceptor);
-   }
-
-   public ArrayList<Interceptor> getInterceptors()
-   {
-      return interceptors;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class Interceptors
+{
+   ArrayList<Interceptor> interceptors = new ArrayList<Interceptor>();
+   
+   public Interceptors()
+   {
+      // FIXME Interceptors constructor
+      super();
+   }
+   
+   public void addInterceptor(Interceptor interceptor)
+   {
+      interceptors.add(interceptor);
+   }
+
+   public ArrayList<Interceptor> getInterceptors()
+   {
+      return interceptors;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Interceptors.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metamodel;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.DDObjectFactory;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.ServiceRef;
-import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * A JBossXB object factory for parsing JBoss application client descriptor files.
- * 
- * http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd
- * 
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class JBossClientDDObjectFactory extends DDObjectFactory
-{
-   private static final Logger log = Logger.getLogger(JBossClientDDObjectFactory.class);
-
-   private ApplicationClientDD dd;
-
-   public static ApplicationClientDD parse(URL ddResource, ApplicationClientDD dd) throws JBossXBException, IOException
-   {
-      // TODO: how to properly fix this
-      if (dd == null)
-         dd = new ApplicationClientDD();
-
-      if (ddResource == null)
-         return dd;
-
-      log.debug("found jboss-client.xml " + ddResource);
-
-      JBossClientDDObjectFactory factory = new JBossClientDDObjectFactory(dd);
-      UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
-      Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
-      unmarshaller.setEntityResolver(new JBossEntityResolver());
-      unmarshaller.setNamespaceAware(true);
-      unmarshaller.setSchemaValidation(true);
-      unmarshaller.setValidation(true);
-
-      dd = (ApplicationClientDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
-
-      return dd;
-   }
-
-   public JBossClientDDObjectFactory(ApplicationClientDD dd)
-   {
-      // JBossXB will otherwise fail later on
-      if (dd == null)
-         throw new NullPointerException("dd is null");
-
-      this.dd = dd;
-   }
-
-   public void addChild(ApplicationClientDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      dd.updateEjbRef(ref);
-   }
-
-   public void addChild(ApplicationClientDD parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      dd.updateMessageDestinationRef(ref);
-   }
-
-   public void addChild(ApplicationClientDD parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      dd.addServiceRef(ref);
-   }
-
-   public void addChild(ApplicationClientDD dd, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      dd.updateResourceEnvRef(envRef);
-   }
-
-   public void addChild(ApplicationClientDD parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      dd.updateResourceRef(ref);
-   }
-
-   public Object completeRoot(Object root, UnmarshallingContext navigator, String uri, String name)
-   {
-      return root;
-   }
-
-   public Object newChild(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      child = newEnvRefGroupChild(localName);
-      if (child != null)
-         return child;
-
-      // space for more
-
-      return child;
-   }
-
-   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      return dd;
-   }
-
-   public void setValue(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("jndi-name"))
-         dd.setJndiName(value);
-      else if (localName.equals("depends"))
-         dd.addDependency(value);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.DDObjectFactory;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.ServiceRef;
+import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+/**
+ * A JBossXB object factory for parsing JBoss application client descriptor files.
+ * 
+ * http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd
+ * 
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class JBossClientDDObjectFactory extends DDObjectFactory
+{
+   private static final Logger log = Logger.getLogger(JBossClientDDObjectFactory.class);
+
+   private ApplicationClientDD dd;
+
+   public static ApplicationClientDD parse(URL ddResource, ApplicationClientDD dd) throws JBossXBException, IOException
+   {
+      // TODO: how to properly fix this
+      if (dd == null)
+         dd = new ApplicationClientDD();
+
+      if (ddResource == null)
+         return dd;
+
+      log.debug("found jboss-client.xml " + ddResource);
+
+      JBossClientDDObjectFactory factory = new JBossClientDDObjectFactory(dd);
+      UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+      Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+      unmarshaller.setEntityResolver(new JBossEntityResolver());
+      unmarshaller.setNamespaceAware(true);
+      unmarshaller.setSchemaValidation(true);
+      unmarshaller.setValidation(true);
+
+      dd = (ApplicationClientDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
+
+      return dd;
+   }
+
+   public JBossClientDDObjectFactory(ApplicationClientDD dd)
+   {
+      // JBossXB will otherwise fail later on
+      if (dd == null)
+         throw new NullPointerException("dd is null");
+
+      this.dd = dd;
+   }
+
+   public void addChild(ApplicationClientDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      dd.updateEjbRef(ref);
+   }
+
+   public void addChild(ApplicationClientDD parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      dd.updateMessageDestinationRef(ref);
+   }
+
+   public void addChild(ApplicationClientDD parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      dd.addServiceRef(ref);
+   }
+
+   public void addChild(ApplicationClientDD dd, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      dd.updateResourceEnvRef(envRef);
+   }
+
+   public void addChild(ApplicationClientDD parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      dd.updateResourceRef(ref);
+   }
+
+   public Object completeRoot(Object root, UnmarshallingContext navigator, String uri, String name)
+   {
+      return root;
+   }
+
+   public Object newChild(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      child = newEnvRefGroupChild(localName);
+      if (child != null)
+         return child;
+
+      // space for more
+
+      return child;
+   }
+
+   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return dd;
+   }
+
+   public void setValue(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("jndi-name"))
+         dd.setJndiName(value);
+      else if (localName.equals("depends"))
+         dd.addDependency(value);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,1085 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metamodel;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.KernelAbstraction;
-import org.jboss.ejb3.KernelAbstractionFactory;
-import org.jboss.logging.Logger;
-import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-import org.jboss.metadata.SecurityRoleMetaData;
-import org.jboss.metamodel.descriptor.DDObjectFactory;
-import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.InjectionTarget;
-import org.jboss.metamodel.descriptor.JndiRef;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.NameValuePair;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.ServiceRef;
-import org.jboss.metamodel.descriptor.ServiceRef;
-
-/**
- * Represents the jboss.xml deployment descriptor for the 2.1 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @author Anil.Saldhana at jboss.com
- * @version <tt>$Revision$</tt>
- */
-public class JBossDDObjectFactory extends DDObjectFactory
-{
-   private static final Logger log = Logger.getLogger(JBossDDObjectFactory.class);
-
-   private EjbJarDD dd;
-   private Class ejbClass;
-
-   public static EjbJarDD parse(URL ddResource, EjbJarDD dd) throws JBossXBException, IOException
-   {
-      ObjectModelFactory factory = null;
-      Unmarshaller unmarshaller = null;
-
-      if (ddResource != null)
-      {
-         log.debug("found jboss.xml " + ddResource);
-
-         if (dd == null)
-            dd = new EjbJarDD();
-
-         factory = new JBossDDObjectFactory(dd);
-         UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
-         unmarshaller = unmarshallerFactory.newUnmarshaller();
-         unmarshaller.setEntityResolver(new JBossEntityResolver());
-         unmarshaller.setNamespaceAware(true);
-         unmarshaller.setSchemaValidation(true);
-         unmarshaller.setValidation(true);
-
-         dd = (EjbJarDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
-      }
-
-      return dd;
-   }
-
-   public JBossDDObjectFactory(EjbJarDD dd)
-   {
-      super();
-      this.dd = dd;
-   }
-
-   /**
-    * Return the root.
-    */
-   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      return dd;
-   }
-
-   public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
-   {
-      return root;
-   }
-
-   // Methods discovered by introspection
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("enterprise-beans"))
-      {
-         child = dd.getEnterpriseBeans();
-         if (child == null)
-         {
-            dd.setEnterpriseBeans(new EnterpriseBeans());
-            child = dd.getEnterpriseBeans();
-         }
-      }
-      else if (localName.equals("assembly-descriptor"))
-      {
-         child = dd.getAssemblyDescriptor();
-         if (child == null)
-         {
-            dd.setAssemblyDescriptor(new AssemblyDescriptor());
-            child = dd.getAssemblyDescriptor();
-         }
-      }
-      else if (localName.equals("resource-manager"))
-      {
-         child = new ResourceManager();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if ((child = this.newEnvRefGroupChild(localName)) != null)
-         return child;
-
-      if (localName.equals("current-message"))
-      {
-         child = new CurrentMessage();
-      }
-      else if (localName.equals("message-properties"))
-      {
-         child = new MessageProperties();
-      }
-      else if (localName.equals("producer"))
-      {
-         child = new Producer(false);
-      }
-      else if (localName.equals("local-producer"))
-      {
-         child = new Producer(true);
-      }
-      else if (localName.equals("annotation"))
-      {
-         child = new XmlAnnotation();
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         child = new InjectionTarget();
-      }
-      else if (localName.equals("remote-binding"))
-      {
-         child = new RemoteBinding();
-      }
-      else if (localName.equals("pool-config"))
-      {
-         child = new PoolConfig();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(Service service, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if ((child = this.newEnvRefGroupChild(localName)) != null)
-         return child;
-
-      if (localName.equals("ignore-dependency"))
-      {
-         child = new InjectionTarget();
-      }
-      else if (localName.equals("annotation"))
-      {
-         child = new XmlAnnotation();
-      }
-      else if (localName.equals("remote-binding"))
-      {
-         child = new RemoteBinding();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(CurrentMessage message, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MessageProperties properties, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(MethodAttributes attributes, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("method"))
-      {
-         child = new Method();
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(AssemblyDescriptor descriptor, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("message-destination"))
-      {
-         child = new MessageDestination();
-      }
-      if (localName.equals("security-role"))
-      {
-         child = new SecurityRoleMetaData("dummy_to_be_replaced_in_setValue");
-      }
-
-      return child;
-   }
-
-   /**
-    * Called when parsing of a new element started.
-    */
-   public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if ((child = this.newEnvRefGroupChild(localName)) != null)
-      {
-         return child;
-      }
-
-      if (localName.equals("session"))
-      {
-         ejbClass = SessionEnterpriseBean.class;
-         child = ejbs;
-      }
-      else if (localName.equals("message-driven"))
-      {
-         ejbClass = MessageDrivenBean.class;
-         child = ejbs;
-      }
-      else if (localName.equals("service"))
-      {
-         child = new Service();
-      }
-      else if (localName.equals("consumer"))
-      {
-         child = new Consumer();
-      }
-      else if (localName.equals("method-attributes"))
-      {
-         child = new MethodAttributes();
-      }
-      else if (localName.equals("annotation"))
-      {
-         child = new XmlAnnotation();
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         child = new InjectionTarget();
-      }
-      else if (localName.equals("cluster-config"))
-      {
-         child = new ClusterConfig();
-      }
-      else if (localName.equals("remote-binding"))
-      {
-         child = new RemoteBinding();
-      }
-      else if (localName.equals("cache-config"))
-      {
-         child = new CacheConfig();
-      }
-      else if (localName.equals("pool-config"))
-      {
-         child = new PoolConfig();
-      }
-      else if (localName.equals("default-activation-config"))
-      {
-         child = new ActivationConfig();
-      }
-
-      return child;
-   }
-
-   public Object newChild(ActivationConfig parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("default-activation-config-property"))
-      {
-         child = new NameValuePair();
-      }
-
-      return child;
-   }
-
-   public Object newChild(XmlAnnotation parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-
-      if (localName.equals("injection-target"))
-      {
-         child = new InjectionTarget();
-      }
-      else if (localName.equals("property"))
-      {
-         child = new NameValuePair();
-      }
-
-      return child;
-   }
-
-   public void addChild(XmlAnnotation parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addProperty(property);
-   }
-
-   public void addChild(XmlAnnotation parent, InjectionTarget injectionTarget, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(injectionTarget);
-   }
-
-   public void addChild(EnterpriseBeans parent, ActivationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setDefaultActivationConfig(config);
-   }
-
-   public void addChild(ActivationConfig parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addActivationConfigProperty(property);
-   }
-
-   public void addChild(Consumer parent, Producer producer, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      if (producer.isLocal())
-         parent.addLocalProducer(producer);
-      else parent.addProducer(producer);
-   }
-
-   public void addChild(Consumer parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addRemoteBinding(binding);
-   }
-
-   public void addChild(AssemblyDescriptor parent, MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMessageDestination(destination);
-   }
-
-   public void addChild(AssemblyDescriptor parent, SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addSecurityRoleMetaData(srm);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, CacheConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setCacheConfig(config);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setPoolConfig(config);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, MethodAttributes attributes, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMethodAttributes(attributes);
-   }
-
-   public void addChild(EnterpriseBeans parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addRemoteBinding(binding);
-   }
-
-   public void addChild(EnterpriseBeans parent, InjectionTarget ignoreDependency, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addIgnoreDependency(ignoreDependency);
-   }
-
-   public void addChild(EnterpriseBeans parent, XmlAnnotation xmlAnnotation, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addXmlAnnotation(xmlAnnotation);
-   }
-
-   public void addChild(MethodAttributes parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   public void addChild(Consumer parent, CurrentMessage message, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setCurrentMessage(message);
-   }
-
-   public void addChild(Consumer parent, PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setPoolConfig(config);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, MessageProperties message, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setMessageProperties(message);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(CurrentMessage parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(MessageProperties parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addMethod(method);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, Service service, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnterpriseBean(service);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addRemoteBinding(binding);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addJndiRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Service parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addJndiRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(Consumer parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceEnvRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addEnterpriseBean(consumer);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addJndiRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EjbJarDD parent, ResourceManager manager, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addResourceManager(manager);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.updateEjbRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.updateEjbLocalRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, ClusterConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setClusterConfig(config);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.updateResourceRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.updateMessageDestinationRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.addServiceRef(ref);
-   }
-
-   /**
-    * Called when parsing character is complete.
-    */
-   public void addChild(EnterpriseBeans parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.updateResourceEnvRef(ref);
-   }
-
-   public void setValue(XmlAnnotation xmlAnnotation, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("annotation-class"))
-      {
-         xmlAnnotation.setAnnotationClass(getValue(localName, value));
-      }
-      else if (localName.equals("annotation-implementation-class"))
-      {
-         xmlAnnotation.setAnnotationImplementationClass(getValue(localName, value));
-      }
-   }
-
-   public void setValue(NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("activation-config-property-name") || localName.equals("message-driven-config-property-name") || localName.equals("property-name"))
-      {
-         property.setName(getValue(localName, value));
-      }
-      else if (localName.equals("activation-config-property-value") || localName.equals("message-driven-config-property-value") || localName.equals("property-value"))
-      {
-         property.setValue(getValue(localName, value));
-      }
-   }
-
-   public void setValue(ResourceManager manager, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-name"))
-      {
-         manager.setResourceName(getValue(localName, value));
-      }
-      else if (localName.equals("res-jndi-name"))
-      {
-         manager.setResourceJndiName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("message-destination-name"))
-      {
-         destination.setMessageDestinationName(getValue(localName, value));
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         destination.setJndiName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         ejbs.setCurrentEjbName(value, ejbClass);
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         ejbs.setJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("local-jndi-name"))
-      {
-         ejbs.setLocalJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("security-domain"))
-      {
-         ejbs.setSecurityDomain(getValue(localName, value));
-      }
-      else if (localName.equals("depends"))
-      {
-         ejbs.addDependency(getValue(localName, value));
-      }
-      else if (localName.equals("run-as-principal"))
-      {
-         ejbs.setRunAsPrincipal(getValue(localName, value));
-      }
-      else if (localName.equals("aop-domain-name"))
-      {
-         ejbs.setAopDomainName(getValue(localName, value));
-      }
-      else if (localName.equals("resource-adapter-name"))
-      {
-         ejbs.setResourceAdapterName(getValue(localName, value));
-      }
-      else if (localName.equals("destination-jndi-name"))
-      {
-         ejbs.setDestinationJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("mdb-user"))
-      {
-         ejbs.setMdbUser(getValue(localName, value));
-      }
-      else if (localName.equals("mdb-passwd"))
-      {
-         ejbs.setMdbPassword(getValue(localName, value));
-      }
-      else if (localName.equals("mdb-subscription-id"))
-      {
-         ejbs.setMdbSubscriptionId(getValue(localName, value));
-      }
-      else if (localName.equals("clustered"))
-      {
-         ejbs.setClustered(getValue(localName, value));
-      }
-      else if (localName.equals("concurrent"))
-      {
-         ejbs.setConcurrent(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Service service, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-name"))
-      {
-         service.setEjbName(getValue(localName, value));
-      }
-      if (localName.equals("object-name"))
-      {
-         service.setObjectName(getValue(localName, value));
-      }
-      else if (localName.equals("ejb-class"))
-      {
-         service.setEjbClass(getValue(localName, value));
-      }
-      if (localName.equals("xmbean"))
-      {
-         service.setXMBean(getValue(localName, value));
-      }
-      else if (localName.equals("local"))
-      {
-         service.setLocal(getValue(localName, value));
-      }
-      else if (localName.equals("remote"))
-      {
-         service.setRemote(getValue(localName, value));
-      }
-      else if (localName.equals("management"))
-      {
-         service.setManagement(getValue(localName, value));
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         service.setJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("local-jndi-name"))
-      {
-         service.setLocalJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("security-domain"))
-      {
-         service.setSecurityDomain(getValue(localName, value));
-      }
-      else if (localName.equals("aop-domain-name"))
-      {
-         service.setAopDomainName(getValue(localName, value));
-      }
-      else if (localName.equals("depends"))
-      {
-         service.addDependency(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("message-destination"))
-      {
-         consumer.setDestination(getValue(localName, value));
-      }
-      else if (localName.equals("message-destination-type"))
-      {
-         consumer.setDestinationType(getValue(localName, value));
-      }
-      else if (localName.equals("ejb-class"))
-      {
-         consumer.setEjbClass(getValue(localName, value));
-         consumer.setEjbName(getValue(localName, value));
-      }
-      else if (localName.equals("local"))
-      {
-         consumer.setLocal(getValue(localName, value));
-      }
-      else if (localName.equals("remote"))
-      {
-         consumer.setRemote(getValue(localName, value));
-      }
-      else if (localName.equals("jndi-name"))
-      {
-         consumer.setJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("local-jndi-name"))
-      {
-         consumer.setLocalJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("security-domain"))
-      {
-         consumer.setSecurityDomain(getValue(localName, value));
-      }
-      else if (localName.equals("run-as-principal"))
-      {
-         consumer.setRunAsPrincipal(getValue(localName, value));
-      }
-      else if (localName.equals("aop-domain-name"))
-      {
-         consumer.setAopDomainName(getValue(localName, value));
-      }
-      else if (localName.equals("depends"))
-      {
-         consumer.addDependency(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("jndi-name"))
-      {
-         binding.setJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("client-bind-url"))
-      {
-         binding.setClientBindUrl(getValue(localName, value));
-      }
-      else if (localName.equals("proxy-factory"))
-      {
-         binding.setProxyFactory(getValue(localName, value));
-      }
-      else if (localName.equals("interceptor-stack"))
-      {
-         binding.setInterceptorStack(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageProperties properties, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("delivery"))
-      {
-         properties.setDelivery(getValue(localName, value));
-      }
-      else if (localName.equals("class"))
-      {
-         properties.setClassName(getValue(localName, value));
-      }
-      else if (localName.equals("priority"))
-      {
-         properties.setPriority(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(ClusterConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("load-balance-policy"))
-      {
-         config.setLoadBalancePolicy(getValue(localName, value));
-      }
-      else if (localName.equals("partition-name"))
-      {
-         config.setPartition(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(CacheConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("cache-class"))
-      {
-         config.setCacheClass(getValue(localName, value));
-      }
-      else if (localName.equals("cache-max-size"))
-      {
-         config.setMaxSize(getValue(localName, value));
-      }
-      else if (localName.equals("idle-timeout-seconds"))
-      {
-         config.setIdleTimeoutSeconds(getValue(localName, value));
-      }
-      else if (localName.equals("cache-name"))
-      {
-         config.setName(getValue(localName, value));
-      }
-      else if (localName.equals("persistence-manager"))
-      {
-         config.setPersistenceManager(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("pool-class"))
-      {
-         config.setPoolClass(getValue(localName, value));
-      }
-      else if (localName.equals("pool-max-size"))
-      {
-         config.setMaxSize(getValue(localName, value));
-      }
-      else if (localName.equals("pool-timeout"))
-      {
-         config.setTimeout(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("method-name"))
-      {
-         method.setMethodName(getValue(localName, value));
-      }
-      else if (localName.equals("transaction-timeout"))
-      {
-         method.setTransactionTimeout(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("security-domain"))
-      {
-         dd.setSecurityDomain(getValue(localName, value));
-      }
-      else if (localName.equals("unauthenticated-principal"))
-      {
-         dd.setUnauthenticatedPrincipal(getValue(localName, value));
-      }
-      else if (localName.equals("jmx-name"))
-      {
-         dd.setJmxName(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(Producer producer, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("class"))
-      {
-         producer.setClassName(getValue(localName, value));
-      }
-      else if (localName.equals("connection-factory"))
-      {
-         producer.setConnectionFactory(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         srm.setRoleName(getValue(localName, value));
-      }
-      else if (localName.equals("principal-name"))
-      {
-         srm.addPrincipalName(getValue(localName, value));
-      }
-   }
-
-   protected String getValue(String name, String value)
-   {
-      if (value.startsWith("${") && value.endsWith("}"))
-      {
-         try
-         {
-            String propertyName = value.substring(2, value.length() - 1);
-            ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
-            KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
-            String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
-            log.debug("Replaced jboss.xml element " + name + " with value " + propertyValue);
-            return propertyValue;
-         }
-         catch (Exception e)
-         {
-            log
-                  .warn("Unable to look up property service for jboss.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
-                        + e.getMessage());
-         }
-      }
-
-      return value;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,1088 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.io.IOException;
+import java.net.URL;
+
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.KernelAbstraction;
+import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.logging.Logger;
+import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+//import org.jboss.metadata.SecurityRoleMetaData;
+import org.jboss.metamodel.descriptor.DDObjectFactory;
+import org.jboss.metamodel.descriptor.EjbLocalRef;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.InjectionTarget;
+import org.jboss.metamodel.descriptor.JndiRef;
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
+import org.jboss.metamodel.descriptor.NameValuePair;
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.ServiceRef;
+
+/**
+ * Represents the jboss.xml deployment descriptor for the 2.1 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author Anil.Saldhana at jboss.com
+ * @version <tt>$Revision$</tt>
+ */
+public class JBossDDObjectFactory extends DDObjectFactory
+{
+   private static final Logger log = Logger.getLogger(JBossDDObjectFactory.class);
+
+   private EjbJarDD dd;
+   private Class ejbClass;
+
+   public static EjbJarDD parse(URL ddResource, EjbJarDD dd) throws JBossXBException, IOException
+   {
+      ObjectModelFactory factory = null;
+      Unmarshaller unmarshaller = null;
+
+      if (ddResource != null)
+      {
+         log.debug("found jboss.xml " + ddResource);
+
+         if (dd == null)
+            dd = new EjbJarDD();
+
+         factory = new JBossDDObjectFactory(dd);
+         UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+         unmarshaller = unmarshallerFactory.newUnmarshaller();
+         unmarshaller.setEntityResolver(new JBossEntityResolver());
+         unmarshaller.setNamespaceAware(true);
+         unmarshaller.setSchemaValidation(true);
+         unmarshaller.setValidation(true);
+
+         dd = (EjbJarDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
+      }
+
+      return dd;
+   }
+
+   public JBossDDObjectFactory(EjbJarDD dd)
+   {
+      super();
+      this.dd = dd;
+   }
+
+   /**
+    * Return the root.
+    */
+   public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return dd;
+   }
+
+   public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
+   {
+      return root;
+   }
+
+   // Methods discovered by introspection
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("enterprise-beans"))
+      {
+         child = dd.getEnterpriseBeans();
+         if (child == null)
+         {
+            dd.setEnterpriseBeans(new EnterpriseBeans());
+            child = dd.getEnterpriseBeans();
+         }
+      }
+      else if (localName.equals("assembly-descriptor"))
+      {
+         child = dd.getAssemblyDescriptor();
+         if (child == null)
+         {
+            dd.setAssemblyDescriptor(new AssemblyDescriptor());
+            child = dd.getAssemblyDescriptor();
+         }
+      }
+      else if (localName.equals("resource-manager"))
+      {
+         child = new ResourceManager();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if ((child = this.newEnvRefGroupChild(localName)) != null)
+         return child;
+
+      if (localName.equals("current-message"))
+      {
+         child = new CurrentMessage();
+      }
+      else if (localName.equals("message-properties"))
+      {
+         child = new MessageProperties();
+      }
+      else if (localName.equals("producer"))
+      {
+         child = new Producer(false);
+      }
+      else if (localName.equals("local-producer"))
+      {
+         child = new Producer(true);
+      }
+      else if (localName.equals("annotation"))
+      {
+         child = new XmlAnnotation();
+      }
+      else if (localName.equals("ignore-dependency"))
+      {
+         child = new InjectionTarget();
+      }
+      else if (localName.equals("remote-binding"))
+      {
+         child = new RemoteBinding();
+      }
+      else if (localName.equals("pool-config"))
+      {
+         child = new PoolConfig();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(Service service, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if ((child = this.newEnvRefGroupChild(localName)) != null)
+         return child;
+
+      if (localName.equals("ignore-dependency"))
+      {
+         child = new InjectionTarget();
+      }
+      else if (localName.equals("annotation"))
+      {
+         child = new XmlAnnotation();
+      }
+      else if (localName.equals("remote-binding"))
+      {
+         child = new RemoteBinding();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(CurrentMessage message, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(MessageProperties properties, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(MethodAttributes attributes, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("method"))
+      {
+         child = new Method();
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(AssemblyDescriptor descriptor, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("message-destination"))
+      {
+         child = new MessageDestination();
+      }
+      if (localName.equals("security-role"))
+      {
+         // FIXME: NYI
+//         child = new SecurityRoleMetaData("dummy_to_be_replaced_in_setValue");
+         throw new RuntimeException("NYI");
+      }
+
+      return child;
+   }
+
+   /**
+    * Called when parsing of a new element started.
+    */
+   public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if ((child = this.newEnvRefGroupChild(localName)) != null)
+      {
+         return child;
+      }
+
+      if (localName.equals("session"))
+      {
+         ejbClass = SessionEnterpriseBean.class;
+         child = ejbs;
+      }
+      else if (localName.equals("message-driven"))
+      {
+         ejbClass = MessageDrivenBean.class;
+         child = ejbs;
+      }
+      else if (localName.equals("service"))
+      {
+         child = new Service();
+      }
+      else if (localName.equals("consumer"))
+      {
+         child = new Consumer();
+      }
+      else if (localName.equals("method-attributes"))
+      {
+         child = new MethodAttributes();
+      }
+      else if (localName.equals("annotation"))
+      {
+         child = new XmlAnnotation();
+      }
+      else if (localName.equals("ignore-dependency"))
+      {
+         child = new InjectionTarget();
+      }
+      else if (localName.equals("cluster-config"))
+      {
+         child = new ClusterConfig();
+      }
+      else if (localName.equals("remote-binding"))
+      {
+         child = new RemoteBinding();
+      }
+      else if (localName.equals("cache-config"))
+      {
+         child = new CacheConfig();
+      }
+      else if (localName.equals("pool-config"))
+      {
+         child = new PoolConfig();
+      }
+      else if (localName.equals("default-activation-config"))
+      {
+         child = new ActivationConfig();
+      }
+
+      return child;
+   }
+
+   public Object newChild(ActivationConfig parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("default-activation-config-property"))
+      {
+         child = new NameValuePair();
+      }
+
+      return child;
+   }
+
+   public Object newChild(XmlAnnotation parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+
+      if (localName.equals("injection-target"))
+      {
+         child = new InjectionTarget();
+      }
+      else if (localName.equals("property"))
+      {
+         child = new NameValuePair();
+      }
+
+      return child;
+   }
+
+   public void addChild(XmlAnnotation parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addProperty(property);
+   }
+
+   public void addChild(XmlAnnotation parent, InjectionTarget injectionTarget, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(injectionTarget);
+   }
+
+   public void addChild(EnterpriseBeans parent, ActivationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setDefaultActivationConfig(config);
+   }
+
+   public void addChild(ActivationConfig parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addActivationConfigProperty(property);
+   }
+
+   public void addChild(Consumer parent, Producer producer, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      if (producer.isLocal())
+         parent.addLocalProducer(producer);
+      else parent.addProducer(producer);
+   }
+
+   public void addChild(Consumer parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addRemoteBinding(binding);
+   }
+
+   public void addChild(AssemblyDescriptor parent, MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMessageDestination(destination);
+   }
+
+   // FIXME: NYI
+//   public void addChild(AssemblyDescriptor parent, SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName)
+//   {
+//      parent.addSecurityRoleMetaData(srm);
+//   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, CacheConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setCacheConfig(config);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setPoolConfig(config);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, MethodAttributes attributes, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setMethodAttributes(attributes);
+   }
+
+   public void addChild(EnterpriseBeans parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addRemoteBinding(binding);
+   }
+
+   public void addChild(EnterpriseBeans parent, InjectionTarget ignoreDependency, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addIgnoreDependency(ignoreDependency);
+   }
+
+   public void addChild(EnterpriseBeans parent, XmlAnnotation xmlAnnotation, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addXmlAnnotation(xmlAnnotation);
+   }
+
+   public void addChild(MethodAttributes parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethod(method);
+   }
+
+   public void addChild(Consumer parent, CurrentMessage message, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setCurrentMessage(message);
+   }
+
+   public void addChild(Consumer parent, PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setPoolConfig(config);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Consumer parent, MessageProperties message, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setMessageProperties(message);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(CurrentMessage parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethod(method);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(MessageProperties parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addMethod(method);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, Service service, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEnterpriseBean(service);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Service parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Service parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addRemoteBinding(binding);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Service parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbLocalRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Service parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Service parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addJndiRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Service parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceEnvRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Consumer parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Consumer parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEjbLocalRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Consumer parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Consumer parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addJndiRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(Consumer parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceEnvRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addEnterpriseBean(consumer);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addJndiRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EjbJarDD parent, ResourceManager manager, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addResourceManager(manager);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.updateEjbRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.updateEjbLocalRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, ClusterConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setClusterConfig(config);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.updateResourceRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.updateMessageDestinationRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addServiceRef(ref);
+   }
+
+   /**
+    * Called when parsing character is complete.
+    */
+   public void addChild(EnterpriseBeans parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.updateResourceEnvRef(ref);
+   }
+
+   public void setValue(XmlAnnotation xmlAnnotation, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("annotation-class"))
+      {
+         xmlAnnotation.setAnnotationClass(getValue(localName, value));
+      }
+      else if (localName.equals("annotation-implementation-class"))
+      {
+         xmlAnnotation.setAnnotationImplementationClass(getValue(localName, value));
+      }
+   }
+
+   public void setValue(NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("activation-config-property-name") || localName.equals("message-driven-config-property-name") || localName.equals("property-name"))
+      {
+         property.setName(getValue(localName, value));
+      }
+      else if (localName.equals("activation-config-property-value") || localName.equals("message-driven-config-property-value") || localName.equals("property-value"))
+      {
+         property.setValue(getValue(localName, value));
+      }
+   }
+
+   public void setValue(ResourceManager manager, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("res-name"))
+      {
+         manager.setResourceName(getValue(localName, value));
+      }
+      else if (localName.equals("res-jndi-name"))
+      {
+         manager.setResourceJndiName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("message-destination-name"))
+      {
+         destination.setMessageDestinationName(getValue(localName, value));
+      }
+      else if (localName.equals("jndi-name"))
+      {
+         destination.setJndiName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-name"))
+      {
+         ejbs.setCurrentEjbName(value, ejbClass);
+      }
+      else if (localName.equals("jndi-name"))
+      {
+         ejbs.setJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("local-jndi-name"))
+      {
+         ejbs.setLocalJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("security-domain"))
+      {
+         ejbs.setSecurityDomain(getValue(localName, value));
+      }
+      else if (localName.equals("depends"))
+      {
+         ejbs.addDependency(getValue(localName, value));
+      }
+      else if (localName.equals("run-as-principal"))
+      {
+         ejbs.setRunAsPrincipal(getValue(localName, value));
+      }
+      else if (localName.equals("aop-domain-name"))
+      {
+         ejbs.setAopDomainName(getValue(localName, value));
+      }
+      else if (localName.equals("resource-adapter-name"))
+      {
+         ejbs.setResourceAdapterName(getValue(localName, value));
+      }
+      else if (localName.equals("destination-jndi-name"))
+      {
+         ejbs.setDestinationJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("mdb-user"))
+      {
+         ejbs.setMdbUser(getValue(localName, value));
+      }
+      else if (localName.equals("mdb-passwd"))
+      {
+         ejbs.setMdbPassword(getValue(localName, value));
+      }
+      else if (localName.equals("mdb-subscription-id"))
+      {
+         ejbs.setMdbSubscriptionId(getValue(localName, value));
+      }
+      else if (localName.equals("clustered"))
+      {
+         ejbs.setClustered(getValue(localName, value));
+      }
+      else if (localName.equals("concurrent"))
+      {
+         ejbs.setConcurrent(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(Service service, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-name"))
+      {
+         service.setEjbName(getValue(localName, value));
+      }
+      if (localName.equals("object-name"))
+      {
+         service.setObjectName(getValue(localName, value));
+      }
+      else if (localName.equals("ejb-class"))
+      {
+         service.setEjbClass(getValue(localName, value));
+      }
+      if (localName.equals("xmbean"))
+      {
+         service.setXMBean(getValue(localName, value));
+      }
+      else if (localName.equals("local"))
+      {
+         service.setLocal(getValue(localName, value));
+      }
+      else if (localName.equals("remote"))
+      {
+         service.setRemote(getValue(localName, value));
+      }
+      else if (localName.equals("management"))
+      {
+         service.setManagement(getValue(localName, value));
+      }
+      else if (localName.equals("jndi-name"))
+      {
+         service.setJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("local-jndi-name"))
+      {
+         service.setLocalJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("security-domain"))
+      {
+         service.setSecurityDomain(getValue(localName, value));
+      }
+      else if (localName.equals("aop-domain-name"))
+      {
+         service.setAopDomainName(getValue(localName, value));
+      }
+      else if (localName.equals("depends"))
+      {
+         service.addDependency(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("message-destination"))
+      {
+         consumer.setDestination(getValue(localName, value));
+      }
+      else if (localName.equals("message-destination-type"))
+      {
+         consumer.setDestinationType(getValue(localName, value));
+      }
+      else if (localName.equals("ejb-class"))
+      {
+         consumer.setEjbClass(getValue(localName, value));
+         consumer.setEjbName(getValue(localName, value));
+      }
+      else if (localName.equals("local"))
+      {
+         consumer.setLocal(getValue(localName, value));
+      }
+      else if (localName.equals("remote"))
+      {
+         consumer.setRemote(getValue(localName, value));
+      }
+      else if (localName.equals("jndi-name"))
+      {
+         consumer.setJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("local-jndi-name"))
+      {
+         consumer.setLocalJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("security-domain"))
+      {
+         consumer.setSecurityDomain(getValue(localName, value));
+      }
+      else if (localName.equals("run-as-principal"))
+      {
+         consumer.setRunAsPrincipal(getValue(localName, value));
+      }
+      else if (localName.equals("aop-domain-name"))
+      {
+         consumer.setAopDomainName(getValue(localName, value));
+      }
+      else if (localName.equals("depends"))
+      {
+         consumer.addDependency(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("jndi-name"))
+      {
+         binding.setJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("client-bind-url"))
+      {
+         binding.setClientBindUrl(getValue(localName, value));
+      }
+      else if (localName.equals("proxy-factory"))
+      {
+         binding.setProxyFactory(getValue(localName, value));
+      }
+      else if (localName.equals("interceptor-stack"))
+      {
+         binding.setInterceptorStack(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(MessageProperties properties, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("delivery"))
+      {
+         properties.setDelivery(getValue(localName, value));
+      }
+      else if (localName.equals("class"))
+      {
+         properties.setClassName(getValue(localName, value));
+      }
+      else if (localName.equals("priority"))
+      {
+         properties.setPriority(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(ClusterConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("load-balance-policy"))
+      {
+         config.setLoadBalancePolicy(getValue(localName, value));
+      }
+      else if (localName.equals("partition-name"))
+      {
+         config.setPartition(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(CacheConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("cache-class"))
+      {
+         config.setCacheClass(getValue(localName, value));
+      }
+      else if (localName.equals("cache-max-size"))
+      {
+         config.setMaxSize(getValue(localName, value));
+      }
+      else if (localName.equals("idle-timeout-seconds"))
+      {
+         config.setIdleTimeoutSeconds(getValue(localName, value));
+      }
+      else if (localName.equals("cache-name"))
+      {
+         config.setName(getValue(localName, value));
+      }
+      else if (localName.equals("persistence-manager"))
+      {
+         config.setPersistenceManager(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("pool-class"))
+      {
+         config.setPoolClass(getValue(localName, value));
+      }
+      else if (localName.equals("pool-max-size"))
+      {
+         config.setMaxSize(getValue(localName, value));
+      }
+      else if (localName.equals("pool-timeout"))
+      {
+         config.setTimeout(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("method-name"))
+      {
+         method.setMethodName(getValue(localName, value));
+      }
+      else if (localName.equals("transaction-timeout"))
+      {
+         method.setTransactionTimeout(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("security-domain"))
+      {
+         dd.setSecurityDomain(getValue(localName, value));
+      }
+      else if (localName.equals("unauthenticated-principal"))
+      {
+         dd.setUnauthenticatedPrincipal(getValue(localName, value));
+      }
+      else if (localName.equals("jmx-name"))
+      {
+         dd.setJmxName(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(Producer producer, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("class"))
+      {
+         producer.setClassName(getValue(localName, value));
+      }
+      else if (localName.equals("connection-factory"))
+      {
+         producer.setConnectionFactory(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   // FIXME: NYI
+//   public void setValue(SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+//   {
+//      if (localName.equals("role-name"))
+//      {
+//         srm.setRoleName(getValue(localName, value));
+//      }
+//      else if (localName.equals("principal-name"))
+//      {
+//         srm.addPrincipalName(getValue(localName, value));
+//      }
+//   }
+
+   protected String getValue(String name, String value)
+   {
+      if (value.startsWith("${") && value.endsWith("}"))
+      {
+         try
+         {
+            String propertyName = value.substring(2, value.length() - 1);
+            ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
+            KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
+            String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
+            log.debug("Replaced jboss.xml element " + name + " with value " + propertyValue);
+            return propertyValue;
+         }
+         catch (Exception e)
+         {
+            log
+                  .warn("Unable to look up property service for jboss.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
+                        + e.getMessage());
+         }
+      }
+
+      return value;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metamodel;
-
-/**
- * The lifecycle-callback type specifies a method on a
- * class to be called when a lifecycle event occurs.
- * Note that each class may have only one lifecycle callback
- * method for any given event and that the method may not
- * be overloaded.
- * 
- * If the lifefycle-callback-class element is missing then
- * the class defining the callback is assumed to be the
- * component class in scope at the place in the descriptor
- * in which the callback definition appears.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class LifecycleCallback
-{
-   private String lifecycleCallbackClass;
-   private String lifecycleCallbackMethod;
-   
-   public String getLifecycleCallbackClass()
-   {
-      return lifecycleCallbackClass;
-   }
-   
-   public void setLifecycleCallbackClass(String lifecycleCallbackClass)
-   {
-      this.lifecycleCallbackClass = lifecycleCallbackClass;
-   }
-   
-   public String getLifecycleCallbackMethod()
-   {
-      return lifecycleCallbackMethod;
-   }
-   
-   public void setLifecycleCallbackMethod(String lifecycleCallbackMethod)
-   {
-      this.lifecycleCallbackMethod = lifecycleCallbackMethod;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/LifecycleCallback.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+/**
+ * The lifecycle-callback type specifies a method on a
+ * class to be called when a lifecycle event occurs.
+ * Note that each class may have only one lifecycle callback
+ * method for any given event and that the method may not
+ * be overloaded.
+ * 
+ * If the lifefycle-callback-class element is missing then
+ * the class defining the callback is assumed to be the
+ * component class in scope at the place in the descriptor
+ * in which the callback definition appears.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class LifecycleCallback
+{
+   private String lifecycleCallbackClass;
+   private String lifecycleCallbackMethod;
+   
+   public String getLifecycleCallbackClass()
+   {
+      return lifecycleCallbackClass;
+   }
+   
+   public void setLifecycleCallbackClass(String lifecycleCallbackClass)
+   {
+      this.lifecycleCallbackClass = lifecycleCallbackClass;
+   }
+   
+   public String getLifecycleCallbackMethod()
+   {
+      return lifecycleCallbackMethod;
+   }
+   
+   public void setLifecycleCallbackMethod(String lifecycleCallbackMethod)
+   {
+      this.lifecycleCallbackMethod = lifecycleCallbackMethod;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * Represents a <message-destination> element of the jboss.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageDestination
-{
-   private static final Logger log = Logger.getLogger(MessageDestination.class);
-   
-   private String messageDestinationName;
-   
-   private String jndiName;
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMessageDestinationName()
-   {
-      return messageDestinationName;
-   }
-
-   public void setMessageDestinationName(String messageDestinationName)
-   {
-      this.messageDestinationName = messageDestinationName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[MessageDestination: ");
-      sb.append("messageDestinationName=").append(messageDestinationName);
-      sb.append(", jndiName=").append(jndiName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import org.jboss.logging.Logger;
+
+
+/**
+ * Represents a <message-destination> element of the jboss.xml deployment descriptor for the
+ * 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MessageDestination
+{
+   private static final Logger log = Logger.getLogger(MessageDestination.class);
+   
+   private String messageDestinationName;
+   
+   private String jndiName;
+   
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+
+   public String getMessageDestinationName()
+   {
+      return messageDestinationName;
+   }
+
+   public void setMessageDestinationName(String messageDestinationName)
+   {
+      this.messageDestinationName = messageDestinationName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[MessageDestination: ");
+      sb.append("messageDestinationName=").append(messageDestinationName);
+      sb.append(", jndiName=").append(jndiName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDestination.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,224 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import javax.ejb.TransactionManagementType;
-import org.jboss.logging.Logger;
-
-/**
- * Represents a message-driven element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageDrivenBean extends EnterpriseBean
-{
-   private static final Logger log = Logger.getLogger(MessageDrivenBean.class);
-
-   public static final String BEAN = "Bean";
-
-   public static final String CONTAINER = "Container";
-
-   // ejb-jar.xml
-   private String acknowledgeMode;
-
-   private String transactionType;
-   
-   private String messagingType;
-   
-   private String resourceAdaptorName;
-
-   private MessageDrivenDestination messageDrivenDestination;
-   
-   private ActivationConfig activationConfig;
-   private ActivationConfig defaultActivationConfig;
-   
-   private String destinationJndiName;
-   
-   private String mdbUser;
-   private String mdbPassword;
-   private String mdbSubscriptionId;
-
-   private Method aroundInvoke;
-   private Method postConstruct;
-   private Method postActivate;
-   private Method preDestroy;
-   private Method prePassivate;
-   
-   public ActivationConfig getDefaultActivationConfig()
-   {
-      return defaultActivationConfig;
-   }
-
-   public void setDefaultActivationConfig(ActivationConfig defaultActivationConfig)
-   {
-      this.defaultActivationConfig = defaultActivationConfig;
-   }
-   
-   public MessageDrivenDestination getMessageDrivenDestination()
-   {
-      return messageDrivenDestination;
-   }
-
-   public void setMessageDrivenDestination(MessageDrivenDestination messageDrivenDestination)
-   {
-      this.messageDrivenDestination = messageDrivenDestination;
-   }
-   
-   public ActivationConfig getActivationConfig()
-   {
-      return activationConfig;
-   }
-
-   public void setActivationConfig(ActivationConfig activationConfig)
-   {
-      this.activationConfig = activationConfig;
-   }
-   
-   public void setDestinationJndiName(String name)
-   {
-      destinationJndiName = name;
-   }
-   
-   public String getDestinationJndiName()
-   {
-      return destinationJndiName;
-   }
-
-   public String getAcknowledgeMode()
-   {
-      return acknowledgeMode;
-   }
-
-   public void setAcknowledgeMode(String acknowledgeMode)
-   {
-      this.acknowledgeMode = acknowledgeMode;
-   }
-   
-   public String getMessagingType()
-   {
-      return messagingType;
-   }
-
-   public void setMessagingType(String messagingType)
-   {
-      this.messagingType = messagingType;
-   }
-   
-   public String getResourceAdaptorName()
-   {
-      return resourceAdaptorName;
-   }
-
-   public void setResourceAdaptorName(String resourceAdaptorName)
-   {
-      this.resourceAdaptorName = resourceAdaptorName;
-   }
-
-   public String getTransactionType()
-   {
-      return transactionType;
-   }
-
-   public void setTransactionType(String transactionType)
-   {
-      if (transactionType.equals(BEAN))
-         tmType = TransactionManagementType.BEAN;
-      else if (transactionType.equals(CONTAINER))
-         tmType = TransactionManagementType.CONTAINER;
-      this.transactionType = transactionType;
-   }
-   
-   public String getMdbPassword()
-   {
-      return mdbPassword;
-   }
-
-   public void setMdbPassword(String mdbPassword)
-   {
-      this.mdbPassword = mdbPassword;
-   }
-
-   public String getMdbUser()
-   {
-      return mdbUser;
-   }
-
-   public void setMdbUser(String mdbUser)
-   {
-      this.mdbUser = mdbUser;
-   }
-   
-   public String getMdbSubscriptionId()
-   {
-      return mdbSubscriptionId;
-   }
-
-   public void setMdbSubscriptionId(String mdbSubscriptionId)
-   {
-      this.mdbSubscriptionId = mdbSubscriptionId;
-   }
-
-   public Method getAroundInvoke()
-   {
-      return aroundInvoke;
-   }
-
-   public void setAroundInvoke(Method aroundInvoke)
-   {
-      this.aroundInvoke = aroundInvoke;
-   }
-
-   public Method getPostConstruct()
-   {
-      return postConstruct;
-   }
-
-   public void setPostConstruct(Method postConstruct)
-   {
-      this.postConstruct = postConstruct;
-   }
-
-   public Method getPreDestroy()
-   {
-      return preDestroy;
-   }
-
-   public void setPreDestroy(Method preDestroy)
-   {
-      this.preDestroy = preDestroy;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[MessageDrivenBean:");
-      sb.append(super.toString());
-      sb.append(",");
-      sb.append("acknowledgeMode=").append(acknowledgeMode);
-      sb.append("destination=").append(messageDrivenDestination);
-      sb.append("messagingType=").append(messagingType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,224 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import javax.ejb.TransactionManagementType;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a message-driven element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MessageDrivenBean extends EnterpriseBean
+{
+   private static final Logger log = Logger.getLogger(MessageDrivenBean.class);
+
+   public static final String BEAN = "Bean";
+
+   public static final String CONTAINER = "Container";
+
+   // ejb-jar.xml
+   private String acknowledgeMode;
+
+   private String transactionType;
+   
+   private String messagingType;
+   
+   private String resourceAdaptorName;
+
+   private MessageDrivenDestination messageDrivenDestination;
+   
+   private ActivationConfig activationConfig;
+   private ActivationConfig defaultActivationConfig;
+   
+   private String destinationJndiName;
+   
+   private String mdbUser;
+   private String mdbPassword;
+   private String mdbSubscriptionId;
+
+   private Method aroundInvoke;
+   private Method postConstruct;
+   private Method postActivate;
+   private Method preDestroy;
+   private Method prePassivate;
+   
+   public ActivationConfig getDefaultActivationConfig()
+   {
+      return defaultActivationConfig;
+   }
+
+   public void setDefaultActivationConfig(ActivationConfig defaultActivationConfig)
+   {
+      this.defaultActivationConfig = defaultActivationConfig;
+   }
+   
+   public MessageDrivenDestination getMessageDrivenDestination()
+   {
+      return messageDrivenDestination;
+   }
+
+   public void setMessageDrivenDestination(MessageDrivenDestination messageDrivenDestination)
+   {
+      this.messageDrivenDestination = messageDrivenDestination;
+   }
+   
+   public ActivationConfig getActivationConfig()
+   {
+      return activationConfig;
+   }
+
+   public void setActivationConfig(ActivationConfig activationConfig)
+   {
+      this.activationConfig = activationConfig;
+   }
+   
+   public void setDestinationJndiName(String name)
+   {
+      destinationJndiName = name;
+   }
+   
+   public String getDestinationJndiName()
+   {
+      return destinationJndiName;
+   }
+
+   public String getAcknowledgeMode()
+   {
+      return acknowledgeMode;
+   }
+
+   public void setAcknowledgeMode(String acknowledgeMode)
+   {
+      this.acknowledgeMode = acknowledgeMode;
+   }
+   
+   public String getMessagingType()
+   {
+      return messagingType;
+   }
+
+   public void setMessagingType(String messagingType)
+   {
+      this.messagingType = messagingType;
+   }
+   
+   public String getResourceAdaptorName()
+   {
+      return resourceAdaptorName;
+   }
+
+   public void setResourceAdaptorName(String resourceAdaptorName)
+   {
+      this.resourceAdaptorName = resourceAdaptorName;
+   }
+
+   public String getTransactionType()
+   {
+      return transactionType;
+   }
+
+   public void setTransactionType(String transactionType)
+   {
+      if (transactionType.equals(BEAN))
+         tmType = TransactionManagementType.BEAN;
+      else if (transactionType.equals(CONTAINER))
+         tmType = TransactionManagementType.CONTAINER;
+      this.transactionType = transactionType;
+   }
+   
+   public String getMdbPassword()
+   {
+      return mdbPassword;
+   }
+
+   public void setMdbPassword(String mdbPassword)
+   {
+      this.mdbPassword = mdbPassword;
+   }
+
+   public String getMdbUser()
+   {
+      return mdbUser;
+   }
+
+   public void setMdbUser(String mdbUser)
+   {
+      this.mdbUser = mdbUser;
+   }
+   
+   public String getMdbSubscriptionId()
+   {
+      return mdbSubscriptionId;
+   }
+
+   public void setMdbSubscriptionId(String mdbSubscriptionId)
+   {
+      this.mdbSubscriptionId = mdbSubscriptionId;
+   }
+
+   public Method getAroundInvoke()
+   {
+      return aroundInvoke;
+   }
+
+   public void setAroundInvoke(Method aroundInvoke)
+   {
+      this.aroundInvoke = aroundInvoke;
+   }
+
+   public Method getPostConstruct()
+   {
+      return postConstruct;
+   }
+
+   public void setPostConstruct(Method postConstruct)
+   {
+      this.postConstruct = postConstruct;
+   }
+
+   public Method getPreDestroy()
+   {
+      return preDestroy;
+   }
+
+   public void setPreDestroy(Method preDestroy)
+   {
+      this.preDestroy = preDestroy;
+   }
+   
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[MessageDrivenBean:");
+      sb.append(super.toString());
+      sb.append(",");
+      sb.append("acknowledgeMode=").append(acknowledgeMode);
+      sb.append("destination=").append(messageDrivenDestination);
+      sb.append("messagingType=").append(messagingType);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a message-driven-destination element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageDrivenDestination
-{
-   private static final Logger log = Logger.getLogger(MessageDrivenDestination.class);
-
-   // ejb-jar.xml
-   private String destinationType;
-
-   private String subscriptionDurability;
-
-   public String getDestinationType()
-   {
-      return destinationType;
-   }
-
-   public void setDestinationType(String destinationType)
-   {
-      this.destinationType = destinationType;
-   }
-
-   public String getSubscriptionDurability()
-   {
-      return subscriptionDurability;
-   }
-
-   public void setSubscriptionDurability(String subscriptionDurability)
-   {
-      this.subscriptionDurability = subscriptionDurability;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("destinationType=").append(destinationType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a message-driven-destination element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MessageDrivenDestination
+{
+   private static final Logger log = Logger.getLogger(MessageDrivenDestination.class);
+
+   // ejb-jar.xml
+   private String destinationType;
+
+   private String subscriptionDurability;
+
+   public String getDestinationType()
+   {
+      return destinationType;
+   }
+
+   public void setDestinationType(String destinationType)
+   {
+      this.destinationType = destinationType;
+   }
+
+   public String getSubscriptionDurability()
+   {
+      return subscriptionDurability;
+   }
+
+   public void setSubscriptionDurability(String subscriptionDurability)
+   {
+      this.subscriptionDurability = subscriptionDurability;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append('[');
+      sb.append("destinationType=").append(destinationType);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenDestination.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MessageProperties
-{
-   private List methods = new ArrayList();
-   private String delivery;
-   private String priority;
-   private String className;
-
-   public List getMethods()
-   {
-      return methods;
-   }
-   
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-   
-   public String getDelivery()
-   {
-      return delivery;
-   }
-   
-   public void setDelivery(String delivery)
-   {
-      this.delivery = delivery;
-   }
-   
-   public String getClassName()
-   {
-      return className;
-   }
-   
-   public void setClassName(String className)
-   {
-      this.className = className;
-   }
-   
-   public String getPriority()
-   {
-      return priority;
-   }
-   
-   public void setPriority(String priority)
-   {
-      this.priority = priority;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("className=").append(className);
-      sb.append(", priority=").append(priority);
-      sb.append(", delivery=").append(delivery);
-      sb.append(", methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MessageProperties
+{
+   private List methods = new ArrayList();
+   private String delivery;
+   private String priority;
+   private String className;
+
+   public List getMethods()
+   {
+      return methods;
+   }
+   
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+   
+   public String getDelivery()
+   {
+      return delivery;
+   }
+   
+   public void setDelivery(String delivery)
+   {
+      this.delivery = delivery;
+   }
+   
+   public String getClassName()
+   {
+      return className;
+   }
+   
+   public void setClassName(String className)
+   {
+      this.className = className;
+   }
+   
+   public String getPriority()
+   {
+      return priority;
+   }
+   
+   public void setPriority(String priority)
+   {
+      this.priority = priority;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("className=").append(className);
+      sb.append(", priority=").append(priority);
+      sb.append(", delivery=").append(delivery);
+      sb.append(", methods=").append(methods);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MessageProperties.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an <method> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Method
-{
-
-   private String ejbName = null;
-
-   private String methodName = null;
-   
-   private String transactionTimeout = null;
-
-   private List methodParams;
-
-   public String getTransactionTimeout()
-   {
-      return transactionTimeout;
-   }
-
-   public void setTransactionTimeout(String transactionTimeout)
-   {
-      this.transactionTimeout = transactionTimeout;
-   }
-   
-   public String getEjbName()
-   {
-      return ejbName;
-   }
-
-   public void setEjbName(String ejbName)
-   {
-      this.ejbName = ejbName;
-   }
-
-   public String getMethodName()
-   {
-      return methodName;
-   }
-
-   public void setMethodName(String methodName)
-   {
-      this.methodName = methodName;
-   }
-
-   public void setHasParameters()
-   {
-      methodParams = new ArrayList();
-   }
-   
-   public void addMethodParam(String methodParam)
-   {
-      methodParams.add(methodParam);
-   }
-
-   public List getMethodParams()
-   {
-      return methodParams;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(ejbName);
-      sb.append(", methodName=").append(methodName);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents an <method> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Method
+{
+
+   private String ejbName = null;
+
+   private String methodName = null;
+   
+   private String transactionTimeout = null;
+
+   private List methodParams;
+
+   public String getTransactionTimeout()
+   {
+      return transactionTimeout;
+   }
+
+   public void setTransactionTimeout(String transactionTimeout)
+   {
+      this.transactionTimeout = transactionTimeout;
+   }
+   
+   public String getEjbName()
+   {
+      return ejbName;
+   }
+
+   public void setEjbName(String ejbName)
+   {
+      this.ejbName = ejbName;
+   }
+
+   public String getMethodName()
+   {
+      return methodName;
+   }
+
+   public void setMethodName(String methodName)
+   {
+      this.methodName = methodName;
+   }
+
+   public void setHasParameters()
+   {
+      methodParams = new ArrayList();
+   }
+   
+   public void addMethodParam(String methodParam)
+   {
+      methodParams.add(methodParam);
+   }
+
+   public List getMethodParams()
+   {
+      return methodParams;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbName=").append(ejbName);
+      sb.append(", methodName=").append(methodName);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Method.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <method-attributes> element of the jboss.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MethodAttributes
-{
-   private static final Logger log = Logger.getLogger(MethodAttributes.class);
-
-   private List<Method> methods = new ArrayList();
-
-   public List<Method> getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents an <method-attributes> element of the jboss.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MethodAttributes
+{
+   private static final Logger log = Logger.getLogger(MethodAttributes.class);
+
+   private List<Method> methods = new ArrayList();
+
+   public List<Method> getMethods()
+   {
+      return methods;
+   }
+
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("methods=").append(methods);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodAttributes.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <method-permission> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MethodPermission
-{
-   private static final Logger log = Logger.getLogger(MethodPermission.class);
-
-   private List roleNames = new ArrayList();
-   private boolean isUnchecked = false;
-   private List<Method> methods = new ArrayList();
-
-   public boolean isUnchecked()
-   {
-      return isUnchecked;
-   }
-
-   public void setUnchecked(boolean isUnchecked)
-   {
-      this.isUnchecked = isUnchecked;
-   }
-
-   public List getRoleNames()
-   {
-      return roleNames;
-   }
-
-   public void addRoleName(String roleName)
-   {
-      roleNames.add(roleName);
-   }
-
-   public List<Method> getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("roleNames=").append(roleNames);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents an <method-permission> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MethodPermission
+{
+   private static final Logger log = Logger.getLogger(MethodPermission.class);
+
+   private List roleNames = new ArrayList();
+   private boolean isUnchecked = false;
+   private List<Method> methods = new ArrayList();
+
+   public boolean isUnchecked()
+   {
+      return isUnchecked;
+   }
+
+   public void setUnchecked(boolean isUnchecked)
+   {
+      this.isUnchecked = isUnchecked;
+   }
+
+   public List getRoleNames()
+   {
+      return roleNames;
+   }
+
+   public void addRoleName(String roleName)
+   {
+      roleNames.add(roleName);
+   }
+
+   public List<Method> getMethods()
+   {
+      return methods;
+   }
+
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("roleNames=").append(roleNames);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/MethodPermission.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-
-/**
- * Represents an <pool-config> element of the jboss.xml deployment descriptor
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class PoolConfig
-{
-   private String poolClass = null;
-   private String maxSize = null;
-   private String timeout = null;
-   
-   public String getPoolClass()
-   {
-      return poolClass;
-   }
-
-   public void setPoolClass(String poolClass)
-   {
-      this.poolClass = poolClass;
-   }
-
-   public String getMaxSize()
-   {
-      return maxSize;
-   }
-
-   public void setMaxSize(String maxSize)
-   {
-      this.maxSize = maxSize;
-   }
-   
-   public String getTimeout()
-   {
-      return timeout;
-   }
-
-   public void setTimeout(String timeout)
-   {
-      this.timeout = timeout;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("poolClass=").append(poolClass);
-      sb.append(", maxSize=").append(maxSize);
-      sb.append(", timeout=").append(timeout);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+
+/**
+ * Represents an <pool-config> element of the jboss.xml deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class PoolConfig
+{
+   private String poolClass = null;
+   private String maxSize = null;
+   private String timeout = null;
+   
+   public String getPoolClass()
+   {
+      return poolClass;
+   }
+
+   public void setPoolClass(String poolClass)
+   {
+      this.poolClass = poolClass;
+   }
+
+   public String getMaxSize()
+   {
+      return maxSize;
+   }
+
+   public void setMaxSize(String maxSize)
+   {
+      this.maxSize = maxSize;
+   }
+   
+   public String getTimeout()
+   {
+      return timeout;
+   }
+
+   public void setTimeout(String timeout)
+   {
+      this.timeout = timeout;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("poolClass=").append(poolClass);
+      sb.append(", maxSize=").append(maxSize);
+      sb.append(", timeout=").append(timeout);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/PoolConfig.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a producer element of the jboss.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Producer
-{
-   private static final Logger log = Logger.getLogger(Producer.class);
-
-   // jboss.xml
-   private String className;
-   private String connectionFactory;
-   private boolean local = false;
-   
-   public Producer(boolean local)
-   {
-      this.local = local;
-   }
-   
-   public boolean isLocal()
-   {
-      return local;
-   }
-
-   public String getClassName()
-   {
-      return className;
-   }
-
-   public void setClassName(String className)
-   {
-      this.className = className;
-   }
-   
-   public String getConnectionFactory()
-   {
-      return connectionFactory;
-   }
-
-   public void setConnectionFactory(String connectionFactory)
-   {
-      this.connectionFactory = connectionFactory;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("className=").append(className);
-      sb.append(", connectionFactory=").append(connectionFactory);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a producer element of the jboss.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Producer
+{
+   private static final Logger log = Logger.getLogger(Producer.class);
+
+   // jboss.xml
+   private String className;
+   private String connectionFactory;
+   private boolean local = false;
+   
+   public Producer(boolean local)
+   {
+      this.local = local;
+   }
+   
+   public boolean isLocal()
+   {
+      return local;
+   }
+
+   public String getClassName()
+   {
+      return className;
+   }
+
+   public void setClassName(String className)
+   {
+      this.className = className;
+   }
+   
+   public String getConnectionFactory()
+   {
+      return connectionFactory;
+   }
+
+   public void setConnectionFactory(String connectionFactory)
+   {
+      this.connectionFactory = connectionFactory;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append('[');
+      sb.append("className=").append(className);
+      sb.append(", connectionFactory=").append(connectionFactory);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Producer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-/**
- * Represents an query element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Query
-{
-
-   private String ejbQl;
-
-   private QueryMethod queryMethod;
-
-   public String getEjbQl()
-   {
-      return ejbQl;
-   }
-
-   public void setEjbQl(String ejbQl)
-   {
-      this.ejbQl = ejbQl;
-   }
-
-   public QueryMethod getQueryMethod()
-   {
-      return queryMethod;
-   }
-
-   public void setQueryMethod(QueryMethod queryMethod)
-   {
-      this.queryMethod = queryMethod;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbQl=").append(ejbQl);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+/**
+ * Represents an query element of the ejb-jar.xml deployment descriptor for the
+ * 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Query
+{
+
+   private String ejbQl;
+
+   private QueryMethod queryMethod;
+
+   public String getEjbQl()
+   {
+      return ejbQl;
+   }
+
+   public void setEjbQl(String ejbQl)
+   {
+      this.ejbQl = ejbQl;
+   }
+
+   public QueryMethod getQueryMethod()
+   {
+      return queryMethod;
+   }
+
+   public void setQueryMethod(QueryMethod queryMethod)
+   {
+      this.queryMethod = queryMethod;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbQl=").append(ejbQl);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Query.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.List;
-
-/**
- * Represents an query-method element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class QueryMethod
-{
-
-   private String methodName;
-
-   private List methodParams;
-
-   public String getMethodName()
-   {
-      return methodName;
-   }
-
-   public void setMethodName(String methodName)
-   {
-      this.methodName = methodName;
-   }
-
-   public List getMethodParams()
-   {
-      return methodParams;
-   }
-
-   public void setMethodParams(List methodParams)
-   {
-      this.methodParams = methodParams;
-   }
-
-   public void addMethodParam(String methodParam)
-   {
-      methodParams.add(methodParam);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methodName=").append(methodName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.List;
+
+/**
+ * Represents an query-method element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class QueryMethod
+{
+
+   private String methodName;
+
+   private List methodParams;
+
+   public String getMethodName()
+   {
+      return methodName;
+   }
+
+   public void setMethodName(String methodName)
+   {
+      this.methodName = methodName;
+   }
+
+   public List getMethodParams()
+   {
+      return methodParams;
+   }
+
+   public void setMethodParams(List methodParams)
+   {
+      this.methodParams = methodParams;
+   }
+
+   public void addMethodParam(String methodParam)
+   {
+      methodParams.add(methodParam);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("methodName=").append(methodName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/QueryMethod.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-/**
- * Represents an ejb-relationship-role element of the ejb-jar.xml deployment
- * descriptor for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class RelationshipRoleSource
-{
-
-   private String ejbName;
-
-   public String getEjbName()
-   {
-      return ejbName;
-   }
-
-   public void setEjbName(String ejbName)
-   {
-      this.ejbName = ejbName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(ejbName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+/**
+ * Represents an ejb-relationship-role element of the ejb-jar.xml deployment
+ * descriptor for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class RelationshipRoleSource
+{
+
+   private String ejbName;
+
+   public String getEjbName()
+   {
+      return ejbName;
+   }
+
+   public void setEjbName(String ejbName)
+   {
+      this.ejbName = ejbName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbName=").append(ejbName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RelationshipRoleSource.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents <relationships> elements of the ejb-jar.xml deployment descriptor for the 1.4
- * schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Relationships
-{
-
-   private List ejbRelations = new ArrayList();
-
-   public List getEjbRelations()
-   {
-      return ejbRelations;
-   }
-
-   public void setEjbRelations(List ejbRelations)
-   {
-      this.ejbRelations = ejbRelations;
-   }
-
-   public void addEjbRelation(EjbRelation ejbRelation)
-   {
-      ejbRelations.add(ejbRelation);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRelations=").append(ejbRelations);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents <relationships> elements of the ejb-jar.xml deployment descriptor for the 1.4
+ * schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Relationships
+{
+
+   private List ejbRelations = new ArrayList();
+
+   public List getEjbRelations()
+   {
+      return ejbRelations;
+   }
+
+   public void setEjbRelations(List ejbRelations)
+   {
+      this.ejbRelations = ejbRelations;
+   }
+
+   public void addEjbRelation(EjbRelation ejbRelation)
+   {
+      ejbRelations.add(ejbRelation);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbRelations=").append(ejbRelations);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Relationships.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,92 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents an <remote-binding> element of the jboss.xml deployment descriptor
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class RemoteBinding
-{
-   private String jndiName = null;
-   private String proxyFactory = null;
-   private String clientBindUrl = null;
-   private String interceptorStack = null;
-
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-   
-   public String getProxyFactory()
-   {
-      return proxyFactory;
-   }
-
-   public void setProxyFactory(String proxyFactory)
-   {
-      this.proxyFactory = proxyFactory;
-   }
-
-   public String getClientBindUrl()
-   {
-      return clientBindUrl;
-   }
-
-   public void setClientBindUrl(String clientBindUrl)
-   {
-      this.clientBindUrl = clientBindUrl;
-   }
-
-   public String getInterceptorStack()
-   {
-      return interceptorStack;
-   }
-
-   public void setInterceptorStack(String interceptorStack)
-   {
-      this.interceptorStack = interceptorStack;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("jndiName=").append(jndiName);
-      sb.append(", proxyFactory=").append(proxyFactory);
-      sb.append(", interceptorStack=").append(interceptorStack);
-      sb.append(", clientBindUrl=").append(clientBindUrl);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents an <remote-binding> element of the jboss.xml deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class RemoteBinding
+{
+   private String jndiName = null;
+   private String proxyFactory = null;
+   private String clientBindUrl = null;
+   private String interceptorStack = null;
+
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+   
+   public String getProxyFactory()
+   {
+      return proxyFactory;
+   }
+
+   public void setProxyFactory(String proxyFactory)
+   {
+      this.proxyFactory = proxyFactory;
+   }
+
+   public String getClientBindUrl()
+   {
+      return clientBindUrl;
+   }
+
+   public void setClientBindUrl(String clientBindUrl)
+   {
+      this.clientBindUrl = clientBindUrl;
+   }
+
+   public String getInterceptorStack()
+   {
+      return interceptorStack;
+   }
+
+   public void setInterceptorStack(String interceptorStack)
+   {
+      this.interceptorStack = interceptorStack;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("jndiName=").append(jndiName);
+      sb.append(", proxyFactory=").append(proxyFactory);
+      sb.append(", interceptorStack=").append(interceptorStack);
+      sb.append(", clientBindUrl=").append(clientBindUrl);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoteBinding.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.logging.Logger;
-
-/**
- * Represents an <remove-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class RemoveList
-{
-   private static final Logger log = Logger.getLogger(RemoveList.class);
-
-   private List methods = new ArrayList();
-
-   public List getMethods()
-   {
-      return methods;
-   }
-
-   public void addMethod(Method method)
-   {
-      methods.add(method);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("methods=").append(methods);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.logging.Logger;
+
+/**
+ * Represents an <remove-list> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class RemoveList
+{
+   private static final Logger log = Logger.getLogger(RemoveList.class);
+
+   private List methods = new ArrayList();
+
+   public List getMethods()
+   {
+      return methods;
+   }
+
+   public void addMethod(Method method)
+   {
+      methods.add(method);
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("methods=").append(methods);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveList.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-/**
- * Represents an <remove-list> element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class RemoveMethod
-{
-
-   private Method beanMethod;
-   private boolean retainIfException;
-
-   public Method getBeanMethod()
-   {
-      return beanMethod;
-   }
-
-   public void setBeanMethod(Method beanMethod)
-   {
-      this.beanMethod = beanMethod;
-   }
-
-   public boolean isRetainIfException()
-   {
-      return retainIfException;
-   }
-
-   public void setRetainIfException(boolean retainIfException)
-   {
-      this.retainIfException = retainIfException;
-   }
-
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("method=").append(beanMethod);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+/**
+ * Represents an <remove-list> element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class RemoveMethod
+{
+
+   private Method beanMethod;
+   private boolean retainIfException;
+
+   public Method getBeanMethod()
+   {
+      return beanMethod;
+   }
+
+   public void setBeanMethod(Method beanMethod)
+   {
+      this.beanMethod = beanMethod;
+   }
+
+   public boolean isRetainIfException()
+   {
+      return retainIfException;
+   }
+
+   public void setRetainIfException(boolean retainIfException)
+   {
+      this.retainIfException = retainIfException;
+   }
+
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("method=").append(beanMethod);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/RemoveMethod.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-/**
- * Represents a resource-manager element of the jboss.xml deployment descriptor for
- * the 4.0 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ResourceManager
-{
-   private String resourceName;
-   private String resourceJndiName;
-   
-   public String getResourceName()
-   {
-      return resourceName;
-   }
-   
-   public void setResourceName(String resourceName)
-   {
-      this.resourceName = resourceName;
-   }
-   
-   public String getResourceJndiName()
-   {
-      return resourceJndiName;
-   }
-   
-   public void setResourceJndiName(String resourceJndiName)
-   {
-      this.resourceJndiName = resourceJndiName;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+/**
+ * Represents a resource-manager element of the jboss.xml deployment descriptor for
+ * the 4.0 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ResourceManager
+{
+   private String resourceName;
+   private String resourceJndiName;
+   
+   public String getResourceName()
+   {
+      return resourceName;
+   }
+   
+   public void setResourceName(String resourceName)
+   {
+      this.resourceName = resourceName;
+   }
+   
+   public String getResourceJndiName()
+   {
+      return resourceJndiName;
+   }
+   
+   public void setResourceJndiName(String resourceJndiName)
+   {
+      this.resourceJndiName = resourceJndiName;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/ResourceManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,92 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import org.jboss.metamodel.descriptor.RunAs;
-
-/**
- * Represents a <security-identity> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SecurityIdentity
-{
-   private String id;
-
-   private boolean useCallerIdentity = false;
-
-   private RunAs runAs;
-
-   private String runAsPrincipal;
-
-   public String getId()
-   {
-      return id;
-   }
-
-   public void setId(String id)
-   {
-      this.id = id;
-   }
-
-   public boolean isUseCallerIdentity()
-   {
-      return useCallerIdentity;
-   }
-
-   public void setUseCallerIdentity(boolean useCallerIdentity)
-   {
-      this.useCallerIdentity = useCallerIdentity;
-   }
-
-   public RunAs getRunAs()
-   {
-      return runAs;
-   }
-
-   public void setRunAs(RunAs runAs)
-   {
-      this.runAs = runAs;
-   }
-
-   public String getRunAsPrincipal()
-   {
-      return runAsPrincipal;
-   }
-
-   public void setRunAsPrincipal(String runAsPrincipal)
-   {
-      this.runAsPrincipal = runAsPrincipal;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbName=").append(id);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import org.jboss.metamodel.descriptor.RunAs;
+
+/**
+ * Represents a <security-identity> element of the ejb-jar.xml deployment descriptor for the
+ * 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class SecurityIdentity
+{
+   private String id;
+
+   private boolean useCallerIdentity = false;
+
+   private RunAs runAs;
+
+   private String runAsPrincipal;
+
+   public String getId()
+   {
+      return id;
+   }
+
+   public void setId(String id)
+   {
+      this.id = id;
+   }
+
+   public boolean isUseCallerIdentity()
+   {
+      return useCallerIdentity;
+   }
+
+   public void setUseCallerIdentity(boolean useCallerIdentity)
+   {
+      this.useCallerIdentity = useCallerIdentity;
+   }
+
+   public RunAs getRunAs()
+   {
+      return runAs;
+   }
+
+   public void setRunAs(RunAs runAs)
+   {
+      this.runAs = runAs;
+   }
+
+   public String getRunAsPrincipal()
+   {
+      return runAsPrincipal;
+   }
+
+   public void setRunAsPrincipal(String runAsPrincipal)
+   {
+      this.runAsPrincipal = runAsPrincipal;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbName=").append(id);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SecurityIdentity.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Service extends EnterpriseBean
-{
-   private static final Logger log = Logger.getLogger(Service.class);
-   
-   private String management = null;
-   private String objectName = null;
-   private String xmbean = null;
-   
-   public String getManagement()
-   {
-      return management;
-   }
-   
-   public void setManagement(String management)
-   {
-      this.management = management;
-   }
-   
-   public String getXMBean()
-   {
-      return xmbean;
-   }
-   
-   public void setXMBean(String xmbean)
-   {
-      this.xmbean = xmbean;
-   }
-   
-   public String getObjectName()
-   {
-      return objectName;
-   }
-   
-   public void setObjectName(String objectName)
-   {
-      this.objectName = objectName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[Service:");
-      sb.append(super.toString());
-      sb.append(", management=" + management);
-      sb.append(", objectName=" + objectName);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metamodel;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Service extends EnterpriseBean
+{
+   private static final Logger log = Logger.getLogger(Service.class);
+   
+   private String management = null;
+   private String objectName = null;
+   private String xmbean = null;
+   
+   public String getManagement()
+   {
+      return management;
+   }
+   
+   public void setManagement(String management)
+   {
+      this.management = management;
+   }
+   
+   public String getXMBean()
+   {
+      return xmbean;
+   }
+   
+   public void setXMBean(String xmbean)
+   {
+      this.xmbean = xmbean;
+   }
+   
+   public String getObjectName()
+   {
+      return objectName;
+   }
+   
+   public void setObjectName(String objectName)
+   {
+      this.objectName = objectName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[Service:");
+      sb.append(super.toString());
+      sb.append(", management=" + management);
+      sb.append(", objectName=" + objectName);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/Service.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,204 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.metamodel;
-
-import java.util.List;
-import java.util.ArrayList;
-import org.jboss.logging.Logger;
-
-import org.jboss.metamodel.descriptor.PersistenceUnitRef;
-
-/**
- * Represents a Session EJB element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SessionEnterpriseBean extends EnterpriseBean
-{
-   private static final Logger log = Logger
-           .getLogger(SessionEnterpriseBean.class);
-
-   public static final String STATELESS = "Stateless";
-
-   public static final String STATEFUL = "Stateful";
-
-   // ejb-jar.xml
-   private String sessionType = STATELESS;
-   private Method aroundInvoke;
-   private Method postConstruct;
-   private Method postActivate;
-   private Method preDestroy;
-   private Method prePassivate;
-   private List<RemoveMethod> removeMethods = new ArrayList<RemoveMethod>();
-   private List<InitMethod> initMethods = new ArrayList<InitMethod>();
-   
-   private String clustered = null;
-   private ClusterConfig clusterConfig = null;
-   private CacheConfig cacheConfig = null;
-   
-   private String concurrent = null;
-   
-   public CacheConfig getCacheConfig()
-   {
-      return cacheConfig;
-   }
-   
-   public void setCacheConfig(CacheConfig cacheConfig)
-   {
-      this.cacheConfig = cacheConfig;
-   }
-   
-   public String getConcurrent()
-   {
-      return concurrent;
-   }
-   
-   public void setConcurrent(String concurrent)
-   {
-      this.concurrent = concurrent;
-   }
-   
-   public String getClustered()
-   {
-      return clustered;
-   }
-   
-   public void setClustered(String clustered)
-   {
-      this.clustered = clustered;
-   }
-   
-   public ClusterConfig getClusterConfig()
-   {
-      return clusterConfig;
-   }
-   
-   public void setClusterConfig(ClusterConfig clusterConfig)
-   {
-      this.clusterConfig = clusterConfig;
-   }
-
-   public List<RemoveMethod> getRemoveMethods()
-   {
-      return removeMethods;
-   }
-   
-   public void addRemoveMethod(RemoveMethod method)
-   {
-      removeMethods.add(method);
-   }
-   
-   public List<InitMethod> getInitMethods()
-   {
-      return initMethods;
-   }
-   
-   public void addInitMethod(InitMethod method)
-   {
-      initMethods.add(method);
-   }
-
-   public boolean isStateless()
-   {
-      return sessionType.equals(STATELESS);
-   }
-
-   public boolean isStateful()
-   {
-      return sessionType.equals(STATEFUL);
-   }
-
-   public String getSessionType()
-   {
-      return sessionType;
-   }
-
-   public void setSessionType(String sessionType)
-   {
-      this.sessionType = sessionType;
-   }
-
-   public Method getAroundInvoke()
-   {
-      return aroundInvoke;
-   }
-
-   public void setAroundInvoke(Method aroundInvoke)
-   {
-      this.aroundInvoke = aroundInvoke;
-   }
-
-   public Method getPostActivate()
-   {
-      if (sessionType.equals(STATELESS)) return null;
-      return postActivate;
-   }
-
-   public void setPostActivate(Method postActivate)
-   {
-      this.postActivate = postActivate;
-   }
-
-   public Method getPostConstruct()
-   {
-      return postConstruct;
-   }
-
-   public void setPostConstruct(Method postConstruct)
-   {
-      this.postConstruct = postConstruct;
-   }
-
-   public Method getPreDestroy()
-   {
-      return preDestroy;
-   }
-
-   public void setPreDestroy(Method preDestroy)
-   {
-      this.preDestroy = preDestroy;
-   }
-
-   public Method getPrePassivate()
-   {
-      if (sessionType.equals(STATELESS)) return null;
-      return prePassivate;
-   }
-
-   public void setPrePassivate(Method prePassivate)
-   {
-      this.prePassivate = prePassivate;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append(super.toString());
-      sb.append(",");
-      sb.append("sessionType=").append(sessionType);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,204 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.metamodel;
+
+import java.util.List;
+import java.util.ArrayList;
+import org.jboss.logging.Logger;
+
+import org.jboss.metamodel.descriptor.PersistenceUnitRef;
+
+/**
+ * Represents a Session EJB element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class SessionEnterpriseBean extends EnterpriseBean
+{
+   private static final Logger log = Logger
+           .getLogger(SessionEnterpriseBean.class);
+
+   public static final String STATELESS = "Stateless";
+
+   public static final String STATEFUL = "Stateful";
+
+   // ejb-jar.xml
+   private String sessionType = STATELESS;
+   private Method aroundInvoke;
+   private Method postConstruct;
+   private Method postActivate;
+   private Method preDestroy;
+   private Method prePassivate;
+   private List<RemoveMethod> removeMethods = new ArrayList<RemoveMethod>();
+   private List<InitMethod> initMethods = new ArrayList<InitMethod>();
+   
+   private String clustered = null;
+   private ClusterConfig clusterConfig = null;
+   private CacheConfig cacheConfig = null;
+   
+   private String concurrent = null;
+   
+   public CacheConfig getCacheConfig()
+   {
+      return cacheConfig;
+   }
+   
+   public void setCacheConfig(CacheConfig cacheConfig)
+   {
+      this.cacheConfig = cacheConfig;
+   }
+   
+   public String getConcurrent()
+   {
+      return concurrent;
+   }
+   
+   public void setConcurrent(String concurrent)
+   {
+      this.concurrent = concurrent;
+   }
+   
+   public String getClustered()
+   {
+      return clustered;
+   }
+   
+   public void setClustered(String clustered)
+   {
+      this.clustered = clustered;
+   }
+   
+   public ClusterConfig getClusterConfig()
+   {
+      return clusterConfig;
+   }
+   
+   public void setClusterConfig(ClusterConfig clusterConfig)
+   {
+      this.clusterConfig = clusterConfig;
+   }
+
+   public List<RemoveMethod> getRemoveMethods()
+   {
+      return removeMethods;
+   }
+   
+   public void addRemoveMethod(RemoveMethod method)
+   {
+      removeMethods.add(method);
+   }
+   
+   public List<InitMethod> getInitMethods()
+   {
+      return initMethods;
+   }
+   
+   public void addInitMethod(InitMethod method)
+   {
+      initMethods.add(method);
+   }
+
+   public boolean isStateless()
+   {
+      return sessionType.equals(STATELESS);
+   }
+
+   public boolean isStateful()
+   {
+      return sessionType.equals(STATEFUL);
+   }
+
+   public String getSessionType()
+   {
+      return sessionType;
+   }
+
+   public void setSessionType(String sessionType)
+   {
+      this.sessionType = sessionType;
+   }
+
+   public Method getAroundInvoke()
+   {
+      return aroundInvoke;
+   }
+
+   public void setAroundInvoke(Method aroundInvoke)
+   {
+      this.aroundInvoke = aroundInvoke;
+   }
+
+   public Method getPostActivate()
+   {
+      if (sessionType.equals(STATELESS)) return null;
+      return postActivate;
+   }
+
+   public void setPostActivate(Method postActivate)
+   {
+      this.postActivate = postActivate;
+   }
+
+   public Method getPostConstruct()
+   {
+      return postConstruct;
+   }
+
+   public void setPostConstruct(Method postConstruct)
+   {
+      this.postConstruct = postConstruct;
+   }
+
+   public Method getPreDestroy()
+   {
+      return preDestroy;
+   }
+
+   public void setPreDestroy(Method preDestroy)
+   {
+      this.preDestroy = preDestroy;
+   }
+
+   public Method getPrePassivate()
+   {
+      if (sessionType.equals(STATELESS)) return null;
+      return prePassivate;
+   }
+
+   public void setPrePassivate(Method prePassivate)
+   {
+      this.prePassivate = prePassivate;
+   }
+   
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append('[');
+      sb.append(super.toString());
+      sb.append(",");
+      sb.append("sessionType=").append(sessionType);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.metamodel;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.jboss.metamodel.descriptor.InjectionTarget;
-import org.jboss.metamodel.descriptor.NameValuePair;
-
-
-/**
- * Represents an <annotation> element of the jboss.xml deployment descriptor
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class XmlAnnotation
-{
-   private InjectionTarget injectionTarget = null;
-   private String annotationClass = null;
-   private String annotationImplementationClass = null;
-   private Collection<NameValuePair> properties = new HashSet<NameValuePair>();
-   
-   public Collection<NameValuePair> getProperties()
-   {
-      return properties;
-   }
-   
-   public void addProperty(NameValuePair property)
-   {
-      properties.add(property);
-   }
-
-   public String getAnnotationClass()
-   {
-      return annotationClass;
-   }
-
-   public void setAnnotationClass(String annotationClass)
-   {
-      this.annotationClass = annotationClass;
-   }
-   
-   public String getAnnotationImplementationClass()
-   {
-      return annotationImplementationClass;
-   }
-
-   public void setAnnotationImplementationClass(String annotationImplementationClass)
-   {
-      this.annotationImplementationClass = annotationImplementationClass;
-   }
-   
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-   
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("annotationClass=").append(annotationClass);
-      sb.append(", injectionTarget=").append(injectionTarget);
-      sb.append("]");
-      return sb.toString();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/XmlAnnotation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.metamodel;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.jboss.metamodel.descriptor.InjectionTarget;
+import org.jboss.metamodel.descriptor.NameValuePair;
+
+
+/**
+ * Represents an <annotation> element of the jboss.xml deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class XmlAnnotation
+{
+   private InjectionTarget injectionTarget = null;
+   private String annotationClass = null;
+   private String annotationImplementationClass = null;
+   private Collection<NameValuePair> properties = new HashSet<NameValuePair>();
+   
+   public Collection<NameValuePair> getProperties()
+   {
+      return properties;
+   }
+   
+   public void addProperty(NameValuePair property)
+   {
+      properties.add(property);
+   }
+
+   public String getAnnotationClass()
+   {
+      return annotationClass;
+   }
+
+   public void setAnnotationClass(String annotationClass)
+   {
+      this.annotationClass = annotationClass;
+   }
+   
+   public String getAnnotationImplementationClass()
+   {
+      return annotationImplementationClass;
+   }
+
+   public void setAnnotationImplementationClass(String annotationImplementationClass)
+   {
+      this.annotationImplementationClass = annotationImplementationClass;
+   }
+   
+   public InjectionTarget getInjectionTarget()
+   {
+      return injectionTarget;
+   }
+   
+   public void setInjectionTarget(InjectionTarget injectionTarget)
+   {
+      this.injectionTarget = injectionTarget;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("annotationClass=").append(annotationClass);
+      sb.append(", injectionTarget=").append(injectionTarget);
+      sb.append("]");
+      return sb.toString();
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/naming)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,183 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.naming;
-
-import javax.naming.*;
-import java.util.Hashtable;
-
-/**
- * A naming context which can't do anything.
- *
- * @author carlo
- */
-public class BrainlessContext implements Context
-{
-   public BrainlessContext()
-   {
-      super();
-   }
-
-   public Object lookup(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Object lookup(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void bind(Name name, Object obj) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void bind(String name, Object obj) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void rebind(Name name, Object obj) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void rebind(String name, Object obj) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void unbind(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void unbind(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void rename(Name oldName, Name newName) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void rename(String oldName, String newName) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public NamingEnumeration<NameClassPair> list(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public NamingEnumeration<NameClassPair> list(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public NamingEnumeration<Binding> listBindings(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public NamingEnumeration<Binding> listBindings(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void destroySubcontext(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void destroySubcontext(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Context createSubcontext(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Context createSubcontext(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Object lookupLink(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Object lookupLink(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public NameParser getNameParser(Name name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public NameParser getNameParser(String name) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Name composeName(Name name, Name prefix) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public String composeName(String name, String prefix) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Object addToEnvironment(String propName, Object propVal) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Object removeFromEnvironment(String propName) throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public Hashtable<?, ?> getEnvironment() throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public void close() throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-
-   public String getNameInNamespace() throws NamingException
-   {
-      throw new OperationNotSupportedException();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,183 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.naming;
+
+import javax.naming.*;
+import java.util.Hashtable;
+
+/**
+ * A naming context which can't do anything.
+ *
+ * @author carlo
+ */
+public class BrainlessContext implements Context
+{
+   public BrainlessContext()
+   {
+      super();
+   }
+
+   public Object lookup(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Object lookup(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void bind(Name name, Object obj) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void bind(String name, Object obj) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void rebind(Name name, Object obj) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void rebind(String name, Object obj) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void unbind(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void unbind(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void rename(Name oldName, Name newName) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void rename(String oldName, String newName) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public NamingEnumeration<NameClassPair> list(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public NamingEnumeration<NameClassPair> list(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public NamingEnumeration<Binding> listBindings(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public NamingEnumeration<Binding> listBindings(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void destroySubcontext(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void destroySubcontext(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Context createSubcontext(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Context createSubcontext(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Object lookupLink(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Object lookupLink(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public NameParser getNameParser(Name name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public NameParser getNameParser(String name) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Name composeName(Name name, Name prefix) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public String composeName(String name, String prefix) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Object addToEnvironment(String propName, Object propVal) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Object removeFromEnvironment(String propName) throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public Hashtable<?, ?> getEnvironment() throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public void close() throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+
+   public String getNameInNamespace() throws NamingException
+   {
+      throw new OperationNotSupportedException();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/BrainlessContext.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/naming/client)

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/naming/client/java)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.naming.client.java;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
-import javax.naming.NamingException;
-import javax.naming.spi.ObjectFactory;
-
-import org.jboss.corba.ORBFactory;
-import org.jboss.ejb3.naming.BrainlessContext;
-import org.jboss.naming.client.java.HandleDelegateFactory;
-
-/**
- * Creates objects for in the java:comp namespace.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class javaURLContextFactory implements ObjectFactory
-{
-
-   /* (non-Javadoc)
-    * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable)
-    */
-   public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment)
-         throws Exception
-   {
-      if(nameCtx == null)
-         nameCtx = new InitialContext(environment); 
-      final Context lookupCtx = nameCtx;
-      return new BrainlessContext() 
-      {
-         @Override
-         public Object lookup(Name name) throws NamingException
-         {
-            if (name.size() > 0 && "java:comp".equals(name.get(0)))
-            {
-               if (name.size() == 2 && "ORB".equals(name.get(1)))
-                  return ORBFactory.getORB();
-               else if (name.size() == 2 && "HandleDelegate".equals(name.get(1)))
-                  return HandleDelegateFactory.getHandleDelegateSingleton();
-            }
-            throw new NameNotFoundException(name.toString());
-         }
-         
-         @Override
-         public Object lookup(String name) throws NamingException
-         {
-            NameParser parser = lookupCtx.getNameParser("");
-            return lookup(parser.parse(name));
-         }
-      };
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/naming/client/java/javaURLContextFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.naming.client.java;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingException;
+import javax.naming.spi.ObjectFactory;
+
+import org.jboss.corba.ORBFactory;
+import org.jboss.ejb3.naming.BrainlessContext;
+import org.jboss.naming.client.java.HandleDelegateFactory;
+
+/**
+ * Creates objects for in the java:comp namespace.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class javaURLContextFactory implements ObjectFactory
+{
+
+   /* (non-Javadoc)
+    * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable)
+    */
+   public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment)
+         throws Exception
+   {
+      if(nameCtx == null)
+         nameCtx = new InitialContext(environment); 
+      final Context lookupCtx = nameCtx;
+      return new BrainlessContext() 
+      {
+         @Override
+         public Object lookup(Name name) throws NamingException
+         {
+            if (name.size() > 0 && "java:comp".equals(name.get(0)))
+            {
+               if (name.size() == 2 && "ORB".equals(name.get(1)))
+                  return ORBFactory.getORB();
+               else if (name.size() == 2 && "HandleDelegate".equals(name.get(1)))
+                  return HandleDelegateFactory.getHandleDelegateSingleton();
+            }
+            throw new NameNotFoundException(name.toString());
+         }
+         
+         @Override
+         public Object lookup(String name) throws NamingException
+         {
+            NameParser parser = lookupCtx.getNameParser("");
+            return lookup(parser.parse(name));
+         }
+      };
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/proxy)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,153 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.proxy;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-
-import javax.ejb.HomeHandle;
-import javax.ejb.EJBMetaData;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBException;
-
-/**
- * An implementation of the EJBMetaData interface which allows a
- * client to obtain the enterprise Bean's meta-data information.
- *
- * @author  Rickard Oberg (rickard.oberg at telkel.com)
- * @author  <a href="mailto:marc.fleury at telkel.com">Marc Fleury</a>
- * @author  <a href="mailto:jason at planet57.com">Jason Dillon</a>
- * @version $Revision$
- */
-public class EJBMetaDataImpl
-      implements EJBMetaData, Serializable
-{
-   /** Serial Version Identifier. @since 1.1 */
-   private static final long serialVersionUID = -3698855455664391097L;
-
-   // Attributes ----------------------------------------------------
-   private final Class remote;
-   private final Class home;
-   private final Class pkClass;
-
-   private final boolean session;
-   private final boolean statelessSession;
-   private final HomeHandle homeHandle;
-
-   // Constructors --------------------------------------------------
-
-   /**
-    * Construct an <tt>EJBMetaDataImpl</tt>.
-    * this should only be accessible from the factory.
-    */
-   public EJBMetaDataImpl(final Class remote,
-         final Class home,
-         final Class pkClass,
-         final boolean session,
-         final boolean statelessSession,
-         final HomeHandle homeHandle)
-   {
-      this.remote = remote;
-      this.home = home;
-      this.pkClass = pkClass;
-      this.session = session;
-      this.statelessSession = statelessSession;
-      this.homeHandle = homeHandle;
-   }
-
-   // Constructors --------------------------------------------------
-
-   // EJBMetaData ---------------------------------------------------
-
-
-   // EJBMetaData ---------------------------------------------------
-
-   /**
-    * Obtain the home interface of the enterprise Bean.
-    *
-    * @throws EJBException     Failed to get EJBHome object.
-    */
-
-   public EJBHome getEJBHome()
-   {
-      try
-      {
-         return homeHandle.getEJBHome();
-      }
-      catch (EJBException e)
-      {
-         throw e;
-      }
-      catch (RemoteException e)
-      {
-         e.printStackTrace();
-         throw new EJBException(e);
-      }
-   }
-
-   /**
-    * Obtain the Class object for the enterprise Bean's home interface.
-    */
-   public Class getHomeInterfaceClass()
-   {
-      return home;
-   }
-
-   /**
-    * Obtain the Class object for the enterprise Bean's remote interface.
-    */
-   public Class getRemoteInterfaceClass()
-   {
-      return remote;
-   }
-
-   /**
-    * Obtain the Class object for the enterprise Bean's primary key class.
-    */
-   public Class getPrimaryKeyClass()
-   {
-      if (session == true)
-         throw new RuntimeException("A session bean does not have a primary key class");
-
-      return pkClass;
-   }
-
-   /**
-    * Test if the enterprise Bean's type is "session".
-    *
-    * @return True if the type of the enterprise Bean is session bean.
-    */
-   public boolean isSession()
-   {
-      return session;
-   }
-
-   /**
-    * Test if the enterprise Bean's type is "stateless session".
-    *
-    * @return True if the type of the enterprise Bean is stateless session.
-    */
-   public boolean isStatelessSession()
-   {
-      return statelessSession;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,153 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.proxy;
+
+import java.io.Serializable;
+import java.rmi.RemoteException;
+
+import javax.ejb.HomeHandle;
+import javax.ejb.EJBMetaData;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBException;
+
+/**
+ * An implementation of the EJBMetaData interface which allows a
+ * client to obtain the enterprise Bean's meta-data information.
+ *
+ * @author  Rickard Oberg (rickard.oberg at telkel.com)
+ * @author  <a href="mailto:marc.fleury at telkel.com">Marc Fleury</a>
+ * @author  <a href="mailto:jason at planet57.com">Jason Dillon</a>
+ * @version $Revision$
+ */
+public class EJBMetaDataImpl
+      implements EJBMetaData, Serializable
+{
+   /** Serial Version Identifier. @since 1.1 */
+   private static final long serialVersionUID = -3698855455664391097L;
+
+   // Attributes ----------------------------------------------------
+   private final Class remote;
+   private final Class home;
+   private final Class pkClass;
+
+   private final boolean session;
+   private final boolean statelessSession;
+   private final HomeHandle homeHandle;
+
+   // Constructors --------------------------------------------------
+
+   /**
+    * Construct an <tt>EJBMetaDataImpl</tt>.
+    * this should only be accessible from the factory.
+    */
+   public EJBMetaDataImpl(final Class remote,
+         final Class home,
+         final Class pkClass,
+         final boolean session,
+         final boolean statelessSession,
+         final HomeHandle homeHandle)
+   {
+      this.remote = remote;
+      this.home = home;
+      this.pkClass = pkClass;
+      this.session = session;
+      this.statelessSession = statelessSession;
+      this.homeHandle = homeHandle;
+   }
+
+   // Constructors --------------------------------------------------
+
+   // EJBMetaData ---------------------------------------------------
+
+
+   // EJBMetaData ---------------------------------------------------
+
+   /**
+    * Obtain the home interface of the enterprise Bean.
+    *
+    * @throws EJBException     Failed to get EJBHome object.
+    */
+
+   public EJBHome getEJBHome()
+   {
+      try
+      {
+         return homeHandle.getEJBHome();
+      }
+      catch (EJBException e)
+      {
+         throw e;
+      }
+      catch (RemoteException e)
+      {
+         e.printStackTrace();
+         throw new EJBException(e);
+      }
+   }
+
+   /**
+    * Obtain the Class object for the enterprise Bean's home interface.
+    */
+   public Class getHomeInterfaceClass()
+   {
+      return home;
+   }
+
+   /**
+    * Obtain the Class object for the enterprise Bean's remote interface.
+    */
+   public Class getRemoteInterfaceClass()
+   {
+      return remote;
+   }
+
+   /**
+    * Obtain the Class object for the enterprise Bean's primary key class.
+    */
+   public Class getPrimaryKeyClass()
+   {
+      if (session == true)
+         throw new RuntimeException("A session bean does not have a primary key class");
+
+      return pkClass;
+   }
+
+   /**
+    * Test if the enterprise Bean's type is "session".
+    *
+    * @return True if the type of the enterprise Bean is session bean.
+    */
+   public boolean isSession()
+   {
+      return session;
+   }
+
+   /**
+    * Test if the enterprise Bean's type is "stateless session".
+    *
+    * @return True if the type of the enterprise Bean is stateless session.
+    */
+   public boolean isStatelessSession()
+   {
+      return statelessSession;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/EJBMetaDataImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/proxy/handle)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,139 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.proxy.handle;
-
-import javax.ejb.HomeHandle;
-import javax.ejb.EJBHome;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.rmi.ServerException;
-import java.rmi.RemoteException;
-import java.io.ObjectStreamField;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.util.Hashtable;
-import org.jboss.naming.NamingContextFactory;
-
-
-/**
- * An EJB home handle implementation.
- *
- * @author  <a href="mailto:marc.fleury at jboss.org">Marc Fleury</a>.
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class HomeHandleImpl
-      implements HomeHandle
-{
-   // Constants -----------------------------------------------------
-
-   /** Serial Version Identifier. */
-   static final long serialVersionUID = 208629381571948124L;
-   /** The persistent field defintions */
-   private static final ObjectStreamField[] serialPersistentFields =
-      new ObjectStreamField[]
-   {
-      new ObjectStreamField("jndiName", String.class),
-      new ObjectStreamField("jndiEnv", Hashtable.class)
-   };
-
-   /** The JNDI name of the home inteface binding */
-   private String jndiName;
-   /** The JNDI env in effect when the home handle was created */
-   private Hashtable jndiEnv;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   /**
-    * Construct a <tt>HomeHandleImpl</tt>.
-    *
-    * @param handle    The initial context handle that will be used
-    *                  to restore the naming context or null to use
-    *                  a fresh InitialContext object.
-    * @param name      JNDI name.
-    */
-   public HomeHandleImpl(String jndiName)
-   {
-      this.jndiName = jndiName;
-      this.jndiEnv = (Hashtable) NamingContextFactory.lastInitialContextEnv.get();
-   }
-
-   // Public --------------------------------------------------------
-
-   // Handle implementation -----------------------------------------
-
-   /**
-    * HomeHandle implementation.
-    *
-    * @return  <tt>EJBHome</tt> reference.
-    *
-    * @throws ServerException    Could not get EJBObject.
-    * @throws RemoteException
-    */
-   public EJBHome getEJBHome() throws RemoteException
-   {
-      try
-      {
-         InitialContext ic = null;
-         if( jndiEnv != null )
-            ic = new InitialContext(jndiEnv);
-         else
-            ic = new InitialContext();
-         EJBHome home = (EJBHome) ic.lookup(jndiName);
-         return home;
-      }
-      catch (NamingException e)
-      {
-         throw new ServerException("Could not get EJBHome", e);
-      }
-   }
-
-   /**
-    * @return the jndi name
-    */
-   public String getJNDIName()
-   {
-      return jndiName;
-   }
-
-   private void readObject(ObjectInputStream ois)
-      throws IOException, ClassNotFoundException
-   {
-      ObjectInputStream.GetField getField = ois.readFields();
-      jndiName = (String) getField.get("jndiName", null);
-      jndiEnv = (Hashtable) getField.get("jndiEnv", null);
-   }
-
-   private void writeObject(ObjectOutputStream oos)
-      throws IOException
-   {
-      ObjectOutputStream.PutField putField = oos.putFields();
-      putField.put("jndiName", jndiName);
-      putField.put("jndiEnv", jndiEnv);
-      oos.writeFields();
-   }
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.proxy.handle;
+
+import javax.ejb.HomeHandle;
+import javax.ejb.EJBHome;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.rmi.ServerException;
+import java.rmi.RemoteException;
+import java.io.ObjectStreamField;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.Hashtable;
+import org.jboss.naming.NamingContextFactory;
+
+
+/**
+ * An EJB home handle implementation.
+ *
+ * @author  <a href="mailto:marc.fleury at jboss.org">Marc Fleury</a>.
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class HomeHandleImpl
+      implements HomeHandle
+{
+   // Constants -----------------------------------------------------
+
+   /** Serial Version Identifier. */
+   static final long serialVersionUID = 208629381571948124L;
+   /** The persistent field defintions */
+   private static final ObjectStreamField[] serialPersistentFields =
+      new ObjectStreamField[]
+   {
+      new ObjectStreamField("jndiName", String.class),
+      new ObjectStreamField("jndiEnv", Hashtable.class)
+   };
+
+   /** The JNDI name of the home inteface binding */
+   private String jndiName;
+   /** The JNDI env in effect when the home handle was created */
+   private Hashtable jndiEnv;
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   /**
+    * Construct a <tt>HomeHandleImpl</tt>.
+    *
+    * @param handle    The initial context handle that will be used
+    *                  to restore the naming context or null to use
+    *                  a fresh InitialContext object.
+    * @param name      JNDI name.
+    */
+   public HomeHandleImpl(String jndiName)
+   {
+      this.jndiName = jndiName;
+      this.jndiEnv = (Hashtable) NamingContextFactory.lastInitialContextEnv.get();
+   }
+
+   // Public --------------------------------------------------------
+
+   // Handle implementation -----------------------------------------
+
+   /**
+    * HomeHandle implementation.
+    *
+    * @return  <tt>EJBHome</tt> reference.
+    *
+    * @throws ServerException    Could not get EJBObject.
+    * @throws RemoteException
+    */
+   public EJBHome getEJBHome() throws RemoteException
+   {
+      try
+      {
+         InitialContext ic = null;
+         if( jndiEnv != null )
+            ic = new InitialContext(jndiEnv);
+         else
+            ic = new InitialContext();
+         EJBHome home = (EJBHome) ic.lookup(jndiName);
+         return home;
+      }
+      catch (NamingException e)
+      {
+         throw new ServerException("Could not get EJBHome", e);
+      }
+   }
+
+   /**
+    * @return the jndi name
+    */
+   public String getJNDIName()
+   {
+      return jndiName;
+   }
+
+   private void readObject(ObjectInputStream ois)
+      throws IOException, ClassNotFoundException
+   {
+      ObjectInputStream.GetField getField = ois.readFields();
+      jndiName = (String) getField.get("jndiName", null);
+      jndiEnv = (Hashtable) getField.get("jndiEnv", null);
+   }
+
+   private void writeObject(ObjectOutputStream oos)
+      throws IOException
+   {
+      ObjectOutputStream.PutField putField = oos.putFields();
+      putField.put("jndiName", jndiName);
+      putField.put("jndiEnv", jndiEnv);
+      oos.writeFields();
+   }
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/proxy/handle/HomeHandleImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.remoting;
-
-import java.io.Serializable;
-import java.util.Map;
-
-import org.jboss.aop.Dispatcher;
-import org.jboss.aop.Advisor;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-import org.jboss.serial.io.MarshalledObjectForLocalCalls;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.Ejb3Registry;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class IsLocalInterceptor implements Interceptor, Serializable
-{
-   private static final Logger log = Logger.getLogger(IsLocalInterceptor.class);
-
-   public static final String IS_LOCAL = "IS_LOCAL";
-   public static final String IS_LOCAL_EXCEPTION = "IS_LOCAL_EXCEPTION";
-   
-   private static final long stamp = System.currentTimeMillis();
-   private long marshalledStamp = stamp;
-
-   public String getName()
-   {
-      return getClass().getName();
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      if (isLocal())
-      {
-	     Object oid = invocation.getMetaData(Dispatcher.DISPATCHER, Dispatcher.OID);
-	     Container container = Ejb3Registry.findContainer(oid.toString());
-
-         Invocation copy = (Invocation) new MarshalledObjectForLocalCalls(invocation).get();
-         copy.getMetaData().addMetaData(IS_LOCAL, IS_LOCAL, Boolean.TRUE);
-         org.jboss.aop.joinpoint.InvocationResponse response = ((Advisor) container).dynamicInvoke(null, copy);
-         Map contextInfo = response.getContextInfo();
-         if (contextInfo != null)
-         {
-            MarshalledObjectForLocalCalls wrappedException = (MarshalledObjectForLocalCalls) response.getContextInfo().get(IS_LOCAL_EXCEPTION);
-            if (wrappedException != null)
-            {
-               throw (Throwable) wrappedException.get();
-            }
-         }
-         invocation.setResponseContextInfo(response.getContextInfo());
-         MarshalledObjectForLocalCalls wrapped = (MarshalledObjectForLocalCalls) response.getResponse();
-         Object rtn = null;
-         if (wrapped != null)
-         {
-            rtn = wrapped.get();
-         }
-         return rtn;
-      }
-      return invocation.invokeNext();
-   }
-   
-   private boolean isLocal()
-   {
-      return stamp == marshalledStamp;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.remoting;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.jboss.aop.Dispatcher;
+import org.jboss.aop.Advisor;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
+import org.jboss.serial.io.MarshalledObjectForLocalCalls;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.Ejb3Registry;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class IsLocalInterceptor implements Interceptor, Serializable
+{
+   private static final Logger log = Logger.getLogger(IsLocalInterceptor.class);
+
+   public static final String IS_LOCAL = "IS_LOCAL";
+   public static final String IS_LOCAL_EXCEPTION = "IS_LOCAL_EXCEPTION";
+   
+   private static final long stamp = System.currentTimeMillis();
+   private long marshalledStamp = stamp;
+
+   public String getName()
+   {
+      return getClass().getName();
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      if (isLocal())
+      {
+         Object oid = invocation.getMetaData(Dispatcher.DISPATCHER, Dispatcher.OID);
+         Container container = Ejb3Registry.getContainer(oid.toString());
+         Invocation copy = (Invocation) new MarshalledObjectForLocalCalls(invocation).get();
+         copy.getMetaData().addMetaData(IS_LOCAL, IS_LOCAL, Boolean.TRUE);
+         org.jboss.aop.joinpoint.InvocationResponse response = ((Advisor) container).dynamicInvoke(null, copy);
+         Map contextInfo = response.getContextInfo();
+         if (contextInfo != null)
+         {
+            MarshalledObjectForLocalCalls wrappedException = (MarshalledObjectForLocalCalls) response.getContextInfo().get(IS_LOCAL_EXCEPTION);
+            if (wrappedException != null)
+            {
+               throw (Throwable) wrappedException.get();
+            }
+         }
+         invocation.setResponseContextInfo(response.getContextInfo());
+         MarshalledObjectForLocalCalls wrapped = (MarshalledObjectForLocalCalls) response.getResponse();
+         Object rtn = null;
+         if (wrapped != null)
+         {
+            rtn = wrapped.get();
+         }
+         return rtn;
+      }
+      return invocation.invokeNext();
+   }
+
+   private boolean isLocal()
+   {
+      return stamp == marshalledStamp;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/IsLocalInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.remoting;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface Proxy
-{
-   /**
-    * For use in hashCode, toString() and equals() *
-    */
-   String toString();
-
-   Object getAsynchronousProxy(Object proxy);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.remoting;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface Proxy
+{
+   /**
+    * For use in hashCode, toString() and equals() *
+    */
+   String toString();
+
+   Object getAsynchronousProxy(Object proxy);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/Proxy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/AuthenticationInterceptorFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/AuthenticationInterceptorFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/AuthenticationInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -48,7 +48,7 @@
          SecurityDomain securityAnnotation = (SecurityDomain) advisor.resolveAnnotation(SecurityDomain.class);
          if (securityAnnotation != null)
          {
-            domain = ctx.lookup("java:/jaas/" + securityAnnotation.value());
+            domain = SecurityDomainManager.getSecurityManager(securityAnnotation.value(),ctx);
          }
       }
       catch (NamingException e)
@@ -77,6 +77,6 @@
    public String getName()
    {
       return getClass().getName();
-   }
+   } 
 }
 

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -22,12 +22,8 @@
 package org.jboss.ejb3.security;
 
 import java.security.GeneralSecurityException;
-import java.security.Principal;
-import java.util.Set;
-import java.util.HashSet;
+import java.security.Principal; 
 
-import javax.security.auth.Subject;
-
 import javax.ejb.EJBAccessException;
 
 import org.jboss.ejb3.Container;
@@ -40,15 +36,16 @@
 import org.jboss.aspects.security.AuthenticationInterceptor;
 import org.jboss.aspects.security.SecurityContext;
 import org.jboss.security.AuthenticationManager;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.RunAsIdentity;
+import org.jboss.security.RealmMapping; 
 import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityRolesAssociation;
 import org.jboss.security.SimplePrincipal;
 
 /**
- * Comment
+ * Authentication Interceptor
  *
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author Anil.Saldhana at jboss.org
  * @version $Revision$
  */
 public class Ejb3AuthenticationInterceptor extends AuthenticationInterceptor
@@ -98,7 +95,20 @@
             }
          }
       }
-
-      return super.invoke(invocation);
-   }
+      try
+      {  
+         //Set a map of principal-roles that may be configured at deployment level
+         if(container.getAssemblyDescriptor() != null)
+         {
+            // FIXME: NYI
+            throw new RuntimeException("NYI");
+//            SecurityRolesAssociation.setSecurityRoles(container.getAssemblyDescriptor().getPrincipalVersusRolesMap());
+         }
+         return super.invoke(invocation);
+      }
+      finally
+      { 
+         SecurityRolesAssociation.setSecurityRoles(null);
+      }
+   } 
 }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,210 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.security;
-
-import java.security.SecurityPermission;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-
-import javax.security.jacc.PolicyContextException;
-import javax.security.jacc.PolicyConfiguration;
-import javax.security.jacc.PolicyConfigurationFactory;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author Scott.Stark at jboss.org
- * @author Ron Monzillo, Gary Ellison (javadoc)
- * @version $Revision$
- */
-public abstract class Ejb3PolicyConfigurationFactory
-{
-   private static final Logger log = Logger.getLogger(Ejb3PolicyConfigurationFactory.class);
-   
-   /** The standard name of the system property specifying the JACC
-    PolicyConfigurationFactory implementation class name.
-    */
-   private static final String FACTORY_PROP =
-      "javax.security.jacc.PolicyConfigurationFactory.provider";
-   /** The default PolicyConfigurationFactory implementation */
-   private static final String DEFAULT_FACTORY_NAME = 
-      "org.jboss.security.jacc.JBossPolicyConfigurationFactory";
-   /** The loaded PolicyConfigurationFactory provider */
-   private static PolicyConfigurationFactory factory;
-
-   /** This static method uses the javax.security.jacc.PolicyConfigurationFactory.provider
-    * system property to create a provider factory implementation. The provider
-    * class must provide a public no-arg ctor.
-    * 
-    * @return the PolicyConfigurationFactory singleton
-    * @throws  SecurityException - when the caller does not have a
-    * SecurityPermission(setPolicy) permission. 
-    * @throws ClassNotFoundException - when the class named by the system
-    * property could not be found or because the value of the system
-    * property is null. 
-    * @throws PolicyContextException - if the PolicyConfigurationFactory ctor
-    * throws an exception other than those in the getPolicyConfigurationFactory
-    * method signature. The exception will be encapsulated in a
-    * PolicyContextException as its cause.
-    */
-   public static PolicyConfigurationFactory getPolicyConfigurationFactory()
-      throws ClassNotFoundException, PolicyContextException
-   {
-      
-      // Validate the caller permission
-      SecurityManager sm = System.getSecurityManager();
-      if (sm != null)
-         sm.checkPermission(new SecurityPermission("setPolicy"));
-
-      if (factory == null)
-      {
-         String factoryName = null;
-         Class clazz = null;
-         try
-         {
-            LoadAction action = new LoadAction();
-            try
-            {
-               clazz = (Class) AccessController.doPrivileged(action);
-               factoryName = action.getName();
-            }
-            catch (PrivilegedActionException ex)
-            {
-               ex.printStackTrace();
-               factoryName = action.getName();
-               Exception e = ex.getException();
-               if (e instanceof ClassNotFoundException)
-                  throw (ClassNotFoundException) e;
-               else
-                  throw new PolicyContextException("Failure during load of class: "+action.getName(), e);
-            }
-            
-            factory = (PolicyConfigurationFactory) clazz.newInstance();
-         }
-         catch (ClassNotFoundException e)
-         {
-            String msg = "Failed to find PolicyConfigurationFactory : " + factoryName;
-            throw new ClassNotFoundException(msg, e);
-         }
-         catch (IllegalAccessException e)
-         {
-            String msg = "Unable to access class : " + factoryName;
-            throw new PolicyContextException(msg, e);
-         }
-         catch (InstantiationException e)
-         {
-            String msg = "Failed to create instance of: " + factoryName;
-            throw new PolicyContextException(msg, e);
-         }
-         catch (ClassCastException e)
-         {
-            StringBuffer msg = new StringBuffer(factoryName + " Is not a PolicyConfigurationFactory, ");
-            msg.append("PCF.class.CL: "+Ejb3PolicyConfigurationFactory.class.getClassLoader());
-            msg.append("\nPCF.class.CS: "+Ejb3PolicyConfigurationFactory.class.getProtectionDomain().getCodeSource());
-            msg.append("\nPCF.class.hash: "+System.identityHashCode(Ejb3PolicyConfigurationFactory.class));
-            msg.append("\nclazz.CL: "+clazz.getClassLoader());
-            msg.append("\nclazz.CS: "+clazz.getProtectionDomain().getCodeSource());
-            msg.append("\nclazz.super.CL: "+clazz.getSuperclass().getClassLoader());
-            msg.append("\nclazz.super.CS: "+clazz.getSuperclass().getProtectionDomain().getCodeSource());
-            msg.append("\nclazz.super.hash: "+System.identityHashCode(clazz.getSuperclass()));
-            ClassCastException cce = new ClassCastException(msg.toString());
-            cce.initCause(e);
-         }
-      }
-      return factory;
-   }
-
-   /** This method is used to obtain an instance of the provider specific class
-    * that implements the PolicyConfiguration interface that corresponds to the
-    * identified policy context within the provider. The methods of the
-    * PolicyConfiguration interface are used to define the policy statements of
-    * the identified policy context.
-    * 
-    * If at the time of the call, the identified policy context does not exist
-    * in the provider, then the policy context will be created in the provider
-    * and the Object that implements the context's PolicyConfiguration Interface
-    * will be returned. If the state of the identified context is "deleted" or
-    * "inService" it will be transitioned to the "open" state as a result of the
-    * call. The states in the lifecycle of a policy context are defined by the
-    * PolicyConfiguration interface.
-    * 
-    * For a given value of policy context identifier, this method must always
-    * return the same instance of PolicyConfiguration and there must be at most
-    * one actual instance of a PolicyConfiguration with a given policy context
-    * identifier (during a process context).
-    * 
-    * To preserve the invariant that there be at most one PolicyConfiguration
-    * object for a given policy context, it may be necessary for this method to
-    * be thread safe. 
-    * 
-    * @param contextID - the policy context ID indicates which
-    * PolicyConfiguration to return. This must not be null.
-    * @param remove - A boolean flag that establishes whether or not the policy
-    * statements of an existing policy context are to be removed before its
-    * PolicyConfiguration object is returned. If the value passed to this
-    * parameter is true, the policy statements of an existing policy context
-    * will be removed. If the value is false, they will not be removed.
-    * @return a PolicyConfiguration instance
-    * @throws PolicyContextException
-    */
-   public abstract PolicyConfiguration getPolicyConfiguration(String contextID,
-      boolean remove)
-      throws PolicyContextException;
-
-   /** This method determines if the identified policy context exists with state
-    * "inService" in the Policy provider associated with the factory.
-    * 
-    * @param contextID - the context ID for selecting the policy
-    * @return true if the identified policy context exists within the provider
-    *    and its state is "inService", false otherwise.
-    * @throws PolicyContextException
-    */
-   public abstract boolean inService(String contextID)
-      throws PolicyContextException;
-
-   /** A PrivilegedExceptionAction that looks up the class name identified
-    * by the javax.security.jacc.PolicyConfigurationFactory.provider system
-    * property and loads the class using the thread context class loader.
-    */ 
-   private static class LoadAction implements PrivilegedExceptionAction
-   {
-      private String name;
-      public String getName()
-      {
-         return name;
-      }
-      public Object run()
-         throws Exception
-      {
-         name = System.getProperty(FACTORY_PROP);
-         if( name == null )
-         {
-            // Use the default factory impl
-            name = DEFAULT_FACTORY_NAME;
-         }
-         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-         Class factoryClass = loader.loadClass(name);
-         return factoryClass;
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,195 @@
+/*
+ * JBoss, the OpenSource J2EE WebOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.security;
+
+import java.security.SecurityPermission;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
+import java.security.PrivilegedActionException;
+
+import javax.security.jacc.PolicyContextException;
+import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyConfigurationFactory;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @author Ron Monzillo, Gary Ellison (javadoc)
+ * @version $Revision$
+ */
+public abstract class Ejb3PolicyConfigurationFactory
+{
+   private static final Logger log = Logger.getLogger(Ejb3PolicyConfigurationFactory.class);
+   
+   /** The standard name of the system property specifying the JACC
+    PolicyConfigurationFactory implementation class name.
+    */
+   private static final String FACTORY_PROP =
+      "javax.security.jacc.PolicyConfigurationFactory.provider";
+   /** The default PolicyConfigurationFactory implementation */
+   private static final String DEFAULT_FACTORY_NAME = 
+      "org.jboss.security.jacc.JBossPolicyConfigurationFactory";
+   /** The loaded PolicyConfigurationFactory provider */
+   private static PolicyConfigurationFactory factory;
+
+   /** This static method uses the javax.security.jacc.PolicyConfigurationFactory.provider
+    * system property to create a provider factory implementation. The provider
+    * class must provide a public no-arg ctor.
+    * 
+    * @return the PolicyConfigurationFactory singleton
+    * @throws  SecurityException - when the caller does not have a
+    * SecurityPermission(setPolicy) permission. 
+    * @throws ClassNotFoundException - when the class named by the system
+    * property could not be found or because the value of the system
+    * property is null. 
+    * @throws PolicyContextException - if the PolicyConfigurationFactory ctor
+    * throws an exception other than those in the getPolicyConfigurationFactory
+    * method signature. The exception will be encapsulated in a
+    * PolicyContextException as its cause.
+    */
+   public static PolicyConfigurationFactory getPolicyConfigurationFactory()
+      throws ClassNotFoundException, PolicyContextException
+   {
+      
+      // Validate the caller permission
+      SecurityManager sm = System.getSecurityManager();
+      if (sm != null)
+         sm.checkPermission(new SecurityPermission("setPolicy"));
+
+      if (factory == null)
+      {
+         String factoryName = null;
+         Class clazz = null;
+         try
+         {
+            LoadAction action = new LoadAction();
+            try
+            {
+               clazz = (Class) AccessController.doPrivileged(action);
+               factoryName = action.getName();
+            }
+            catch (PrivilegedActionException ex)
+            {
+               ex.printStackTrace();
+               factoryName = action.getName();
+               Exception e = ex.getException();
+               if (e instanceof ClassNotFoundException)
+                  throw (ClassNotFoundException) e;
+               else
+                  throw new PolicyContextException("Failure during load of class: "+action.getName(), e);
+            }
+            
+            factory = (PolicyConfigurationFactory) clazz.newInstance();
+         }
+         catch (ClassNotFoundException e)
+         {
+            String msg = "Failed to find PolicyConfigurationFactory : " + factoryName;
+            throw new ClassNotFoundException(msg, e);
+         }
+         catch (IllegalAccessException e)
+         {
+            String msg = "Unable to access class : " + factoryName;
+            throw new PolicyContextException(msg, e);
+         }
+         catch (InstantiationException e)
+         {
+            String msg = "Failed to create instance of: " + factoryName;
+            throw new PolicyContextException(msg, e);
+         }
+         catch (ClassCastException e)
+         {
+            StringBuffer msg = new StringBuffer(factoryName + " Is not a PolicyConfigurationFactory, ");
+            msg.append("PCF.class.CL: "+Ejb3PolicyConfigurationFactory.class.getClassLoader());
+            msg.append("\nPCF.class.CS: "+Ejb3PolicyConfigurationFactory.class.getProtectionDomain().getCodeSource());
+            msg.append("\nPCF.class.hash: "+System.identityHashCode(Ejb3PolicyConfigurationFactory.class));
+            msg.append("\nclazz.CL: "+clazz.getClassLoader());
+            msg.append("\nclazz.CS: "+clazz.getProtectionDomain().getCodeSource());
+            msg.append("\nclazz.super.CL: "+clazz.getSuperclass().getClassLoader());
+            msg.append("\nclazz.super.CS: "+clazz.getSuperclass().getProtectionDomain().getCodeSource());
+            msg.append("\nclazz.super.hash: "+System.identityHashCode(clazz.getSuperclass()));
+            ClassCastException cce = new ClassCastException(msg.toString());
+            cce.initCause(e);
+         }
+      }
+      return factory;
+   }
+
+   /** This method is used to obtain an instance of the provider specific class
+    * that implements the PolicyConfiguration interface that corresponds to the
+    * identified policy context within the provider. The methods of the
+    * PolicyConfiguration interface are used to define the policy statements of
+    * the identified policy context.
+    * 
+    * If at the time of the call, the identified policy context does not exist
+    * in the provider, then the policy context will be created in the provider
+    * and the Object that implements the context's PolicyConfiguration Interface
+    * will be returned. If the state of the identified context is "deleted" or
+    * "inService" it will be transitioned to the "open" state as a result of the
+    * call. The states in the lifecycle of a policy context are defined by the
+    * PolicyConfiguration interface.
+    * 
+    * For a given value of policy context identifier, this method must always
+    * return the same instance of PolicyConfiguration and there must be at most
+    * one actual instance of a PolicyConfiguration with a given policy context
+    * identifier (during a process context).
+    * 
+    * To preserve the invariant that there be at most one PolicyConfiguration
+    * object for a given policy context, it may be necessary for this method to
+    * be thread safe. 
+    * 
+    * @param contextID - the policy context ID indicates which
+    * PolicyConfiguration to return. This must not be null.
+    * @param remove - A boolean flag that establishes whether or not the policy
+    * statements of an existing policy context are to be removed before its
+    * PolicyConfiguration object is returned. If the value passed to this
+    * parameter is true, the policy statements of an existing policy context
+    * will be removed. If the value is false, they will not be removed.
+    * @return a PolicyConfiguration instance
+    * @throws PolicyContextException
+    */
+   public abstract PolicyConfiguration getPolicyConfiguration(String contextID,
+      boolean remove)
+      throws PolicyContextException;
+
+   /** This method determines if the identified policy context exists with state
+    * "inService" in the Policy provider associated with the factory.
+    * 
+    * @param contextID - the context ID for selecting the policy
+    * @return true if the identified policy context exists within the provider
+    *    and its state is "inService", false otherwise.
+    * @throws PolicyContextException
+    */
+   public abstract boolean inService(String contextID)
+      throws PolicyContextException;
+
+   /** A PrivilegedExceptionAction that looks up the class name identified
+    * by the javax.security.jacc.PolicyConfigurationFactory.provider system
+    * property and loads the class using the thread context class loader.
+    */ 
+   private static class LoadAction implements PrivilegedExceptionAction
+   {
+      private String name;
+      public String getName()
+      {
+         return name;
+      }
+      public Object run()
+         throws Exception
+      {
+         name = System.getProperty(FACTORY_PROP);
+         if( name == null )
+         {
+            // Use the default factory impl
+            name = DEFAULT_FACTORY_NAME;
+         }
+         ClassLoader loader = Thread.currentThread().getContextClassLoader();
+         Class factoryClass = loader.loadClass(name);
+         return factoryClass;
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3PolicyConfigurationFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -29,6 +29,7 @@
 import org.jboss.aop.joinpoint.MethodInvocation;
 import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
 import org.jboss.remoting.InvokerLocator;
+import org.jboss.security.RealmMapping;
 
 
 /**
@@ -44,6 +45,7 @@
 
    private String ejbName;
    private CodeSource ejbCS;
+   private RealmMapping realmMapping;
 
    public JaccAuthorizationInterceptor(String ejbName, CodeSource cs)
    {
@@ -55,6 +57,11 @@
    {
       return "JaccAuthorizationInterceptor";
    }
+   
+   public void setRealmMapping(RealmMapping ssm)
+   {
+      this.realmMapping = ssm;
+   }
 
    public Object invoke(Invocation inv) throws Throwable
    {
@@ -90,7 +97,10 @@
       String iface = (locator != null) ? "Remote" : "Local";
 
       EJBMethodPermission methodPerm = new EJBMethodPermission(ejbName, iface, m);
-      JaccHelper.checkPermission(ejbCS, methodPerm);
+      if(realmMapping != null)
+      { 
+         JaccHelper.checkPermission(ejbCS, methodPerm,realmMapping);  
+      }
       /*// Get the caller
       Subject caller = SecurityActions.getContextSubject(); 
 

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptorFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptorFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccAuthorizationInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,17 +19,28 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.security;
 
 import java.security.CodeSource;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.security.SecurityDomain;
 import org.jboss.aop.Advisor;
 import org.jboss.aop.InstanceAdvisor;
 import org.jboss.aop.advice.AspectFactory;
 import org.jboss.aop.joinpoint.Joinpoint;
+import org.jboss.ejb3.Container;
 import org.jboss.ejb3.EJBContainer;
+import org.jboss.security.AuthenticationManager;
+import org.jboss.security.RealmMapping;
+import org.jboss.security.SubjectSecurityManager;
 
 /**
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @author Anil.Saldhana at jboss.org
  * @version $Revision$
  */
 public class JaccAuthorizationInterceptorFactory implements AspectFactory
@@ -50,8 +61,9 @@
          CodeSource ejbCS = advisor.getClazz().getProtectionDomain().getCodeSource();
          
          String ejbName = ((EJBContainer)advisor).getEjbName(); 
-
-         return new JaccAuthorizationInterceptor(ejbName, ejbCS);
+         JaccAuthorizationInterceptor jai = new JaccAuthorizationInterceptor(ejbName, ejbCS);
+         jai.setRealmMapping(getSecurityManager(advisor)); 
+         return jai;
       }
       catch (Exception e)
       {
@@ -78,6 +90,26 @@
    {
       return getClass().getName();
    }
+   
+   public RealmMapping getSecurityManager(Advisor advisor)
+   {
+      Object domain = null;
+      Container container = (Container)advisor;
+      try
+      {
+         InitialContext ctx = container.getInitialContext();
+         SecurityDomain securityAnnotation = (SecurityDomain) advisor.resolveAnnotation(SecurityDomain.class);
+         if (securityAnnotation != null)
+         {
+            domain = SecurityDomainManager.getSecurityManager(securityAnnotation.value(),ctx);
+         }
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      return (RealmMapping) domain;
+   }
 }
 
 

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.security;
 
 import java.lang.reflect.Method;
@@ -26,13 +27,17 @@
 import java.security.CodeSource;
 import java.security.Policy;
 import java.security.Principal;
-import java.security.ProtectionDomain;
+import java.security.ProtectionDomain; 
 import java.util.Set;
+
+import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.DenyAll;
 import javax.annotation.security.PermitAll;
 import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJBAccessException;
 import javax.security.auth.Subject;
 import javax.security.jacc.EJBMethodPermission;
+import javax.security.jacc.EJBRoleRefPermission;
 import javax.security.jacc.PolicyConfiguration;
 import javax.security.jacc.PolicyConfigurationFactory;
 import javax.security.jacc.PolicyContextException;
@@ -42,9 +47,14 @@
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.logging.Logger;
+//import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.security.RealmMapping; 
+import org.jboss.security.RunAsIdentity;
 
 /**
+ * JACC Helper class that created permissions as well as done the checks
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @author Anil.Saldhana at jboss.com
  * @version $Revision$
  */
 public class JaccHelper
@@ -57,11 +67,11 @@
     */
    public static PolicyConfiguration initialiseJacc(String contextID) throws Exception
    {
-      log.debug("Initialising JACC Context for deployment: " + contextID);
+      log.trace("Initialising JACC Context for deployment: " + contextID);
       PolicyConfigurationFactory pcFactory = Ejb3PolicyConfigurationFactory.getPolicyConfigurationFactory();
       boolean removeExistingContext = true;
       PolicyConfiguration pc = pcFactory.getPolicyConfiguration(contextID, removeExistingContext);
-      
+
       /*Set keys = PolicyContext.getHandlerKeys();
       if (!keys.contains(EnterpriseBeanPolicyContextHandler.EJB_CONTEXT_KEY))
       {
@@ -85,10 +95,17 @@
       return pc;
    }
 
+   // FIXME: NYI
+//   public static void putJaccInService(PolicyConfiguration pc, DeploymentUnit di) throws Exception
+//   {
+//      //TODO: How do we link this with the parent PC?
+//      pc.commit(); 
+//   }
+   
    public static void putJaccInService(PolicyConfiguration pc, DeploymentInfo di) throws Exception
    {
       di.context.put("javax.security.jacc.PolicyConfiguration", pc);
-      
+
       // Link this to the parent PC
       DeploymentInfo current = di;
       while (current.parent != null)
@@ -105,7 +122,7 @@
       }
 
       pc.commit();
-      log.debug("JACC Policy Configuration for deployment has been put in service");
+      log.trace("JACC Policy Configuration for deployment has been put in service");
    }
 
    public static void unregisterJacc(String contextID) throws Exception
@@ -127,25 +144,19 @@
          addPermissions(container, pc);
       }
       catch (Exception e)
-      {
-         e.printStackTrace();
+      { 
          throw new RuntimeException(e);
       }
    }
 
    private static void addPermissions(EJBContainer container, PolicyConfiguration pc)
    {
-      SecurityDomain sd = (SecurityDomain) container.resolveAnnotation(SecurityDomain.class);
+      SecurityDomain sd = (SecurityDomain) container.resolveAnnotation(SecurityDomain.class); 
 
-      if (sd == null)
-      {
-         log.debug(container.getEjbName() + " has no @SecurityDomain - skipping JACC configuration");
-         return;
-      }
-      log.debug(container.getEjbName() + " has @SecurityDomain - peforming JACC configuration");
-
       PermitAll beanUnchecked = (PermitAll) container.resolveAnnotation(PermitAll.class);
       RolesAllowed beanPermissions = (RolesAllowed) container.resolveAnnotation(RolesAllowed.class);
+      
+      DeclareRoles beanDeclareRolesPerms = (DeclareRoles)container.resolveAnnotation(DeclareRoles.class);
 
       if (beanUnchecked != null && beanPermissions != null)
       {
@@ -153,6 +164,24 @@
       }
 
       String ejbName = container.getEjbName();
+
+      //Add the security role references
+      if(beanDeclareRolesPerms != null)
+      {
+         String[] rolerefs = beanDeclareRolesPerms.value();
+         int len = rolerefs != null ? rolerefs.length : 0;
+         for(int i=0; i < len; i++)
+         {
+             try
+            {
+               pc.addToRole(rolerefs[i], new EJBRoleRefPermission(ejbName, rolerefs[i]));
+            }
+            catch (PolicyContextException e)
+            {
+               throw new RuntimeException(e);
+            } 
+         }
+      }
       
       //Am I iterating over the right thing here? Should I be using the stuff from 
       //Advisor.methodInterceptors instead?
@@ -166,7 +195,7 @@
          }
 
          EJBMethodPermission permission = new EJBMethodPermission(ejbName, null, m);
-         log.debug("Creating permission: " + permission);
+         log.trace("Creating permission: " + permission);
 
          PermitAll unchecked = (PermitAll) container.resolveAnnotation(m, PermitAll.class);
          RolesAllowed permissions = (RolesAllowed) container.resolveAnnotation(m, RolesAllowed.class);
@@ -176,7 +205,16 @@
 
          if (annotationCount == 0 && beanPermissions == null && beanUnchecked == null)
          {
-            continue;
+            //continue;
+            //EJBTHREE-755:Add to unchecked if there are no annotations
+            try
+            {
+               pc.addToUncheckedPolicy(permission);
+            }
+            catch (PolicyContextException e)
+            {
+               throw new RuntimeException(e); 
+            } 
          }
          else if (annotationCount > 1)
          {
@@ -189,7 +227,7 @@
             if (unchecked != null)
             {
                pc.addToUncheckedPolicy(permission);
-               log.debug("Adding permission to unchecked policy");
+               log.trace("Adding permission to unchecked policy");
                continue;
             }
             if (permissions != null)
@@ -200,14 +238,14 @@
             if (exclude != null)
             {
                pc.addToExcludedPolicy(permission);
-               log.debug("Adding permission to excluded policy");
+               log.trace("Adding permission to excluded policy");
                continue;
             }
 
             if (beanUnchecked != null)
             {
                pc.addToUncheckedPolicy(permission);
-               log.debug("Adding permission to unchecked policy");
+               log.trace("Adding permission to unchecked policy");
                continue;
             }
             if (beanPermissions != null)
@@ -218,11 +256,11 @@
 
             //The default is unchecked
             pc.addToUncheckedPolicy(permission);
-            log.debug("Adding permission to unchecked policy");
+            log.trace("Adding permission to unchecked policy");
          }
          catch (PolicyContextException e)
          {
-            throw new RuntimeException(e); // TODO Auto-generated catch block
+            throw new RuntimeException(e);  
          }
       }
    }
@@ -243,7 +281,7 @@
       for (int i = 0; i < roles.length; i++)
       {
          pc.addToRole(roles[i], p);
-         log.debug("Adding permission to role: " + roles[i]);
+         log.trace("Adding permission to role: " + roles[i]);
       }
    }
 
@@ -260,28 +298,47 @@
       container.addClassMetaData(jaccCtx);
    }
 
-   public static void checkPermission(CodeSource ejbCS, EJBMethodPermission methodPerm) throws SecurityException
+   public static void checkPermission(CodeSource ejbCS, EJBMethodPermission methodPerm,
+         RealmMapping realmMapping) 
+   throws EJBAccessException
    {
       try
       {
          Policy policy = Policy.getPolicy();
          // Get the caller
          Subject caller = SecurityActions.getContextSubject();
+  
+         RunAsIdentity rai = SecurityActions.peekRunAsIdentity();
 
          Principal[] principals = null;
-         if (caller != null)
+         if(rai != null)
          {
-            // Get the caller principals
-            Set principalsSet = caller.getPrincipals();
-            principals = new Principal[principalsSet.size()];
-            principalsSet.toArray(principals);
+            Set runAsRoles = rai.getRunAsRoles();
+            principals = new Principal[runAsRoles.size()];
+            runAsRoles.toArray(principals); 
          }
-
+         else
+         {
+            /*if (caller != null)
+            {
+               // Get the caller principals
+               Set principalsSet = caller.getPrincipals();
+               principals = new Principal[principalsSet.size()];
+               principalsSet.toArray(principals);
+            }*/
+            //Get the current roles from the Authorization Manager
+            Principal callerP = SecurityActions.getCallerPrincipal();
+            Set principalSet = realmMapping.getUserRoles(callerP);
+            principals = new Principal[principalSet.size()];
+            principalSet.toArray(principals);
+         } 
+         
          ProtectionDomain pd = new ProtectionDomain(ejbCS, null, null, principals);
          if (policy.implies(pd, methodPerm) == false)
          {
             String msg = "Denied: " + methodPerm + ", caller=" + caller;
-            SecurityException e = new SecurityException(msg);
+            //SecurityException e = new SecurityException(msg);
+            EJBAccessException e = new EJBAccessException(msg);
             throw e;
          }
       }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -46,7 +46,7 @@
       {
          InitialContext ctx = container.getInitialContext();
          org.jboss.annotation.security.SecurityDomain securityAnnotation = (org.jboss.annotation.security.SecurityDomain) advisor.resolveAnnotation(org.jboss.annotation.security.SecurityDomain.class);
-         domain = ctx.lookup("java:/jaas/" + securityAnnotation.value());
+         domain = SecurityDomainManager.getSecurityManager(securityAnnotation.value(), ctx);
       }
       catch (NamingException e)
       {
@@ -76,6 +76,7 @@
    public String getName()
    {
       return getClass().getName();
-   }
+   } 
+   
 }
 

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -20,21 +20,12 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 package org.jboss.ejb3.security;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import java.security.Principal;
-
-import javax.annotation.security.RunAs;
-import org.jboss.aop.joinpoint.Invocation;
+ 
+import org.jboss.aop.joinpoint.Invocation;  
 import org.jboss.logging.Logger;
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.RealmMapping;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
+import org.jboss.security.RunAsIdentity; 
 
 /**
  * An interceptor that enforces the run-as identity declared by a bean.
@@ -50,7 +41,7 @@
    public RunAsSecurityInterceptor(AuthenticationManager manager, RealmMapping realmMapping, RunAsIdentity id)
    {
       super(manager, realmMapping);
-      this.runAsIdentity = id;
+      this.runAsIdentity = id; 
    }
 
    protected RunAsIdentity getRunAsIdentity(Invocation invocation)
@@ -59,8 +50,8 @@
    }
 
    public Object invoke(Invocation invocation) throws Throwable
-   {
-      return super.invoke(invocation);
+   { 
+      return super.invoke(invocation); 
    }
 
 }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,121 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.security;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.annotation.security.RunAs;
-
-import org.jboss.aop.Advisor;
-import org.jboss.aop.InstanceAdvisor;
-import org.jboss.aop.advice.AspectFactory;
-import org.jboss.aop.joinpoint.Joinpoint;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-import org.jboss.security.AuthenticationManager;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.tx.NullInterceptor;
-import org.jboss.annotation.security.RunAsPrincipal;
-
-import java.security.Principal;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.HashSet;
-
-public class RunAsSecurityInterceptorFactory implements AspectFactory
-{
-   private static final Logger log = Logger.getLogger(RunAsSecurityInterceptorFactory.class);
-
-   public Object createPerVM()
-   {
-      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
-   }
-
-
-   protected RunAsIdentity getRunAsIdentity(EJBContainer container)
-   {
-      RunAs runAs = (RunAs) container.resolveAnnotation(RunAs.class);
-      if (runAs == null) return null;
-      if (container.getXml() != null && container.getXml().getSecurityIdentity() != null)
-      {
-         if (container.getXml().getSecurityIdentity().isUseCallerIdentity()) return null;
-      }
-      RunAsPrincipal rap = (RunAsPrincipal) container.resolveAnnotation(RunAsPrincipal.class);
-      String runAsPrincipal = null;
-      if (rap != null) runAsPrincipal = rap.value();
-
-      HashSet extraRoles = new HashSet(); // todo get extra mapped roles.
-
-      return new RunAsIdentity(runAs.value(), runAsPrincipal, extraRoles);
-   }
-
-
-   public Object createPerClass(Advisor advisor)
-   {
-      Object domain = null;
-      EJBContainer container = (EJBContainer)advisor;
-      RunAsIdentity runAsIdentity = getRunAsIdentity(container);
-      if (runAsIdentity == null)
-      {
-         return new NullInterceptor();
-      }
-      try
-      {
-         InitialContext ctx = container.getInitialContext();
-         org.jboss.annotation.security.SecurityDomain securityAnnotation = (org.jboss.annotation.security.SecurityDomain) advisor.resolveAnnotation(org.jboss.annotation.security.SecurityDomain.class);
-         domain = ctx.lookup("java:/jaas/" + securityAnnotation.value());
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      AuthenticationManager manager = (AuthenticationManager) domain;
-      RealmMapping mapping = (RealmMapping) domain;
-      if (manager == null) throw new RuntimeException("Unable to find Security Domain");
-      return new RunAsSecurityInterceptor(manager, mapping, getRunAsIdentity(container));
-   }
-
-   public Object createPerInstance(Advisor advisor, InstanceAdvisor instanceAdvisor)
-   {
-      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
-   }
-
-   public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
-   {
-      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
-   }
-
-   public Object createPerJoinpoint(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
-   {
-      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
-   }
-
-   public String getName()
-   {
-      return getClass().getName();
-   }
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.security;
+
+import java.util.HashSet;
+
+import javax.annotation.security.RunAs;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.security.RunAsPrincipal;
+import org.jboss.aop.Advisor;
+import org.jboss.aop.InstanceAdvisor;
+import org.jboss.aop.advice.AspectFactory;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Joinpoint;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.metamodel.AssemblyDescriptor;
+import org.jboss.ejb3.tx.NullInterceptor;
+import org.jboss.logging.Logger;
+import org.jboss.security.AuthenticationManager;
+import org.jboss.security.RealmMapping;
+import org.jboss.security.RunAsIdentity;
+
+public class RunAsSecurityInterceptorFactory implements AspectFactory
+{
+   private static final Logger log = Logger.getLogger(RunAsSecurityInterceptorFactory.class);
+
+   public Object createPerVM()
+   {
+      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
+   }
+
+
+   protected RunAsIdentity getRunAsIdentity(EJBContainer container)
+   {
+      RunAs runAs = (RunAs) container.resolveAnnotation(RunAs.class);
+      if (runAs == null) return null;
+      if (container.getXml() != null && container.getXml().getSecurityIdentity() != null)
+      {
+         if (container.getXml().getSecurityIdentity().isUseCallerIdentity()) return null;
+      }
+      RunAsPrincipal rap = (RunAsPrincipal) container.resolveAnnotation(RunAsPrincipal.class);
+      String runAsPrincipal = null;
+      if (rap != null) 
+         runAsPrincipal = rap.value();
+      else
+      {
+         //Check if jboss.xml has it  
+         if(container.getXml() != null && container.getXml().getSecurityIdentity() != null)
+         {
+            runAsPrincipal = container.getXml().getSecurityIdentity().getRunAsPrincipal();
+         }
+      }
+
+      HashSet extraRoles = new HashSet();  
+      AssemblyDescriptor ad = container.getAssemblyDescriptor();
+      if(ad != null)
+      {
+         // FIXME: NYI
+         throw new RuntimeException("NYI");
+//         extraRoles.addAll(ad.getSecurityRolesGivenPrincipal(runAsPrincipal));
+      }
+
+      return new RunAsIdentity(runAs.value(), runAsPrincipal, extraRoles);
+   }
+
+
+   public Object createPerClass(Advisor advisor)
+   {
+      EJBContainer container = (EJBContainer)advisor;
+      RunAsIdentity runAsIdentity = getRunAsIdentity(container);
+      /*if (runAsIdentity == null)
+      {
+         return new NullInterceptor();
+      }*/
+
+      Object domain = null;
+      try
+      {
+         InitialContext ctx = container.getInitialContext();
+         org.jboss.annotation.security.SecurityDomain anSecurityDomain = (org.jboss.annotation.security.SecurityDomain) advisor.resolveAnnotation(org.jboss.annotation.security.SecurityDomain.class);
+         if (anSecurityDomain != null)
+         {
+            String domainName = anSecurityDomain.value();
+            domain = SecurityDomainManager.getSecurityManager(domainName, ctx);
+         }
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      
+      Interceptor interceptor = new NullInterceptor();
+      if (domain != null)
+      {
+         AuthenticationManager manager = (AuthenticationManager) domain;
+         RealmMapping mapping = (RealmMapping) domain;
+         interceptor = new RunAsSecurityInterceptor(manager, mapping, getRunAsIdentity(container));
+      }
+      return interceptor;
+   }
+
+   public Object createPerInstance(Advisor advisor, InstanceAdvisor instanceAdvisor)
+   {
+      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
+   }
+
+   public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
+   {
+      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
+   }
+
+   public Object createPerJoinpoint(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
+   {
+      throw new RuntimeException("PER_VM not supported for this interceptor factory, only PER_CLASS");
+   }
+
+   public String getName()
+   {
+      return getClass().getName();
+   }
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityActions.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityActions.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityActions.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -23,12 +23,16 @@
 
 import java.lang.reflect.UndeclaredThrowableException;
 import java.security.AccessController;
+import java.security.Principal;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import javax.security.auth.Subject;
 import javax.security.jacc.PolicyContext;
 import javax.security.jacc.PolicyContextException;
+  
+import org.jboss.security.RunAsIdentity;
+import org.jboss.security.SecurityAssociation;
 
 
 /**
@@ -41,6 +45,7 @@
  * @author Scott.Stark at jboss.org
  * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @author Anil.Saldhana at jboss.org
  * @version $Revison: 1.1$
  */
 class SecurityActions
@@ -108,7 +113,77 @@
       Subject getContextSubject()
               throws PolicyContextException;
    }
+   
+   interface RunAsIdentityActions
+   {
+      RunAsIdentityActions PRIVILEGED = new RunAsIdentityActions()
+      {
+         private final PrivilegedAction peekAction = new PrivilegedAction()
+         {
+            public Object run()
+            {
+               return SecurityAssociation.peekRunAsIdentity();
+            }
+         };
 
+         private final PrivilegedAction popAction = new PrivilegedAction()
+         {
+            public Object run()
+            {
+               return SecurityAssociation.popRunAsIdentity();
+            }
+         };
+
+         public RunAsIdentity peek()
+         {
+            return (RunAsIdentity)AccessController.doPrivileged(peekAction);
+         }
+
+         public void push(final RunAsIdentity id)
+         {
+            AccessController.doPrivileged(
+               new PrivilegedAction()
+               {
+                  public Object run()
+                  {
+                     SecurityAssociation.pushRunAsIdentity(id);
+                     return null;
+                  }
+               }
+            );
+         }
+
+         public RunAsIdentity pop()
+         {
+            return (RunAsIdentity)AccessController.doPrivileged(popAction);
+         }
+      };
+
+      RunAsIdentityActions NON_PRIVILEGED = new RunAsIdentityActions()
+      {
+         public RunAsIdentity peek()
+         {
+            return SecurityAssociation.peekRunAsIdentity();
+         }
+
+         public void push(RunAsIdentity id)
+         {
+            SecurityAssociation.pushRunAsIdentity(id);
+         }
+
+         public RunAsIdentity pop()
+         {
+            return SecurityAssociation.popRunAsIdentity();
+         }
+      };
+
+      RunAsIdentity peek();
+
+      void push(RunAsIdentity id);
+
+      RunAsIdentity pop();
+   } 
+
    static Subject getContextSubject()
            throws PolicyContextException
    {
@@ -128,4 +203,50 @@
       String previousID = (String) AccessController.doPrivileged(action);
       return previousID;
    }
+   
+   static RunAsIdentity peekRunAsIdentity()
+   {
+      if(System.getSecurityManager() == null)
+      {
+         return RunAsIdentityActions.NON_PRIVILEGED.peek();
+      }
+      else
+      {
+         return RunAsIdentityActions.PRIVILEGED.peek();
+      }
+   }
+   
+   static void pushRunAsIdentity(RunAsIdentity principal)
+   {
+      if(System.getSecurityManager() == null)
+      {
+         RunAsIdentityActions.NON_PRIVILEGED.push(principal);
+      }
+      else
+      {
+         RunAsIdentityActions.PRIVILEGED.push(principal);
+      }
+   }
+   
+   static RunAsIdentity popRunAsIdentity()
+   {
+      if(System.getSecurityManager() == null)
+      {
+         return RunAsIdentityActions.NON_PRIVILEGED.pop();
+      }
+      else
+      {
+         return RunAsIdentityActions.PRIVILEGED.pop();
+      }
+   }
+   
+   static Principal getCallerPrincipal()
+   {
+      return (Principal)AccessController.doPrivileged(new PrivilegedAction(){
+
+         public Object run()
+         { 
+            return SecurityAssociation.getCallerPrincipal();
+         }});
+   }
 }

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityDomainManager.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/security/SecurityDomainManager.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityDomainManager.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/SecurityDomainManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.security;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+//$Id$
+
+/**
+ *  Utility class that deals with the authentication/authorization
+ *  managers associated with a security domain
+ *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ *  @since  Oct 9, 2006 
+ *  @version $Revision$
+ */
+public class SecurityDomainManager
+{
+   public static Object getSecurityManager(String securityDomain,
+         InitialContext ctx) throws NamingException
+   { 
+      return ctx.lookup(preProcessSecurityDomain(securityDomain)); 
+   }
+   
+   /**
+    * Ensure that the security domain is of the proper format
+    * @param domainValue
+    * @return
+    */
+   private static String preProcessSecurityDomain(String domainValue)
+   { 
+      if(domainValue.startsWith("java:/jaas"))
+         return domainValue;
+      else
+         return "java:/jaas/" + domainValue;
+   }
+}

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,23 +21,6 @@
  */
 package org.jboss.ejb3.service;
 
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-
-import javax.ejb.EJBException;
-import javax.ejb.Handle;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.InvalidAttributeValueException;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-
 import org.jboss.annotation.ejb.Management;
 import org.jboss.annotation.ejb.Service;
 import org.jboss.aop.AspectManager;
@@ -56,14 +39,31 @@
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.ProxyFactory;
 import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.ThreadLocalENCFactory;
 import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
 import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
 import org.jboss.ejb3.timerservice.TimedObjectInvoker;
 import org.jboss.ejb3.timerservice.TimerServiceFactory;
+import org.jboss.injection.Injector;
 import org.jboss.logging.Logger;
-import org.jboss.injection.Injector;
 
+import javax.ejb.EJBException;
+import javax.ejb.Handle;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.InvalidAttributeValueException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import java.lang.reflect.Method;
+import java.util.Hashtable;
+
 /**
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
@@ -78,6 +78,7 @@
    ObjectName delegateObjectName;
    private TimerService timerService;
 
+   @SuppressWarnings("unused")
    private static final Logger log = Logger.getLogger(ServiceContainer.class);
 
    public ServiceContainer(MBeanServer server, ClassLoader cl, String beanClassName, String ejbName,
@@ -126,6 +127,14 @@
    public void create() throws Exception
    {
       super.create();
+      
+      // EJBTHREE-655: fire up an instance for use as MBean delegate
+      singleton = super.construct();
+
+      // won't work, before starting the management interface MBean injection must have been done.
+      //registerManagementInterface();
+      
+      invokeOptionalMethod("create");
    }
 
 
@@ -135,8 +144,6 @@
 
       try
       {
-         singleton = super.construct();
-
          initBeanContext();
 
          // make sure the timer service is there before injection takes place
@@ -144,9 +151,12 @@
 
          injectDependencies(beanContext);
 
+         // TODO: EJBTHREE-655: shouldn't happen here, but in create
          registerManagementInterface();
          
          TimerServiceFactory.getInstance().restoreTimerService(timerService);
+         
+         invokeOptionalMethod("start");
       }
       catch (Exception e)
       {
@@ -157,19 +167,24 @@
 
    public void stop() throws Exception
    {
+      invokeOptionalMethod("stop");
+      
       if (timerService != null) TimerServiceFactory.getInstance().removeTimerService(timerService);
 
+      // TODO: EJBTHREE-655: shouldn't happen here, but in destroy
+      unregisterManagementInterface();
+      
       super.stop();
 
-      if (delegate != null)
-      {
-         getDeployment().getKernelAbstraction().uninstallMBean(delegateObjectName);
-      }
       injected = false;
    }
 
    public void destroy() throws Exception
    {
+      invokeOptionalMethod("destroy");
+      
+      //unregisterManagementInterface();
+      
       super.destroy();
    }
 
@@ -189,6 +204,46 @@
       return timerService;
    }
    
+   /**
+    * Invoke a method on the singleton without a specific security or transaction context.
+    * 
+    * @param methodName
+    */
+   private void invokeOptionalMethod(String methodName)
+   {
+      /* EJBTHREE-655 has been postponed
+      ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); 
+      try
+      {
+         Thread.currentThread().setContextClassLoader(classloader);
+         Class parameterTypes[] = { };
+         Method method = clazz.getMethod(methodName, parameterTypes);
+         Object args[] = { };
+         method.invoke(singleton, args);
+      }
+      catch(NoSuchMethodException e)
+      {
+         // ignore
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getCause());
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(oldLoader);
+      }
+      */
+   }
+   
    public void invokePostConstruct(BeanContext beanContext)
    {
       //Ignore
@@ -219,9 +274,13 @@
     */
    public Object localInvoke(Method method, Object[] args, FutureHolder provider) throws Throwable
    {
+      long start = System.currentTimeMillis();
+      
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
       try
       {
+         invokeStats.callIn();
+         
          Thread.currentThread().setContextClassLoader(classloader);
          long hash = MethodHashing.calculateHash(method);
          MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
@@ -229,8 +288,7 @@
          {
             throw new RuntimeException("Could not resolve beanClass method from proxy call: " + method.toString());
          }
-         Interceptor[] aspects = info.getInterceptors();
-         EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info, aspects);
+         EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info);
          nextInvocation.setAdvisor(this);
          nextInvocation.setArguments(args);
 
@@ -245,25 +303,40 @@
       }
       finally
       {
+         if (method != null)
+         {
+            long end = System.currentTimeMillis();
+            long elapsed = end - start;
+            invokeStats.updateStats(method, elapsed);
+         }
+         
+         invokeStats.callOut();
+         
          Thread.currentThread().setContextClassLoader(oldLoader);
       }
    }
 
    public InvocationResponse dynamicInvoke(Object target, Invocation invocation) throws Throwable
    {
+      long start = System.currentTimeMillis();
+      
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
       EJBContainerInvocation newSi = null;
+      
+      MethodInvocation si = (MethodInvocation) invocation;
+      MethodInfo info = (MethodInfo) methodInterceptors.get(si.getMethodHash());
+      Method method = info.getUnadvisedMethod();
       try
       {
+         invokeStats.callIn();
+         
          Thread.currentThread().setContextClassLoader(classloader);
-         MethodInvocation si = (MethodInvocation) invocation;
-         MethodInfo info = (MethodInfo) methodInterceptors.get(si.getMethodHash());
+         
          if (info == null)
          {
             throw new RuntimeException("Could not resolve beanClass method from proxy call");
          }
-         Interceptor[] aspects = info.getInterceptors();
-         newSi = new EJBContainerInvocation(info, aspects);
+         newSi = new EJBContainerInvocation(info);
          newSi.setArguments(si.getArguments());
          newSi.setMetaData(si.getMetaData());
          newSi.setAdvisor(this);
@@ -285,6 +358,15 @@
       }
       finally
       {
+         if (method != null)
+         {
+            long end = System.currentTimeMillis();
+            long elapsed = end - start;
+            invokeStats.updateStats(method, elapsed);
+         }
+         
+         invokeStats.callOut();
+         
          Thread.currentThread().setContextClassLoader(oldLoader);
       }
    }
@@ -331,7 +413,7 @@
       {
          try
          {
-            ThreadLocalENCFactory.push(enc);
+            pushEnc();
             for (Injector injector : injectors)
             {
                injector.inject(ctx);
@@ -339,7 +421,7 @@
          }
          finally
          {
-            ThreadLocalENCFactory.pop();
+            popEnc();
          }
       }
       injected = true;
@@ -426,11 +508,29 @@
 
             delegate = new ServiceMBeanDelegate(mbeanServer, this, intf, delegateObjectName);
 
-            Object securityDomainAnnotation = resolveAnnotation(org.jboss.annotation.security.SecurityDomain.class);
-
             getDeployment().getKernelAbstraction().installMBean(delegateObjectName, getDependencyPolicy(), delegate);
+         }
+         else
+         {
+            Service service = (Service)resolveAnnotation(Service.class);
+            if (service.xmbean().length() > 0)
+            {
+               if (mbeanServer == null)
+                  mbeanServer = org.jboss.mx.util.MBeanServerLocator.locateJBoss();
 
+               if (mbeanServer == null)
+                  throw new RuntimeException(ejbName + "is defined as an XMBean, but the MBeanServer has not been initialized for it");
+
+               String objname = service.objectName();
+               delegateObjectName = (objname == null || objname.equals("")) ?
+                               new ObjectName(getObjectName().getCanonicalName() + ",type=ManagementInterface") : new ObjectName(service.objectName());
+
+               delegate = new ServiceMBeanDelegate(mbeanServer, this, service.xmbean(), delegateObjectName);
+
+               getDeployment().getKernelAbstraction().installMBean(delegateObjectName, getDependencyPolicy(), delegate);
+            }
          }
+         
       }
       catch (Exception e)
       {
@@ -438,6 +538,14 @@
       }
    }
 
+   private void unregisterManagementInterface() throws InstanceNotFoundException, MBeanRegistrationException
+   {
+      if (delegate != null)
+      {
+         getDeployment().getKernelAbstraction().uninstallMBean(delegateObjectName);
+      }
+   }
+   
    protected void removeHandle(Handle handle)
    {
       throw new RuntimeException("Don't do this");

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -40,6 +40,8 @@
  */
 public class ServiceLocalProxy extends LocalProxy
 {
+   private static final long serialVersionUID = -4023671606878355605L;
+   
    AsynchProvider provider;
 
    public ServiceLocalProxy()

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceMBeanDelegate.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceMBeanDelegate.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceMBeanDelegate.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -28,7 +28,9 @@
 import javax.management.Attribute;
 import javax.management.AttributeList;
 import javax.management.AttributeNotFoundException;
+import javax.management.Descriptor;
 import javax.management.DynamicMBean;
+import javax.management.InstanceNotFoundException;
 import javax.management.InvalidAttributeValueException;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanException;
@@ -40,14 +42,23 @@
 import javax.management.ReflectionException;
 import javax.management.StandardMBean;
 import javax.management.NotCompliantMBeanException;
+import javax.management.modelmbean.DescriptorSupport;
+
+import org.jboss.mx.modelmbean.XMBean;
+import org.jboss.mx.modelmbean.XMBeanConstants;
+
+import org.jboss.logging.Logger;
 import org.jboss.util.Classes;
 
+
 /**
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
  */
-public class ServiceMBeanDelegate implements DynamicMBean
+public class ServiceMBeanDelegate implements DynamicMBean, XMBeanConstants
 {
+   private static final Logger log = Logger.getLogger(ServiceMBeanDelegate.class);
+   
    MBeanServer server;
    ServiceContainer container;
    ObjectName serviceOn;
@@ -76,7 +87,33 @@
       }
       mbeanInfo = mbean.getMBeanInfo();
    }
+   
+   public ServiceMBeanDelegate(MBeanServer server, ServiceContainer container, String xmbean, ObjectName on)
+   {
+      this.container = container;
+      this.server = server;
+      serviceOn = on;
+      XMBean mbean = null;
+      try
+      {
+         Descriptor descriptor = new DescriptorSupport();
+         descriptor.setField(RESOURCE_REFERENCE, container.getSingleton());
+         descriptor.setField(RESOURCE_TYPE, xmbean);
+         descriptor.setField(SAX_PARSER, "org.apache.crimson.parser.XMLReaderImpl");
 
+         mbean = new XMBean(descriptor, DESCRIPTOR);
+      }
+      catch (NotCompliantMBeanException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (javax.management.MBeanException e)
+      {
+         throw new RuntimeException(e);
+      }
+      mbeanInfo = mbean.getMetaData();
+   }
+
    public ObjectName getObjectName()
    {
       return serviceOn;
@@ -162,9 +199,19 @@
    public Object invoke(String actionName, Object params[], String signature[])
            throws MBeanException, ReflectionException
    {
-      Method operation = getOperation(actionName, signature);
+      if(log.isTraceEnabled())
+         log.trace("invoke: " + actionName);
+      
       try
       {
+         // EJBTHREE-655: intercept lifecycle methods
+//         if(isMagicLifecycleMethod(actionName))
+//         {
+//            invokeMagicLifecycleMethod(actionName);
+//            return null;
+//         }
+         
+         Method operation = getOperation(actionName, signature);
          return container.localInvoke(operation, params);
       }
       catch (Throwable t)
@@ -390,4 +437,33 @@
 
       return operation;
    }
+
+   /* EJBTHREE-655 has been postponed
+   protected void invokeMagicLifecycleMethod(String operationName) throws Exception
+   {
+      if(operationName.equals("create"))
+         container.create();
+      else if(operationName.equals("start"))
+         container.start();
+      else if(operationName.equals("stop"))
+         container.stop();
+      else if(operationName.equals("destroy"))
+         container.destroy();
+      else
+         throw new IllegalArgumentException("can't invoke " + operationName);
+   }
+   
+   protected boolean isMagicLifecycleMethod(String methodName)
+   {
+      if(methodName.equals("create"))
+         return true;
+      if(methodName.equals("start"))
+         return true;
+      if(methodName.equals("stop"))
+         return true;
+      if(methodName.equals("destroy"))
+         return true;
+      return false;
+   }
+   */
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -42,6 +42,8 @@
  */
 public class ServiceRemoteProxy extends org.jboss.ejb3.remoting.BaseRemoteProxy
 {
+   private static final long serialVersionUID = 306994045720155142L;
+   
    protected InvokerLocator uri;
    AsynchProvider provider;
 

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/session)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,143 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.session;
-
-import javax.ejb.EJBMetaData;
-import javax.ejb.Handle;
-import javax.ejb.HomeHandle;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.aop.Advisor;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.ProxyFactory;
-import org.jboss.logging.Logger;
-import org.jboss.util.StringPropertyReplacer;
-import org.jboss.ejb3.proxy.EJBMetaDataImpl;
-import org.jboss.ejb3.proxy.handle.HomeHandleImpl;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public abstract class BaseSessionProxyFactory implements ProxyFactory
-{
-   private static final Logger log = Logger.getLogger(BaseSessionProxyFactory.class);
-   
-   protected Container container;
-   protected Advisor advisor;
-  
-   public Object createHomeProxy()
-   {
-      throw new RuntimeException("NYI");
-   }
-   
-   public void setContainer(Container container)
-   {
-      this.container = container;
-      this.advisor = (Advisor) container;
-   }
-   
-   protected void setEjb21Objects(BaseSessionRemoteProxy proxy)
-   {
-      proxy.setHandle(getHandle());
-      proxy.setHomeHandle(getHomeHandle());
-      proxy.setEjbMetaData(getEjbMetaData());
-   }
-   
-   abstract protected Handle getHandle();
-   
-   protected HomeHandle getHomeHandle()
-   {
-      EJBContainer ejbContainer = (EJBContainer)container;
-      
-      HomeHandleImpl homeHandle = null;
-      
-      RemoteBinding remoteBindingAnnotation = (RemoteBinding)ejbContainer.resolveAnnotation(RemoteBinding.class);
-      if (remoteBindingAnnotation != null)
-         homeHandle = new HomeHandleImpl(remoteBindingAnnotation.jndiBinding() + "Home");
-      
-      return homeHandle;
-   }
-   
-   protected EJBMetaData getEjbMetaData()
-   {
-      Class remote = null;
-      Class home = null;
-      Class pkClass = Object.class;
-      HomeHandleImpl homeHandle = null;
-      
-      EJBContainer ejbContainer = (EJBContainer)container;
-      
-      Remote remoteAnnotation = (Remote)ejbContainer.resolveAnnotation(Remote.class);
-      if (remoteAnnotation != null)
-         remote = remoteAnnotation.value()[0];
-      RemoteHome homeAnnotation = (RemoteHome)ejbContainer.resolveAnnotation(RemoteHome.class);
-      if (homeAnnotation != null)
-         home = homeAnnotation.value();
-      RemoteBinding remoteBindingAnnotation = (RemoteBinding)ejbContainer.resolveAnnotation(RemoteBinding.class);
-      if (remoteBindingAnnotation != null)
-         homeHandle = new HomeHandleImpl(remoteBindingAnnotation.jndiBinding());
-      
-      EJBMetaDataImpl metadata = new EJBMetaDataImpl(remote, home, pkClass, true, false, homeHandle);
-      
-      return metadata;
-   }
-   
-   /**
-    * Performs a system property substitution if the given value conforms to the
-    * "${property.name}" or "${property.name:defaultvalue}" patterns; otherwise just 
-    * returns <code>value</value>.
-    *
-    * TODO Put this in a utility somewhere; this is just the common parent of
-    * the places that currently use it.
-    * 
-    * @param value a String that may represent a system property.
-    * 
-    * @return  the value of the given system property, or the provided default value
-    *          if there was no system property matching the given string, or 
-    *          <code>value</code> itself if it didn't encode a system property name.
-    */
-   protected String substituteSystemProperty(String value)
-   {
-      try
-      {
-         String replacedValue = StringPropertyReplacer.replaceProperties(value);
-         if (value != replacedValue)
-         {            
-            log.debug("Replacing @Clustered partition attribute " + value + " with " + replacedValue);
-            value = replacedValue;
-         }
-      }
-      catch (Exception e)
-      {
-         log.warn("Unable to replace @Clustered partition attribute " + value + 
-                  ". Caused by " + e.getClass() + " " + e.getMessage());         
-      }
-      
-      return value;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.session;
+
+import javax.ejb.EJBMetaData;
+import javax.ejb.Handle;
+import javax.ejb.HomeHandle;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.ProxyFactory;
+import org.jboss.logging.Logger;
+import org.jboss.util.StringPropertyReplacer;
+import org.jboss.ejb3.proxy.EJBMetaDataImpl;
+import org.jboss.ejb3.proxy.handle.HomeHandleImpl;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public abstract class BaseSessionProxyFactory implements ProxyFactory
+{
+   private static final Logger log = Logger.getLogger(BaseSessionProxyFactory.class);
+   
+   protected Container container;
+   protected Advisor advisor;
+  
+   public Object createHomeProxy()
+   {
+      throw new RuntimeException("NYI");
+   }
+   
+   public void setContainer(Container container)
+   {
+      this.container = container;
+      this.advisor = (Advisor) container;
+   }
+   
+   protected void setEjb21Objects(BaseSessionRemoteProxy proxy)
+   {
+      proxy.setHandle(getHandle());
+      proxy.setHomeHandle(getHomeHandle());
+      proxy.setEjbMetaData(getEjbMetaData());
+   }
+   
+   abstract protected Handle getHandle();
+   
+   protected HomeHandle getHomeHandle()
+   {
+      EJBContainer ejbContainer = (EJBContainer)container;
+      
+      HomeHandleImpl homeHandle = null;
+      
+      RemoteBinding remoteBindingAnnotation = (RemoteBinding)ejbContainer.resolveAnnotation(RemoteBinding.class);
+      if (remoteBindingAnnotation != null)
+         homeHandle = new HomeHandleImpl(remoteBindingAnnotation.jndiBinding() + "Home");
+      
+      return homeHandle;
+   }
+   
+   protected EJBMetaData getEjbMetaData()
+   {
+      Class remote = null;
+      Class home = null;
+      Class pkClass = Object.class;
+      HomeHandleImpl homeHandle = null;
+      
+      EJBContainer ejbContainer = (EJBContainer)container;
+      
+      Remote remoteAnnotation = (Remote)ejbContainer.resolveAnnotation(Remote.class);
+      if (remoteAnnotation != null)
+         remote = remoteAnnotation.value()[0];
+      RemoteHome homeAnnotation = (RemoteHome)ejbContainer.resolveAnnotation(RemoteHome.class);
+      if (homeAnnotation != null)
+         home = homeAnnotation.value();
+      RemoteBinding remoteBindingAnnotation = (RemoteBinding)ejbContainer.resolveAnnotation(RemoteBinding.class);
+      if (remoteBindingAnnotation != null)
+         homeHandle = new HomeHandleImpl(remoteBindingAnnotation.jndiBinding());
+      
+      EJBMetaDataImpl metadata = new EJBMetaDataImpl(remote, home, pkClass, true, false, homeHandle);
+      
+      return metadata;
+   }
+   
+   /**
+    * Performs a system property substitution if the given value conforms to the
+    * "${property.name}" or "${property.name:defaultvalue}" patterns; otherwise just 
+    * returns <code>value</value>.
+    *
+    * TODO Put this in a utility somewhere; this is just the common parent of
+    * the places that currently use it.
+    * 
+    * @param value a String that may represent a system property.
+    * 
+    * @return  the value of the given system property, or the provided default value
+    *          if there was no system property matching the given string, or 
+    *          <code>value</code> itself if it didn't encode a system property name.
+    */
+   protected String substituteSystemProperty(String value)
+   {
+      try
+      {
+         String replacedValue = StringPropertyReplacer.replaceProperties(value);
+         if (value != replacedValue)
+         {            
+            log.debug("Replacing @Clustered partition attribute " + value + " with " + replacedValue);
+            value = replacedValue;
+         }
+      }
+      catch (Exception e)
+      {
+         log.warn("Unable to replace @Clustered partition attribute " + value + 
+                  ". Caused by " + e.getClass() + " " + e.getMessage());         
+      }
+      
+      return value;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.session;
-
-import javax.ejb.EJBMetaData;
-import javax.ejb.Handle;
-import javax.ejb.HomeHandle;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.proxy.ejb.handle.StatefulHandleImpl;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public abstract class BaseSessionRemoteProxy extends org.jboss.ejb3.remoting.BaseRemoteProxy
-{
-   protected Object id;
-   
-   protected Handle handle;
-   protected HomeHandle homeHandle;
-   protected EJBMetaData ejbMetaData;
-   
-   public BaseSessionRemoteProxy(Object containerId, Interceptor[] interceptors)
-   {
-      super(containerId, interceptors);
-   }
-   
-   protected BaseSessionRemoteProxy()
-   {
-   }
-   
-   public void setHandle(Handle handle)
-   {
-      this.handle = handle;
-   }
-   
-   public void setHomeHandle(HomeHandle homeHandle)
-   {
-      this.homeHandle = homeHandle;
-   }
-   
-   public void setEjbMetaData(EJBMetaData ejbMetaData)
-   {
-      this.ejbMetaData = ejbMetaData;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.session;
+
+import javax.ejb.EJBMetaData;
+import javax.ejb.Handle;
+import javax.ejb.HomeHandle;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.proxy.ejb.handle.StatefulHandleImpl;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public abstract class BaseSessionRemoteProxy extends org.jboss.ejb3.remoting.BaseRemoteProxy
+{
+   protected Object id;
+   
+   protected Handle handle;
+   protected HomeHandle homeHandle;
+   protected EJBMetaData ejbMetaData;
+   
+   public BaseSessionRemoteProxy(Object containerId, Interceptor[] interceptors)
+   {
+      super(containerId, interceptors);
+   }
+   
+   protected BaseSessionRemoteProxy()
+   {
+   }
+   
+   public void setHandle(Handle handle)
+   {
+      this.handle = handle;
+   }
+   
+   public void setHomeHandle(HomeHandle homeHandle)
+   {
+      this.homeHandle = homeHandle;
+   }
+   
+   public void setEjbMetaData(EJBMetaData ejbMetaData)
+   {
+      this.ejbMetaData = ejbMetaData;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/session/BaseSessionRemoteProxy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateful;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.HashMap;
-import javax.persistence.EntityManager;
-import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.ejb3.Ejb3Registry;
-import org.jboss.serial.io.MarshalledObject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class NestedStatefulBeanContext extends StatefulBeanContext
-{
-   public void writeExternal(ObjectOutput out) throws IOException
-   {
-      out.writeUTF(getContainer().getObjectName().getCanonicalName());
-      out.writeObject(id);
-      out.writeObject(metadata);
-      out.writeObject(bean);
-      out.writeObject(persistenceContexts);
-      out.writeObject(interceptorInstances);
-      out.writeObject(contains);
-   }
-
-   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
-   {
-      containerName = in.readUTF();
-      id = in.readObject();
-      metadata = (SimpleMetaData) in.readObject();
-      bean = in.readObject();
-      persistenceContexts = (HashMap<String, EntityManager>)  in.readObject();
-      interceptorInstances = (HashMap<Class, Object>)in.readObject();
-      beanMO = (MarshalledObject) in.readObject();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateful;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashMap;
+import javax.persistence.EntityManager;
+import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.ejb3.Ejb3Registry;
+import org.jboss.serial.io.MarshalledObject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class NestedStatefulBeanContext extends StatefulBeanContext
+{
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeUTF(getContainer().getObjectName().getCanonicalName());
+      out.writeObject(id);
+      out.writeObject(metadata);
+      out.writeObject(bean);
+      out.writeObject(persistenceContexts);
+      out.writeObject(interceptorInstances);
+      out.writeObject(contains);
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      containerName = in.readUTF();
+      id = in.readObject();
+      metadata = (SimpleMetaData) in.readObject();
+      bean = in.readObject();
+      persistenceContexts = (HashMap<String, EntityManager>)  in.readObject();
+      interceptorInstances = (HashMap<Class, Object>)in.readObject();
+      beanMO = (MarshalledObject) in.readObject();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,251 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateful;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
-import javax.ejb.EJBContext;
-import javax.persistence.EntityManager;
-import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.interceptor.InterceptorInfo;
-
-/**
- * Comment
- * 
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ProxiedStatefulBeanContext extends StatefulBeanContext implements
-      Externalizable
-{
-   private transient StatefulBeanContext delegate;
-
-   private Object oid;
-
-   private String containerId;
-   
-   private StatefulBeanContextReference parentRef;
-
-   public ProxiedStatefulBeanContext(StatefulBeanContext delegate)
-   {
-      this.delegate = delegate;
-      oid = delegate.getId();
-      containerId = delegate.getContainer().getObjectName().getCanonicalName();
-   }
-
-   public ProxiedStatefulBeanContext()
-   {
-   }
-
-   protected StatefulBeanContext getDelegate()
-   {
-      if (delegate == null)
-      {
-         for (StatefulBeanContext ctx : parentRef.getBeanContext()
-               .getContains())
-         {
-            Object matchingOid = ctx.getId();
-            if (oid.equals(matchingOid)
-                  && ctx.getContainer().getObjectName().getCanonicalName()
-                        .equals(containerId))
-            {
-               delegate = ctx;
-               break;
-            }
-         }
-         if (delegate == null)
-            throw new RuntimeException("Failed to read delegate");
-      }
-      return delegate;
-   }
-
-   public void writeExternal(ObjectOutput out) throws IOException
-   {
-      out.writeObject(oid);
-      out.writeUTF(containerId);
-      if(parentRef == null)
-      {
-         parentRef = new StatefulBeanContextReference(getDelegate()
-            .getContainedIn());
-      }
-      out.writeObject(parentRef);
-   }
-
-   public void readExternal(ObjectInput in) throws IOException,
-         ClassNotFoundException
-   {
-      oid = in.readObject();
-      containerId = in.readUTF();
-      parentRef = (StatefulBeanContextReference) in.readObject();
-   }
-
-//   public void prePassivate()
-//   {
-//   }
-
-//   public void postActivate()
-//   {
-//   }
-
-   public List<StatefulBeanContext> getContains()
-   {
-      return getDelegate().getContains();
-   }
-
-   public EntityManager getExtendedPersistenceContext(String id)
-   {
-      return getDelegate().getExtendedPersistenceContext(id);
-   }
-
-   public void addExtendedPersistenceContext(String id, EntityManager pc)
-   {
-      getDelegate().addExtendedPersistenceContext(id, pc);
-   }
-
-   public Map<String, EntityManager> getExtendedPersistenceContexts()
-   {
-      return getDelegate().getExtendedPersistenceContexts();
-   }
-
-   public StatefulBeanContext getContainedIn()
-   {
-      return getDelegate().getContainedIn();
-   }
-
-   public void addContains(StatefulBeanContext ctx)
-   {
-      getDelegate().addContains(ctx);
-   }
-
-   public StatefulBeanContext pushContainedIn()
-   {
-      return getDelegate().pushContainedIn();
-   }
-
-   public void popContainedIn()
-   {
-      getDelegate().popContainedIn();
-   }
-
-   public boolean isDiscarded()
-   {
-      return getDelegate().isDiscarded();
-   }
-
-   public void setDiscarded(boolean discarded)
-   {
-      getDelegate().setDiscarded(discarded);
-   }
-
-   public ReentrantLock getLock()
-   {
-      return getDelegate().getLock();
-   }
-
-   public boolean isInInvocation()
-   {
-      return getDelegate().isInInvocation();
-   }
-
-   public void setInInvocation(boolean inInvocation)
-   {
-      getDelegate().setInInvocation(inInvocation);
-   }
-
-   public Object getId()
-   {
-      return getDelegate().getId();
-   }
-
-   public void setId(Object id)
-   {
-      this.oid = id;
-      getDelegate().setId(id);
-   }
-
-   public boolean isTxSynchronized()
-   {
-      return getDelegate().isTxSynchronized();
-   }
-
-   public void setTxSynchronized(boolean txSynchronized)
-   {
-      getDelegate().setTxSynchronized(txSynchronized);
-   }
-
-   public void remove()
-   {
-      getDelegate().remove();
-   }
-
-   public void setContainer(Container container)
-   {
-      getDelegate().setContainer(container);
-   }
-
-   public Container getContainer()
-   {
-      return getDelegate().getContainer();
-   }
-
-   public Object getInstance()
-   {
-      return getDelegate().getInstance();
-   }
-
-   public SimpleMetaData getMetaData()
-   {
-      return getDelegate().getMetaData();
-   }
-
-   public Object[] getInterceptorInstances(InterceptorInfo[] interceptorInfos)
-   {
-      return getDelegate().getInterceptorInstances(interceptorInfos);
-   }
-
-   public void extractBeanAndInterceptors()
-   {
-      getDelegate().extractBeanAndInterceptors();
-   }
-
-   public void setInstance(Object instance)
-   {
-      getDelegate().setInstance(instance);
-   }
-
-   public void initialiseInterceptorInstances()
-   {
-      getDelegate().initialiseInterceptorInstances();
-   }
-
-   public EJBContext getEJBContext()
-   {
-      return getDelegate().getEJBContext();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,251 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateful;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.ejb.EJBContext;
+import javax.persistence.EntityManager;
+import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.interceptor.InterceptorInfo;
+
+/**
+ * Comment
+ * 
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ProxiedStatefulBeanContext extends StatefulBeanContext implements
+      Externalizable
+{
+   private transient StatefulBeanContext delegate;
+
+   private Object oid;
+
+   private String containerId;
+   
+   private StatefulBeanContextReference parentRef;
+
+   public ProxiedStatefulBeanContext(StatefulBeanContext delegate)
+   {
+      this.delegate = delegate;
+      oid = delegate.getId();
+      containerId = delegate.getContainer().getObjectName().getCanonicalName();
+   }
+
+   public ProxiedStatefulBeanContext()
+   {
+   }
+
+   protected StatefulBeanContext getDelegate()
+   {
+      if (delegate == null)
+      {
+         for (StatefulBeanContext ctx : parentRef.getBeanContext()
+               .getContains())
+         {
+            Object matchingOid = ctx.getId();
+            if (oid.equals(matchingOid)
+                  && ctx.getContainer().getObjectName().getCanonicalName()
+                        .equals(containerId))
+            {
+               delegate = ctx;
+               break;
+            }
+         }
+         if (delegate == null)
+            throw new RuntimeException("Failed to read delegate");
+      }
+      return delegate;
+   }
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeObject(oid);
+      out.writeUTF(containerId);
+      if(parentRef == null)
+      {
+         parentRef = new StatefulBeanContextReference(getDelegate()
+            .getContainedIn());
+      }
+      out.writeObject(parentRef);
+   }
+
+   public void readExternal(ObjectInput in) throws IOException,
+         ClassNotFoundException
+   {
+      oid = in.readObject();
+      containerId = in.readUTF();
+      parentRef = (StatefulBeanContextReference) in.readObject();
+   }
+
+//   public void prePassivate()
+//   {
+//   }
+
+//   public void postActivate()
+//   {
+//   }
+
+   public List<StatefulBeanContext> getContains()
+   {
+      return getDelegate().getContains();
+   }
+
+   public EntityManager getExtendedPersistenceContext(String id)
+   {
+      return getDelegate().getExtendedPersistenceContext(id);
+   }
+
+   public void addExtendedPersistenceContext(String id, EntityManager pc)
+   {
+      getDelegate().addExtendedPersistenceContext(id, pc);
+   }
+
+   public Map<String, EntityManager> getExtendedPersistenceContexts()
+   {
+      return getDelegate().getExtendedPersistenceContexts();
+   }
+
+   public StatefulBeanContext getContainedIn()
+   {
+      return getDelegate().getContainedIn();
+   }
+
+   public void addContains(StatefulBeanContext ctx)
+   {
+      getDelegate().addContains(ctx);
+   }
+
+   public StatefulBeanContext pushContainedIn()
+   {
+      return getDelegate().pushContainedIn();
+   }
+
+   public void popContainedIn()
+   {
+      getDelegate().popContainedIn();
+   }
+
+   public boolean isDiscarded()
+   {
+      return getDelegate().isDiscarded();
+   }
+
+   public void setDiscarded(boolean discarded)
+   {
+      getDelegate().setDiscarded(discarded);
+   }
+
+   public ReentrantLock getLock()
+   {
+      return getDelegate().getLock();
+   }
+
+   public boolean isInInvocation()
+   {
+      return getDelegate().isInInvocation();
+   }
+
+   public void setInInvocation(boolean inInvocation)
+   {
+      getDelegate().setInInvocation(inInvocation);
+   }
+
+   public Object getId()
+   {
+      return getDelegate().getId();
+   }
+
+   public void setId(Object id)
+   {
+      this.oid = id;
+      getDelegate().setId(id);
+   }
+
+   public boolean isTxSynchronized()
+   {
+      return getDelegate().isTxSynchronized();
+   }
+
+   public void setTxSynchronized(boolean txSynchronized)
+   {
+      getDelegate().setTxSynchronized(txSynchronized);
+   }
+
+   public void remove()
+   {
+      getDelegate().remove();
+   }
+
+   public void setContainer(Container container)
+   {
+      getDelegate().setContainer(container);
+   }
+
+   public Container getContainer()
+   {
+      return getDelegate().getContainer();
+   }
+
+   public Object getInstance()
+   {
+      return getDelegate().getInstance();
+   }
+
+   public SimpleMetaData getMetaData()
+   {
+      return getDelegate().getMetaData();
+   }
+
+   public Object[] getInterceptorInstances(InterceptorInfo[] interceptorInfos)
+   {
+      return getDelegate().getInterceptorInstances(interceptorInfos);
+   }
+
+   public void extractBeanAndInterceptors()
+   {
+      getDelegate().extractBeanAndInterceptors();
+   }
+
+   public void setInstance(Object instance)
+   {
+      getDelegate().setInstance(instance);
+   }
+
+   public void initialiseInterceptorInstances()
+   {
+      getDelegate().initialiseInterceptorInstances();
+   }
+
+   public EJBContext getEJBContext()
+   {
+      return getDelegate().getEJBContext();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,144 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateful;
-
-import java.rmi.RemoteException;
-import javax.ejb.EJBException;
-import javax.ejb.SessionSynchronization;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.ejb3.tx.TxUtil;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class SessionSynchronizationInterceptor implements Interceptor
-{
-   private TransactionManager tm;
-
-   public SessionSynchronizationInterceptor()
-   {
-      this.tm = TxUtil.getTransactionManager();
-   }
-
-   public String getName()
-   {
-      return null;
-   }
-
-   protected static class SFSBSessionSynchronization implements Synchronization
-   {
-      private StatefulBeanContext ctx;
-
-      public SFSBSessionSynchronization(StatefulBeanContext ctx)
-      {
-         this.ctx = ctx;
-      }
-
-      public void beforeCompletion()
-      {
-         SessionSynchronization bean = (SessionSynchronization) ctx.getInstance();
-         try
-         {
-            bean.beforeCompletion();
-         }
-         catch (RemoteException e)
-         {
-            throw new RuntimeException(e);
-         }
-      }
-
-      public void afterCompletion(int status)
-      {
-         ctx.setTxSynchronized(false);
-         SessionSynchronization bean = (SessionSynchronization) ctx.getInstance();
-         try
-         {
-            if (status == Status.STATUS_COMMITTED)
-            {
-               bean.afterCompletion(true);
-            }
-            else
-            {
-               bean.afterCompletion(false);
-            }
-         }
-         catch (RemoteException ignore)
-         {
-         }
-         finally
-         {
-            StatefulContainer container = (StatefulContainer) ctx.getContainer();
-            container.getCache().finished(ctx);
-         }
-      }
-   }
-
-   protected void registerSessionSynchronization(StatefulBeanContext ctx) throws SystemException
-   {
-      if (ctx.isTxSynchronized()) return;
-      Transaction tx = tm.getTransaction();
-      if (tx == null) return;
-      if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) return;
-      SFSBSessionSynchronization synch = new SFSBSessionSynchronization(ctx);
-      SessionSynchronization bean = (SessionSynchronization) ctx.getInstance();
-      try
-      {
-         bean.afterBegin();
-      }
-      catch (EJBException e)
-      {
-         throw e;
-      }
-      catch (RemoteException e)
-      {
-         throw new EJBException(e);
-      }
-      try
-      {
-         tx.registerSynchronization(synch);
-      }
-      catch (RollbackException ignore)
-      {
-      }
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      StatefulContainerInvocation ejb = (StatefulContainerInvocation) invocation;
-      StatefulBeanContext target = (StatefulBeanContext) ejb.getBeanContext();
-      if (target.getInstance() instanceof SessionSynchronization)
-      {
-         registerSessionSynchronization(target);
-      }
-      return ejb.invokeNext();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,144 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateful;
+
+import java.rmi.RemoteException;
+import javax.ejb.EJBException;
+import javax.ejb.SessionSynchronization;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.ejb3.tx.TxUtil;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class SessionSynchronizationInterceptor implements Interceptor
+{
+   private TransactionManager tm;
+
+   public SessionSynchronizationInterceptor()
+   {
+      this.tm = TxUtil.getTransactionManager();
+   }
+
+   public String getName()
+   {
+      return null;
+   }
+
+   protected static class SFSBSessionSynchronization implements Synchronization
+   {
+      private StatefulBeanContext ctx;
+
+      public SFSBSessionSynchronization(StatefulBeanContext ctx)
+      {
+         this.ctx = ctx;
+      }
+
+      public void beforeCompletion()
+      {
+         SessionSynchronization bean = (SessionSynchronization) ctx.getInstance();
+         try
+         {
+            bean.beforeCompletion();
+         }
+         catch (RemoteException e)
+         {
+            throw new RuntimeException(e);
+         }
+      }
+
+      public void afterCompletion(int status)
+      {
+         ctx.setTxSynchronized(false);
+         SessionSynchronization bean = (SessionSynchronization) ctx.getInstance();
+         try
+         {
+            if (status == Status.STATUS_COMMITTED)
+            {
+               bean.afterCompletion(true);
+            }
+            else
+            {
+               bean.afterCompletion(false);
+            }
+         }
+         catch (RemoteException ignore)
+         {
+         }
+         finally
+         {
+            StatefulContainer container = (StatefulContainer) ctx.getContainer();
+            container.getCache().finished(ctx);
+         }
+      }
+   }
+
+   protected void registerSessionSynchronization(StatefulBeanContext ctx) throws SystemException
+   {
+      if (ctx.isTxSynchronized()) return;
+      Transaction tx = tm.getTransaction();
+      if (tx == null) return;
+      if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) return;
+      SFSBSessionSynchronization synch = new SFSBSessionSynchronization(ctx);
+      SessionSynchronization bean = (SessionSynchronization) ctx.getInstance();
+      try
+      {
+         bean.afterBegin();
+      }
+      catch (EJBException e)
+      {
+         throw e;
+      }
+      catch (RemoteException e)
+      {
+         throw new EJBException(e);
+      }
+      try
+      {
+         tx.registerSynchronization(synch);
+      }
+      catch (RollbackException ignore)
+      {
+      }
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      StatefulContainerInvocation ejb = (StatefulContainerInvocation) invocation;
+      StatefulBeanContext target = (StatefulBeanContext) ejb.getBeanContext();
+      if (target.getInstance() instanceof SessionSynchronization)
+      {
+         registerSessionSynchronization(target);
+      }
+      return ejb.invokeNext();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/SessionSynchronizationInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -233,17 +233,32 @@
       this.txSynchronized = txSynchronized;
    }
 
+   public boolean isRemoved()
+   {
+      return removed;
+   }
+
    public void remove()
    {
       if (removed)
          return;
       removed = true;
+      RuntimeException exceptionThrown = null;
       if (contains != null)
       {
          for (StatefulBeanContext contained : contains)
          {
-            ((StatefulContainer) contained.getContainer()).getCache().remove(
-                    contained.getId());
+            try
+            {
+               ((StatefulContainer) contained.getContainer()).getCache().remove(
+                       contained.getId());
+            }
+            catch (RuntimeException e)
+            {
+               // we still need to remove every contained SFSB
+               // save the thrown exception and rethrow it after we have cleaned up.
+               exceptionThrown = e;
+            }
          }
       }
       try
@@ -270,8 +285,9 @@
       }
       catch (Exception e)
       {
-         throw new RuntimeException(e);
+         throw new RuntimeException("Exception thrown while removing SFSB", e);
       }
+      if (exceptionThrown != null) throw new RuntimeException("exception thrown while removing SFSB", exceptionThrown);
    }
 
    private void closeExtendedPCs()
@@ -279,10 +295,19 @@
       Map<String, EntityManager> extendedPCS = getExtendedPersistenceContexts();
       if (extendedPCS != null)
       {
+         RuntimeException exceptionThrown = null;
          for (EntityManager pc : extendedPCS.values())
          {
-            pc.close();
+            try
+            {
+               pc.close();
+            }
+            catch (RuntimeException e)
+            {
+               exceptionThrown = e;
+            }
          }
+         if (exceptionThrown != null) throw new RuntimeException("Error cleaning up PersistenceContexts in SFSB removal", exceptionThrown);
       }
    }
 

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateful;
-
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import org.jboss.ejb3.Ejb3Registry;
-
-/**
- * Serializable reference to stateful bean context that can be disconnected
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class StatefulBeanContextReference implements Externalizable
-{
-   private transient StatefulBeanContext beanContext;
-   private Object oid;
-   private String containerId;
-   
-   
-
-   public StatefulBeanContextReference()
-   {
-   }
-
-   public StatefulBeanContextReference(StatefulBeanContext beanContext)
-   {
-      this.beanContext = beanContext;
-      oid = beanContext.getId();
-      containerId = beanContext.getContainer().getObjectName().getCanonicalName();
-   }
-
-   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
-   {
-      containerId = in.readUTF();
-      oid = in.readObject();
-   }
-
-   public void writeExternal(ObjectOutput out) throws IOException
-   {
-      out.writeUTF(containerId);
-      out.writeObject(oid);
-   }
-
-   public StatefulBeanContext getBeanContext()
-   {
-      if (beanContext == null)
-      {
-         StatefulContainer container = (StatefulContainer)Ejb3Registry.getContainer(containerId);
-         beanContext = container.getCache().get(oid);
-      }
-      return beanContext;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateful;
+
+import java.io.Externalizable;
+import java.io.ObjectInput;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import org.jboss.ejb3.Ejb3Registry;
+
+/**
+ * Serializable reference to stateful bean context that can be disconnected
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class StatefulBeanContextReference implements Externalizable
+{
+   private transient StatefulBeanContext beanContext;
+   private Object oid;
+   private String containerId;
+   
+   
+
+   public StatefulBeanContextReference()
+   {
+   }
+
+   public StatefulBeanContextReference(StatefulBeanContext beanContext)
+   {
+      this.beanContext = beanContext;
+      oid = beanContext.getId();
+      containerId = beanContext.getContainer().getObjectName().getCanonicalName();
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      containerId = in.readUTF();
+      oid = in.readObject();
+   }
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeUTF(containerId);
+      out.writeObject(oid);
+   }
+
+   public StatefulBeanContext getBeanContext()
+   {
+      if (beanContext == null)
+      {
+         StatefulContainer container = (StatefulContainer)Ejb3Registry.getContainer(containerId);
+         beanContext = container.getCache().get(oid);
+      }
+      return beanContext;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -86,7 +86,9 @@
       locator = new InvokerLocator(clientBindUrl);
       Clustered clustered = (Clustered) advisor.resolveAnnotation(Clustered.class);
       if (clustered == null) throw new RuntimeException("Could not find @Clustered annotation.  Cannot deploy.");
-      String partitionName = clustered.partition();
+      // Partition name may be ${jboss.partition.name:DefaultPartition} 
+      // so do a system property substitution
+      String partitionName = substituteSystemProperty(clustered.partition());
       proxyFamilyName = container.getEjbName() + locator.getProtocol() + partitionName;
       HAPartition partition = (HAPartition) container.getInitialContext().lookup("/HAPartition/" + partitionName);
       hatarget = new HATarget(partition, proxyFamilyName, locator, HATarget.ENABLE_INVOCATIONS);

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -46,6 +46,8 @@
  */
 public class StatefulClusteredProxy extends org.jboss.ejb3.remoting.BaseRemoteProxy
 {
+   private static final long serialVersionUID = 2702033360945548435L;
+   
    private Object id;
    protected FamilyWrapper family;
    protected LoadBalancePolicy lbPolicy;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,13 +21,29 @@
  */
 package org.jboss.ejb3.stateful;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBObject;
+import javax.ejb.Handle;
+import javax.ejb.Init;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.TimerService;
+
 import org.jboss.annotation.ejb.LocalBinding;
 import org.jboss.annotation.ejb.RemoteBinding;
 import org.jboss.annotation.ejb.RemoteBindings;
 import org.jboss.annotation.ejb.cache.Cache;
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.InvocationResponse;
 import org.jboss.aop.util.MethodHashing;
@@ -39,31 +55,14 @@
 import org.jboss.ejb3.ProxyFactoryHelper;
 import org.jboss.ejb3.ProxyUtils;
 import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.ThreadLocalENCFactory;
 import org.jboss.ejb3.cache.StatefulCache;
-import org.jboss.injection.Injector;
-import org.jboss.injection.JndiFieldInjector;
 import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
 import org.jboss.ejb3.proxy.EJBMetaDataImpl;
 import org.jboss.ejb3.proxy.handle.HomeHandleImpl;
+import org.jboss.injection.Injector;
+import org.jboss.injection.JndiFieldInjector;
 import org.jboss.logging.Logger;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import javax.ejb.Handle;
-import javax.ejb.Init;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.TimerService;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Map;
-
 /**
  * Comment
  *
@@ -132,12 +131,11 @@
    /**
     * Performs a synchronous or asynchronous local invocation
     *
-    * @param provider If null a synchronous invocation, otherwise an asynchronous
     */
    public Object localHomeInvoke(Method method, Object[] args) throws Throwable
    {
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          long hash = MethodHashing.calculateHash(method);
@@ -153,7 +151,7 @@
       finally
       {
          Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
    }
 
@@ -163,10 +161,12 @@
     * @param provider If null a synchronous invocation, otherwise an asynchronous
     */
    public Object localInvoke(Object id, Method method, Object[] args,
-                             FutureHolder provider) throws Throwable
+         FutureHolder provider) throws Throwable
    {
+      long start = System.currentTimeMillis();
+
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          long hash = MethodHashing.calculateHash(method);
@@ -174,43 +174,53 @@
          if (info == null)
          {
             throw new RuntimeException(
-                    "Could not resolve beanClass method from proxy call: "
-                            + method.toString());
+                  "Could not resolve beanClass method from proxy call: "
+                  + method.toString());
          }
-
+      
          Method unadvisedMethod = info.getUnadvisedMethod();
-
-         if (unadvisedMethod != null && isHomeMethod(unadvisedMethod))
-         {
-            return invokeLocalHomeMethod(info, args);
-         }
-         else if (unadvisedMethod != null
-                 && isEJBObjectMethod(unadvisedMethod))
-         {
-            return invokeEJBLocalObjectMethod(id, info, args);
-         }
-
-         Interceptor[] aspects = info.getInterceptors();
-         StatefulContainerInvocation nextInvocation = new StatefulContainerInvocation(
-                 info, aspects, id);
-         nextInvocation.setAdvisor(this);
-         nextInvocation.setArguments(args);
-
-         ProxyUtils.addLocalAsynchronousInfo(nextInvocation, provider);
+      
          try
          {
+            invokeStats.callIn();
+      
+            if (unadvisedMethod != null && isHomeMethod(unadvisedMethod))
+            {
+               return invokeLocalHomeMethod(info, args);
+            }
+            else if (unadvisedMethod != null
+                  && isEJBObjectMethod(unadvisedMethod))
+            {
+               return invokeEJBLocalObjectMethod(id, info, args);
+            }
+            
+            StatefulContainerInvocation nextInvocation = new StatefulContainerInvocation(info, id);
+            nextInvocation.setAdvisor(this);
+            nextInvocation.setArguments(args);
+            
+            ProxyUtils.addLocalAsynchronousInfo(nextInvocation, provider);
+            
             invokedMethod.push(new InvokedMethod(true, method));
             return nextInvocation.invokeNext();
          }
          finally
          {
+            if (unadvisedMethod != null)
+            {
+               long end = System.currentTimeMillis();
+               long elapsed = end - start;
+               invokeStats.updateStats(unadvisedMethod, elapsed);
+            }
+         
+            invokeStats.callOut();
+            
             invokedMethod.pop();
          }
       }
       finally
       {
          Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
    }
 
@@ -222,7 +232,7 @@
    public Object createSession()
    {
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          Thread.currentThread().setContextClassLoader(classloader);
@@ -231,7 +241,7 @@
       finally
       {
          Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
    }
 
@@ -243,7 +253,7 @@
    public Object createSession(Class[] initTypes, Object[] initValues)
    {
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          Thread.currentThread().setContextClassLoader(classloader);
@@ -252,7 +262,7 @@
       finally
       {
          Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
    }
 
@@ -270,9 +280,11 @@
     */
    public InvocationResponse dynamicInvoke(Object target, Invocation invocation) throws Throwable
    {
+      long start = System.currentTimeMillis();
+      
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
       EJBContainerInvocation newSi = null;
-      ThreadLocalENCFactory.push(enc);
+      pushEnc();
       try
       {
          Thread.currentThread().setContextClassLoader(classloader);
@@ -285,57 +297,69 @@
 
          InvocationResponse response = null;
          Method unadvisedMethod = info.getUnadvisedMethod();
-         if (info != null && unadvisedMethod != null && isHomeMethod(unadvisedMethod))
+         Object newId = null;
+         
+         try
          {
-            response = invokeHomeMethod(info, si);
-         }
-         else if (info != null && unadvisedMethod != null && isEJBObjectMethod(unadvisedMethod))
-         {
-            response = invokeEJBObjectMethod(info, si);
-         }
-         else
-         {
-            Interceptor[] aspects = info.getInterceptors();
-            Object newId = null;
-
-            if (si.getId() == null)
+            invokeStats.callIn();
+            
+            if (info != null && unadvisedMethod != null && isHomeMethod(unadvisedMethod))
             {
-               StatefulBeanContext ctx = getCache().create();
-               newId = ctx.getId();
+               response = invokeHomeMethod(info, si);
             }
-            else
+            else if (info != null && unadvisedMethod != null && isEJBObjectMethod(unadvisedMethod))
             {
-               newId = si.getId();
+               response = invokeEJBObjectMethod(info, si);
             }
-            newSi = new StatefulContainerInvocation(info, aspects, newId);
-            newSi.setArguments(si.getArguments());
-            newSi.setMetaData(si.getMetaData());
-            newSi.setAdvisor(this);
-
-            Object rtn = null;
-            try
+            else
             {
+               if (si.getId() == null)
+               {
+                  StatefulBeanContext ctx = getCache().create();
+                  newId = ctx.getId();
+               }
+               else
+               {
+                  newId = si.getId();
+               }
+               newSi = new StatefulContainerInvocation(info, newId);
+               newSi.setArguments(si.getArguments());
+               newSi.setMetaData(si.getMetaData());
+               newSi.setAdvisor(this);
+   
+               Object rtn = null;
+               
                invokedMethod.push(new InvokedMethod(false, unadvisedMethod));
                rtn = newSi.invokeNext();
+
+               response = marshallResponse(invocation, rtn, newSi.getResponseContextInfo());
+               if (newId != null) response.addAttachment(StatefulConstants.NEW_ID, newId);
             }
-            catch (Throwable throwable)
+         }
+         catch (Throwable throwable)
+         {
+            Throwable exception = throwable;
+            if (newId != null)
             {
-               Throwable exception = throwable;
-               if (newId != null)
-               {
-                  exception = new ForwardId(throwable, newId);
-               }
-               Map responseContext = newSi.getResponseContextInfo();
-               response = marshallException(invocation, exception, responseContext);
-               return response;
+               exception = new ForwardId(throwable, newId);
             }
-            finally
+            Map responseContext = null;
+            if (newSi != null) newSi.getResponseContextInfo();
+            response = marshallException(invocation, exception, responseContext);
+            return response;
+         }
+         finally
+         {
+            if (unadvisedMethod != null)
             {
-               invokedMethod.pop();
+               long end = System.currentTimeMillis();
+               long elapsed = end - start;
+               invokeStats.updateStats(unadvisedMethod, elapsed);
             }
-
-            response = marshallResponse(invocation, rtn, newSi.getResponseContextInfo());
-            if (newId != null) response.addAttachment(StatefulConstants.NEW_ID, newId);
+            
+            invokeStats.callOut();
+            
+            invokedMethod.pop();
          }
 
          return response;
@@ -343,11 +367,11 @@
       finally
       {
          Thread.currentThread().setContextClassLoader(oldLoader);
-         ThreadLocalENCFactory.pop();
+         popEnc();
       }
-
    }
 
+
    public TimerService getTimerService()
    {
       throw new UnsupportedOperationException("stateful bean doesn't support TimerService (EJB3 18.2#2)");
@@ -771,8 +795,6 @@
                                                           Class[] initParameterTypes, Object[] initParameterValues)
    {
       StatefulContainerInvocation newStatefulInvocation = null;
-      Interceptor[] aspects = info.getInterceptors();
-      Object newId = null;
 
       StatefulBeanContext ctx = null;
       if (initParameterTypes.length > 0)
@@ -780,9 +802,8 @@
       else
          ctx = getCache().create();
 
-      newId = ctx.getId();
-      newStatefulInvocation = new StatefulContainerInvocation(info, aspects,
-              newId);
+      Object newId = ctx.getId();
+      newStatefulInvocation = new StatefulContainerInvocation(info, newId);
 
       newStatefulInvocation.setArguments(statefulInvocation.getArguments());
       newStatefulInvocation.setMetaData(statefulInvocation.getMetaData());
@@ -795,19 +816,16 @@
                                                        StatefulRemoteInvocation statefulInvocation)
    {
       StatefulContainerInvocation newStatefulInvocation = null;
-      Interceptor[] aspects = info.getInterceptors();
       Object newId = null;
       if (statefulInvocation.getId() == null)
       {
          StatefulBeanContext ctx = getCache().create();
          newId = ctx.getId();
-         newStatefulInvocation = new StatefulContainerInvocation(info, aspects,
-                 newId);
+         newStatefulInvocation = new StatefulContainerInvocation(info, newId);
       }
       else
       {
-         newStatefulInvocation = new StatefulContainerInvocation(info, aspects,
-                 statefulInvocation.getId());
+         newStatefulInvocation = new StatefulContainerInvocation(info, statefulInvocation.getId());
       }
 
       newStatefulInvocation.setArguments(statefulInvocation.getArguments());

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainerInvocation.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainerInvocation.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainerInvocation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -22,6 +22,7 @@
 package org.jboss.ejb3.stateful;
 
 import java.lang.reflect.Method;
+
 import org.jboss.aop.Advisor;
 import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.Interceptor;
@@ -44,9 +45,9 @@
       this.id = id;
    }
 
-   public StatefulContainerInvocation(MethodInfo info, Interceptor[] interceptors, Object id)
+   public StatefulContainerInvocation(MethodInfo info, Object id)
    {
-      super(info, interceptors);
+      super(info);
       this.id = id;
    }
 

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,184 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateful;
-
-import java.rmi.RemoteException;
-import java.rmi.ServerException;
-import java.security.AccessControlException;
-import java.util.Hashtable;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import javax.ejb.EJBObject;
-import javax.ejb.Handle;
-import javax.naming.InitialContext;
-
-import org.jboss.invocation.Invoker;
-import org.jboss.logging.Logger;
-import org.jboss.naming.NamingContextFactory;
-
-/**
- * An EJB stateful session bean handle.
- *
- * @author  <a href="mailto:marc.fleury at jboss.org">Marc Fleury</a>
- * @author  <a href="mailto:jason at planet57.com">Jason Dillon</a>
- * @author <a href="bill at burkecentral.com">Bill Burke</a>
- * @author <a href="bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class StatefulHandleImpl
-   implements Handle
-{
-   private static final Logger log = Logger.getLogger(StatefulHandleImpl.class);
-   
-   /** Serial Version Identifier. */
-   static final long serialVersionUID = -6324520755180597156L;
-
-   /** A reference to {@link Handle#getEJBObject}. */
-   protected static final Method GET_EJB_OBJECT;
-
-   /** The value of our local Invoker.ID to detect when we are local. */
-   private Object invokerID = null;
-
-   /**
-    * Initialize <tt>Handle</tt> method references.
-    */
-   static
-   {
-      try
-      {
-         GET_EJB_OBJECT = Handle.class.getMethod("getEJBObject", new Class[0]);
-      }
-      catch(Exception e)
-      {
-         e.printStackTrace();
-         throw new ExceptionInInitializerError(e);
-      }
-   }
-   
-   public StatefulHandleImpl()
-   {
-      
-   }
-   
-   /** The identity of the bean. */
-   public int objectName;
-   public String jndiName;
-   public String invokerProxyBinding;
-   public Invoker invoker;
-   public Object id;
-
-   /** The JNDI env in effect when the home handle was created */
-   protected Hashtable jndiEnv;
-
-   /** Create an ejb handle for a stateful session bean.
-    * @param objectName - the session container jmx name
-    * @param jndiName - the session home ejb name
-    * @param invoker - the invoker to request the EJBObject from
-    * @param invokerProxyBinding - the type of invoker binding
-    * @param id - the session id
-    */ 
-   public StatefulHandleImpl(
-      int objectName,
-      String jndiName,
-      Invoker invoker,
-      String invokerProxyBinding,
-      Object id,
-      Object invokerID)
-   {
-      this.jndiName = jndiName;
-      this.id = id;
-      this.jndiEnv = (Hashtable) NamingContextFactory.lastInitialContextEnv.get();
-      try
-      {
-         String property = System.getProperty("org.jboss.ejb.sfsb.handle.V327");
-         if (property != null)
-         {
-            this.invokerProxyBinding = invokerProxyBinding;
-            this.invokerID = invokerID;
-            this.objectName = objectName;
-            this.invoker = invoker;
-         }
-      }
-      catch (AccessControlException ignored)
-      {
-      }
-
-   }
-
-   /**
-    * @return the internal session identifier
-    */
-   public Object getID()
-   {
-      return id;
-   }
-
-   /**
-    * @return the jndi name
-    */
-   public String getJNDIName()
-   {
-      return jndiName;
-   }
-
-   /**
-    * Handle implementation.
-    *
-    * This differs from Stateless and Entity handles which just invoke
-    * standard methods (<tt>create</tt> and <tt>findByPrimaryKey</tt>
-    * respectively) on the Home interface (proxy).
-    * There is no equivalent option for stateful SBs, so a direct invocation
-    * on the container has to be made to locate the bean by its id (the
-    * stateful SB container provides an implementation of
-    * <tt>getEJBObject</tt>).
-    *
-    * This means the security context has to be set here just as it would
-    * be in the Proxy.
-    *
-    * @return  <tt>EJBObject</tt> reference.
-    *
-    * @throws ServerException    Could not get EJBObject.
-    */
-   public EJBObject getEJBObject() throws RemoteException
-   {
-      try
-      {
-         InitialContext ic = null;
-         if( jndiEnv != null )
-            ic = new InitialContext(jndiEnv);
-         else
-            ic = new InitialContext();
-    
-         Proxy proxy = (Proxy) ic.lookup(jndiName);
-
-         return (EJBObject) proxy;
-      }
-      catch (Throwable t)
-      {
-         t.printStackTrace();
-         throw new RemoteException("Error during getEJBObject", t);
-      }
-   }
-}
-

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,184 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateful;
+
+import java.rmi.RemoteException;
+import java.rmi.ServerException;
+import java.security.AccessControlException;
+import java.util.Hashtable;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import javax.ejb.EJBObject;
+import javax.ejb.Handle;
+import javax.naming.InitialContext;
+
+import org.jboss.invocation.Invoker;
+import org.jboss.logging.Logger;
+import org.jboss.naming.NamingContextFactory;
+
+/**
+ * An EJB stateful session bean handle.
+ *
+ * @author  <a href="mailto:marc.fleury at jboss.org">Marc Fleury</a>
+ * @author  <a href="mailto:jason at planet57.com">Jason Dillon</a>
+ * @author <a href="bill at burkecentral.com">Bill Burke</a>
+ * @author <a href="bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class StatefulHandleImpl
+   implements Handle
+{
+   private static final Logger log = Logger.getLogger(StatefulHandleImpl.class);
+   
+   /** Serial Version Identifier. */
+   static final long serialVersionUID = -6324520755180597156L;
+
+   /** A reference to {@link Handle#getEJBObject}. */
+   protected static final Method GET_EJB_OBJECT;
+
+   /** The value of our local Invoker.ID to detect when we are local. */
+   private Object invokerID = null;
+
+   /**
+    * Initialize <tt>Handle</tt> method references.
+    */
+   static
+   {
+      try
+      {
+         GET_EJB_OBJECT = Handle.class.getMethod("getEJBObject", new Class[0]);
+      }
+      catch(Exception e)
+      {
+         e.printStackTrace();
+         throw new ExceptionInInitializerError(e);
+      }
+   }
+   
+   public StatefulHandleImpl()
+   {
+      
+   }
+   
+   /** The identity of the bean. */
+   public int objectName;
+   public String jndiName;
+   public String invokerProxyBinding;
+   public Invoker invoker;
+   public Object id;
+
+   /** The JNDI env in effect when the home handle was created */
+   protected Hashtable jndiEnv;
+
+   /** Create an ejb handle for a stateful session bean.
+    * @param objectName - the session container jmx name
+    * @param jndiName - the session home ejb name
+    * @param invoker - the invoker to request the EJBObject from
+    * @param invokerProxyBinding - the type of invoker binding
+    * @param id - the session id
+    */ 
+   public StatefulHandleImpl(
+      int objectName,
+      String jndiName,
+      Invoker invoker,
+      String invokerProxyBinding,
+      Object id,
+      Object invokerID)
+   {
+      this.jndiName = jndiName;
+      this.id = id;
+      this.jndiEnv = (Hashtable) NamingContextFactory.lastInitialContextEnv.get();
+      try
+      {
+         String property = System.getProperty("org.jboss.ejb.sfsb.handle.V327");
+         if (property != null)
+         {
+            this.invokerProxyBinding = invokerProxyBinding;
+            this.invokerID = invokerID;
+            this.objectName = objectName;
+            this.invoker = invoker;
+         }
+      }
+      catch (AccessControlException ignored)
+      {
+      }
+
+   }
+
+   /**
+    * @return the internal session identifier
+    */
+   public Object getID()
+   {
+      return id;
+   }
+
+   /**
+    * @return the jndi name
+    */
+   public String getJNDIName()
+   {
+      return jndiName;
+   }
+
+   /**
+    * Handle implementation.
+    *
+    * This differs from Stateless and Entity handles which just invoke
+    * standard methods (<tt>create</tt> and <tt>findByPrimaryKey</tt>
+    * respectively) on the Home interface (proxy).
+    * There is no equivalent option for stateful SBs, so a direct invocation
+    * on the container has to be made to locate the bean by its id (the
+    * stateful SB container provides an implementation of
+    * <tt>getEJBObject</tt>).
+    *
+    * This means the security context has to be set here just as it would
+    * be in the Proxy.
+    *
+    * @return  <tt>EJBObject</tt> reference.
+    *
+    * @throws ServerException    Could not get EJBObject.
+    */
+   public EJBObject getEJBObject() throws RemoteException
+   {
+      try
+      {
+         InitialContext ic = null;
+         if( jndiEnv != null )
+            ic = new InitialContext(jndiEnv);
+         else
+            ic = new InitialContext();
+    
+         Proxy proxy = (Proxy) ic.lookup(jndiName);
+
+         return (EJBObject) proxy;
+      }
+      catch (Throwable t)
+      {
+         t.printStackTrace();
+         throw new RemoteException("Error during getEJBObject", t);
+      }
+   }
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHandleImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,132 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateful;
-
-import java.lang.reflect.Method;
-import javax.ejb.EJBMetaData;
-import javax.ejb.HomeHandle;
-import org.jboss.aop.Dispatcher;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.util.MethodHashing;
-import org.jboss.aop.util.PayloadKey;
-import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
-import org.jboss.ejb3.ProxyUtils;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.InvokerLocator;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class StatefulHomeRemoteProxy extends org.jboss.ejb3.session.BaseSessionRemoteProxy
-{
-   private static final Logger log = Logger.getLogger(StatefulHomeRemoteProxy.class);
-
-   protected InvokerLocator uri;
-   private HomeHandle homeHandle;
-   private EJBMetaData ejbMetaData;
-
-   public StatefulHomeRemoteProxy(Object containerId, Interceptor[] interceptors, InvokerLocator uri)
-   {
-      super(containerId, interceptors);
-      this.uri = uri;
-   }
-
-   public StatefulHomeRemoteProxy(Object containerId, Interceptor[] interceptors, InvokerLocator uri, Object id)
-   {
-      super(containerId, interceptors);
-      this.uri = uri;
-      this.id = id;
-   }
-
-   protected StatefulHomeRemoteProxy()
-   {
-   }
-
-   public void setHandle(StatefulHandleImpl handle)
-   {
-      this.handle = handle;
-      handle.id = id;
-   }
-
-   public void setHomeHandle(HomeHandle homeHandle)
-   {
-      this.homeHandle = homeHandle;
-   }
-
-   public void setEjbMetaData(EJBMetaData ejbMetaData)
-   {
-      this.ejbMetaData = ejbMetaData;
-   }
-
-   public Object invoke(Object proxy, Method method, Object[] args)
-           throws Throwable
-   {
-      long hash = MethodHashing.calculateHash(method);
-      Object ret = ProxyUtils.handleCallLocally(hash, proxy, this, method, args);
-      if (ret != null)
-      {
-         return ret;
-      }
-
-      ret = handleEjb21CallLocally(method, args);
-      if (ret != null)
-      {
-         return ret;
-      }
-
-      StatefulRemoteInvocation sri = new StatefulRemoteInvocation(interceptors, hash, method, method, null, null);
-      sri.setArguments(args);
-      sri.setInstanceResolver(metadata);
-      sri.getMetaData().addMetaData(Dispatcher.DISPATCHER, Dispatcher.OID, containerId, PayloadKey.AS_IS);
-      sri.getMetaData().addMetaData(InvokeRemoteInterceptor.REMOTING, InvokeRemoteInterceptor.INVOKER_LOCATOR, uri, PayloadKey.AS_IS);
-      sri.getMetaData().addMetaData(InvokeRemoteInterceptor.REMOTING, InvokeRemoteInterceptor.SUBSYSTEM, "AOP", PayloadKey.AS_IS);
-
-      return sri.invokeNext();
-   }
-
-   public Object getAsynchronousProxy(Object proxy)
-   {
-      throw new RuntimeException("NOT IMPLEMENTED");
-   }
-
-   public String toString()
-   {
-      return containerId.toString() + ":Home";
-   }
-
-   private Object handleEjb21CallLocally(Method method, Object[] args)
-   {
-      if (method.equals(ProxyUtils.GET_HOME_HANDLE))
-      {
-         return homeHandle;
-      }
-      else if (method.equals(ProxyUtils.GET_EJB_METADATA))
-      {
-         return ejbMetaData;
-      }
-
-      return null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateful;
+
+import java.lang.reflect.Method;
+import javax.ejb.EJBMetaData;
+import javax.ejb.HomeHandle;
+import org.jboss.aop.Dispatcher;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.util.MethodHashing;
+import org.jboss.aop.util.PayloadKey;
+import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
+import org.jboss.ejb3.ProxyUtils;
+import org.jboss.logging.Logger;
+import org.jboss.remoting.InvokerLocator;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class StatefulHomeRemoteProxy extends org.jboss.ejb3.session.BaseSessionRemoteProxy
+{
+   private static final long serialVersionUID = 5509794838403316545L;
+
+   private static final Logger log = Logger.getLogger(StatefulHomeRemoteProxy.class);
+
+   protected InvokerLocator uri;
+   private HomeHandle homeHandle;
+   private EJBMetaData ejbMetaData;
+
+   public StatefulHomeRemoteProxy(Object containerId, Interceptor[] interceptors, InvokerLocator uri)
+   {
+      super(containerId, interceptors);
+      this.uri = uri;
+   }
+
+   public StatefulHomeRemoteProxy(Object containerId, Interceptor[] interceptors, InvokerLocator uri, Object id)
+   {
+      super(containerId, interceptors);
+      this.uri = uri;
+      this.id = id;
+   }
+
+   protected StatefulHomeRemoteProxy()
+   {
+   }
+
+   public void setHandle(StatefulHandleImpl handle)
+   {
+      this.handle = handle;
+      handle.id = id;
+   }
+
+   public void setHomeHandle(HomeHandle homeHandle)
+   {
+      this.homeHandle = homeHandle;
+   }
+
+   public void setEjbMetaData(EJBMetaData ejbMetaData)
+   {
+      this.ejbMetaData = ejbMetaData;
+   }
+
+   public Object invoke(Object proxy, Method method, Object[] args)
+           throws Throwable
+   {
+      long hash = MethodHashing.calculateHash(method);
+      Object ret = ProxyUtils.handleCallLocally(hash, proxy, this, method, args);
+      if (ret != null)
+      {
+         return ret;
+      }
+
+      ret = handleEjb21CallLocally(method, args);
+      if (ret != null)
+      {
+         return ret;
+      }
+
+      StatefulRemoteInvocation sri = new StatefulRemoteInvocation(interceptors, hash, method, method, null, null);
+      sri.setArguments(args);
+      sri.setInstanceResolver(metadata);
+      sri.getMetaData().addMetaData(Dispatcher.DISPATCHER, Dispatcher.OID, containerId, PayloadKey.AS_IS);
+      sri.getMetaData().addMetaData(InvokeRemoteInterceptor.REMOTING, InvokeRemoteInterceptor.INVOKER_LOCATOR, uri, PayloadKey.AS_IS);
+      sri.getMetaData().addMetaData(InvokeRemoteInterceptor.REMOTING, InvokeRemoteInterceptor.SUBSYSTEM, "AOP", PayloadKey.AS_IS);
+
+      return sri.invokeNext();
+   }
+
+   public Object getAsynchronousProxy(Object proxy)
+   {
+      throw new RuntimeException("NOT IMPLEMENTED");
+   }
+
+   public String toString()
+   {
+      return containerId.toString() + ":Home";
+   }
+
+   private Object handleEjb21CallLocally(Method method, Object[] args)
+   {
+      if (method.equals(ProxyUtils.GET_HOME_HANDLE))
+      {
+         return homeHandle;
+      }
+      else if (method.equals(ProxyUtils.GET_EJB_METADATA))
+      {
+         return ejbMetaData;
+      }
+
+      return null;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulHomeRemoteProxy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateful;
-
-import java.lang.reflect.Method;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.LocalProxy;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class StatefulLocalHomeProxy extends LocalProxy
-{
-   protected StatefulLocalHomeProxy()
-   {
-   }
-
-   public StatefulLocalHomeProxy(Container container)
-   {
-      super(container);
-   }
-
-   public Object invoke(Object proxy, Method method, Object[] args)
-           throws Throwable
-   {
-      StatefulContainer sfsb = (StatefulContainer) container;
-      return sfsb.localHomeInvoke(method, args);
-   }
-
-   public Object getAsynchronousProxy(Object proxy)
-   {
-      throw new RuntimeException("NOT AVAILABLE FOR HOME PROXIES");
-   }
-
-   public String toString()
-   {
-      return container.getObjectName().getCanonicalName() + ": Home Proxy";
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateful;
+
+import java.lang.reflect.Method;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.LocalProxy;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class StatefulLocalHomeProxy extends LocalProxy
+{
+   private static final long serialVersionUID = -9026021347498876589L;
+
+   protected StatefulLocalHomeProxy()
+   {
+   }
+
+   public StatefulLocalHomeProxy(Container container)
+   {
+      super(container);
+   }
+
+   public Object invoke(Object proxy, Method method, Object[] args)
+           throws Throwable
+   {
+      StatefulContainer sfsb = (StatefulContainer) container;
+      return sfsb.localHomeInvoke(method, args);
+   }
+
+   public Object getAsynchronousProxy(Object proxy)
+   {
+      throw new RuntimeException("NOT AVAILABLE FOR HOME PROXIES");
+   }
+
+   public String toString()
+   {
+      return container.getObjectName().getCanonicalName() + ": Home Proxy";
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalHomeProxy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -43,6 +43,8 @@
  */
 public class StatefulLocalProxy extends LocalProxy implements Externalizable
 {
+   private static final long serialVersionUID = 206913210970415540L;
+   
    protected Object id;
    AsynchProvider provider;
 
@@ -88,7 +90,7 @@
       }
 
       //Make sure we get the cache id before getting the asynchronous interface
-      StatefulContainer sfsb = (StatefulContainer) container;
+      StatefulContainer sfsb = (StatefulContainer) getContainer();
       Object ret = ProxyUtils.handleCallLocally(proxy, this, method, args);
       if (ret != null)
       {
@@ -105,7 +107,7 @@
       {
          Class[] interfaces = ProxyUtils.addAsynchProviderInterface(infs);
          AsynchMixin mixin = new AsynchMixin();
-         StatefulLocalProxy handler = new StatefulLocalProxy(mixin, container, id);
+         StatefulLocalProxy handler = new StatefulLocalProxy(mixin, getContainer(), id);
          return Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), interfaces, handler);
       }
 
@@ -117,13 +119,13 @@
    {
       if (id != null)
       {
-         return container.getEjbName().toString() + ":" + id.toString();
+         return getContainer().getEjbName().toString() + ":" + id.toString();
       }
       else
       {
          //If the proxy has not been used yet, create a temporary id 
          GUID guid = new GUID();
-         return container.getEjbName().toString() + ":" + guid.toString();
+         return getContainer().getEjbName().toString() + ":" + guid.toString();
       }
    }
 

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -97,7 +97,9 @@
       try
       {
          StatefulContainer sfsb = (StatefulContainer) container;
-         Object id = sfsb.createSession();
+         StatefulBeanContext ctx = sfsb.getCache().create();
+         ctx.inUse = false;
+         Object id = ctx.getId();
          Object[] args = {new StatefulLocalProxy(container, id)};
          return proxyConstructor.newInstance(args);
       }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -47,6 +47,8 @@
  */
 public class StatefulRemoteProxy extends org.jboss.ejb3.session.BaseSessionRemoteProxy
 {
+   private static final long serialVersionUID = -2164496320326661428L;
+
    private static final Logger log = Logger.getLogger(StatefulRemoteProxy.class);
    
    protected InvokerLocator uri;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -28,6 +28,7 @@
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.ejb3.BeanContext;
 import org.jboss.logging.Logger;
 import org.jboss.tm.TxUtils;
 
@@ -53,13 +54,15 @@
 
    private static class RemoveSynchronization implements Synchronization
    {
+      protected boolean retainIfException;
       private StatefulContainer container;
       private Object id;
 
-      public RemoveSynchronization(StatefulContainer container, Object id)
+      public RemoveSynchronization(StatefulContainer container, Object id, boolean removeOnException)
       {
          this.container = container;
          this.id = id;
+         this.retainIfException = removeOnException;
       }
 
 
@@ -69,6 +72,19 @@
 
       public void afterCompletion(int status)
       {
+         try
+         {
+            StatefulBeanContext ctx = container.getCache().get(id);
+            container.invokePreDestroy(ctx);
+         }
+         catch (Throwable t)
+         {
+            if (!retainIfException)
+            {
+               container.getCache().remove(id);
+            }
+            throw new RuntimeException(t);
+         }
          container.getCache().remove(id);
       }
    }
@@ -82,20 +98,25 @@
       }
       catch (Throwable t)
       {
-         if (!retainIfException)
-         {
-            removeSession(invocation);
-         }
+         // don't remove if we're an applicationexception and retain is true
+         if (TxUtil.getApplicationException(t.getClass(), invocation) != null && retainIfException) throw t;
+
+         // otherwise, just remove it.
+         removeSession(invocation, true);
          throw t;
       }
-      removeSession(invocation);
+      removeSession(invocation, false);
       return rtn;
    }
 
-   protected void removeSession(Invocation invocation)
+   protected void removeSession(Invocation invocation, boolean exceptionThrown) throws Throwable
    {
       StatefulContainerInvocation ejb = (StatefulContainerInvocation) invocation;
+      StatefulBeanContext ctx = (StatefulBeanContext)ejb.getBeanContext();
+      if (ctx.isDiscarded() || ctx.isRemoved()) return;
       Object id = ejb.getId();
+
+
       StatefulContainer container = (StatefulContainer) ejb.getAdvisor();
       Transaction tx = null;
       try
@@ -106,11 +127,12 @@
       {
          throw new RuntimeException(e);
       }
+    
       if (tx != null && TxUtils.isActive(tx))
       {
          try
          {
-            tx.registerSynchronization(new RemoveSynchronization(container, id));
+            tx.registerSynchronization(new RemoveSynchronization(container, id, exceptionThrown != true && retainIfException));
          }
          catch (RollbackException e)
          {
@@ -123,8 +145,6 @@
       }
       else
       {
-         // Release it properly.
-         StatefulBeanContext ctx = container.getCache().get(id);
          container.getCache().remove(id);
       }
    }

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,251 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateless;
-
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import javassist.util.proxy.MethodHandler;
-import javassist.util.proxy.ProxyObject;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.aop.Advisor;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.ProxyFactory;
-import org.jboss.logging.Logger;
-import org.jboss.naming.Util;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public abstract class BaseStatelessProxyFactory extends org.jboss.ejb3.session.BaseSessionProxyFactory implements ProxyFactory
-{
-   private static final Logger log = Logger.getLogger(BaseStatelessProxyFactory.class);
-
-//   protected Class proxyClass;
-//   protected Constructor proxyConstructor;
-   protected Context proxyFactoryContext;
-   protected String jndiName;
-   
-   private javassist.util.proxy.ProxyFactory proxyFactory;
-   private Class proxyClass;
-   private Constructor proxyConstructor;
-   
-   /**
-    * Adapt the JDK to cglib.
-    * 
-    * This is a named class because it implements both InvocationHandler and Serializable.
-    */
-   /* TODO: fix EJBTHREE-485 without cglib 
-   private static class CGLibInvocationHandlerAdapter implements net.sf.cglib.proxy.InvocationHandler, Serializable
-   {
-      private static final long serialVersionUID = 1L;
-
-      private InvocationHandler delegate;
-      
-      private CGLibInvocationHandlerAdapter(InvocationHandler delegate)
-      {
-         if(delegate == null)
-            throw new IllegalArgumentException("delegate must not be null");
-         this.delegate = delegate;
-      }
-      
-      public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
-      {
-         return delegate.invoke(proxy, method, args);
-      }
-      
-   }
-   */
-   
-   /**
-    * Adapt the InvocationHandler to MethodHandler.
-    * 
-    * This is a named class because it implements both MethodHandler and Serializable.
-    */
-   private static class MethodHandlerAdapter implements MethodHandler, Serializable
-   {
-      private static final long serialVersionUID = 1L;
-      
-      private InvocationHandler delegate;
-      
-      private MethodHandlerAdapter(InvocationHandler delegate)
-      {
-         if(delegate == null)
-            throw new IllegalArgumentException("delegate must not be null");
-         this.delegate = delegate;
-      }
-      
-      public Object invoke(Object self, Method thisMethod, Method process, Object[] args) throws Throwable
-      {
-         return delegate.invoke(self, thisMethod, args);
-      }         
-   }
-   
-   /**
-    * Hide the fact that I'm now using javassist.
-    * 
-    * @param handler    a JDK proxy InvocationHandler
-    * @return           a true proxy
-    */
-   protected Object constructProxy(final InvocationHandler handler)
-   {
-      try
-      {
-         /* plain jdk */
-         Object args[] = { handler };
-         Object proxy = proxyConstructor.newInstance(args);
-         
-         /* javassist */
-         /*
-         MethodHandler realHandler = new MethodHandlerAdapter(handler);
-//         ProxyObject proxy = (ProxyObject) proxyConstructor.newInstance((Object[]) null);
-//         proxy.setHandler(realHandler);
-         JavassistProxy proxy = (JavassistProxy) proxyConstructor.newInstance((Object[]) null);
-         proxy.setMethodHandler(realHandler);
-         JavassistProxy.pokeInterfaces(proxy, getInterfaces());
-         */
-         
-         /* cglib */
-         /*
-         Object args[] = { new CGLibInvocationHandlerAdapter(handler) };
-         Object proxy = proxyConstructor.newInstance(args);
-         */
-         
-         return proxy;
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (InstantiationException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e.getTargetException());
-      }
-   }
-   
-   public final Object createProxy(Object id)
-   {
-      assert id == null : "stateless bean must not have an id";
-      return createProxy();
-   }
-   
-   public void init() throws Exception
-   {
-      initializeJndiName();
-      Class[] interfaces = getInterfaces();
-      
-      /* plain jdk */
-      Class proxyClass = java.lang.reflect.Proxy.getProxyClass(container.getBeanClass().getClassLoader(), interfaces);
-      final Class[] constructorParams =
-              {InvocationHandler.class};
-      proxyConstructor = proxyClass.getConstructor(constructorParams);
-      
-      /* javassist */
-      /*
-      proxyFactory = new javassist.util.proxy.ProxyFactory()
-      {
-         @Override
-         protected ClassLoader getClassLoader()
-         {
-            return container.getBeanClass().getClassLoader();
-         }
-      };
-      proxyFactory.setInterfaces(interfaces);
-      proxyFactory.setSuperclass(JavassistProxy.class);
-      proxyClass = proxyFactory.createClass();
-      proxyConstructor = proxyClass.getConstructor((Class[]) null);
-      */
-      
-      /* cglib */
-      /*
-      proxyClass = net.sf.cglib.proxy.Proxy.getProxyClass(container.getBeanClass().getClassLoader(), interfaces);
-      final Class[] constructorParams = {net.sf.cglib.proxy.InvocationHandler.class};
-      proxyConstructor = proxyClass.getConstructor(constructorParams);
-      */
-   }
-
-   /* for debugging purposes * /
-   private static void describeClass(Class cls) {
-      System.err.println("class " + cls + " has the following:");
-      for(Class i : cls.getInterfaces()) {
-         System.err.println("  interface: " + i);
-      }
-      for(Method m : cls.getDeclaredMethods()) {
-         System.err.println("  method: " + m);
-      }
-      System.err.println("  classloader = " + cls.getClassLoader());
-      if(cls.getSuperclass() != null)
-         describeClass(cls.getSuperclass());
-   }
-   */
-   
-   public void start() throws Exception
-   {
-      init();
-
-      Object proxy = createProxy();
-      //describeClass(proxy.getClass());
-      try
-      {
-         Util.rebind(container.getInitialContext(), jndiName, proxy);
-      } catch (NamingException e)
-      {
-         NamingException namingException = new NamingException("Could not bind stateless proxy with ejb name " + container.getEjbName() + " into JNDI under jndiName: " + container.getInitialContext().getNameInNamespace() + "/" + jndiName);
-         namingException.setRootCause(e);
-         throw namingException;
-      }
-   }
-
-   public void stop() throws Exception
-   {
-      Util.unbind(container.getInitialContext(), jndiName);
-   }
-
-   protected abstract Class[] getInterfaces();
-
-   protected abstract void initializeJndiName();
-
-   public void setContainer(Container container)
-   {
-      this.container = container;
-      this.advisor = (Advisor) container;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,251 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateless;
+
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import javassist.util.proxy.MethodHandler;
+import javassist.util.proxy.ProxyObject;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.ProxyFactory;
+import org.jboss.logging.Logger;
+import org.jboss.naming.Util;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public abstract class BaseStatelessProxyFactory extends org.jboss.ejb3.session.BaseSessionProxyFactory implements ProxyFactory
+{
+   private static final Logger log = Logger.getLogger(BaseStatelessProxyFactory.class);
+
+//   protected Class proxyClass;
+//   protected Constructor proxyConstructor;
+   protected Context proxyFactoryContext;
+   protected String jndiName;
+   
+   private javassist.util.proxy.ProxyFactory proxyFactory;
+   private Class proxyClass;
+   private Constructor proxyConstructor;
+   
+   /**
+    * Adapt the JDK to cglib.
+    * 
+    * This is a named class because it implements both InvocationHandler and Serializable.
+    */
+   /* TODO: fix EJBTHREE-485 without cglib 
+   private static class CGLibInvocationHandlerAdapter implements net.sf.cglib.proxy.InvocationHandler, Serializable
+   {
+      private static final long serialVersionUID = 1L;
+
+      private InvocationHandler delegate;
+      
+      private CGLibInvocationHandlerAdapter(InvocationHandler delegate)
+      {
+         if(delegate == null)
+            throw new IllegalArgumentException("delegate must not be null");
+         this.delegate = delegate;
+      }
+      
+      public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+      {
+         return delegate.invoke(proxy, method, args);
+      }
+      
+   }
+   */
+   
+   /**
+    * Adapt the InvocationHandler to MethodHandler.
+    * 
+    * This is a named class because it implements both MethodHandler and Serializable.
+    */
+   private static class MethodHandlerAdapter implements MethodHandler, Serializable
+   {
+      private static final long serialVersionUID = 1L;
+      
+      private InvocationHandler delegate;
+      
+      private MethodHandlerAdapter(InvocationHandler delegate)
+      {
+         if(delegate == null)
+            throw new IllegalArgumentException("delegate must not be null");
+         this.delegate = delegate;
+      }
+      
+      public Object invoke(Object self, Method thisMethod, Method process, Object[] args) throws Throwable
+      {
+         return delegate.invoke(self, thisMethod, args);
+      }         
+   }
+   
+   /**
+    * Hide the fact that I'm now using javassist.
+    * 
+    * @param handler    a JDK proxy InvocationHandler
+    * @return           a true proxy
+    */
+   protected Object constructProxy(final InvocationHandler handler)
+   {
+      try
+      {
+         /* plain jdk */
+         Object args[] = { handler };
+         Object proxy = proxyConstructor.newInstance(args);
+         
+         /* javassist */
+         /*
+         MethodHandler realHandler = new MethodHandlerAdapter(handler);
+//         ProxyObject proxy = (ProxyObject) proxyConstructor.newInstance((Object[]) null);
+//         proxy.setHandler(realHandler);
+         JavassistProxy proxy = (JavassistProxy) proxyConstructor.newInstance((Object[]) null);
+         proxy.setMethodHandler(realHandler);
+         JavassistProxy.pokeInterfaces(proxy, getInterfaces());
+         */
+         
+         /* cglib */
+         /*
+         Object args[] = { new CGLibInvocationHandlerAdapter(handler) };
+         Object proxy = proxyConstructor.newInstance(args);
+         */
+         
+         return proxy;
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (InstantiationException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getTargetException());
+      }
+   }
+   
+   public final Object createProxy(Object id)
+   {
+      assert id == null : "stateless bean must not have an id";
+      return createProxy();
+   }
+   
+   public void init() throws Exception
+   {
+      initializeJndiName();
+      Class[] interfaces = getInterfaces();
+      
+      /* plain jdk */
+      Class proxyClass = java.lang.reflect.Proxy.getProxyClass(container.getBeanClass().getClassLoader(), interfaces);
+      final Class[] constructorParams =
+              {InvocationHandler.class};
+      proxyConstructor = proxyClass.getConstructor(constructorParams);
+      
+      /* javassist */
+      /*
+      proxyFactory = new javassist.util.proxy.ProxyFactory()
+      {
+         @Override
+         protected ClassLoader getClassLoader()
+         {
+            return container.getBeanClass().getClassLoader();
+         }
+      };
+      proxyFactory.setInterfaces(interfaces);
+      proxyFactory.setSuperclass(JavassistProxy.class);
+      proxyClass = proxyFactory.createClass();
+      proxyConstructor = proxyClass.getConstructor((Class[]) null);
+      */
+      
+      /* cglib */
+      /*
+      proxyClass = net.sf.cglib.proxy.Proxy.getProxyClass(container.getBeanClass().getClassLoader(), interfaces);
+      final Class[] constructorParams = {net.sf.cglib.proxy.InvocationHandler.class};
+      proxyConstructor = proxyClass.getConstructor(constructorParams);
+      */
+   }
+
+   /* for debugging purposes * /
+   private static void describeClass(Class cls) {
+      System.err.println("class " + cls + " has the following:");
+      for(Class i : cls.getInterfaces()) {
+         System.err.println("  interface: " + i);
+      }
+      for(Method m : cls.getDeclaredMethods()) {
+         System.err.println("  method: " + m);
+      }
+      System.err.println("  classloader = " + cls.getClassLoader());
+      if(cls.getSuperclass() != null)
+         describeClass(cls.getSuperclass());
+   }
+   */
+   
+   public void start() throws Exception
+   {
+      init();
+
+      Object proxy = createProxy();
+      //describeClass(proxy.getClass());
+      try
+      {
+         Util.rebind(container.getInitialContext(), jndiName, proxy);
+      } catch (NamingException e)
+      {
+         NamingException namingException = new NamingException("Could not bind stateless proxy with ejb name " + container.getEjbName() + " into JNDI under jndiName: " + container.getInitialContext().getNameInNamespace() + "/" + jndiName);
+         namingException.setRootCause(e);
+         throw namingException;
+      }
+   }
+
+   public void stop() throws Exception
+   {
+      Util.unbind(container.getInitialContext(), jndiName);
+   }
+
+   protected abstract Class[] getInterfaces();
+
+   protected abstract void initializeJndiName();
+
+   public void setContainer(Container container)
+   {
+      this.container = container;
+      this.advisor = (Advisor) container;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,126 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateless;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import javassist.util.proxy.MethodHandler;
-import javassist.util.proxy.ProxyFactory;
-import javassist.util.proxy.ProxyObject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision: 46054 $
- */
-public class JavassistProxy implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-   
-   private MethodHandler handler;
-   private Class interfaces[];
-   
-//   /**
-//    * Public because of classloading? 
-//    */
-//   public static class JavassistProxyReplacement extends JavassistProxy
-//   {
-//      public void setHandler(MethodHandler handler)
-//      {
-//         throw new RuntimeException("should never happen");
-//      }
-//   }
-//   
-   /**
-    * With this method you can directly poke interfaces into the
-    * proxy without setting of the method handler.
-    * 
-    * @param proxy
-    * @param interfaces
-    */
-   protected static void pokeInterfaces(JavassistProxy proxy, Class interfaces[]) {
-      proxy.interfaces = interfaces;
-   }
-   
-   private Object readResolve() throws ObjectStreamException
-   {
-      System.err.println("JavassistProxy.readResolve");
-      try {
-         ProxyFactory proxyFactory = new ProxyFactory() {
-            protected ClassLoader getClassLoader()
-            {
-               return Thread.currentThread().getContextClassLoader();
-            }
-         };
-         proxyFactory.setInterfaces(interfaces);
-         proxyFactory.setSuperclass(JavassistProxy.class);
-         Class proxyClass = proxyFactory.createClass();
-         Constructor proxyConstructor = proxyClass.getConstructor((Class[]) null);
-         JavassistProxy proxy = (JavassistProxy) proxyConstructor.newInstance((Object[]) null);
-         proxy.setMethodHandler(this.handler);
-         proxy.interfaces = this.interfaces;
-         return proxy;
-      }
-      catch (NoSuchMethodException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (InstantiationException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e.getTargetException());
-      }
-   }
-   
-   protected void setInterfaces(Class interfaces[])
-   {
-      // TODO: check whether I get true interfaces
-      this.interfaces = interfaces;
-   }
-   
-   protected void setMethodHandler(MethodHandler handler)
-   {
-      // LOL
-      ((ProxyObject) this).setHandler(handler);
-      this.handler = handler;
-   }
-   
-   private Object writeReplace() throws ObjectStreamException
-   {
-      System.err.println("JavassistProxy.writeReplace");
-      JavassistProxy replacement = new JavassistProxyReplacement();
-      replacement.handler = this.handler;
-      replacement.interfaces = this.interfaces;
-      return replacement;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateless;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import javassist.util.proxy.MethodHandler;
+import javassist.util.proxy.ProxyFactory;
+import javassist.util.proxy.ProxyObject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class JavassistProxy implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+   
+   private MethodHandler handler;
+   private Class interfaces[];
+   
+//   /**
+//    * Public because of classloading? 
+//    */
+//   public static class JavassistProxyReplacement extends JavassistProxy
+//   {
+//      public void setHandler(MethodHandler handler)
+//      {
+//         throw new RuntimeException("should never happen");
+//      }
+//   }
+//   
+   /**
+    * With this method you can directly poke interfaces into the
+    * proxy without setting of the method handler.
+    * 
+    * @param proxy
+    * @param interfaces
+    */
+   protected static void pokeInterfaces(JavassistProxy proxy, Class interfaces[]) {
+      proxy.interfaces = interfaces;
+   }
+   
+   private Object readResolve() throws ObjectStreamException
+   {
+      System.err.println("JavassistProxy.readResolve");
+      try {
+         ProxyFactory proxyFactory = new ProxyFactory() {
+            protected ClassLoader getClassLoader()
+            {
+               return Thread.currentThread().getContextClassLoader();
+            }
+         };
+         proxyFactory.setInterfaces(interfaces);
+         proxyFactory.setSuperclass(JavassistProxy.class);
+         Class proxyClass = proxyFactory.createClass();
+         Constructor proxyConstructor = proxyClass.getConstructor((Class[]) null);
+         JavassistProxy proxy = (JavassistProxy) proxyConstructor.newInstance((Object[]) null);
+         proxy.setMethodHandler(this.handler);
+         proxy.interfaces = this.interfaces;
+         return proxy;
+      }
+      catch (NoSuchMethodException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (InstantiationException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getTargetException());
+      }
+   }
+   
+   protected void setInterfaces(Class interfaces[])
+   {
+      // TODO: check whether I get true interfaces
+      this.interfaces = interfaces;
+   }
+   
+   protected void setMethodHandler(MethodHandler handler)
+   {
+      // LOL
+      ((ProxyObject) this).setHandler(handler);
+      this.handler = handler;
+   }
+   
+   private Object writeReplace() throws ObjectStreamException
+   {
+      System.err.println("JavassistProxy.writeReplace");
+      JavassistProxy replacement = new JavassistProxyReplacement();
+      replacement.handler = this.handler;
+      replacement.interfaces = this.interfaces;
+      return replacement;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision: 46054 $
- */
-public class JavassistProxyReplacement extends JavassistProxy
-{
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class JavassistProxyReplacement extends JavassistProxy
+{
+   private static final long serialVersionUID = 9099344618191098800L;
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/JavassistProxyReplacement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,8 +21,12 @@
  */
 package org.jboss.ejb3.stateless;
 
+import javax.xml.ws.WebServiceContext;
+
 import org.jboss.ejb3.BaseContext;
+import org.jboss.injection.lang.reflect.BeanProperty;
 
+
 /**
  * Comment
  *
@@ -31,9 +35,30 @@
  */
 public class StatelessBeanContext extends BaseContext
 {
+   private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext;
+   private BeanProperty webServiceContextProperty;
+   
+   public javax.xml.rpc.handler.MessageContext getMessageContextJAXRPC()
+   {
+      return jaxrpcMessageContext;
+   }
+
+   public void setMessageContextJAXRPC(javax.xml.rpc.handler.MessageContext rpcMessageContext)
+   {
+      this.jaxrpcMessageContext = rpcMessageContext;
+   }
+
+   public BeanProperty getWebServiceContextProperty()
+   {
+      return webServiceContextProperty;
+   }
+
+   public void setWebServiceContextProperty(BeanProperty webServiceContextProperty)
+   {
+      this.webServiceContextProperty = webServiceContextProperty;
+   }
+
    public void remove()
    {
    }
-   
-
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -79,7 +79,9 @@
       locator = new InvokerLocator(clientBindUrl);
       Clustered clustered = (Clustered) advisor.resolveAnnotation(Clustered.class);
       if (clustered == null) throw new RuntimeException("Could not find @Clustered annotation.  Cannot deploy.");
-      String partitionName = clustered.partition();
+      // Partition name may be ${jboss.partition.name:DefaultPartition} 
+      // so do a system property substitution
+      String partitionName = substituteSystemProperty(clustered.partition());
       proxyFamilyName = container.getEjbName() + locator.getProtocol() + partitionName;
       HAPartition partition = (HAPartition) container.getInitialContext().lookup("/HAPartition/" + partitionName);
       hatarget = new HATarget(partition, proxyFamilyName, locator, HATarget.ENABLE_INVOCATIONS);

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -47,6 +47,8 @@
  */
 public class StatelessClusteredProxy extends BaseRemoteProxy
 {
+   private static final long serialVersionUID = 4266509371275725205L;
+   
    protected FamilyWrapper family;
    protected LoadBalancePolicy lbPolicy;
    AsynchProvider provider;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -22,44 +22,42 @@
 package org.jboss.ejb3.stateless;
 
 
+import java.lang.reflect.Method;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.ejb.EJBException;
+import javax.ejb.Handle;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+import javax.naming.NamingException;
+
 import org.jboss.annotation.ejb.LocalBinding;
 import org.jboss.annotation.ejb.RemoteBinding;
 import org.jboss.annotation.ejb.RemoteBindings;
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.InvocationResponse;
 import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.aop.util.MethodHashing;
 import org.jboss.aspects.asynch.FutureHolder;
 import org.jboss.ejb.AllowedOperationsAssociation;
 import org.jboss.ejb.AllowedOperationsFlags;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.BeanContextLifecycleCallback;
 import org.jboss.ejb3.EJBContainerInvocation;
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.ProxyFactoryHelper;
 import org.jboss.ejb3.ProxyUtils;
 import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.BeanContext;
 import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
 import org.jboss.ejb3.timerservice.TimedObjectInvoker;
 import org.jboss.ejb3.timerservice.TimerServiceFactory;
 import org.jboss.logging.Logger;
 import org.jboss.proxy.ejb.handle.HomeHandleImpl;
 import org.jboss.proxy.ejb.handle.StatelessHandleImpl;
-import org.jboss.injection.EncInjector;
 
-import javax.ejb.EJBException;
-import javax.ejb.Handle;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.naming.NamingException;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.HashMap;
 
-
 /**
  * Comment
  *
@@ -143,8 +141,7 @@
          try
          {
             MethodInfo info = (MethodInfo) methodInterceptors.get(callbackHandler.getTimeoutCalllbackHash());
-            Interceptor[] aspects = info.getInterceptors();
-            EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info, aspects);
+            EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info);
             nextInvocation.setAdvisor(this);
             nextInvocation.setArguments(args);
             nextInvocation.invokeNext();
@@ -180,21 +177,23 @@
     */
    public Object localInvoke(Method method, Object[] args, FutureHolder provider) throws Throwable
    {
+      return localInvoke(method, args, provider, null);
+   }
+   
+   public Object localInvoke(Method method, Object[] args, FutureHolder provider, BeanContextLifecycleCallback<StatelessBeanContext> callback) throws Throwable
+   {
+      long start = System.currentTimeMillis();
+      
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
       try
       {
-         long hash = MethodHashing.calculateHash(method);
-         MethodInfo info = (MethodInfo) methodInterceptors.get(hash);
-         if (info == null)
-         {
-            throw new RuntimeException("Could not resolve beanClass method from proxy call: " + method.toString());
-         }
-
+         MethodInfo info = getMethodInfo(method);
          Method unadvisedMethod = info.getUnadvisedMethod();
 
-
          try
          {
+            invokeStats.callIn();
+            
             invokedMethod.push(new InvokedMethod(true, unadvisedMethod));
 
             if (unadvisedMethod != null && isHomeMethod(unadvisedMethod))
@@ -202,16 +201,25 @@
                return invokeLocalHomeMethod(info, args);
             }
 
-            Interceptor[] aspects = info.getInterceptors();
-            EJBContainerInvocation nextInvocation = new EJBContainerInvocation(info, aspects);
+            EJBContainerInvocation<StatelessContainer, StatelessBeanContext> nextInvocation = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info);
             nextInvocation.setAdvisor(this);
             nextInvocation.setArguments(args);
+            nextInvocation.setContextCallback(callback);
 
             ProxyUtils.addLocalAsynchronousInfo(nextInvocation, provider);
             return nextInvocation.invokeNext();
          }
          finally
          {
+            if (unadvisedMethod != null)
+            {
+               long end = System.currentTimeMillis();
+               long elapsed = end - start;
+               invokeStats.updateStats(unadvisedMethod, elapsed);
+            }
+            
+            invokeStats.callOut();
+            
             invokedMethod.pop();
          }
       }
@@ -223,6 +231,8 @@
 
    public InvocationResponse dynamicInvoke(Object target, Invocation invocation) throws Throwable
    {
+      long start = System.currentTimeMillis();
+      
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
       try
       {
@@ -237,6 +247,8 @@
          Method unadvisedMethod = info.getUnadvisedMethod();
          try
          {
+            invokeStats.callIn();
+            
             invokedMethod.push(new InvokedMethod(false, unadvisedMethod));
             Map responseContext = null;
             Object rtn = null;
@@ -252,9 +264,8 @@
             {
 
                EJBContainerInvocation newSi = null;
-               Interceptor[] aspects = info.getInterceptors();
 
-               newSi = new EJBContainerInvocation(info, aspects);
+               newSi = new EJBContainerInvocation(info);
                newSi.setArguments(si.getArguments());
                newSi.setMetaData(si.getMetaData());
                newSi.setAdvisor(this);
@@ -275,6 +286,15 @@
          }
          finally
          {
+            if (unadvisedMethod != null)
+            {
+               long end = System.currentTimeMillis();
+               long elapsed = end - start;
+               invokeStats.updateStats(unadvisedMethod, elapsed);
+            }
+            
+            invokeStats.callOut();
+            
             invokedMethod.pop();
          }
       }
@@ -285,6 +305,7 @@
 
    }
 
+
    protected Object invokeEJBObjectMethod(MethodInfo info, MethodInvocation invocation) throws Throwable
    {
       Method unadvisedMethod = info.getUnadvisedMethod();

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,133 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.stateless;
-
-import java.rmi.RemoteException;
-import java.rmi.ServerException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.io.ObjectStreamField;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.util.Hashtable;
-
-import javax.naming.InitialContext;
-import javax.ejb.Handle;
-import javax.ejb.EJBObject;
-import javax.ejb.EJBHome;
-
-import org.jboss.naming.NamingContextFactory;
-
-/**
- * An EJB stateless session bean handle.
- *
- * @author  <a href="mailto:marc.fleury at jboss.org">Marc Fleury</a>
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class StatelessHandleImpl
-      implements Handle
-{
-   /** Serial Version Identifier. */
-   static final long serialVersionUID = 3811452873535097661L;
-   private static final ObjectStreamField[] serialPersistentFields =
-      new ObjectStreamField[]
-   {
-      new ObjectStreamField("jndiName", String.class),
-      new ObjectStreamField("jndiEnv", Hashtable.class)
-   };
-
-   /** The JNDI name of the home inteface binding */
-   public String jndiName;
-   /** The JNDI env in effect when the home handle was created */
-   private Hashtable jndiEnv;
-
-   // Constructors --------------------------------------------------
-
-   public StatelessHandleImpl()
-   {
-      
-   }
-   
-   /**
-    * Construct a <tt>StatelessHandleImpl</tt>.
-    *
-    * @param handle    The initial context handle that will be used
-    *                  to restore the naming context or null to use
-    *                  a fresh InitialContext object.
-    * @param name      JNDI name.
-    */
-   public StatelessHandleImpl(String jndiName)
-   {
-      this.jndiName = jndiName;
-      this.jndiEnv = (Hashtable) NamingContextFactory.lastInitialContextEnv.get();
-   }
-
-   // Public --------------------------------------------------------
-
-   public EJBObject getEJBObject() throws RemoteException
-   {
-      try
-      {
-         InitialContext ic = null;
-         if( jndiEnv != null )
-            ic = new InitialContext(jndiEnv);
-         else
-            ic = new InitialContext();
-    
-         Proxy proxy = (Proxy) ic.lookup(jndiName);
-
-         return (EJBObject) proxy;
-      }
-      catch (Throwable t)
-      {
-         t.printStackTrace();
-         throw new RemoteException("Error during getEJBObject", t);
-      }
-   }
-
-   /**
-    * @return the jndi name
-    */
-   public String getJNDIName()
-   {
-      return jndiName;
-   }
-
-   private void readObject(ObjectInputStream ois)
-      throws IOException, ClassNotFoundException
-   {
-      ObjectInputStream.GetField getField = ois.readFields();
-      jndiName = (String) getField.get("jndiName", null);
-      jndiEnv = (Hashtable) getField.get("jndiEnv", null);
-   }
-
-   private void writeObject(ObjectOutputStream oos)
-      throws IOException
-   {
-      ObjectOutputStream.PutField putField = oos.putFields();
-      putField.put("jndiName", jndiName);
-      putField.put("jndiEnv", jndiEnv);
-      oos.writeFields();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.stateless;
+
+import java.rmi.RemoteException;
+import java.rmi.ServerException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.io.ObjectStreamField;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.Hashtable;
+
+import javax.naming.InitialContext;
+import javax.ejb.Handle;
+import javax.ejb.EJBObject;
+import javax.ejb.EJBHome;
+
+import org.jboss.naming.NamingContextFactory;
+
+/**
+ * An EJB stateless session bean handle.
+ *
+ * @author  <a href="mailto:marc.fleury at jboss.org">Marc Fleury</a>
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class StatelessHandleImpl
+      implements Handle
+{
+   /** Serial Version Identifier. */
+   static final long serialVersionUID = 3811452873535097661L;
+   private static final ObjectStreamField[] serialPersistentFields =
+      new ObjectStreamField[]
+   {
+      new ObjectStreamField("jndiName", String.class),
+      new ObjectStreamField("jndiEnv", Hashtable.class)
+   };
+
+   /** The JNDI name of the home inteface binding */
+   public String jndiName;
+   /** The JNDI env in effect when the home handle was created */
+   private Hashtable jndiEnv;
+
+   // Constructors --------------------------------------------------
+
+   public StatelessHandleImpl()
+   {
+      
+   }
+   
+   /**
+    * Construct a <tt>StatelessHandleImpl</tt>.
+    *
+    * @param handle    The initial context handle that will be used
+    *                  to restore the naming context or null to use
+    *                  a fresh InitialContext object.
+    * @param name      JNDI name.
+    */
+   public StatelessHandleImpl(String jndiName)
+   {
+      this.jndiName = jndiName;
+      this.jndiEnv = (Hashtable) NamingContextFactory.lastInitialContextEnv.get();
+   }
+
+   // Public --------------------------------------------------------
+
+   public EJBObject getEJBObject() throws RemoteException
+   {
+      try
+      {
+         InitialContext ic = null;
+         if( jndiEnv != null )
+            ic = new InitialContext(jndiEnv);
+         else
+            ic = new InitialContext();
+    
+         Proxy proxy = (Proxy) ic.lookup(jndiName);
+
+         return (EJBObject) proxy;
+      }
+      catch (Throwable t)
+      {
+         t.printStackTrace();
+         throw new RemoteException("Error during getEJBObject", t);
+      }
+   }
+
+   /**
+    * @return the jndi name
+    */
+   public String getJNDIName()
+   {
+      return jndiName;
+   }
+
+   private void readObject(ObjectInputStream ois)
+      throws IOException, ClassNotFoundException
+   {
+      ObjectInputStream.GetField getField = ois.readFields();
+      jndiName = (String) getField.get("jndiName", null);
+      jndiEnv = (Hashtable) getField.get("jndiEnv", null);
+   }
+
+   private void writeObject(ObjectOutputStream oos)
+      throws IOException
+   {
+      ObjectOutputStream.PutField putField = oos.putFields();
+      putField.put("jndiName", jndiName);
+      putField.put("jndiEnv", jndiEnv);
+      oos.writeFields();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessHandleImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -40,6 +40,8 @@
  */
 public class StatelessLocalProxy extends LocalProxy
 {
+   private static final long serialVersionUID = -3241008127518089831L;
+   
    AsynchProvider provider;
 
    public StatelessLocalProxy()

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -24,6 +24,7 @@
 import java.lang.reflect.InvocationTargetException;
 import javax.ejb.LocalHome;
 import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.JBossProxy;
 import org.jboss.ejb3.NonSerializableFactory;
 import org.jboss.ejb3.ProxyFactoryHelper;
@@ -42,7 +43,7 @@
       Class[] interfaces;
 
       Class[] localInterfaces = ProxyFactoryHelper.getLocalInterfaces(container);
-      StatelessContainer statelessContainer = (StatelessContainer) container;
+      EJBContainer statelessContainer = (EJBContainer) container;
       interfaces = new Class[localInterfaces.length + 2];
 
       System.arraycopy(localInterfaces, 0, interfaces, 0, localInterfaces.length);
@@ -61,7 +62,7 @@
    public void start() throws Exception
    {
       super.start();
-      StatelessContainer statelessContainer = (StatelessContainer) container;
+      EJBContainer statelessContainer = (EJBContainer) container;
       LocalHome localHome = (LocalHome) statelessContainer.resolveAnnotation(LocalHome.class);
       if (localHome != null)
       {
@@ -76,7 +77,7 @@
    public void stop() throws Exception
    {
       super.stop();
-      StatelessContainer statelessContainer = (StatelessContainer) container;
+      EJBContainer statelessContainer = (EJBContainer) container;
       LocalHome localHome = (LocalHome) statelessContainer.resolveAnnotation(LocalHome.class);
       if (localHome != null)
       {

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -44,6 +44,7 @@
  */
 public class StatelessRemoteProxy extends org.jboss.ejb3.session.BaseSessionRemoteProxy
 {
+   private static final long serialVersionUID = 2583299153931800023L;
    private static final Logger log = Logger.getLogger(StatelessRemoteProxy.class);
    
    protected InvokerLocator uri;

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -27,6 +27,7 @@
 import org.jboss.aop.Advisor;
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.advice.AdviceStack;
+import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.JBossProxy;
 import org.jboss.ejb3.ProxyFactoryHelper;
 import org.jboss.ejb3.remoting.RemoteProxyFactory;
@@ -82,7 +83,7 @@
    public void start() throws Exception
    {
       super.start();
-      StatelessContainer statelessContainer = (StatelessContainer) container;
+      EJBContainer statelessContainer = (EJBContainer) container;
       RemoteHome remoteHome = (RemoteHome) statelessContainer.resolveAnnotation(RemoteHome.class);
       if (remoteHome != null)
       {
@@ -104,7 +105,7 @@
    public void stop() throws Exception
    {
       super.stop();
-      StatelessContainer statelessContainer = (StatelessContainer) container;
+      EJBContainer statelessContainer = (EJBContainer) container;
       RemoteHome remoteHome = (RemoteHome) statelessContainer.resolveAnnotation(RemoteHome.class);
       if (remoteHome != null)
       {

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/statistics)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,166 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.statistics;
-
-import java.lang.reflect.Method;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-
-/** A method invocation statistics collection class.
- *
- * @author Scott.Stark at jboss.org
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class InvocationStatistics implements Serializable
-{
-   /** A HashMap<Method, TimeStatistic> of the method invocations */
-   private Map methodStats;
-
-   public long concurrentCalls = 0;
-   public long maxConcurrentCalls = 0;
-   public long lastResetTime = System.currentTimeMillis();
-
-   public class TimeStatistic implements Serializable
-   {
-      public volatile long count;
-      public volatile long minTime = Long.MAX_VALUE;
-      public volatile long maxTime;
-      public volatile long totalTime;
-
-      public void reset()
-      {
-         count = 0;
-         minTime = Long.MAX_VALUE;
-         maxTime = 0;
-         totalTime = 0;
-      }
-   }
-
-   public InvocationStatistics()
-   {
-      methodStats = new ConcurrentReaderHashMap();
-   }
-
-   /** Update the TimeStatistic for the given method. This synchronizes on
-    * m to ensure that the TimeStatistic for m is updated atomically.
-    *
-    * @param m the method to update the statistics for.
-    * @param elapsed the elapsed time in milliseconds for the invocation.
-    */
-   public void updateStats(Method m, long elapsed)
-   {
-      TimeStatistic stat = (TimeStatistic) methodStats.get(m.getName());
-      if (stat == null)
-      {
-         stat = new TimeStatistic();
-         methodStats.put(m.getName(), stat);
-      }
-      stat.count++;
-      stat.totalTime += elapsed;
-      if (stat.minTime > elapsed)
-         stat.minTime = elapsed;
-      if (stat.maxTime < elapsed)
-         stat.maxTime = elapsed;
-   }
-
-   public synchronized void callIn()
-   {
-      concurrentCalls++;
-      if (concurrentCalls > maxConcurrentCalls)
-         maxConcurrentCalls = concurrentCalls;
-   }
-
-   public synchronized void callOut()
-   {
-      concurrentCalls--;
-   }
-
-   /** Resets all current TimeStatistics.
-    *
-    */
-   public void resetStats()
-   {
-      synchronized (methodStats)
-      {
-         Iterator iter = methodStats.values().iterator();
-         while (iter.hasNext())
-         {
-            TimeStatistic stat = (TimeStatistic) iter.next();
-            stat.reset();
-         }
-      }
-      maxConcurrentCalls = 0;
-      lastResetTime = System.currentTimeMillis();
-   }
-
-   /** Access the current collection of method invocation statistics
-    *
-    * @return A HashMap<Method, TimeStatistic> of the method invocations
-    */
-   public Map getStats()
-   {
-      return methodStats;
-   }
-
-   /** Generate an XML fragement for the InvocationStatistics. The format is
-    * <InvocationStatistics concurrentCalls="c">
-    *    <method name="aMethod" count="x" minTime="y" maxTime="z" totalTime="t" />
-    *    ...
-    * </InvocationStatistics>
-    *
-    * @return an XML representation of the InvocationStatistics
-    */
-   public String toString()
-   {
-      StringBuffer tmp = new StringBuffer("<InvocationStatistics concurrentCalls='");
-      tmp.append(concurrentCalls);
-      tmp.append("' >\n");
-
-      HashMap copy = new HashMap(methodStats);
-      Iterator iter = copy.entrySet().iterator();
-      while (iter.hasNext())
-      {
-         Map.Entry entry = (Map.Entry) iter.next();
-         TimeStatistic stat = (TimeStatistic) entry.getValue();
-         if (stat != null)
-         {
-            tmp.append("<method name='");
-            tmp.append(entry.getKey());
-            tmp.append("' count='");
-            tmp.append(stat.count);
-            tmp.append("' minTime='");
-            tmp.append(stat.minTime);
-            tmp.append("' maxTime='");
-            tmp.append(stat.maxTime);
-            tmp.append("' totalTime='");
-            tmp.append(stat.totalTime);
-            tmp.append("' />\n");
-         }
-      }
-      tmp.append("</InvocationStatistics>");
-      return tmp.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,166 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.statistics;
+
+import java.lang.reflect.Method;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+
+/** A method invocation statistics collection class.
+ *
+ * @author Scott.Stark at jboss.org
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class InvocationStatistics implements Serializable
+{
+   /** A HashMap<Method, TimeStatistic> of the method invocations */
+   private Map methodStats;
+
+   public long concurrentCalls = 0;
+   public long maxConcurrentCalls = 0;
+   public long lastResetTime = System.currentTimeMillis();
+
+   public class TimeStatistic implements Serializable
+   {
+      public volatile long count;
+      public volatile long minTime = Long.MAX_VALUE;
+      public volatile long maxTime;
+      public volatile long totalTime;
+
+      public void reset()
+      {
+         count = 0;
+         minTime = Long.MAX_VALUE;
+         maxTime = 0;
+         totalTime = 0;
+      }
+   }
+
+   public InvocationStatistics()
+   {
+      methodStats = new ConcurrentReaderHashMap();
+   }
+
+   /** Update the TimeStatistic for the given method. This synchronizes on
+    * m to ensure that the TimeStatistic for m is updated atomically.
+    *
+    * @param m the method to update the statistics for.
+    * @param elapsed the elapsed time in milliseconds for the invocation.
+    */
+   public void updateStats(Method m, long elapsed)
+   {
+      TimeStatistic stat = (TimeStatistic) methodStats.get(m.getName());
+      if (stat == null)
+      {
+         stat = new TimeStatistic();
+         methodStats.put(m.getName(), stat);
+      }
+      stat.count++;
+      stat.totalTime += elapsed;
+      if (stat.minTime > elapsed)
+         stat.minTime = elapsed;
+      if (stat.maxTime < elapsed)
+         stat.maxTime = elapsed;
+   }
+
+   public synchronized void callIn()
+   {
+      concurrentCalls++;
+      if (concurrentCalls > maxConcurrentCalls)
+         maxConcurrentCalls = concurrentCalls;
+   }
+
+   public synchronized void callOut()
+   {
+      concurrentCalls--;
+   }
+
+   /** Resets all current TimeStatistics.
+    *
+    */
+   public void resetStats()
+   {
+      synchronized (methodStats)
+      {
+         Iterator iter = methodStats.values().iterator();
+         while (iter.hasNext())
+         {
+            TimeStatistic stat = (TimeStatistic) iter.next();
+            stat.reset();
+         }
+      }
+      maxConcurrentCalls = 0;
+      lastResetTime = System.currentTimeMillis();
+   }
+
+   /** Access the current collection of method invocation statistics
+    *
+    * @return A HashMap<Method, TimeStatistic> of the method invocations
+    */
+   public Map getStats()
+   {
+      return methodStats;
+   }
+
+   /** Generate an XML fragement for the InvocationStatistics. The format is
+    * <InvocationStatistics concurrentCalls="c">
+    *    <method name="aMethod" count="x" minTime="y" maxTime="z" totalTime="t" />
+    *    ...
+    * </InvocationStatistics>
+    *
+    * @return an XML representation of the InvocationStatistics
+    */
+   public String toString()
+   {
+      StringBuffer tmp = new StringBuffer("<InvocationStatistics concurrentCalls='");
+      tmp.append(concurrentCalls);
+      tmp.append("' >\n");
+
+      HashMap copy = new HashMap(methodStats);
+      Iterator iter = copy.entrySet().iterator();
+      while (iter.hasNext())
+      {
+         Map.Entry entry = (Map.Entry) iter.next();
+         TimeStatistic stat = (TimeStatistic) entry.getValue();
+         if (stat != null)
+         {
+            tmp.append("<method name='");
+            tmp.append(entry.getKey());
+            tmp.append("' count='");
+            tmp.append(stat.count);
+            tmp.append("' minTime='");
+            tmp.append(stat.minTime);
+            tmp.append("' maxTime='");
+            tmp.append(stat.maxTime);
+            tmp.append("' totalTime='");
+            tmp.append(stat.totalTime);
+            tmp.append("' />\n");
+         }
+      }
+      tmp.append("</InvocationStatistics>");
+      return tmp.toString();
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.timerservice;
-
-// $Id: TimedObjectInvoker.java,v 1.1 2006/06/07 09:26:15 wolfc Exp $
-
-import javax.ejb.Timer;
-
-/**
- * An implementation can invoke the ejbTimeout method on a TimedObject.
- *
- * The TimedObjectInvoker has knowledge of the TimedObjectId, it
- * knows which object to invoke.
- *
- * @author Thomas.Diesler at jboss.org
- * @version $Revision: 1.1 $
- * @since 07-Apr-2004
- */
-public interface TimedObjectInvoker extends org.jboss.ejb.txtimer.TimedObjectInvoker
-{
-   /**
-    * Invokes the ejbTimeout method on the TimedObject with the given id.
-    *
-    * @param timer the Timer that is passed to ejbTimeout
-    */
-   void callTimeout(Timer timer) throws Exception;
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimedObjectInvoker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice;
+
+// $Id: TimedObjectInvoker.java,v 1.1 2006/06/07 09:26:15 wolfc Exp $
+
+import javax.ejb.Timer;
+
+/**
+ * An implementation can invoke the ejbTimeout method on a TimedObject.
+ *
+ * The TimedObjectInvoker has knowledge of the TimedObjectId, it
+ * knows which object to invoke.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @version $Revision: 1.1 $
+ * @since 07-Apr-2004
+ */
+public interface TimedObjectInvoker extends org.jboss.ejb.txtimer.TimedObjectInvoker
+{
+   /**
+    * Invokes the ejbTimeout method on the TimedObject with the given id.
+    *
+    * @param timer the Timer that is passed to ejbTimeout
+    */
+   void callTimeout(Timer timer) throws Exception;
+
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.timerservice;
-
-import javax.ejb.EJBException;
-import javax.ejb.TimerService;
-import javax.management.ObjectName;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class TimerServiceFactory
-{
-   private static TimerServiceFactory instance;
-   
-   private synchronized static TimerServiceFactory createInstance()
-   {
-      if(instance != null)
-         return instance;
-      
-      String factoryClass = "org.jboss.ejb3.timerservice.jboss.JBossTimerServiceFactory";
-      factoryClass = System.getProperty("org.jboss.ejb3.timerservice.factory", factoryClass);
-      
-      try
-      {
-         Class cls = Class.forName(factoryClass);
-         instance = (TimerServiceFactory) cls.newInstance();
-         
-         return instance;
-      }
-      catch(ClassNotFoundException e)
-      {
-         throw new EJBException(e);
-      }
-      catch(InstantiationException e)
-      {
-         throw new EJBException(e);
-      }
-      catch(IllegalAccessException e)
-      {
-         throw new EJBException(e);
-      }
-   }
-   
-   public abstract TimerService createTimerService(ObjectName objectName, TimedObjectInvoker invoker);
-   
-   public static TimerServiceFactory getInstance()
-   {
-      if(instance == null)
-      {
-         createInstance();
-      }
-      
-      return instance;
-   }
-   
-   public abstract void removeTimerService(TimerService timerService);
-   
-   /**
-    * Restores the timers held with the specified timer service.
-    * 
-    * @param timerService
-    */
-   public abstract void restoreTimerService(TimerService timerService);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/TimerServiceFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice;
+
+import javax.ejb.EJBException;
+import javax.ejb.TimerService;
+import javax.management.ObjectName;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public abstract class TimerServiceFactory
+{
+   private static TimerServiceFactory instance;
+   
+   private synchronized static TimerServiceFactory createInstance()
+   {
+      if(instance != null)
+         return instance;
+      
+      String factoryClass = "org.jboss.ejb3.timerservice.jboss.JBossTimerServiceFactory";
+      factoryClass = System.getProperty("org.jboss.ejb3.timerservice.factory", factoryClass);
+      
+      try
+      {
+         Class cls = Class.forName(factoryClass);
+         instance = (TimerServiceFactory) cls.newInstance();
+         
+         return instance;
+      }
+      catch(ClassNotFoundException e)
+      {
+         throw new EJBException(e);
+      }
+      catch(InstantiationException e)
+      {
+         throw new EJBException(e);
+      }
+      catch(IllegalAccessException e)
+      {
+         throw new EJBException(e);
+      }
+   }
+   
+   public abstract TimerService createTimerService(ObjectName objectName, TimedObjectInvoker invoker);
+   
+   public static TimerServiceFactory getInstance()
+   {
+      if(instance == null)
+      {
+         createInstance();
+      }
+      
+      return instance;
+   }
+   
+   public abstract void removeTimerService(TimerService timerService);
+   
+   /**
+    * Restores the timers held with the specified timer service.
+    * 
+    * @param timerService
+    */
+   public abstract void restoreTimerService(TimerService timerService);
+}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/jboss)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,122 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.timerservice.jboss;
-
-import javax.ejb.TimerService;
-import javax.management.ObjectName;
-
-import org.jboss.ejb.txtimer.EJBTimerService;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.timerservice.TimedObjectInvoker;
-import org.jboss.ejb3.timerservice.TimerServiceFactory;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-
-/**
- * Factory to create timer services which use the JBoss EJB Timer Service.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class JBossTimerServiceFactory extends TimerServiceFactory
-{
-   private static Logger log = Logger.getLogger(JBossTimerServiceFactory.class);
-   
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.timerservice.TimerServiceFactory#createTimerService(javax.management.ObjectName, org.jboss.ejb3.timerservice.TimedObjectInvoker)
-    */
-   @Override
-   public TimerService createTimerService(ObjectName containerId, TimedObjectInvoker invoker)
-   {
-      TimerService timerService = null;
-      try
-      {
-         EJBTimerService service = getEJBTimerService();
-         TimerService delegate = service.createTimerService(containerId, null, invoker);
-         timerService = new TimerServiceFacade(containerId, delegate);
-      }
-      catch (Exception e)
-      {
-         //throw new EJBException("Could not create timer service", e);
-         if (log.isTraceEnabled())
-         {
-            log.trace("Unable to initialize timer service", e);
-         }
-         else
-         {
-            log.trace("Unable to initialize timer service");
-         }
-      }
-      return timerService;
-   }
-
-   protected EJBTimerService getEJBTimerService()
-   {
-      return (EJBTimerService) MBeanProxyExt.create(EJBTimerService.class, EJBTimerService.OBJECT_NAME, MBeanServerLocator.locateJBoss());
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.timerservice.TimerServiceFactory#removeTimerService(javax.ejb.TimerService)
-    */
-   @Override
-   public void removeTimerService(TimerService timerService)
-   {
-      removeTimerService(((TimerServiceFacade) timerService).getContainerId());
-   }
-
-   protected void removeTimerService(ObjectName containerId)
-   {
-      try
-      {
-         EJBTimerService service = getEJBTimerService();
-         service.removeTimerService(containerId, true);
-      }
-      catch (Exception e)
-      {
-         //throw new EJBException("Could not remove timer service", e);
-         if (log.isTraceEnabled())
-         {
-            log.trace("Unable to initialize timer service", e);
-         }
-         else
-         {
-            log.trace("Unable to initialize timer service");
-         }
-      }
-   }
-   
-   public void restoreTimerService(TimerService aTimerService)
-   {
-      if (aTimerService == null)
-      {
-         log.warn("TIMER SERVICE IS NOT INSTALLED");
-         return;
-      }
-      TimerServiceFacade timerService = (TimerServiceFacade) aTimerService;
-      EJBContainer container = timerService.getContainer();
-      // FIXME: do not assume that a TimedObjectInvoker is an EJBContainer
-      ClassLoader loader = container.getClassloader();
-      
-      getEJBTimerService().restoreTimers(timerService.getContainerId(), loader);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/JBossTimerServiceFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,122 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.jboss;
+
+import javax.ejb.TimerService;
+import javax.management.ObjectName;
+
+import org.jboss.ejb.txtimer.EJBTimerService;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.timerservice.TimedObjectInvoker;
+import org.jboss.ejb3.timerservice.TimerServiceFactory;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+
+/**
+ * Factory to create timer services which use the JBoss EJB Timer Service.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class JBossTimerServiceFactory extends TimerServiceFactory
+{
+   private static Logger log = Logger.getLogger(JBossTimerServiceFactory.class);
+   
+   /* (non-Javadoc)
+    * @see org.jboss.ejb3.timerservice.TimerServiceFactory#createTimerService(javax.management.ObjectName, org.jboss.ejb3.timerservice.TimedObjectInvoker)
+    */
+   @Override
+   public TimerService createTimerService(ObjectName containerId, TimedObjectInvoker invoker)
+   {
+      TimerService timerService = null;
+      try
+      {
+         EJBTimerService service = getEJBTimerService();
+         TimerService delegate = service.createTimerService(containerId, null, invoker);
+         timerService = new TimerServiceFacade(containerId, delegate);
+      }
+      catch (Exception e)
+      {
+         //throw new EJBException("Could not create timer service", e);
+         if (log.isTraceEnabled())
+         {
+            log.trace("Unable to initialize timer service", e);
+         }
+         else
+         {
+            log.trace("Unable to initialize timer service");
+         }
+      }
+      return timerService;
+   }
+
+   protected EJBTimerService getEJBTimerService()
+   {
+      return (EJBTimerService) MBeanProxyExt.create(EJBTimerService.class, EJBTimerService.OBJECT_NAME, MBeanServerLocator.locateJBoss());
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.ejb3.timerservice.TimerServiceFactory#removeTimerService(javax.ejb.TimerService)
+    */
+   @Override
+   public void removeTimerService(TimerService timerService)
+   {
+      removeTimerService(((TimerServiceFacade) timerService).getContainerId());
+   }
+
+   protected void removeTimerService(ObjectName containerId)
+   {
+      try
+      {
+         EJBTimerService service = getEJBTimerService();
+         service.removeTimerService(containerId, true);
+      }
+      catch (Exception e)
+      {
+         //throw new EJBException("Could not remove timer service", e);
+         if (log.isTraceEnabled())
+         {
+            log.trace("Unable to initialize timer service", e);
+         }
+         else
+         {
+            log.trace("Unable to initialize timer service");
+         }
+      }
+   }
+   
+   public void restoreTimerService(TimerService aTimerService)
+   {
+      if (aTimerService == null)
+      {
+         log.warn("TIMER SERVICE IS NOT INSTALLED");
+         return;
+      }
+      TimerServiceFacade timerService = (TimerServiceFacade) aTimerService;
+      EJBContainer container = timerService.getContainer();
+      // FIXME: do not assume that a TimedObjectInvoker is an EJBContainer
+      ClassLoader loader = container.getClassloader();
+      
+      getEJBTimerService().restoreTimers(timerService.getContainerId(), loader);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.timerservice.jboss;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-
-import javax.ejb.EJBException;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Registry;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class TimerServiceFacade implements TimerService
-{
-   private TimerService delegate;
-   
-   private ObjectName containerId;
-   
-   protected TimerServiceFacade(ObjectName containerId, TimerService delegate)
-   {
-      this.containerId = containerId;
-      this.delegate = delegate;
-   }
-
-   public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
-   {
-      return delegate.createTimer(initialExpiration, intervalDuration, info);
-   }
-
-   public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
-   {
-      return delegate.createTimer(expiration, info);
-   }
-
-   public Timer createTimer(long initialDuration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
-   {
-      return delegate.createTimer(initialDuration, intervalDuration, info);
-   }
-
-   public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
-   {
-      return delegate.createTimer(duration, info);
-   }
-
-   protected EJBContainer getContainer()
-   {
-      return (EJBContainer) Ejb3Registry.getContainer(getContainerId().getCanonicalName());
-   }
-   
-   protected ObjectName getContainerId()
-   {
-      return containerId;
-   }
-   
-   public Collection getTimers() throws IllegalStateException, EJBException
-   {
-      return delegate.getTimers();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/jboss/TimerServiceFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.jboss;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Date;
+
+import javax.ejb.EJBException;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Registry;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class TimerServiceFacade implements TimerService
+{
+   private TimerService delegate;
+   
+   private ObjectName containerId;
+   
+   protected TimerServiceFacade(ObjectName containerId, TimerService delegate)
+   {
+      this.containerId = containerId;
+      this.delegate = delegate;
+   }
+
+   public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+   {
+      return delegate.createTimer(initialExpiration, intervalDuration, info);
+   }
+
+   public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+   {
+      return delegate.createTimer(expiration, info);
+   }
+
+   public Timer createTimer(long initialDuration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+   {
+      return delegate.createTimer(initialDuration, intervalDuration, info);
+   }
+
+   public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+   {
+      return delegate.createTimer(duration, info);
+   }
+
+   protected EJBContainer getContainer()
+   {
+      return (EJBContainer) Ejb3Registry.getContainer(getContainerId().getCanonicalName());
+   }
+   
+   protected ObjectName getContainerId()
+   {
+      return containerId;
+   }
+   
+   public Collection getTimers() throws IllegalStateException, EJBException
+   {
+      return delegate.getTimers();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/package.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/package.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-This package forms the bridge between EJB3 and a timer service.
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/package.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/package.html)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/package.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+This package forms the bridge between EJB3 and a timer service.
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.timerservice.quartz;
-
-import java.io.Serializable;
-
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchObjectLocalException;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.Ejb3Registry;
-import org.jboss.ejb3.timerservice.TimedObjectInvoker;
-import org.jboss.logging.Logger;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.quartz.Trigger;
-
-/**
- * This class contains all the info for find a persistent timer.
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class PersistentTimer implements Serializable, TimerHandle
-{
-   private static final Logger log = Logger.getLogger(PersistentTimer.class);
-   
-   private static final long serialVersionUID = 1L;
-
-   //private String schedulerName;
-   //private String jobName;
-   //private String jobGroup;
-   private String triggerName;
-   private String triggerGroup;
-   private ObjectName objectName;
-   
-   private Serializable info;
-   
-   protected PersistentTimer(Trigger trigger, ObjectName objectName, Serializable info)
-   {
-      assert trigger != null;
-      assert objectName != null;
-      
-      this.triggerName = trigger.getName();
-      this.triggerGroup = trigger.getGroup();
-      this.objectName = objectName;
-      this.info = info;
-   }
-   
-   protected TimedObjectInvoker getTimedObjectInvoker()
-   {
-      // TODO: a hack to get back the container. This needs thinking.
-      TimedObjectInvoker invoker = (TimedObjectInvoker) Ejb3Registry.getContainer(objectName.getCanonicalName());
-      assert invoker != null;
-      return invoker;
-   }
-   
-   public Timer getTimer() throws IllegalStateException, NoSuchObjectLocalException, EJBException
-   {
-      // TODO: check state
-      try
-      {
-         Scheduler scheduler = QuartzTimerServiceFactory.getScheduler();
-         Trigger trigger = scheduler.getTrigger(triggerName, triggerGroup);
-         if(trigger == null)
-            throw new NoSuchObjectLocalException("can't find trigger '" + triggerName + "' in group '" + triggerGroup + "'");
-         return new TimerImpl(scheduler, trigger, info);
-      }
-      catch(SchedulerException e)
-      {
-         log.error("getTimer failed", e);
-         throw new EJBException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.quartz;
+
+import java.io.Serializable;
+
+import javax.ejb.EJBException;
+import javax.ejb.NoSuchObjectLocalException;
+import javax.ejb.Timer;
+import javax.ejb.TimerHandle;
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.Ejb3Registry;
+import org.jboss.ejb3.timerservice.TimedObjectInvoker;
+import org.jboss.logging.Logger;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+
+/**
+ * This class contains all the info for find a persistent timer.
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class PersistentTimer implements Serializable, TimerHandle
+{
+   private static final Logger log = Logger.getLogger(PersistentTimer.class);
+   
+   private static final long serialVersionUID = 1L;
+
+   //private String schedulerName;
+   //private String jobName;
+   //private String jobGroup;
+   private String triggerName;
+   private String triggerGroup;
+   private ObjectName objectName;
+   
+   private Serializable info;
+   
+   protected PersistentTimer(Trigger trigger, ObjectName objectName, Serializable info)
+   {
+      assert trigger != null;
+      assert objectName != null;
+      
+      this.triggerName = trigger.getName();
+      this.triggerGroup = trigger.getGroup();
+      this.objectName = objectName;
+      this.info = info;
+   }
+   
+   protected TimedObjectInvoker getTimedObjectInvoker()
+   {
+      // TODO: a hack to get back the container. This needs thinking.
+      TimedObjectInvoker invoker = (TimedObjectInvoker) Ejb3Registry.getContainer(objectName.getCanonicalName());
+      assert invoker != null;
+      return invoker;
+   }
+   
+   public Timer getTimer() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+   {
+      // TODO: check state
+      try
+      {
+         Scheduler scheduler = QuartzTimerServiceFactory.getScheduler();
+         Trigger trigger = scheduler.getTrigger(triggerName, triggerGroup);
+         if(trigger == null)
+            throw new NoSuchObjectLocalException("can't find trigger '" + triggerName + "' in group '" + triggerGroup + "'");
+         return new TimerImpl(scheduler, trigger, info);
+      }
+      catch(SchedulerException e)
+      {
+         log.error("getTimer failed", e);
+         throw new EJBException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.timerservice.quartz;
-
-import org.jboss.ejb3.timerservice.TimedObjectInvoker;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class QuartzTimerJob implements Job
-{
-   public void execute(JobExecutionContext context) throws JobExecutionException
-   {
-      PersistentTimer timer = (PersistentTimer) context.getJobDetail().getJobDataMap().get("timer");
-      TimedObjectInvoker invoker = timer.getTimedObjectInvoker();
-      try {
-         invoker.callTimeout(timer.getTimer());
-      }
-      catch(Exception e) {
-         throw new JobExecutionException(e);
-      }
-   }  
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.quartz;
+
+import org.jboss.ejb3.timerservice.TimedObjectInvoker;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class QuartzTimerJob implements Job
+{
+   public void execute(JobExecutionContext context) throws JobExecutionException
+   {
+      PersistentTimer timer = (PersistentTimer) context.getJobDetail().getJobDataMap().get("timer");
+      TimedObjectInvoker invoker = timer.getTimedObjectInvoker();
+      try {
+         invoker.callTimeout(timer.getTimer());
+      }
+      catch(Exception e) {
+         throw new JobExecutionException(e);
+      }
+   }  
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerJob.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,274 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.timerservice.quartz;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import javax.ejb.TimerService;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
-import org.jboss.ejb3.timerservice.TimedObjectInvoker;
-import org.jboss.ejb3.timerservice.TimerServiceFactory;
-import org.jboss.logging.Logger;
-import org.jboss.tm.TransactionManagerService;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerFactory;
-import org.quartz.impl.StdSchedulerFactory;
-import org.quartz.utils.DBConnectionManager;
-import org.quartz.utils.JNDIConnectionProvider;
-
-/**
- * Creates timer service objects for use in EJB3 containers. For this
- * two methods are provided: createTimerService and removeTimerService.
- * 
- * The factory can be started and stopped within both an embedded and full stack.
- * 
- * For now only one scheduler is supported. Each bean container has its own
- * job and trigger group within Quartz.
- * 
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision: 56116 $
- */
-public class QuartzTimerServiceFactory extends TimerServiceFactory
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(QuartzTimerServiceFactory.class);
-   
-   private TransactionManager tm;
-   
-   private static Scheduler scheduler;
-   
-   private Properties properties;
-   
-   /**
-    * Contains the sql statements to create the database schema.
-    */
-   private Properties sqlProperties;
-   
-   private void createSchema()
-   {
-      try
-      {
-         tm.begin();
-         try
-         {
-            Connection conn = getConnection();
-            try
-            {
-               boolean success = execute(conn, "CREATE_TABLE_JOB_DETAILS");
-               if(success)
-               {
-                  execute(conn, "CREATE_TABLE_JOB_LISTENERS");
-                  execute(conn, "CREATE_TABLE_TRIGGERS");
-                  execute(conn, "CREATE_TABLE_SIMPLE_TRIGGERS");
-                  execute(conn, "CREATE_TABLE_CRON_TRIGGERS");
-                  execute(conn, "CREATE_TABLE_BLOB_TRIGGERS");
-                  execute(conn, "CREATE_TABLE_TRIGGER_LISTENERS");
-                  execute(conn, "CREATE_TABLE_CALENDARS");
-                  execute(conn, "CREATE_TABLE_PAUSED_TRIGGER_GRPS");
-                  execute(conn, "CREATE_TABLE_FIRED_TRIGGERS");
-                  execute(conn, "CREATE_TABLE_SCHEDULER_STATE");
-                  execute(conn, "CREATE_TABLE_LOCKS");
-                  
-                  execute(conn, "INSERT_TRIGGER_ACCESS");
-                  execute(conn, "INSERT_JOB_ACCESS");
-                  execute(conn, "INSERT_CALENDAR_ACCESS");
-                  execute(conn, "INSERT_STATE_ACCESS");
-                  execute(conn, "INSERT_MISFIRE_ACCESS");
-               }
-            }
-            finally
-            {
-               conn.close();
-            }
-            tm.commit();
-         }
-         catch(SQLException e)
-         {
-            throw new RuntimeException(e);
-         }
-         catch (RollbackException e)
-         {
-            throw new RuntimeException(e);
-         }
-         catch (HeuristicMixedException e)
-         {
-            throw new RuntimeException(e);
-         }
-         catch (HeuristicRollbackException e)
-         {
-            throw new RuntimeException(e);
-         }
-         finally
-         {
-            if(tm.getStatus() == Status.STATUS_ACTIVE)
-               tm.rollback();
-         }
-      }
-      catch(SystemException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (NotSupportedException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   /**
-    * Create a TimerService for use in a bean container.
-    * 
-    * @param objectName the name of the bean container
-    * @param invoker    the invoker to call on timeouts
-    * @return           an EJB TimerService
-    */
-   public TimerService createTimerService(ObjectName objectName, TimedObjectInvoker invoker)
-   {
-      Scheduler scheduler = getScheduler();
-      if (scheduler == null) return null;
-      
-      return new TimerServiceImpl(scheduler, objectName, invoker);
-   }
-   
-   private boolean execute(Connection conn, String stmtName) throws SQLException
-   {
-      String sql = sqlProperties.getProperty(stmtName);
-      if(sql == null)
-         throw new IllegalStateException("No sql set for '" + stmtName + "'");
-      
-      PreparedStatement stmt = conn.prepareStatement(sql);
-      try
-      {
-         stmt.execute();
-         return true;
-      }
-      catch(SQLException e)
-      {
-         log.warn("sql failed: " + sql);
-         if(log.isDebugEnabled())
-            log.debug("sql failed: " + sql, e);
-         return false;
-      }
-      finally
-      {
-         stmt.close();
-      }
-   }
-   
-   private Connection getConnection() throws SQLException
-   {
-      return DBConnectionManager.getInstance().getConnection("myDS");
-   }
-   
-   /**
-    * @return   the scheduler for package use
-    */
-   protected static Scheduler getScheduler()
-   {
-      if(scheduler == null)
-      {
-         return null;
-         //throw new IllegalStateException("TimerServiceFactory hasn't been started yet");
-      }
-      
-      return scheduler;
-   }
-   
-   public void removeTimerService(TimerService aTimerService)
-   {
-      TimerServiceImpl timerService = (TimerServiceImpl) aTimerService;
-      timerService.shutdown();
-   }
-   
-   public void restoreTimerService(TimerService aTimerService)
-   {
-      // TODO: implement Quartz restore timer service
-   }
-   
-   public void setDataSource(String jndiName)
-   {
-      JNDIConnectionProvider connectionProvider = new JNDIConnectionProvider(jndiName, false);
-      // FIXME: remove hardcoding
-      DBConnectionManager.getInstance().addConnectionProvider("myDS", connectionProvider);
-   }
-   
-   public void setProperties(final Properties props)
-   {
-//      if(scheduler != null)
-//         throw new IllegalStateException("already started");
-      
-      // TODO: precondition the prop
-      properties = props;
-   }
-   
-   public void setSqlProperties(Properties props)
-   {
-      this.sqlProperties = props;
-   }
-   
-   public synchronized void start() throws Exception
-   {
-      if(scheduler != null)
-         throw new IllegalStateException("already started");
-      
-      log.debug("properties = " + properties);
-      
-      InitialContext ctx = new InitialContext();
-      tm = (TransactionManager) ctx.lookup(TransactionManagerService.JNDI_NAME);
-      
-      createSchema();
-      
-      // TODO: bind in JNDI, or is this done by the JMX bean?
-      SchedulerFactory factory;
-      if(properties == null)
-         factory = new StdSchedulerFactory();
-      else
-         factory = new StdSchedulerFactory(properties);
-      scheduler = factory.getScheduler();
-      // TODO: really start right away?
-      scheduler.start();
-   }
-   
-   public synchronized void stop() throws Exception
-   {
-      if(scheduler == null)
-         throw new IllegalStateException("already stopped");
-      
-      // TODO: unbind from JNDI
-      
-      // TODO: standby or shutdown?
-      scheduler.shutdown();
-      
-      scheduler = null;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,274 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.quartz;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import javax.ejb.TimerService;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+
+import org.jboss.ejb3.timerservice.TimedObjectInvoker;
+import org.jboss.ejb3.timerservice.TimerServiceFactory;
+import org.jboss.logging.Logger;
+import org.jboss.tm.TransactionManagerService;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerFactory;
+import org.quartz.impl.StdSchedulerFactory;
+import org.quartz.utils.DBConnectionManager;
+import org.quartz.utils.JNDIConnectionProvider;
+
+/**
+ * Creates timer service objects for use in EJB3 containers. For this
+ * two methods are provided: createTimerService and removeTimerService.
+ * 
+ * The factory can be started and stopped within both an embedded and full stack.
+ * 
+ * For now only one scheduler is supported. Each bean container has its own
+ * job and trigger group within Quartz.
+ * 
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision: 56116 $
+ */
+public class QuartzTimerServiceFactory extends TimerServiceFactory
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(QuartzTimerServiceFactory.class);
+   
+   private TransactionManager tm;
+   
+   private static Scheduler scheduler;
+   
+   private Properties properties;
+   
+   /**
+    * Contains the sql statements to create the database schema.
+    */
+   private Properties sqlProperties;
+   
+   private void createSchema()
+   {
+      try
+      {
+         tm.begin();
+         try
+         {
+            Connection conn = getConnection();
+            try
+            {
+               boolean success = execute(conn, "CREATE_TABLE_JOB_DETAILS");
+               if(success)
+               {
+                  execute(conn, "CREATE_TABLE_JOB_LISTENERS");
+                  execute(conn, "CREATE_TABLE_TRIGGERS");
+                  execute(conn, "CREATE_TABLE_SIMPLE_TRIGGERS");
+                  execute(conn, "CREATE_TABLE_CRON_TRIGGERS");
+                  execute(conn, "CREATE_TABLE_BLOB_TRIGGERS");
+                  execute(conn, "CREATE_TABLE_TRIGGER_LISTENERS");
+                  execute(conn, "CREATE_TABLE_CALENDARS");
+                  execute(conn, "CREATE_TABLE_PAUSED_TRIGGER_GRPS");
+                  execute(conn, "CREATE_TABLE_FIRED_TRIGGERS");
+                  execute(conn, "CREATE_TABLE_SCHEDULER_STATE");
+                  execute(conn, "CREATE_TABLE_LOCKS");
+                  
+                  execute(conn, "INSERT_TRIGGER_ACCESS");
+                  execute(conn, "INSERT_JOB_ACCESS");
+                  execute(conn, "INSERT_CALENDAR_ACCESS");
+                  execute(conn, "INSERT_STATE_ACCESS");
+                  execute(conn, "INSERT_MISFIRE_ACCESS");
+               }
+            }
+            finally
+            {
+               conn.close();
+            }
+            tm.commit();
+         }
+         catch(SQLException e)
+         {
+            throw new RuntimeException(e);
+         }
+         catch (RollbackException e)
+         {
+            throw new RuntimeException(e);
+         }
+         catch (HeuristicMixedException e)
+         {
+            throw new RuntimeException(e);
+         }
+         catch (HeuristicRollbackException e)
+         {
+            throw new RuntimeException(e);
+         }
+         finally
+         {
+            if(tm.getStatus() == Status.STATUS_ACTIVE)
+               tm.rollback();
+         }
+      }
+      catch(SystemException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (NotSupportedException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   /**
+    * Create a TimerService for use in a bean container.
+    * 
+    * @param objectName the name of the bean container
+    * @param invoker    the invoker to call on timeouts
+    * @return           an EJB TimerService
+    */
+   public TimerService createTimerService(ObjectName objectName, TimedObjectInvoker invoker)
+   {
+      Scheduler scheduler = getScheduler();
+      if (scheduler == null) return null;
+      
+      return new TimerServiceImpl(scheduler, objectName, invoker);
+   }
+   
+   private boolean execute(Connection conn, String stmtName) throws SQLException
+   {
+      String sql = sqlProperties.getProperty(stmtName);
+      if(sql == null)
+         throw new IllegalStateException("No sql set for '" + stmtName + "'");
+      
+      PreparedStatement stmt = conn.prepareStatement(sql);
+      try
+      {
+         stmt.execute();
+         return true;
+      }
+      catch(SQLException e)
+      {
+         log.warn("sql failed: " + sql);
+         if(log.isDebugEnabled())
+            log.debug("sql failed: " + sql, e);
+         return false;
+      }
+      finally
+      {
+         stmt.close();
+      }
+   }
+   
+   private Connection getConnection() throws SQLException
+   {
+      return DBConnectionManager.getInstance().getConnection("myDS");
+   }
+   
+   /**
+    * @return   the scheduler for package use
+    */
+   protected static Scheduler getScheduler()
+   {
+      if(scheduler == null)
+      {
+         return null;
+         //throw new IllegalStateException("TimerServiceFactory hasn't been started yet");
+      }
+      
+      return scheduler;
+   }
+   
+   public void removeTimerService(TimerService aTimerService)
+   {
+      TimerServiceImpl timerService = (TimerServiceImpl) aTimerService;
+      timerService.shutdown();
+   }
+   
+   public void restoreTimerService(TimerService aTimerService)
+   {
+      // TODO: implement Quartz restore timer service
+   }
+   
+   public void setDataSource(String jndiName)
+   {
+      JNDIConnectionProvider connectionProvider = new JNDIConnectionProvider(jndiName, false);
+      // FIXME: remove hardcoding
+      DBConnectionManager.getInstance().addConnectionProvider("myDS", connectionProvider);
+   }
+   
+   public void setProperties(final Properties props)
+   {
+//      if(scheduler != null)
+//         throw new IllegalStateException("already started");
+      
+      // TODO: precondition the prop
+      properties = props;
+   }
+   
+   public void setSqlProperties(Properties props)
+   {
+      this.sqlProperties = props;
+   }
+   
+   public synchronized void start() throws Exception
+   {
+      if(scheduler != null)
+         throw new IllegalStateException("already started");
+      
+      log.debug("properties = " + properties);
+      
+      InitialContext ctx = new InitialContext();
+      tm = (TransactionManager) ctx.lookup(TransactionManagerService.JNDI_NAME);
+      
+      createSchema();
+      
+      // TODO: bind in JNDI, or is this done by the JMX bean?
+      SchedulerFactory factory;
+      if(properties == null)
+         factory = new StdSchedulerFactory();
+      else
+         factory = new StdSchedulerFactory(properties);
+      scheduler = factory.getScheduler();
+      // TODO: really start right away?
+      scheduler.start();
+   }
+   
+   public synchronized void stop() throws Exception
+   {
+      if(scheduler == null)
+         throw new IllegalStateException("already stopped");
+      
+      // TODO: unbind from JNDI
+      
+      // TODO: standby or shutdown?
+      scheduler.shutdown();
+      
+      scheduler = null;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,152 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.timerservice.quartz;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchObjectLocalException;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-
-import org.jboss.logging.Logger;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.quartz.Trigger;
-
-/**
- * A view on an actual (persistent) timer.
- * 
- * This object must never be serializable (EJB3 18.4.1)
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class TimerImpl implements Timer
-{
-   private static final Logger log = Logger.getLogger(TimerImpl.class);
-   
-   private Scheduler scheduler;
-   private Trigger trigger;
-   private Serializable info;
-   
-   protected TimerImpl(Scheduler scheduler, Trigger trigger, Serializable info) {
-      assert scheduler != null;
-      assert trigger != null;
-      
-      this.scheduler = scheduler;
-      this.trigger = trigger;
-      this.info = info;
-   }
-   
-   protected void checkState()
-   {
-      // TODO: implement bean state checking to see if a call is allowed
-      
-      if(trigger.getNextFireTime() == null)
-         throw new NoSuchObjectLocalException("timer has expired");
-   }
-   
-   /**
-    * Cause the timer and all its associated expiration notifications to be cancelled.
-    * 
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public void cancel() throws IllegalStateException, NoSuchObjectLocalException, EJBException
-   {
-      checkState();
-      
-      try {
-         // TODO: call TimerServiceImpl.cancelTimer instead
-         scheduler.unscheduleJob(trigger.getName(), trigger.getGroup());
-      }
-      catch(SchedulerException e) {
-         log.error("cancel failed", e);
-         throw new EJBException(e.getMessage());
-      }
-   }
-
-   /**
-    * Get the number of milliseconds that will elapse before the next scheduled timer expiration.
-    * 
-    * @return   The number of milliseconds that will elapse before the next scheduled timer expiration.
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public long getTimeRemaining() throws IllegalStateException, NoSuchObjectLocalException, EJBException
-   {
-      // leave all checks to getNextTimeout
-      return getNextTimeout().getTime() - System.currentTimeMillis();
-   }
-
-   /**
-    * Get the point in time at which the next timer expiration is scheduled to occur.
-    * 
-    * @return   The point in time at which the next timer expiration is scheduled to occur.
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public Date getNextTimeout() throws IllegalStateException, NoSuchObjectLocalException, EJBException
-   {
-      checkState();
-      
-      Date nextTimeout = trigger.getNextFireTime();
-      if(nextTimeout == null)
-         throw new IllegalStateException("trigger does not have a next fire time"); // TODO: proper EJB3 state check & exception
-      return nextTimeout;
-   }
-
-   /**
-    * Get the information associated with the timer at the time of creation.
-    * 
-    * @return   The Serializable object that was passed in at timer creation, or null if the info argument passed in at timer creation was null.
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public Serializable getInfo() throws IllegalStateException, NoSuchObjectLocalException, EJBException
-   {
-      checkState();
-      
-      return info;
-   }
-
-   /**
-    * Get a serializable handle to the timer. This handle can be used at a later time to re-obtain the timer reference.
-    * 
-    * @return   A serializable handle to the timer.
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public TimerHandle getHandle() throws IllegalStateException, NoSuchObjectLocalException, EJBException
-   {
-      checkState();
-      
-      return null; // FIXME: implement getHandle
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.quartz;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.ejb.EJBException;
+import javax.ejb.NoSuchObjectLocalException;
+import javax.ejb.Timer;
+import javax.ejb.TimerHandle;
+
+import org.jboss.logging.Logger;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+
+/**
+ * A view on an actual (persistent) timer.
+ * 
+ * This object must never be serializable (EJB3 18.4.1)
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class TimerImpl implements Timer
+{
+   private static final Logger log = Logger.getLogger(TimerImpl.class);
+   
+   private Scheduler scheduler;
+   private Trigger trigger;
+   private Serializable info;
+   
+   protected TimerImpl(Scheduler scheduler, Trigger trigger, Serializable info) {
+      assert scheduler != null;
+      assert trigger != null;
+      
+      this.scheduler = scheduler;
+      this.trigger = trigger;
+      this.info = info;
+   }
+   
+   protected void checkState()
+   {
+      // TODO: implement bean state checking to see if a call is allowed
+      
+      if(trigger.getNextFireTime() == null)
+         throw new NoSuchObjectLocalException("timer has expired");
+   }
+   
+   /**
+    * Cause the timer and all its associated expiration notifications to be cancelled.
+    * 
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public void cancel() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+   {
+      checkState();
+      
+      try {
+         // TODO: call TimerServiceImpl.cancelTimer instead
+         scheduler.unscheduleJob(trigger.getName(), trigger.getGroup());
+      }
+      catch(SchedulerException e) {
+         log.error("cancel failed", e);
+         throw new EJBException(e.getMessage());
+      }
+   }
+
+   /**
+    * Get the number of milliseconds that will elapse before the next scheduled timer expiration.
+    * 
+    * @return   The number of milliseconds that will elapse before the next scheduled timer expiration.
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public long getTimeRemaining() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+   {
+      // leave all checks to getNextTimeout
+      return getNextTimeout().getTime() - System.currentTimeMillis();
+   }
+
+   /**
+    * Get the point in time at which the next timer expiration is scheduled to occur.
+    * 
+    * @return   The point in time at which the next timer expiration is scheduled to occur.
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public Date getNextTimeout() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+   {
+      checkState();
+      
+      Date nextTimeout = trigger.getNextFireTime();
+      if(nextTimeout == null)
+         throw new IllegalStateException("trigger does not have a next fire time"); // TODO: proper EJB3 state check & exception
+      return nextTimeout;
+   }
+
+   /**
+    * Get the information associated with the timer at the time of creation.
+    * 
+    * @return   The Serializable object that was passed in at timer creation, or null if the info argument passed in at timer creation was null.
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public Serializable getInfo() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+   {
+      checkState();
+      
+      return info;
+   }
+
+   /**
+    * Get a serializable handle to the timer. This handle can be used at a later time to re-obtain the timer reference.
+    * 
+    * @return   A serializable handle to the timer.
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   NoSuchObjectLocalException  If invoked on a timer that has expired or has been cancelled. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public TimerHandle getHandle() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+   {
+      checkState();
+      
+      return null; // FIXME: implement getHandle
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,233 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.timerservice.quartz;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-
-import javax.ejb.EJBException;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.timerservice.TimedObjectInvoker;
-import org.jboss.logging.Logger;
-import org.quartz.JobDetail;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.quartz.SimpleTrigger;
-import org.quartz.Trigger;
-
-/**
- * Implements the EJB3 Timer Service specification (EJB3 chapter 18).
- * 
- * Each bean container has its own job and trigger group.
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class TimerServiceImpl implements TimerService
-{
-   private static final Logger log = Logger.getLogger(TimerServiceImpl.class);
-   
-   private Scheduler scheduler;
-   private ObjectName objectName;
-   private String groupName;
-   private long jobNum = 0;
-   private long triggerNum = 0;
-   
-   protected TimerServiceImpl(Scheduler scheduler, ObjectName objectName, TimedObjectInvoker invoker) {
-      assert scheduler != null;
-      assert objectName != null;
-      assert invoker != null;
-      
-      this.scheduler = scheduler;
-      this.objectName = objectName;
-      this.groupName = objectName.getCanonicalName();
-   }
-   
-   protected Timer createTimer(Trigger trigger, Serializable info)
-   {
-      try {
-         String name = "myJob" + jobNum;
-         jobNum++;
-         
-         Class jobClass = QuartzTimerJob.class;
-         
-         Timer timer = new TimerImpl(scheduler, trigger, info);
-         
-         PersistentTimer persistentTimer = new PersistentTimer(trigger, objectName, info);
-         
-         JobDetail jobDetail = new JobDetail(name, groupName, jobClass);
-         jobDetail.getJobDataMap().put("timer", persistentTimer);
-         
-         scheduler.scheduleJob(jobDetail, trigger);
-         
-         return timer;
-      }
-      catch(SchedulerException e) {
-         // translate the exception, because the client might not have quartz
-         log.error("createTimer failed", e);
-         throw new EJBException(e.getMessage());
-      }
-      
-   }
-   
-   /**
-    * Create a single-action timer that expires after a specified duration.
-    * 
-    * @param    duration    The number of milliseconds that must elapse before the timer expires.
-    * @param    info        Application information to be delivered along with the timer expiration notification. This can be null.
-    * @return   The newly created Timer.
-    * @throws   IllegalArgumentException    If duration is negative.
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method.
-    * @throws   EJBException                If this method fails due to a system-level failure.
-    */
-   public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException,
-         EJBException
-   {
-      if(duration < 0) throw new IllegalArgumentException("duration must not be negative");
-      // TODO: check state
-      
-      Date expiration = new Date(System.currentTimeMillis() + duration);
-      return createTimer(expiration, info);
-   }
-
-   /**
-    * Create an interval timer whose first expiration occurs after a specified duration, 
-    * and whose subsequent expirations occur after a specified interval.
-    * 
-    * @param    initialDuration     The number of milliseconds that must elapse before the first timer expiration notification.
-    * @param    intervalDuration    The number of milliseconds that must elapse between timer expiration notifications. Expiration notifications are scheduled relative to the time of the first expiration. If expiration is delayed(e.g. due to the interleaving of other method calls on the bean) two or more expiration notifications may occur in close succession to "catch up".
-    * @param    info                Application information to be delivered along with the timer expiration. This can be null.
-    * @return   The newly created Timer.
-    * @throws   IllegalArgumentException    If initialDuration is negative, or intervalDuration is negative. 
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public Timer createTimer(long initialDuration, long intervalDuration, Serializable info)
-         throws IllegalArgumentException, IllegalStateException, EJBException
-   {
-      if(initialDuration < 0) throw new IllegalArgumentException("initialDuration must not be negative");
-      if(intervalDuration < 0) throw new IllegalArgumentException("intervalDuration must not be negative");
-      // TODO: check state
-      
-      Date initialExpiration = new Date(System.currentTimeMillis() + initialDuration);
-      
-      return createTimer(initialExpiration, intervalDuration, info);
-   }
-
-   /**
-    * Create a single-action timer that expires at a given point in time.
-    * 
-    * @param    expiration  The point in time at which the timer must expire.
-    * @param    info        Application information to be delivered along with the timer expiration notification. This can be null. 
-    * @return   The newly created Timer. 
-    * @throws   IllegalArgumentException    If expiration is null, or expiration.getTime() is negative. 
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException,
-         EJBException
-   {
-      if(expiration == null) throw new IllegalArgumentException("expiration must not be null");
-      if(expiration.getTime() < 0) throw new IllegalArgumentException("expiration.time must not be negative");
-      // TODO: check state
-      
-      String triggerName = "myTrigger" + triggerNum;
-      triggerNum++;
-      
-      Trigger trigger = new SimpleTrigger(triggerName, groupName, expiration);
-      
-      return createTimer(trigger, info);
-   }
-
-   /**
-    * Create an interval timer whose first expiration occurs at a given point in time and whose subsequent expirations occur after a specified interval.
-    * 
-    * @param    initialExpiration   The point in time at which the first timer expiration must occur.
-    * @param    intervalDuration    The number of milliseconds that must elapse between timer expiration notifications. Expiration notifications are scheduled relative to the time of the first expiration. If expiration is delayed(e.g. due to the interleaving of other method calls on the bean) two or more expiration notifications may occur in close succession to "catch up".
-    * @param    info                Application information to be delivered along with the timer expiration notification. This can be null. 
-    * @return   The newly created Timer. 
-    * @throws   IllegalArgumentException    If initialExpiration is null, or initialExpiration.getTime() is negative, or intervalDuration is negative. 
-    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
-    * @throws   EJBException                If this method could not complete due to a system-level failure.
-    */
-   public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info)
-         throws IllegalArgumentException, IllegalStateException, EJBException
-   {
-      if(initialExpiration == null) throw new IllegalArgumentException("initialExpiration must not be null");
-      if(initialExpiration.getTime() < 0) throw new IllegalArgumentException("initialExpiration.time must not be negative");
-      if(intervalDuration < 0) throw new IllegalArgumentException("intervalDuration must not be negative");
-      // TODO: check state
-      
-      String triggerName = "myTrigger" + triggerNum;
-      triggerNum++;
-      Date endTime = null;
-      
-      Trigger trigger = new SimpleTrigger(triggerName, groupName, initialExpiration, endTime, SimpleTrigger.REPEAT_INDEFINITELY, intervalDuration);
-      
-      return createTimer(trigger, info);
-   }
-
-   protected Scheduler getScheduler()
-   {
-      return scheduler;
-   }
-
-   /**
-    * Get all the active timers associated with this bean.
-    * 
-    * @return   A collection of javax.ejb.Timer objects.
-    * @throws   IllegalStateException   If this method is invoked while the instance is in a state that does not allow access to this method.
-    * @throws   EJBException            If this method could not complete due to a system-level failure.
-    */
-   public Collection getTimers() throws IllegalStateException, EJBException
-   {
-      throw new RuntimeException("NYI");
-   }
-
-   protected void shutdown()
-   {
-      log.debug("shutting down " + this);
-      try
-      {
-         String triggerNames[] = scheduler.getTriggerNames(groupName);
-         for(String triggerName : triggerNames)
-            scheduler.unscheduleJob(triggerName, groupName);
-         String jobNames[] = scheduler.getJobNames(groupName);
-         for(String jobName : jobNames)
-            scheduler.deleteJob(jobName, groupName);
-      }
-      catch(SchedulerException e)
-      {
-         log.error("shutdown failed", e);
-         // TODO: ignore?
-      }
-   }
-   
-   public String toString()
-   {
-      return "Timer Service " + objectName;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,233 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.quartz;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Date;
+
+import javax.ejb.EJBException;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.timerservice.TimedObjectInvoker;
+import org.jboss.logging.Logger;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleTrigger;
+import org.quartz.Trigger;
+
+/**
+ * Implements the EJB3 Timer Service specification (EJB3 chapter 18).
+ * 
+ * Each bean container has its own job and trigger group.
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class TimerServiceImpl implements TimerService
+{
+   private static final Logger log = Logger.getLogger(TimerServiceImpl.class);
+   
+   private Scheduler scheduler;
+   private ObjectName objectName;
+   private String groupName;
+   private long jobNum = 0;
+   private long triggerNum = 0;
+   
+   protected TimerServiceImpl(Scheduler scheduler, ObjectName objectName, TimedObjectInvoker invoker) {
+      assert scheduler != null;
+      assert objectName != null;
+      assert invoker != null;
+      
+      this.scheduler = scheduler;
+      this.objectName = objectName;
+      this.groupName = objectName.getCanonicalName();
+   }
+   
+   protected Timer createTimer(Trigger trigger, Serializable info)
+   {
+      try {
+         String name = "myJob" + jobNum;
+         jobNum++;
+         
+         Class jobClass = QuartzTimerJob.class;
+         
+         Timer timer = new TimerImpl(scheduler, trigger, info);
+         
+         PersistentTimer persistentTimer = new PersistentTimer(trigger, objectName, info);
+         
+         JobDetail jobDetail = new JobDetail(name, groupName, jobClass);
+         jobDetail.getJobDataMap().put("timer", persistentTimer);
+         
+         scheduler.scheduleJob(jobDetail, trigger);
+         
+         return timer;
+      }
+      catch(SchedulerException e) {
+         // translate the exception, because the client might not have quartz
+         log.error("createTimer failed", e);
+         throw new EJBException(e.getMessage());
+      }
+      
+   }
+   
+   /**
+    * Create a single-action timer that expires after a specified duration.
+    * 
+    * @param    duration    The number of milliseconds that must elapse before the timer expires.
+    * @param    info        Application information to be delivered along with the timer expiration notification. This can be null.
+    * @return   The newly created Timer.
+    * @throws   IllegalArgumentException    If duration is negative.
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method.
+    * @throws   EJBException                If this method fails due to a system-level failure.
+    */
+   public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException,
+         EJBException
+   {
+      if(duration < 0) throw new IllegalArgumentException("duration must not be negative");
+      // TODO: check state
+      
+      Date expiration = new Date(System.currentTimeMillis() + duration);
+      return createTimer(expiration, info);
+   }
+
+   /**
+    * Create an interval timer whose first expiration occurs after a specified duration, 
+    * and whose subsequent expirations occur after a specified interval.
+    * 
+    * @param    initialDuration     The number of milliseconds that must elapse before the first timer expiration notification.
+    * @param    intervalDuration    The number of milliseconds that must elapse between timer expiration notifications. Expiration notifications are scheduled relative to the time of the first expiration. If expiration is delayed(e.g. due to the interleaving of other method calls on the bean) two or more expiration notifications may occur in close succession to "catch up".
+    * @param    info                Application information to be delivered along with the timer expiration. This can be null.
+    * @return   The newly created Timer.
+    * @throws   IllegalArgumentException    If initialDuration is negative, or intervalDuration is negative. 
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public Timer createTimer(long initialDuration, long intervalDuration, Serializable info)
+         throws IllegalArgumentException, IllegalStateException, EJBException
+   {
+      if(initialDuration < 0) throw new IllegalArgumentException("initialDuration must not be negative");
+      if(intervalDuration < 0) throw new IllegalArgumentException("intervalDuration must not be negative");
+      // TODO: check state
+      
+      Date initialExpiration = new Date(System.currentTimeMillis() + initialDuration);
+      
+      return createTimer(initialExpiration, intervalDuration, info);
+   }
+
+   /**
+    * Create a single-action timer that expires at a given point in time.
+    * 
+    * @param    expiration  The point in time at which the timer must expire.
+    * @param    info        Application information to be delivered along with the timer expiration notification. This can be null. 
+    * @return   The newly created Timer. 
+    * @throws   IllegalArgumentException    If expiration is null, or expiration.getTime() is negative. 
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException,
+         EJBException
+   {
+      if(expiration == null) throw new IllegalArgumentException("expiration must not be null");
+      if(expiration.getTime() < 0) throw new IllegalArgumentException("expiration.time must not be negative");
+      // TODO: check state
+      
+      String triggerName = "myTrigger" + triggerNum;
+      triggerNum++;
+      
+      Trigger trigger = new SimpleTrigger(triggerName, groupName, expiration);
+      
+      return createTimer(trigger, info);
+   }
+
+   /**
+    * Create an interval timer whose first expiration occurs at a given point in time and whose subsequent expirations occur after a specified interval.
+    * 
+    * @param    initialExpiration   The point in time at which the first timer expiration must occur.
+    * @param    intervalDuration    The number of milliseconds that must elapse between timer expiration notifications. Expiration notifications are scheduled relative to the time of the first expiration. If expiration is delayed(e.g. due to the interleaving of other method calls on the bean) two or more expiration notifications may occur in close succession to "catch up".
+    * @param    info                Application information to be delivered along with the timer expiration notification. This can be null. 
+    * @return   The newly created Timer. 
+    * @throws   IllegalArgumentException    If initialExpiration is null, or initialExpiration.getTime() is negative, or intervalDuration is negative. 
+    * @throws   IllegalStateException       If this method is invoked while the instance is in a state that does not allow access to this method. 
+    * @throws   EJBException                If this method could not complete due to a system-level failure.
+    */
+   public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info)
+         throws IllegalArgumentException, IllegalStateException, EJBException
+   {
+      if(initialExpiration == null) throw new IllegalArgumentException("initialExpiration must not be null");
+      if(initialExpiration.getTime() < 0) throw new IllegalArgumentException("initialExpiration.time must not be negative");
+      if(intervalDuration < 0) throw new IllegalArgumentException("intervalDuration must not be negative");
+      // TODO: check state
+      
+      String triggerName = "myTrigger" + triggerNum;
+      triggerNum++;
+      Date endTime = null;
+      
+      Trigger trigger = new SimpleTrigger(triggerName, groupName, initialExpiration, endTime, SimpleTrigger.REPEAT_INDEFINITELY, intervalDuration);
+      
+      return createTimer(trigger, info);
+   }
+
+   protected Scheduler getScheduler()
+   {
+      return scheduler;
+   }
+
+   /**
+    * Get all the active timers associated with this bean.
+    * 
+    * @return   A collection of javax.ejb.Timer objects.
+    * @throws   IllegalStateException   If this method is invoked while the instance is in a state that does not allow access to this method.
+    * @throws   EJBException            If this method could not complete due to a system-level failure.
+    */
+   public Collection getTimers() throws IllegalStateException, EJBException
+   {
+      throw new RuntimeException("NYI");
+   }
+
+   protected void shutdown()
+   {
+      log.debug("shutting down " + this);
+      try
+      {
+         String triggerNames[] = scheduler.getTriggerNames(groupName);
+         for(String triggerName : triggerNames)
+            scheduler.unscheduleJob(triggerName, groupName);
+         String jobNames[] = scheduler.getJobNames(groupName);
+         for(String jobName : jobNames)
+            scheduler.deleteJob(jobName, groupName);
+      }
+      catch(SchedulerException e)
+      {
+         log.error("shutdown failed", e);
+         // TODO: ignore?
+      }
+   }
+   
+   public String toString()
+   {
+      return "Timer Service " + objectName;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,114 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.timerservice.quartz.jmx;
-
-import java.util.Properties;
-
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.timerservice.quartz.QuartzTimerServiceFactory;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class EJB3TimerService extends ServiceMBeanSupport
-   implements EJB3TimerServiceMBean
-{
-   private QuartzTimerServiceFactory delegate;
-   private ObjectName dataSource;
-   
-   public EJB3TimerService()
-   {
-      delegate = new QuartzTimerServiceFactory();
-   }
-   
-   @Override
-   protected void createService() throws Exception
-   {
-      super.createService();
-   }
-
-   @Override
-   protected void destroyService() throws Exception
-   {
-      //this.delegate.shutdown();
-      super.destroyService();
-   }
-   
-   /**
-    * @jmx:managed-attribute
-    * 
-    * @return   the object name of the data source to use
-    */
-   public ObjectName getDataSource()
-   {
-      return dataSource;
-   }
-   
-   /**
-    * @jmx:managed-attribute
-    */
-   public void setDataSource(ObjectName dataSource)
-   {
-      this.dataSource = dataSource;
-   }
-   
-   /**
-    * @jmx:managed-attribute
-    * 
-    * @param props
-    */
-   public void setProperties(final Properties props)
-   {
-      delegate.setProperties(props);
-   }
-   
-   /**
-    * @jmx:managed-attribute
-    * 
-    * @param props
-    */
-   public void setSqlProperties(Properties props)
-   {
-      delegate.setSqlProperties(props);
-   }
-   
-   @Override
-   protected void startService() throws Exception
-   {
-      super.startService();
-      String jndiName = (String) server.getAttribute(dataSource, "BindName");
-      delegate.setDataSource(jndiName);
-      delegate.start();
-   }
-   
-   @Override
-   protected void stopService() throws Exception
-   {
-      delegate.stop();
-      super.stopService();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.quartz.jmx;
+
+import java.util.Properties;
+
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.timerservice.quartz.QuartzTimerServiceFactory;
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class EJB3TimerService extends ServiceMBeanSupport
+   implements EJB3TimerServiceMBean
+{
+   private QuartzTimerServiceFactory delegate;
+   private ObjectName dataSource;
+   
+   public EJB3TimerService()
+   {
+      delegate = new QuartzTimerServiceFactory();
+   }
+   
+   @Override
+   protected void createService() throws Exception
+   {
+      super.createService();
+   }
+
+   @Override
+   protected void destroyService() throws Exception
+   {
+      //this.delegate.shutdown();
+      super.destroyService();
+   }
+   
+   /**
+    * @jmx:managed-attribute
+    * 
+    * @return   the object name of the data source to use
+    */
+   public ObjectName getDataSource()
+   {
+      return dataSource;
+   }
+   
+   /**
+    * @jmx:managed-attribute
+    */
+   public void setDataSource(ObjectName dataSource)
+   {
+      this.dataSource = dataSource;
+   }
+   
+   /**
+    * @jmx:managed-attribute
+    * 
+    * @param props
+    */
+   public void setProperties(final Properties props)
+   {
+      delegate.setProperties(props);
+   }
+   
+   /**
+    * @jmx:managed-attribute
+    * 
+    * @param props
+    */
+   public void setSqlProperties(Properties props)
+   {
+      delegate.setSqlProperties(props);
+   }
+   
+   @Override
+   protected void startService() throws Exception
+   {
+      super.startService();
+      String jndiName = (String) server.getAttribute(dataSource, "BindName");
+      delegate.setDataSource(jndiName);
+      delegate.start();
+   }
+   
+   @Override
+   protected void stopService() throws Exception
+   {
+      delegate.stop();
+      super.stopService();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.timerservice.quartz.jmx;
-
-import java.util.Properties;
-
-import javax.management.ObjectName;
-
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.system.ServiceMBean;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public interface EJB3TimerServiceMBean extends ServiceMBean
-{
-    /** The default object name */
-    ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ejb:service=EJB3TimerService");
-    
-    void setDataSource(ObjectName dataSource);
-    
-    void setProperties(final Properties props);
-    
-    void setSqlProperties(Properties props);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.timerservice.quartz.jmx;
+
+import java.util.Properties;
+
+import javax.management.ObjectName;
+
+import org.jboss.mx.util.ObjectNameFactory;
+import org.jboss.system.ServiceMBean;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public interface EJB3TimerServiceMBean extends ServiceMBean
+{
+    /** The default object name */
+    ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ejb:service=EJB3TimerService");
+    
+    void setDataSource(ObjectName dataSource);
+    
+    void setProperties(final Properties props);
+    
+    void setSqlProperties(Properties props);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/jmx/EJB3TimerServiceMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<head>
-	<body>
-		This package provides the EJB Timer Service to the EJB3 stack.
-		<p/>
-		It replaces the org.jboss.ejb.txtimer package.
-		<p/>
-		The Jboss EJB3 Timer Service package depends on:
-		<ul>
-			<li>EJB3 API</li>
-			<li>Quartz</li>
-			<li>JTA</li>
-		</ul>
-		<p/>
-		Note that almost all exceptions are caught and rethrown as EJBExceptions, thus
-		making sure that no Quartz API is exposed either compile time or run time.
-	</body>
-</head>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<head>
+	<body>
+		This package provides the EJB Timer Service to the EJB3 stack.
+		<p/>
+		It replaces the org.jboss.ejb.txtimer package.
+		<p/>
+		The Jboss EJB3 Timer Service package depends on:
+		<ul>
+			<li>EJB3 API</li>
+			<li>Quartz</li>
+			<li>JTA</li>
+		</ul>
+		<p/>
+		Note that almost all exceptions are caught and rethrown as EJBExceptions, thus
+		making sure that no Quartz API is exposed either compile time or run time.
+	</body>
+</head>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/package.html
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,222 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.tx;
-
-import javax.ejb.EJBException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.util.PayloadKey;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainerInvocation;
-import org.jboss.ejb3.stateful.StatefulBeanContext;
-import org.jboss.logging.Logger;
-import org.jboss.tm.TxUtils;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- *  @author <a href="mailto:osh at sparre.dk">Ole Husgaard</a>
- * @version $Revision$
- */
-public class BMTInterceptor implements Interceptor
-{
-   private TransactionManager tm;
-   private boolean isStateless;
-   protected static Logger log = Logger.getLogger(BMTInterceptor.class);
-
-   public BMTInterceptor(TransactionManager tm, boolean stateless)
-   {
-      this.tm = tm;
-      isStateless = stateless;
-   }
-
-
-   public String getName()
-   {
-      return BMTInterceptor.class.getName();
-   }
-
-
-
-   public Object handleStateless(Invocation invocation) throws Throwable
-   {
-      Container container = (Container)invocation.getAdvisor();
-      boolean exceptionThrown = false;
-      try
-      {
-         return invocation.invokeNext();
-      }
-      catch (Exception ex)
-      {
-         exceptionThrown = true;
-         checkStatelessDone(container, ex);
-         throw ex;
-      }
-      finally
-      {
-         try
-         {
-            if (!exceptionThrown) checkStatelessDone(container, null);
-         }
-         finally
-         {
-            tm.suspend();
-         }
-      }
-   }
-
-   public Object handleStateful(Invocation invocation) throws Throwable
-   {
-      EJBContainerInvocation ejb = (EJBContainerInvocation)invocation;
-      Container container = (Container)invocation.getAdvisor();
-
-      StatefulBeanContext ctx = (StatefulBeanContext)ejb.getBeanContext();
-      Transaction tx = (Transaction)ctx.getMetaData().getMetaData("TX", "TX");
-      if (tx != null)
-      {
-         ctx.getMetaData().addMetaData("TX", "TX", null, PayloadKey.TRANSIENT);
-         tm.resume(tx);
-      }
-      try
-      {
-         return invocation.invokeNext();
-      }
-      finally
-      {
-         checkBadStateful(container);
-         Transaction newTx = tm.getTransaction();
-         if (newTx != null)
-         {
-            ctx.getMetaData().addMetaData("TX", "TX", newTx, PayloadKey.TRANSIENT);
-            tm.suspend();
-         }
-         else
-         {
-            ctx.getMetaData().addMetaData("TX", "TX", null, PayloadKey.TRANSIENT);
-         }
-      }
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      Transaction oldTx = tm.getTransaction();
-      if (oldTx != null) tm.suspend();
-
-      try
-      {
-         if (isStateless) return handleStateless(invocation);
-         else return handleStateful(invocation);
-      }
-      finally
-      {
-         if (oldTx != null) tm.resume(oldTx);
-      }
-
-
-   }
-
-   private void checkStatelessDone(Container container, Exception ex)
-   {
-      int status = Status.STATUS_NO_TRANSACTION;
-
-      try
-      {
-         status = tm.getStatus();
-      }
-      catch (SystemException sex)
-      {
-         log.error("Failed to get status", sex);
-      }
-
-      switch (status)
-      {
-         case Status.STATUS_ACTIVE :
-         case Status.STATUS_COMMITTING :
-         case Status.STATUS_MARKED_ROLLBACK :
-         case Status.STATUS_PREPARING :
-         case Status.STATUS_ROLLING_BACK :
-            try
-            {
-               tm.rollback();
-            }
-            catch (Exception sex)
-            {
-               log.error("Failed to rollback", sex);
-            }
-         // fall through...
-         case Status.STATUS_PREPARED :
-            String msg = "Application error: BMT stateless bean " + container.getEjbName()
-                         + " should complete transactions before" + " returning (ejb1.1 spec, 11.6.1)";
-            log.error(msg);
-
-            // the instance interceptor will discard the instance
-            if (ex != null)
-            {
-               if (ex instanceof EJBException)
-                  throw (EJBException)ex;
-               else
-                  throw new EJBException(msg, ex);
-            }
-            else throw new EJBException(msg);
-      }
-   }
-
-   private void checkBadStateful(Container container)
-   {
-      int status = Status.STATUS_NO_TRANSACTION;
-
-      try
-      {
-         status = tm.getStatus();
-      }
-      catch (SystemException ex)
-      {
-         log.error("Failed to get status", ex);
-      }
-
-      switch (status)
-      {
-         case Status.STATUS_COMMITTING :
-         case Status.STATUS_MARKED_ROLLBACK :
-         case Status.STATUS_PREPARING :
-         case Status.STATUS_ROLLING_BACK :
-            try
-            {
-               tm.rollback();
-            }
-            catch (Exception ex)
-            {
-               log.error("Failed to rollback", ex);
-            }
-            String msg = "BMT stateful bean '" + container.getEjbName()
-                         + "' did not complete user transaction properly status=" + TxUtils.getStatusAsString(status);
-            log.error(msg);
-      }
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,222 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.tx;
+
+import javax.ejb.EJBException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.util.PayloadKey;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.EJBContainerInvocation;
+import org.jboss.ejb3.stateful.StatefulBeanContext;
+import org.jboss.logging.Logger;
+import org.jboss.tm.TxUtils;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ *  @author <a href="mailto:osh at sparre.dk">Ole Husgaard</a>
+ * @version $Revision$
+ */
+public class BMTInterceptor implements Interceptor
+{
+   private TransactionManager tm;
+   private boolean isStateless;
+   protected static Logger log = Logger.getLogger(BMTInterceptor.class);
+
+   public BMTInterceptor(TransactionManager tm, boolean stateless)
+   {
+      this.tm = tm;
+      isStateless = stateless;
+   }
+
+
+   public String getName()
+   {
+      return BMTInterceptor.class.getName();
+   }
+
+
+
+   public Object handleStateless(Invocation invocation) throws Throwable
+   {
+      Container container = (Container)invocation.getAdvisor();
+      boolean exceptionThrown = false;
+      try
+      {
+         return invocation.invokeNext();
+      }
+      catch (Exception ex)
+      {
+         exceptionThrown = true;
+         checkStatelessDone(container, ex);
+         throw ex;
+      }
+      finally
+      {
+         try
+         {
+            if (!exceptionThrown) checkStatelessDone(container, null);
+         }
+         finally
+         {
+            tm.suspend();
+         }
+      }
+   }
+
+   public Object handleStateful(Invocation invocation) throws Throwable
+   {
+      EJBContainerInvocation ejb = (EJBContainerInvocation)invocation;
+      Container container = (Container)invocation.getAdvisor();
+
+      StatefulBeanContext ctx = (StatefulBeanContext)ejb.getBeanContext();
+      Transaction tx = (Transaction)ctx.getMetaData().getMetaData("TX", "TX");
+      if (tx != null)
+      {
+         ctx.getMetaData().addMetaData("TX", "TX", null, PayloadKey.TRANSIENT);
+         tm.resume(tx);
+      }
+      try
+      {
+         return invocation.invokeNext();
+      }
+      finally
+      {
+         checkBadStateful(container);
+         Transaction newTx = tm.getTransaction();
+         if (newTx != null)
+         {
+            ctx.getMetaData().addMetaData("TX", "TX", newTx, PayloadKey.TRANSIENT);
+            tm.suspend();
+         }
+         else
+         {
+            ctx.getMetaData().addMetaData("TX", "TX", null, PayloadKey.TRANSIENT);
+         }
+      }
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      Transaction oldTx = tm.getTransaction();
+      if (oldTx != null) tm.suspend();
+
+      try
+      {
+         if (isStateless) return handleStateless(invocation);
+         else return handleStateful(invocation);
+      }
+      finally
+      {
+         if (oldTx != null) tm.resume(oldTx);
+      }
+
+
+   }
+
+   private void checkStatelessDone(Container container, Exception ex)
+   {
+      int status = Status.STATUS_NO_TRANSACTION;
+
+      try
+      {
+         status = tm.getStatus();
+      }
+      catch (SystemException sex)
+      {
+         log.error("Failed to get status", sex);
+      }
+
+      switch (status)
+      {
+         case Status.STATUS_ACTIVE :
+         case Status.STATUS_COMMITTING :
+         case Status.STATUS_MARKED_ROLLBACK :
+         case Status.STATUS_PREPARING :
+         case Status.STATUS_ROLLING_BACK :
+            try
+            {
+               tm.rollback();
+            }
+            catch (Exception sex)
+            {
+               log.error("Failed to rollback", sex);
+            }
+         // fall through...
+         case Status.STATUS_PREPARED :
+            String msg = "Application error: BMT stateless bean " + container.getEjbName()
+                         + " should complete transactions before" + " returning (ejb1.1 spec, 11.6.1)";
+            log.error(msg);
+
+            // the instance interceptor will discard the instance
+            if (ex != null)
+            {
+               if (ex instanceof EJBException)
+                  throw (EJBException)ex;
+               else
+                  throw new EJBException(msg, ex);
+            }
+            else throw new EJBException(msg);
+      }
+   }
+
+   private void checkBadStateful(Container container)
+   {
+      int status = Status.STATUS_NO_TRANSACTION;
+
+      try
+      {
+         status = tm.getStatus();
+      }
+      catch (SystemException ex)
+      {
+         log.error("Failed to get status", ex);
+      }
+
+      switch (status)
+      {
+         case Status.STATUS_COMMITTING :
+         case Status.STATUS_MARKED_ROLLBACK :
+         case Status.STATUS_PREPARING :
+         case Status.STATUS_ROLLING_BACK :
+            try
+            {
+               tm.rollback();
+            }
+            catch (Exception ex)
+            {
+               log.error("Failed to rollback", ex);
+            }
+            String msg = "BMT stateful bean '" + container.getEjbName()
+                         + "' did not complete user transaction properly status=" + TxUtils.getStatusAsString(status);
+            log.error(msg);
+      }
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/BMTInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/Ejb3TxPolicy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/Ejb3TxPolicy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/Ejb3TxPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -22,21 +22,15 @@
 package org.jboss.ejb3.tx;
 
 import java.rmi.RemoteException;
-import java.util.Iterator;
-import java.util.List;
 
 import javax.ejb.ApplicationException;
 import javax.ejb.EJBException;
 import javax.ejb.EJBTransactionRequiredException;
 import javax.ejb.EJBTransactionRolledbackException;
 import javax.transaction.Transaction;
-import org.jboss.ejb.ApplicationExceptionImpl;
+
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.metamodel.AssemblyDescriptor;
-import org.jboss.ejb3.stateful.StatefulContainer;
-import org.jboss.ejb3.stateful.StatefulContainerInvocation;
 
 /**
  * Comment
@@ -53,7 +47,7 @@
 
    public void handleExceptionInOurTx(Invocation invocation, Throwable t, Transaction tx) throws Throwable
    {
-      ApplicationException ae = getApplicationException(t.getClass(), invocation);
+      ApplicationException ae = TxUtil.getApplicationException(t.getClass(), invocation);
       if (ae != null)
       {
          if (ae.rollback()) setRollbackOnly(tx);
@@ -73,7 +67,7 @@
 
    public void handleInCallerTx(Invocation invocation, Throwable t, Transaction tx) throws Throwable
    {
-      ApplicationException ae = getApplicationException(t.getClass(), invocation);
+      ApplicationException ae = TxUtil.getApplicationException(t.getClass(), invocation);
    
       if (ae != null)
       {
@@ -92,32 +86,5 @@
       else
          throw new EJBTransactionRolledbackException((Exception) t);
    }
-   
-   protected ApplicationException getApplicationException(Class exceptionClass, Invocation invocation)
-   {
-      MethodInvocation ejb = (MethodInvocation) invocation;
-      EJBContainer container = (EJBContainer) ejb.getAdvisor();
-      
-      if (exceptionClass.isAnnotationPresent(ApplicationException.class))
-         return (ApplicationException)exceptionClass.getAnnotation(ApplicationException.class);
-      
-      AssemblyDescriptor assembly = container.getAssemblyDescriptor();
-      
-      if (assembly != null)
-      {
-         List exceptions = assembly.getApplicationExceptions();
-         if (exceptions.size() > 0)
-         {
-            Iterator exceptionIterator = exceptions.iterator();
-            while (exceptionIterator.hasNext())
-            {
-               org.jboss.ejb3.metamodel.ApplicationException exception = (org.jboss.ejb3.metamodel.ApplicationException)exceptionIterator.next();
-               if (exception.getExceptionClass().equals(exceptionClass.getName()))
-                  return new ApplicationExceptionImpl(exception.getRollback());
-            }
-         }
-         
-      }
-      return null;
-   }
+
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -33,7 +33,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.tm.TransactionManagerLocator;
 import org.jboss.tm.TxManager;
-import org.jboss.ejb3.tx.TxUtil;
 import org.jboss.ejb3.stateful.StatefulContainer;
 import org.jboss.ejb3.stateless.StatelessContainer;
 
@@ -85,6 +84,10 @@
    protected int resolveTransactionTimeout(Advisor advisor, Method method)
    {
       TransactionTimeout annotation = (TransactionTimeout)advisor.resolveAnnotation(method, TransactionTimeout.class);
+      
+      if (annotation == null)
+         annotation = (TransactionTimeout)advisor.resolveAnnotation(TransactionTimeout.class);
+      
       if (annotation != null)
       {
          return annotation.value();

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -23,13 +23,22 @@
 
 import javax.ejb.TransactionManagement;
 import javax.ejb.TransactionManagementType;
+import javax.ejb.ApplicationException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.transaction.TransactionManager;
 import org.jboss.aop.Advisor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.MethodInvocation;
 
 import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.metamodel.AssemblyDescriptor;
+import org.jboss.ejb.ApplicationExceptionImpl;
 
+import java.util.List;
+import java.util.Iterator;
+
 /**
  * Comment
  *
@@ -42,6 +51,7 @@
    {
       try
       {
+         //return TxManager.getInstance();
          InitialContext jndiContext = InitialContextFactory.getInitialContext();
          TransactionManager tm = (TransactionManager)jndiContext.lookup("java:TransactionManager");
          return tm;
@@ -58,4 +68,32 @@
       if (transactionManagement == null) return TransactionManagementType.CONTAINER;
       return transactionManagement.value();
    }
+
+   public static ApplicationException getApplicationException(Class exceptionClass, Invocation invocation)
+   {
+      MethodInvocation ejb = (MethodInvocation) invocation;
+      EJBContainer container = (EJBContainer) ejb.getAdvisor();
+
+      if (exceptionClass.isAnnotationPresent(ApplicationException.class))
+         return (ApplicationException)exceptionClass.getAnnotation(ApplicationException.class);
+
+      AssemblyDescriptor assembly = container.getAssemblyDescriptor();
+
+      if (assembly != null)
+      {
+         List exceptions = assembly.getApplicationExceptions();
+         if (exceptions.size() > 0)
+         {
+            Iterator exceptionIterator = exceptions.iterator();
+            while (exceptionIterator.hasNext())
+            {
+               org.jboss.ejb3.metamodel.ApplicationException exception = (org.jboss.ejb3.metamodel.ApplicationException)exceptionIterator.next();
+               if (exception.getExceptionClass().equals(exceptionClass.getName()))
+                  return new ApplicationExceptionImpl(exception.getRollback());
+            }
+         }
+
+      }
+      return null;
+   }
 }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/UserTransactionImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/UserTransactionImpl.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/tx/UserTransactionImpl.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -42,7 +42,6 @@
  */
 public final class UserTransactionImpl implements UserTransaction, java.io.Externalizable
 {
-   private static final long serialVersionUID = 2403204397187452430L;
    protected static Logger log = Logger.getLogger(UserTransactionImpl.class);
 
    /**
@@ -53,8 +52,8 @@
 
    public UserTransactionImpl()
    {
-      if (log.isTraceEnabled())
-         log.trace("new UserTx: " + this);
+      if (log.isDebugEnabled())
+         log.debug("new UserTx: " + this);
       this.tm = TxUtil.getTransactionManager();
    }
 
@@ -65,8 +64,8 @@
       tm.begin();
 
       Transaction tx = tm.getTransaction();
-      if (log.isTraceEnabled())
-         log.trace("UserTx begin: " + tx);
+      if (log.isDebugEnabled())
+         log.debug("UserTx begin: " + tx);
 
    }
 
@@ -75,8 +74,8 @@
                   SecurityException, IllegalStateException, SystemException
    {
       Transaction tx = tm.getTransaction();
-      if (log.isTraceEnabled())
-         log.trace("UserTx commit: " + tx);
+      if (log.isDebugEnabled())
+         log.debug("UserTx commit: " + tx);
 
       tm.commit();
    }
@@ -85,8 +84,8 @@
            throws IllegalStateException, SecurityException, SystemException
    {
       Transaction tx = tm.getTransaction();
-      if (log.isTraceEnabled())
-         log.trace("UserTx rollback: " + tx);
+      if (log.isDebugEnabled())
+         log.debug("UserTx rollback: " + tx);
       tm.rollback();
    }
 
@@ -94,8 +93,8 @@
            throws IllegalStateException, SystemException
    {
       Transaction tx = tm.getTransaction();
-      if (log.isTraceEnabled())
-         log.trace("UserTx setRollbackOnly: " + tx);
+      if (log.isDebugEnabled())
+         log.debug("UserTx setRollbackOnly: " + tx);
 
       tm.setRollbackOnly();
    }

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.injection.lang.reflect.BeanProperty;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class AbstractPropertyInjector implements Injector
-{
-   protected BeanProperty property;
-   
-   protected AbstractPropertyInjector(BeanProperty property)
-   {
-      this.property = property;
-   }
-   
-   public Class<?> getInjectionClass()
-   {
-      return property.getType();
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      inject(ctx.getInstance());
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/AbstractPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.injection.lang.reflect.BeanProperty;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public abstract class AbstractPropertyInjector implements Injector
+{
+   protected BeanProperty property;
+   
+   protected AbstractPropertyInjector(BeanProperty property)
+   {
+      this.property = property;
+   }
+   
+   public Class<?> getInjectionClass()
+   {
+      return property.getType();
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      inject(ctx.getInstance());
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.mx.util.MBeanProxyExt;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class DependsFieldInjector implements Injector
-{
-   Field field;
-   ObjectName on;
-
-   public DependsFieldInjector(Field field, ObjectName on)
-   {
-      this.field = field;
-      this.on = on;
-      field.setAccessible(true);
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      Object instance = ctx.getInstance();
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      Class clazz = field.getType();
-      Object value = null;
-
-      if (clazz == ObjectName.class)
-      {
-         value = on;
-      }
-      else
-      {
-         MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
-         value = MBeanProxyExt.create(clazz, on, server);
-      }
-
-      try
-      {
-         field.set(instance, value);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public Class getInjectionClass()
-   {
-      return field.getType();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.Field;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.mx.util.MBeanProxyExt;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class DependsFieldInjector implements Injector
+{
+   Field field;
+   ObjectName on;
+
+   public DependsFieldInjector(Field field, ObjectName on)
+   {
+      this.field = field;
+      this.on = on;
+      field.setAccessible(true);
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      Object instance = ctx.getInstance();
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      Class clazz = field.getType();
+      Object value = null;
+
+      if (clazz == ObjectName.class)
+      {
+         value = on;
+      }
+      else
+      {
+         MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+         value = MBeanProxyExt.create(clazz, on, server);
+      }
+
+      try
+      {
+         field.set(instance, value);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public Class getInjectionClass()
+   {
+      return field.getType();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsFieldInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/DependsHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,103 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.AccessibleObject;
-import java.util.Map;
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class DependsHandler implements InjectionHandler
-{
-   private static final Logger log = Logger.getLogger(DependsHandler.class);
-
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
-   {
-   }
-
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      Depends dep = container.getAnnotation(Depends.class, method.getDeclaringClass(), method);
-      if (dep != null)
-      {
-         if (!method.getName().startsWith("set"))
-            throw new RuntimeException("@EJB can only be used with a set method: " + method);
-         String[] names = dep.value();
-         if (names.length != 1)
-            throw new RuntimeException("@Depends on a field can only take one object name: " + method);
-         ObjectName on = null;
-         try
-         {
-            on = new ObjectName(names[0]);
-         }
-         catch (MalformedObjectNameException e)
-         {
-            throw new RuntimeException(e);
-         }
-         injectors.put(method, new DependsMethodInjector(method, on));
-         container.getDependencyPolicy().addDependency(names[0]);
-      }
-   }
-
-   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      Depends dep = container.getAnnotation(Depends.class, field.getDeclaringClass(), field);
-      if (dep != null)
-      {
-         String[] names = dep.value();
-         if (names.length != 1)
-            throw new RuntimeException("@Depends on a field can only take one object name: " + field);
-         ObjectName on = null;
-         try
-         {
-            on = new ObjectName(names[0]);
-         }
-         catch (MalformedObjectNameException e)
-         {
-            throw new RuntimeException(e);
-         }
-         injectors.put(field, new DependsFieldInjector(field, on));
-         container.getDependencyPolicy().addDependency(names[0]);
-      }
-   }
-
-   public void handleClassAnnotations(Class clazz, InjectionContainer container)
-   {
-      Depends dep = (Depends)container.getAnnotation(Depends.class, clazz);
-      if (dep == null) return;
-      for (String dependency : dep.value())
-      {
-         container.getDependencyPolicy().addDependency(dependency);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/DependsHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.AccessibleObject;
+import java.util.Map;
+import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
+
+import org.jboss.annotation.ejb.Depends;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class DependsHandler implements InjectionHandler
+{
+   private static final Logger log = Logger.getLogger(DependsHandler.class);
+
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
+   {
+   }
+
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      Depends dep = container.getAnnotation(Depends.class, method.getDeclaringClass(), method);
+      if (dep != null)
+      {
+         if (!method.getName().startsWith("set"))
+            throw new RuntimeException("@EJB can only be used with a set method: " + method);
+         String[] names = dep.value();
+         if (names.length != 1)
+            throw new RuntimeException("@Depends on a field can only take one object name: " + method);
+         ObjectName on = null;
+         try
+         {
+            on = new ObjectName(names[0]);
+         }
+         catch (MalformedObjectNameException e)
+         {
+            throw new RuntimeException(e);
+         }
+         injectors.put(method, new DependsMethodInjector(method, on));
+         container.getDependencyPolicy().addDependency(names[0]);
+      }
+   }
+
+   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      Depends dep = container.getAnnotation(Depends.class, field.getDeclaringClass(), field);
+      if (dep != null)
+      {
+         String[] names = dep.value();
+         if (names.length != 1)
+            throw new RuntimeException("@Depends on a field can only take one object name: " + field);
+         ObjectName on = null;
+         try
+         {
+            on = new ObjectName(names[0]);
+         }
+         catch (MalformedObjectNameException e)
+         {
+            throw new RuntimeException(e);
+         }
+         injectors.put(field, new DependsFieldInjector(field, on));
+         container.getDependencyPolicy().addDependency(names[0]);
+      }
+   }
+
+   public void handleClassAnnotations(Class clazz, InjectionContainer container)
+   {
+      Depends dep = (Depends)container.getAnnotation(Depends.class, clazz);
+      if (dep == null) return;
+      for (String dependency : dep.value())
+      {
+         container.getDependencyPolicy().addDependency(dependency);
+      }
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.mx.util.MBeanProxyExt;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class DependsMethodInjector implements Injector
-{
-   Method method;
-   ObjectName on;
-
-   public DependsMethodInjector(Method method, ObjectName on)
-   {
-      this.method = method;
-      this.on = on;
-      method.setAccessible(true);
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      Object instance = ctx.getInstance();
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      Class clazz = method.getParameterTypes()[0];
-      Object value = null;
-
-      if (clazz == ObjectName.class)
-      {
-         value = on;
-      }
-      else
-      {
-         MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
-         value = MBeanProxyExt.create(clazz, on, server);
-      }
-
-      try
-      {
-         method.invoke(instance, value);
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public Class getInjectionClass()
-   {
-      return method.getParameterTypes()[0];
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.mx.util.MBeanProxyExt;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class DependsMethodInjector implements Injector
+{
+   Method method;
+   ObjectName on;
+
+   public DependsMethodInjector(Method method, ObjectName on)
+   {
+      this.method = method;
+      this.on = on;
+      method.setAccessible(true);
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      Object instance = ctx.getInstance();
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      Class clazz = method.getParameterTypes()[0];
+      Object value = null;
+
+      if (clazz == ObjectName.class)
+      {
+         value = on;
+      }
+      else
+      {
+         MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+         value = MBeanProxyExt.create(clazz, on, server);
+      }
+
+      try
+      {
+         method.invoke(instance, value);
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public Class getInjectionClass()
+   {
+      return method.getParameterTypes()[0];
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/DependsMethodInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-import org.jboss.ejb3.BeanContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use EJBContextPropertyInjector
- */
-public class EJBContextFieldInjector implements Injector, PojoInjector
-{
-   private Field field;
-
-   public EJBContextFieldInjector(Field field)
-   {
-      this.field = field;
-      field.setAccessible(true);
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      inject(ctx, ctx.getInstance());
-   }
-   
-   public void inject(BeanContext ctx, Object instance)
-   {
-      try
-      {
-         field.set(instance, ctx.getEJBContext());
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("Illegal operation");
-   }
-
-   public Class getInjectionClass()
-   {
-      return field.getType();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.Field;
+import org.jboss.ejb3.BeanContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated use EJBContextPropertyInjector
+ */
+public class EJBContextFieldInjector implements Injector, PojoInjector
+{
+   private Field field;
+
+   public EJBContextFieldInjector(Field field)
+   {
+      this.field = field;
+      field.setAccessible(true);
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      inject(ctx, ctx.getInstance());
+   }
+   
+   public void inject(BeanContext ctx, Object instance)
+   {
+      try
+      {
+         field.set(instance, ctx.getEJBContext());
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("Illegal operation");
+   }
+
+   public Class getInjectionClass()
+   {
+      return field.getType();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextFieldInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import org.jboss.ejb3.BeanContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use EJBContextPropertyInjector
- */
-public class EJBContextMethodInjector implements Injector, PojoInjector
-{
-   private Method setMethod;
-
-   public EJBContextMethodInjector(Method setMethod)
-   {
-      this.setMethod = setMethod;
-      setMethod.setAccessible(true);
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      inject(ctx, ctx.getInstance());
-   }
-   
-   public void inject(BeanContext ctx, Object instance)
-   {
-
-      Object[] args = {ctx.getEJBContext()};
-      try
-      {
-         setMethod.invoke(instance, args);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
-      }
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("Illegal operation");
-   }
-
-  
-   public Class getInjectionClass()
-   {
-      return setMethod.getParameterTypes()[0];
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.jboss.ejb3.BeanContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated use EJBContextPropertyInjector
+ */
+public class EJBContextMethodInjector implements Injector, PojoInjector
+{
+   private Method setMethod;
+
+   public EJBContextMethodInjector(Method setMethod)
+   {
+      this.setMethod = setMethod;
+      setMethod.setAccessible(true);
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      inject(ctx, ctx.getInstance());
+   }
+   
+   public void inject(BeanContext ctx, Object instance)
+   {
+
+      Object[] args = {ctx.getEJBContext()};
+      try
+      {
+         setMethod.invoke(instance, args);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
+      }
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("Illegal operation");
+   }
+
+  
+   public Class getInjectionClass()
+   {
+      return setMethod.getParameterTypes()[0];
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextMethodInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.injection.lang.reflect.BeanProperty;
-
-/**
- * Injects an ejb context into an ejb.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: 1.1 $
- */
-public class EJBContextPropertyInjector implements Injector, PojoInjector
-{
-   private BeanProperty property;
-
-   public EJBContextPropertyInjector(BeanProperty property)
-   {
-      this.property = property;
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      inject(ctx, ctx.getInstance());
-   }
-   
-   public void inject(BeanContext ctx, Object instance)
-   {
-      property.set(instance, ctx.getEJBContext());
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("Illegal operation");
-   }
-
-   public Class getInjectionClass()
-   {
-      return property.getType();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBContextPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.injection.lang.reflect.BeanProperty;
+
+/**
+ * Injects an ejb context into an ejb.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: 1.1 $
+ */
+public class EJBContextPropertyInjector implements Injector, PojoInjector
+{
+   private BeanProperty property;
+
+   public EJBContextPropertyInjector(BeanProperty property)
+   {
+      this.property = property;
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      inject(ctx, ctx.getInstance());
+   }
+   
+   public void inject(BeanContext ctx, Object instance)
+   {
+      property.set(instance, ctx.getEJBContext());
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("Illegal operation");
+   }
+
+   public Class getInjectionClass()
+   {
+      return property.getType();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,408 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import org.jboss.annotation.IgnoreDependency;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.BaseEjbRef;
-import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.naming.NameNotFoundException;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Searches bean class for all @Inject and create Injectors
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EJBHandler implements InjectionHandler
-{
-   private static final Logger log = Logger.getLogger(EJBHandler.class);
-
-   protected void addDependency(String refName, EJBContainer refcon, InjectionContainer container)
-   {
-      // Do not depend on myself
-      if(!container.equals(refcon))
-         container.getDependencyPolicy().addDependency(refcon.getObjectName().getCanonicalName());
-   }
-
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
-   {
-      if (xml != null)
-      {
-         if (xml.getEjbLocalRefs() != null) loadEjbLocalXml(xml.getEjbLocalRefs(), container);
-         log.trace("ejbRefs = " + xml.getEjbRefs());
-         if (xml.getEjbRefs() != null) loadEjbRefXml(xml.getEjbRefs(), container);
-      }
-   }
-
-   protected void loadEjbLocalXml(Collection<EjbLocalRef> refs, InjectionContainer container)
-   {
-      for (EjbLocalRef ref : refs)
-      {
-         String interfaceName = ref.getLocal();
-         String errorType = "<ejb-local-ref>";
-
-         ejbRefXml(ref, interfaceName, container, errorType);
-      }
-   }
-
-   protected void loadEjbRefXml(Collection<EjbRef> refs, InjectionContainer container)
-   {
-      for (EjbRef ref : refs)
-      {
-         String interfaceName = ref.getRemote();
-         String errorType = "<ejb-ref>";
-
-         ejbRefXml(ref, interfaceName, container, errorType);
-      }
-   }
-
-   protected void ejbRefXml(BaseEjbRef ref, String interfaceName, InjectionContainer container, String errorType)
-   {
-      String encName = "env/" + ref.getEjbRefName();
-      InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
-      if (container.getEncInjectors().containsKey(encName))
-         return;
-
-      String mappedName = ref.getMappedName();
-      if (mappedName != null && mappedName.equals("")) mappedName = null;
-
-      String link = ref.getEjbLink();
-      if (link != null && link.trim().equals("")) link = null;
-
-      Class refClass = null;
-
-      if (interfaceName != null)
-      {
-         try
-         {
-            refClass = container.getClassloader().loadClass(interfaceName);
-         }
-         catch (ClassNotFoundException e)
-         {
-            throw new RuntimeException("could not find " + errorType + "'s local interface " + interfaceName + " in " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier());
-         }
-      }
-      
-      //----- injectors
-
-      if (mappedName == null && refClass == null && link == null)
-      {
-         // must be jboss.xml only with @EJB used to define reference.  jboss.xml used to tag for ignore dependency
-         // i think it is ok to assume this because the ejb-jar.xml schema should handle any missing elements
-      }
-      else
-      {
-         ejbRefEncInjector(mappedName, encName, refClass, link, errorType, container);
-         if (ref.isIgnoreDependency())
-         {
-            log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
-            return;
-         }
-
-         ejbRefDependency(link, container, refClass, errorType, encName);
-      }
-   }
-
-   protected void ejbRefDependency(String link, InjectionContainer container, Class refClass, String errorType, String encName)
-   {
-      EJBContainer refcon = null;
-
-      if (refClass != null && (refClass.equals(Object.class) || refClass.equals(void.class))) refClass = null;
-
-      if (refClass != null)
-      {
-         if (link != null && !link.trim().equals(""))
-         {
-            refcon = (EJBContainer) container.resolveEjbContainer(link, refClass);
-            if (refcon == null)
-            {
-               String msg = "IGNORING DEPENDENCY: unable to find " + errorType + " of interface " + refClass.getName() + " and ejbLink of " + link + " in  " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier() + " it might not be deployed yet";
-               log.warn(msg);
-            }
-         }
-         else
-         {
-            try
-            {
-               refcon = (EJBContainer) container.resolveEjbContainer(refClass);
-               if (refcon == null)
-               {
-                  String msg = "IGNORING DEPENDENCY: unable to find " + errorType + " from interface only " + refClass.getName() + " in " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier();
-                  log.warn(msg);
-               }
-            }
-            catch (NameNotFoundException e)
-            {
-               String msg = "IGNORING DEPENDENCY: unable to find " + errorType + " from interface only " + refClass.getName() + " in " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier() + e.getMessage();
-               log.warn(msg);
-            }
-         }
-      }
-      else
-      {
-         String msg = "IGNORING DEPENDENCY: unable to resolve dependency of EJB, there is too little information";
-         log.warn(msg);
-      }
-
-      if (refcon != null)
-      {
-         addDependency(encName, refcon, container);
-      }
-   }
-
-   protected void ejbRefEncInjector(String mappedName, String encName, Class refClass, String link, String errorType, InjectionContainer container)
-   {
-      if (refClass != null && (refClass.equals(Object.class) || refClass.equals(void.class))) refClass = null;
-      if (mappedName != null && mappedName.trim().equals("")) mappedName = null;
-
-      EncInjector injector = null;
-
-      if (mappedName == null)
-      {
-         injector = new EjbEncInjector(encName, refClass, link, errorType);
-      }
-      else
-      {
-         injector = new EjbEncInjector(encName, mappedName, errorType);
-      }
-
-      container.getEncInjectors().put(encName, injector);
-   }
-
-   public static EJBContainer getEjbContainer(EJB ref, InjectionContainer container, Class memberType)
-   {
-      EJBContainer rtn = null;
-
-      if (ref.mappedName() != null && !"".equals(ref.mappedName()))
-      {
-         return null;
-      }
-
-      if (ref.beanName().equals("") && memberType == null)
-         throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB.  Please fill out the beanName and/or businessInterface attributes");
-
-      Class businessInterface = memberType;
-      if (!ref.beanInterface().getName().equals(Object.class.getName()))
-      {
-         businessInterface = ref.beanInterface();
-      }
-
-      if (ref.beanName().equals(""))
-      {
-         try
-         {
-            rtn = (EJBContainer) container.resolveEjbContainer(businessInterface);
-         }
-         catch (NameNotFoundException e)
-         {
-            log.warn("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
-         }
-      }
-      else
-      {
-         rtn = (EJBContainer) container.resolveEjbContainer(ref.beanName(), businessInterface);
-      }
-
-      return rtn;
-   }
-
-   public static String getJndiName(EJB ref, InjectionContainer container, Class memberType)
-   {
-      String jndiName;
-
-      if (ref.mappedName() != null && !"".equals(ref.mappedName()))
-      {
-         return ref.mappedName();
-      }
-
-      if (ref.beanName().equals("") && memberType == null)
-         throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB.  Please fill out the beanName and/or businessInterface attributes");
-
-      Class businessInterface = memberType;
-      if (!ref.beanInterface().getName().equals(Object.class.getName()))
-      {
-         businessInterface = ref.beanInterface();
-      }
-
-      if (ref.beanName().equals(""))
-      {
-         try
-         {
-            jndiName = container.getEjbJndiName(businessInterface);
-         }
-         catch (NameNotFoundException e)
-         {
-            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
-         }
-         if (jndiName == null)
-         {
-            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ")");
-         }
-      }
-      else
-      {
-         jndiName = container.getEjbJndiName(ref.beanName(), businessInterface);
-         if (jndiName == null)
-         {
-            throw new RuntimeException("For EJB " + container.getIdentifier() + "could not find jndi binding based on beanName and business interface for @EJB(" + ref.beanName() + ", " + businessInterface.getName() + ")");
-         }
-      }
-
-      return jndiName;
-   }
-
-   public void handleClassAnnotations(Class clazz, InjectionContainer container)
-   {
-      EJBs ref = container.getAnnotation(EJBs.class, clazz);
-      if (ref != null)
-      {
-         EJB[] ejbs = ref.value();
-
-         for (EJB ejb : ejbs)
-         {
-            handleClassAnnotation(ejb, clazz, container);
-         }
-      }
-      EJB ejbref = container.getAnnotation(EJB.class, clazz);
-      if (ejbref != null) handleClassAnnotation(ejbref, clazz, container);
-   }
-
-   protected void handleClassAnnotation(EJB ejb, Class clazz, InjectionContainer container)
-   {
-      String encName = ejb.name();
-      if (encName == null || encName.equals(""))
-      {
-         throw new RuntimeException("JBoss requires the name of the @EJB in the @EJBs: " + clazz);
-      }
-      encName = "env/" + encName;
-
-      if (container.getEncInjectors().containsKey(encName)) return;
-      ejbRefEncInjector(ejb.mappedName(), encName, ejb.beanInterface(), ejb.beanName(), "@EJB", container);
-
-      // handle dependencies
-
-      if (isIgnoreDependency(container, ejb))
-         log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
-      else
-         ejbRefDependency(ejb.beanName(), container, ejb.beanInterface(), "@EJB", encName);
-   }
-
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      
-      EJB ref = method.getAnnotation(EJB.class);
-      if (ref != null)
-      {
-         if (!method.getName().startsWith("set"))
-            throw new RuntimeException("@EJB can only be used with a set method: " + method);
-         String encName = ref.name();
-         if (encName == null || encName.equals(""))
-         {
-            encName = InjectionUtil.getEncName(method);
-         }
-         else
-         {
-            encName = "env/" + encName;
-         }
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            ejbRefEncInjector(ref.mappedName(), encName, method.getParameterTypes()[0], ref.beanName(), "@EJB", container);
-            
-            if (container.getAnnotation(IgnoreDependency.class, method) == null)
-            {
-               if (isIgnoreDependency(container, ref))
-                  log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
-               else
-                  ejbRefDependency(ref.beanName(), container, method.getParameterTypes()[0], "@EJB", encName);
-            }
-         }
-
-         injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
-      }
-   }
-
-   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      EJB ref = field.getAnnotation(EJB.class);
-      if (ref != null)
-      {
-         String encName = ref.name();
-         if (encName == null || encName.equals(""))
-         {
-            encName = InjectionUtil.getEncName(field);
-         }
-         else
-         {
-            encName = "env/" + encName;
-         }
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            if (container.getAnnotation(IgnoreDependency.class, field) == null)
-            {
-               if (isIgnoreDependency(container, ref))
-                  log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
-               else
-                  ejbRefDependency(ref.beanName(), container, field.getType(), "@EJB", encName);
-            }
-            ejbRefEncInjector(ref.mappedName(), encName, field.getType(), ref.beanName(), "@EJB", container);
-         }
-         injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
-
-      }
-   }
-
-   protected boolean isIgnoreDependency(InjectionContainer container, EJB ref)
-   {
-      EnvironmentRefGroup refGroup =  (EnvironmentRefGroup)container.getEnvironmentRefGroup();
-      
-      if (refGroup != null)
-      {
-         Iterator<EjbRef> ejbRefs = refGroup.getEjbRefs().iterator();
-         while (ejbRefs.hasNext())
-         {
-            EjbRef ejbRef = ejbRefs.next();
-            if (ejbRef.getEjbRefName().equals(ref.name()))
-            {
-               if (ejbRef.isIgnoreDependency())
-                  return true;
-               else
-                  return false;
-            }
-         }
-      }
-      
-      return false;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EJBHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,408 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.annotation.IgnoreDependency;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.BaseEjbRef;
+import org.jboss.metamodel.descriptor.EjbLocalRef;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.naming.NameNotFoundException;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Searches bean class for all @Inject and create Injectors
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EJBHandler implements InjectionHandler
+{
+   private static final Logger log = Logger.getLogger(EJBHandler.class);
+
+   protected void addDependency(String refName, EJBContainer refcon, InjectionContainer container)
+   {
+      // Do not depend on myself
+      if(!container.equals(refcon))
+         container.getDependencyPolicy().addDependency(refcon.getObjectName().getCanonicalName());
+   }
+
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
+   {
+      if (xml != null)
+      {
+         if (xml.getEjbLocalRefs() != null) loadEjbLocalXml(xml.getEjbLocalRefs(), container);
+         log.trace("ejbRefs = " + xml.getEjbRefs());
+         if (xml.getEjbRefs() != null) loadEjbRefXml(xml.getEjbRefs(), container);
+      }
+   }
+
+   protected void loadEjbLocalXml(Collection<EjbLocalRef> refs, InjectionContainer container)
+   {
+      for (EjbLocalRef ref : refs)
+      {
+         String interfaceName = ref.getLocal();
+         String errorType = "<ejb-local-ref>";
+
+         ejbRefXml(ref, interfaceName, container, errorType);
+      }
+   }
+
+   protected void loadEjbRefXml(Collection<EjbRef> refs, InjectionContainer container)
+   {
+      for (EjbRef ref : refs)
+      {
+         String interfaceName = ref.getRemote();
+         String errorType = "<ejb-ref>";
+
+         ejbRefXml(ref, interfaceName, container, errorType);
+      }
+   }
+
+   protected void ejbRefXml(BaseEjbRef ref, String interfaceName, InjectionContainer container, String errorType)
+   {
+      String encName = "env/" + ref.getEjbRefName();
+      InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
+      if (container.getEncInjectors().containsKey(encName))
+         return;
+
+      String mappedName = ref.getMappedName();
+      if (mappedName != null && mappedName.equals("")) mappedName = null;
+
+      String link = ref.getEjbLink();
+      if (link != null && link.trim().equals("")) link = null;
+
+      Class refClass = null;
+
+      if (interfaceName != null)
+      {
+         try
+         {
+            refClass = container.getClassloader().loadClass(interfaceName);
+         }
+         catch (ClassNotFoundException e)
+         {
+            throw new RuntimeException("could not find " + errorType + "'s local interface " + interfaceName + " in " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier());
+         }
+      }
+      
+      //----- injectors
+
+      if (mappedName == null && refClass == null && link == null)
+      {
+         // must be jboss.xml only with @EJB used to define reference.  jboss.xml used to tag for ignore dependency
+         // i think it is ok to assume this because the ejb-jar.xml schema should handle any missing elements
+      }
+      else
+      {
+         ejbRefEncInjector(mappedName, encName, refClass, link, errorType, container);
+         if (ref.isIgnoreDependency())
+         {
+            log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
+            return;
+         }
+
+         ejbRefDependency(link, container, refClass, errorType, encName);
+      }
+   }
+
+   protected void ejbRefDependency(String link, InjectionContainer container, Class refClass, String errorType, String encName)
+   {
+      EJBContainer refcon = null;
+
+      if (refClass != null && (refClass.equals(Object.class) || refClass.equals(void.class))) refClass = null;
+
+      if (refClass != null)
+      {
+         if (link != null && !link.trim().equals(""))
+         {
+            refcon = (EJBContainer) container.resolveEjbContainer(link, refClass);
+            if (refcon == null)
+            {
+               String msg = "IGNORING DEPENDENCY: unable to find " + errorType + " of interface " + refClass.getName() + " and ejbLink of " + link + " in  " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier() + " it might not be deployed yet";
+               log.warn(msg);
+            }
+         }
+         else
+         {
+            try
+            {
+               refcon = (EJBContainer) container.resolveEjbContainer(refClass);
+               if (refcon == null)
+               {
+                  String msg = "IGNORING DEPENDENCY: unable to find " + errorType + " from interface only " + refClass.getName() + " in " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier();
+                  log.warn(msg);
+               }
+            }
+            catch (NameNotFoundException e)
+            {
+               String msg = "IGNORING DEPENDENCY: unable to find " + errorType + " from interface only " + refClass.getName() + " in " + container.getDeploymentDescriptorType() + " of " + container.getIdentifier() + e.getMessage();
+               log.warn(msg);
+            }
+         }
+      }
+      else
+      {
+         String msg = "IGNORING DEPENDENCY: unable to resolve dependency of EJB, there is too little information";
+         log.warn(msg);
+      }
+
+      if (refcon != null)
+      {
+         addDependency(encName, refcon, container);
+      }
+   }
+
+   protected void ejbRefEncInjector(String mappedName, String encName, Class refClass, String link, String errorType, InjectionContainer container)
+   {
+      if (refClass != null && (refClass.equals(Object.class) || refClass.equals(void.class))) refClass = null;
+      if (mappedName != null && mappedName.trim().equals("")) mappedName = null;
+
+      EncInjector injector = null;
+
+      if (mappedName == null)
+      {
+         injector = new EjbEncInjector(encName, refClass, link, errorType);
+      }
+      else
+      {
+         injector = new EjbEncInjector(encName, mappedName, errorType);
+      }
+
+      container.getEncInjectors().put(encName, injector);
+   }
+
+   public static EJBContainer getEjbContainer(EJB ref, InjectionContainer container, Class memberType)
+   {
+      EJBContainer rtn = null;
+
+      if (ref.mappedName() != null && !"".equals(ref.mappedName()))
+      {
+         return null;
+      }
+
+      if (ref.beanName().equals("") && memberType == null)
+         throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB.  Please fill out the beanName and/or businessInterface attributes");
+
+      Class businessInterface = memberType;
+      if (!ref.beanInterface().getName().equals(Object.class.getName()))
+      {
+         businessInterface = ref.beanInterface();
+      }
+
+      if (ref.beanName().equals(""))
+      {
+         try
+         {
+            rtn = (EJBContainer) container.resolveEjbContainer(businessInterface);
+         }
+         catch (NameNotFoundException e)
+         {
+            log.warn("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
+         }
+      }
+      else
+      {
+         rtn = (EJBContainer) container.resolveEjbContainer(ref.beanName(), businessInterface);
+      }
+
+      return rtn;
+   }
+
+   public static String getJndiName(EJB ref, InjectionContainer container, Class memberType)
+   {
+      String jndiName;
+
+      if (ref.mappedName() != null && !"".equals(ref.mappedName()))
+      {
+         return ref.mappedName();
+      }
+
+      if (ref.beanName().equals("") && memberType == null)
+         throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB.  Please fill out the beanName and/or businessInterface attributes");
+
+      Class businessInterface = memberType;
+      if (!ref.beanInterface().getName().equals(Object.class.getName()))
+      {
+         businessInterface = ref.beanInterface();
+      }
+
+      if (ref.beanName().equals(""))
+      {
+         try
+         {
+            jndiName = container.getEjbJndiName(businessInterface);
+         }
+         catch (NameNotFoundException e)
+         {
+            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
+         }
+         if (jndiName == null)
+         {
+            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ")");
+         }
+      }
+      else
+      {
+         jndiName = container.getEjbJndiName(ref.beanName(), businessInterface);
+         if (jndiName == null)
+         {
+            throw new RuntimeException("For EJB " + container.getIdentifier() + "could not find jndi binding based on beanName and business interface for @EJB(" + ref.beanName() + ", " + businessInterface.getName() + ")");
+         }
+      }
+
+      return jndiName;
+   }
+
+   public void handleClassAnnotations(Class clazz, InjectionContainer container)
+   {
+      EJBs ref = container.getAnnotation(EJBs.class, clazz);
+      if (ref != null)
+      {
+         EJB[] ejbs = ref.value();
+
+         for (EJB ejb : ejbs)
+         {
+            handleClassAnnotation(ejb, clazz, container);
+         }
+      }
+      EJB ejbref = container.getAnnotation(EJB.class, clazz);
+      if (ejbref != null) handleClassAnnotation(ejbref, clazz, container);
+   }
+
+   protected void handleClassAnnotation(EJB ejb, Class clazz, InjectionContainer container)
+   {
+      String encName = ejb.name();
+      if (encName == null || encName.equals(""))
+      {
+         throw new RuntimeException("JBoss requires the name of the @EJB in the @EJBs: " + clazz);
+      }
+      encName = "env/" + encName;
+
+      if (container.getEncInjectors().containsKey(encName)) return;
+      ejbRefEncInjector(ejb.mappedName(), encName, ejb.beanInterface(), ejb.beanName(), "@EJB", container);
+
+      // handle dependencies
+
+      if (isIgnoreDependency(container, ejb))
+         log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
+      else
+         ejbRefDependency(ejb.beanName(), container, ejb.beanInterface(), "@EJB", encName);
+   }
+
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      
+      EJB ref = method.getAnnotation(EJB.class);
+      if (ref != null)
+      {
+         if (!method.getName().startsWith("set"))
+            throw new RuntimeException("@EJB can only be used with a set method: " + method);
+         String encName = ref.name();
+         if (encName == null || encName.equals(""))
+         {
+            encName = InjectionUtil.getEncName(method);
+         }
+         else
+         {
+            encName = "env/" + encName;
+         }
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            ejbRefEncInjector(ref.mappedName(), encName, method.getParameterTypes()[0], ref.beanName(), "@EJB", container);
+            
+            if (container.getAnnotation(IgnoreDependency.class, method) == null)
+            {
+               if (isIgnoreDependency(container, ref))
+                  log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
+               else
+                  ejbRefDependency(ref.beanName(), container, method.getParameterTypes()[0], "@EJB", encName);
+            }
+         }
+
+         injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
+      }
+   }
+
+   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      EJB ref = field.getAnnotation(EJB.class);
+      if (ref != null)
+      {
+         String encName = ref.name();
+         if (encName == null || encName.equals(""))
+         {
+            encName = InjectionUtil.getEncName(field);
+         }
+         else
+         {
+            encName = "env/" + encName;
+         }
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            if (container.getAnnotation(IgnoreDependency.class, field) == null)
+            {
+               if (isIgnoreDependency(container, ref))
+                  log.debug("IGNORING <ejb-ref> DEPENDENCY: " + encName);
+               else
+                  ejbRefDependency(ref.beanName(), container, field.getType(), "@EJB", encName);
+            }
+            ejbRefEncInjector(ref.mappedName(), encName, field.getType(), ref.beanName(), "@EJB", container);
+         }
+         injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
+
+      }
+   }
+
+   protected boolean isIgnoreDependency(InjectionContainer container, EJB ref)
+   {
+      EnvironmentRefGroup refGroup =  (EnvironmentRefGroup)container.getEnvironmentRefGroup();
+      
+      if (refGroup != null)
+      {
+         Iterator<EjbRef> ejbRefs = refGroup.getEjbRefs().iterator();
+         while (ejbRefs.hasNext())
+         {
+            EjbRef ejbRef = ejbRefs.next();
+            if (ejbRef.getEjbRefName().equals(ref.name()))
+            {
+               if (ejbRef.isIgnoreDependency())
+                  return true;
+               else
+                  return false;
+            }
+         }
+      }
+      
+      return false;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EJBHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EjbEncInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,103 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import org.jboss.logging.Logger;
-import org.jboss.naming.Util;
-
-import javax.naming.NameNotFoundException;
-import javax.naming.LinkRef;
-import javax.naming.NamingException;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EjbEncInjector implements EncInjector
-{
-   private static final Logger log = Logger.getLogger(EjbEncInjector.class);
-   
-   private String ejbLink;
-   private Class refClass;
-   private String jndiName;
-   private String error;
-   private String encName;
-
-   public EjbEncInjector(String name, String mappedName, String error)
-   {
-      this.jndiName = mappedName;
-      this.error = error;
-      this.encName = name;
-   }
-
-   public EjbEncInjector(String name, Class refClass, String ejbLink, String error)
-   {
-      this.refClass = refClass;
-      String refClassName = refClass == null ? "NULL" : refClass.getName();
-      this.ejbLink = ejbLink;
-      this.error = error;
-      this.encName = name;
-      if (refClass == null && ejbLink == null) throw new RuntimeException("cannot have null refClass and ejbLink for encName: " + name);
-   }
-
-
-   public void inject(InjectionContainer container)
-   {
-      if (jndiName == null || jndiName.equals(""))
-      {
-         if (ejbLink != null && !"".equals(ejbLink))
-         {
-            jndiName = container.getEjbJndiName(ejbLink, refClass);
-         }
-         else
-         {
-            try
-            {
-               if (refClass != null)
-               {
-                  jndiName = container.getEjbJndiName(refClass);
-               }
-               else
-               {
-                  throw new RuntimeException("searching for @EJB" + encName + " has null refClass and null ejbLink.");
-               }
-            }
-            catch (NameNotFoundException e)
-            {
-               throw new RuntimeException("could not resolve global JNDI name for " + error + " for container " + container.getIdentifier() + ": reference class: " + refClass.getName() + " ejbLink: " + ejbLink + " " + e.getMessage());
-            }
-         }
-      }
-      try
-      {
-         if (jndiName == null) throw new RuntimeException("Failed to populate ENC: " + encName + " global jndi name was null");
-         log.debug(" " + encName + " --> " + jndiName);
-         Util.rebind(container.getEnc(), encName, new LinkRef(jndiName));
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException("could not bind enc name '" +  encName + "' for " + error + " for container " + container.getIdentifier() + ": reference class: " + refClass.getName() + " ejbLink: " + ejbLink + " " + e.getMessage());
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EjbEncInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.logging.Logger;
+import org.jboss.naming.Util;
+
+import javax.naming.NameNotFoundException;
+import javax.naming.LinkRef;
+import javax.naming.NamingException;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EjbEncInjector implements EncInjector
+{
+   private static final Logger log = Logger.getLogger(EjbEncInjector.class);
+   
+   private String ejbLink;
+   private Class refClass;
+   private String jndiName;
+   private String error;
+   private String encName;
+
+   public EjbEncInjector(String name, String mappedName, String error)
+   {
+      this.jndiName = mappedName;
+      this.error = error;
+      this.encName = name;
+   }
+
+   public EjbEncInjector(String name, Class refClass, String ejbLink, String error)
+   {
+      this.refClass = refClass;
+      String refClassName = refClass == null ? "NULL" : refClass.getName();
+      this.ejbLink = ejbLink;
+      this.error = error;
+      this.encName = name;
+      if (refClass == null && ejbLink == null) throw new RuntimeException("cannot have null refClass and ejbLink for encName: " + name);
+   }
+
+
+   public void inject(InjectionContainer container)
+   {
+      if (jndiName == null || jndiName.equals(""))
+      {
+         if (ejbLink != null && !"".equals(ejbLink))
+         {
+            jndiName = container.getEjbJndiName(ejbLink, refClass);
+         }
+         else
+         {
+            try
+            {
+               if (refClass != null)
+               {
+                  jndiName = container.getEjbJndiName(refClass);
+               }
+               else
+               {
+                  throw new RuntimeException("searching for @EJB" + encName + " has null refClass and null ejbLink.");
+               }
+            }
+            catch (NameNotFoundException e)
+            {
+               throw new RuntimeException("could not resolve global JNDI name for " + error + " for container " + container.getIdentifier() + ": reference class: " + refClass.getName() + " ejbLink: " + ejbLink + " " + e.getMessage());
+            }
+         }
+      }
+      try
+      {
+         if (jndiName == null) throw new RuntimeException("Failed to populate ENC: " + encName + " global jndi name was null");
+         log.debug(" " + encName + " --> " + jndiName);
+         Util.rebind(container.getEnc(), encName, new LinkRef(jndiName));
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException("could not bind enc name '" +  encName + "' for " + error + " for container " + container.getIdentifier() + ": reference class: " + refClass.getName() + " ejbLink: " + ejbLink + " " + e.getMessage());
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EjbEncInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EncInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-/**
- * Responsible for populating ENC
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface EncInjector
-{
-   void inject(InjectionContainer container);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EncInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+/**
+ * Responsible for populating ENC
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface EncInjector
+{
+   void inject(InjectionContainer container);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EncInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EntityManagerFactoryFieldInjector implements Injector, PojoInjector
-{
-   private static final Logger log = Logger.getLogger(EntityManagerFactoryFieldInjector.class);
-   private Field field;
-   private Object factory;
-
-   public EntityManagerFactoryFieldInjector(Field field, Object factory)
-   {
-      this.field = field;
-      this.field.setAccessible(true);
-      this.factory = factory;
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      inject(ctx, ctx.getInstance());
-   }
-   
-   public void inject(BeanContext ctx, Object instance)
-   {
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      try
-      {
-         field.set(instance, factory);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Failed in setting EntityManager on setter field: " + field.toString());
-      }
-   }
-
-   public Class getInjectionClass()
-   {
-      return field.getType();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.Field;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EntityManagerFactoryFieldInjector implements Injector, PojoInjector
+{
+   private static final Logger log = Logger.getLogger(EntityManagerFactoryFieldInjector.class);
+   private Field field;
+   private Object factory;
+
+   public EntityManagerFactoryFieldInjector(Field field, Object factory)
+   {
+      this.field = field;
+      this.field.setAccessible(true);
+      this.factory = factory;
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      inject(ctx, ctx.getInstance());
+   }
+   
+   public void inject(BeanContext ctx, Object instance)
+   {
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      try
+      {
+         field.set(instance, factory);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException("Failed in setting EntityManager on setter field: " + field.toString());
+      }
+   }
+
+   public Class getInjectionClass()
+   {
+      return field.getType();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryFieldInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EntityManagerFactoryMethodInjector implements Injector, PojoInjector
-{
-   private static final Logger log = Logger.getLogger(EntityManagerFactoryMethodInjector.class);
-   private Method setMethod;
-   private Object factory;
-
-   public EntityManagerFactoryMethodInjector(Method setMethod, Object factory)
-   {
-      this.setMethod = setMethod;
-      setMethod.setAccessible(true);
-      this.factory = factory;
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      inject(ctx, ctx.getInstance());
-   }
-   
-   public void inject(BeanContext ctx, Object instance)
-   {
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      try
-      {
-         Object[] args = {factory};
-         setMethod.invoke(instance, args);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
-      }
-   }
-
-   public Class getInjectionClass()
-   {
-      return setMethod.getParameterTypes()[0];
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EntityManagerFactoryMethodInjector implements Injector, PojoInjector
+{
+   private static final Logger log = Logger.getLogger(EntityManagerFactoryMethodInjector.class);
+   private Method setMethod;
+   private Object factory;
+
+   public EntityManagerFactoryMethodInjector(Method setMethod, Object factory)
+   {
+      this.setMethod = setMethod;
+      setMethod.setAccessible(true);
+      this.factory = factory;
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      inject(ctx, ctx.getInstance());
+   }
+   
+   public void inject(BeanContext ctx, Object instance)
+   {
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      try
+      {
+         Object[] args = {factory};
+         setMethod.invoke(instance, args);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
+      }
+   }
+
+   public Class getInjectionClass()
+   {
+      return setMethod.getParameterTypes()[0];
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EntityManagerFactoryMethodInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,120 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import org.jboss.logging.Logger;
-import org.jboss.naming.Util;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EnvEntryEncInjector implements EncInjector
-{
-   private static final Logger log = Logger.getLogger(EnvEntryEncInjector.class);
-
-   private String name;
-   private String entryType;
-   private String value;
-
-
-   public EnvEntryEncInjector(String encName, String entryType, String value)
-   {
-      this.name = encName;
-      this.entryType = entryType;
-      this.value = value;
-   }
-
-   public void inject(InjectionContainer container)
-   {
-      try
-      {
-         Util.rebind(container.getEnc(),
-                 name,
-                 getEnvEntryValue());
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException("Invalid <env-entry> name: " + name, e);
-      }
-   }
-
-
-   protected Object getEnvEntryValue() throws ClassNotFoundException
-   {
-      Class type = Thread.currentThread().getContextClassLoader().loadClass(entryType);
-      if (type == String.class)
-      {
-         return value;
-      }
-      else if (type == Integer.class)
-      {
-         return new Integer(value);
-      }
-      else if (type == Long.class)
-      {
-         return new Long(value);
-      }
-      else if (type == Double.class)
-      {
-         return new Double(value);
-      }
-      else if (type == Float.class)
-      {
-         return new Float(value);
-      }
-      else if (type == Byte.class)
-      {
-         return new Byte(value);
-      }
-      else if (type == Character.class)
-      {
-         String input = value;
-         if (input == null || input.length() == 0)
-         {
-            return new Character((char) 0);
-         }
-         else
-         {
-            if (input.length() > 1)
-               // TODO: Add deployment context
-               log.warn("Warning character env-entry is too long: binding="
-                       + name + " value=" + input);
-            return new Character(input.charAt(0));
-         }
-      }
-      else if (type == Short.class)
-      {
-         return new Short(value);
-      }
-      else if (type == Boolean.class)
-      {
-         return new Boolean(value);
-      }
-      else
-      {
-         return value;
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.logging.Logger;
+import org.jboss.naming.Util;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EnvEntryEncInjector implements EncInjector
+{
+   private static final Logger log = Logger.getLogger(EnvEntryEncInjector.class);
+
+   private String name;
+   private String entryType;
+   private String value;
+
+
+   public EnvEntryEncInjector(String encName, String entryType, String value)
+   {
+      this.name = encName;
+      this.entryType = entryType;
+      this.value = value;
+   }
+
+   public void inject(InjectionContainer container)
+   {
+      try
+      {
+         Util.rebind(container.getEnc(),
+                 name,
+                 getEnvEntryValue());
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException("Invalid <env-entry> name: " + name, e);
+      }
+   }
+
+
+   protected Object getEnvEntryValue() throws ClassNotFoundException
+   {
+      Class type = Thread.currentThread().getContextClassLoader().loadClass(entryType);
+      if (type == String.class)
+      {
+         return value;
+      }
+      else if (type == Integer.class)
+      {
+         return new Integer(value);
+      }
+      else if (type == Long.class)
+      {
+         return new Long(value);
+      }
+      else if (type == Double.class)
+      {
+         return new Double(value);
+      }
+      else if (type == Float.class)
+      {
+         return new Float(value);
+      }
+      else if (type == Byte.class)
+      {
+         return new Byte(value);
+      }
+      else if (type == Character.class)
+      {
+         String input = value;
+         if (input == null || input.length() == 0)
+         {
+            return new Character((char) 0);
+         }
+         else
+         {
+            if (input.length() > 1)
+               // TODO: Add deployment context
+               log.warn("Warning character env-entry is too long: binding="
+                       + name + " value=" + input);
+            return new Character(input.charAt(0));
+         }
+      }
+      else if (type == Short.class)
+      {
+         return new Short(value);
+      }
+      else if (type == Boolean.class)
+      {
+         return new Boolean(value);
+      }
+      else
+      {
+         return value;
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import javax.persistence.EntityManager;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.entity.ManagedEntityManagerFactory;
-import org.jboss.ejb3.stateful.StatefulBeanContext;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ExtendedPersistenceContextInjector implements Injector, PojoInjector
-{
-   protected static final Logger log = Logger.getLogger(ExtendedPersistenceContextInjector.class);
-   protected ManagedEntityManagerFactory factory;
-
-   protected ExtendedPersistenceContextInjector(ManagedEntityManagerFactory factory)
-   {
-      this.factory = factory;
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      inject(ctx, ctx.getInstance());
-   }
-
-   public void inject(BeanContext beanContext, Object instance)
-   {
-      StatefulBeanContext ctx = (StatefulBeanContext)beanContext;
-      EntityManager pc = ctx.getExtendedPersistenceContext(factory.getKernelName());
-      if (pc == null)
-      {
-         pc = factory.createEntityManager();
-         ctx.addExtendedPersistenceContext(factory.getKernelName(), pc);
-      }
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("Illegal operation");
-   }
-
-   public Class getInjectionClass()
-   {
-      return null;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import javax.persistence.EntityManager;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.entity.ManagedEntityManagerFactory;
+import org.jboss.ejb3.stateful.StatefulBeanContext;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ExtendedPersistenceContextInjector implements Injector, PojoInjector
+{
+   protected static final Logger log = Logger.getLogger(ExtendedPersistenceContextInjector.class);
+   protected ManagedEntityManagerFactory factory;
+
+   protected ExtendedPersistenceContextInjector(ManagedEntityManagerFactory factory)
+   {
+      this.factory = factory;
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      inject(ctx, ctx.getInstance());
+   }
+
+   public void inject(BeanContext beanContext, Object instance)
+   {
+      StatefulBeanContext ctx = (StatefulBeanContext)beanContext;
+      EntityManager pc = ctx.getExtendedPersistenceContext(factory.getKernelName());
+      if (pc == null)
+      {
+         pc = factory.createEntityManager();
+         ctx.addExtendedPersistenceContext(factory.getKernelName(), pc);
+      }
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("Illegal operation");
+   }
+
+   public Class getInjectionClass()
+   {
+      return null;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ExtendedPersistenceContextInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/InjectionContainer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,102 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.NameNotFoundException;
-
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * This is the container that manages all injections.  Could be an EJB Container
- * or a WAR.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface InjectionContainer
-{
-   /** Some identifier that can be used in error messages */
-   String getIdentifier();
-
-   /** 
-    * For error messages
-    * @return  ejb-jar.xml, web.xml, etc..
-    */
-   String getDeploymentDescriptorType();
-
-   ClassLoader getClassloader();
-
-   Map<String, EncInjector> getEncInjectors();
-   Map<String, Map<AccessibleObject, Injector>> getEncInjections();
-
-   // EncInjectors/Handlers may need to add extra instance injectors
-   List<Injector> getInjectors();
-   
-   VirtualFile getRootFile();
-
-   Context getEnc();
-
-   PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException;
-
-   Container resolveEjbContainer(String link, Class businessIntf);
-   Container resolveEjbContainer(Class businessIntf) throws NameNotFoundException;
-   String getEjbJndiName(Class businessInterface) throws NameNotFoundException;
-   String getEjbJndiName(String link, Class businessInterface);
-
-   /**
-    * If class has container overridable annotations, this method will
-    * discover those overriden annotations.
-    */
-   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz);
-   
-   /**
-    * If class has container overridable annotations, this method will
-    * discover those overriden annotations.
-    */
-   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method);
-   
-   <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method);
-
-   /**
-    * If class has container overridable annotations, this method will
-    * discover those overriden annotations.
-    */
-   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field);
-   
-   <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field);
-
-   DependencyPolicy getDependencyPolicy();
-   
-   EnvironmentRefGroup getEnvironmentRefGroup();
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/InjectionContainer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.NameNotFoundException;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+//import org.jboss.virtual.VirtualFile;
+
+/**
+ * This is the container that manages all injections.  Could be an EJB Container
+ * or a WAR.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface InjectionContainer
+{
+   /** Some identifier that can be used in error messages */
+   String getIdentifier();
+
+   /** 
+    * For error messages
+    * @return  ejb-jar.xml, web.xml, etc..
+    */
+   String getDeploymentDescriptorType();
+
+   ClassLoader getClassloader();
+
+   Map<String, EncInjector> getEncInjectors();
+   Map<String, Map<AccessibleObject, Injector>> getEncInjections();
+
+   // EncInjectors/Handlers may need to add extra instance injectors
+   List<Injector> getInjectors();
+   
+//   VirtualFile getRootFile();
+
+   Context getEnc();
+
+   PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException;
+
+   Container resolveEjbContainer(String link, Class businessIntf);
+   Container resolveEjbContainer(Class businessIntf) throws NameNotFoundException;
+   String getEjbJndiName(Class businessInterface) throws NameNotFoundException;
+   String getEjbJndiName(String link, Class businessInterface);
+
+   /**
+    * If class has container overridable annotations, this method will
+    * discover those overriden annotations.
+    */
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz);
+   
+   /**
+    * If class has container overridable annotations, this method will
+    * discover those overriden annotations.
+    */
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Method method);
+   
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method);
+
+   /**
+    * If class has container overridable annotations, this method will
+    * discover those overriden annotations.
+    */
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Class<?> clazz, Field field);
+   
+   <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field);
+
+   DependencyPolicy getDependencyPolicy();
+   
+   EnvironmentRefGroup getEnvironmentRefGroup();
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionContainer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/InjectionHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface InjectionHandler
-{
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container);
-   public void handleClassAnnotations(Class clazz, InjectionContainer container);
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors);
-   public void handleFieldAnnotations(Field Field, InjectionContainer container, Map<AccessibleObject, Injector> injectors);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/InjectionHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface InjectionHandler
+{
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container);
+   public void handleClassAnnotations(Class clazz, InjectionContainer container);
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors);
+   public void handleFieldAnnotations(Field Field, InjectionContainer container, Map<AccessibleObject, Injector> injectors);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/InjectionUtil.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,297 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.InjectionTarget;
-import org.jboss.metamodel.descriptor.Ref;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class InjectionUtil
-{
-   private static final Logger log = Logger
-           .getLogger(InjectionUtil.class);
-
-
-   /**
-    * This method will take a set of XML loaded injectors and collapse them based on spec inheritance rules
-    * It will remove injectors that should not be used in the injection of the base component class.
-    *
-    * @param visitedMethods
-    * @param clazz
-    * @param xmlDefinedInjectors
-    * @param classInjectors
-    */
-   public static void collapseXmlMethodInjectors(Set<String> visitedMethods, Class clazz, Map<String, Map<AccessibleObject, Injector>> xmlDefinedInjectors, Map<AccessibleObject, Injector> classInjectors)
-   {
-      if (clazz == null || clazz.equals(Object.class))
-      {
-         return;
-      }
-      Map<AccessibleObject, Injector> xmlInjectors = xmlDefinedInjectors.get(clazz.getName());
-      if (xmlInjectors != null)
-      {
-         Method[] methods = clazz.getDeclaredMethods();
-         for (Method method : methods)
-         {
-            if (method.getParameterTypes().length != 1) continue;
-
-            if (!Modifier.isPrivate(method.getModifiers()))
-            {
-               if (visitedMethods.contains(method.getName()))
-               {
-                  xmlInjectors.remove(method); // if not private then it has been overriden
-                  continue;
-               }
-               visitedMethods.add(method.getName());
-            }
-         }
-         classInjectors.putAll(xmlInjectors);
-      }
-      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
-      collapseXmlMethodInjectors(visitedMethods, clazz.getSuperclass(), xmlDefinedInjectors, classInjectors);
-   }
-
-   public static void processMethodAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Set<String> visitedMethods, Class clazz, Map<AccessibleObject, Injector> classInjectors)
-   {
-      if (clazz == null || clazz.equals(Object.class))
-      {
-         return;
-      }
-      Method[] methods = clazz.getDeclaredMethods();
-      for (Method method : methods)
-      {
-         if (method.getParameterTypes().length != 1) continue;
-
-         if (!Modifier.isPrivate(method.getModifiers()))
-         {
-            if (visitedMethods.contains(method.getName()))
-            {
-               continue;
-            }
-            visitedMethods.add(method.getName());
-         }
-        
-         if (handlers != null)
-         {
-            for (InjectionHandler handler : handlers)
-            {
-               handler.handleMethodAnnotations(method, container, classInjectors);
-            }
-         }
-      }
-      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
-      processMethodAnnotations(container, handlers, visitedMethods, clazz.getSuperclass(), classInjectors);
-   }
-
-   public static void processFieldAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Class clazz, Map<AccessibleObject, Injector> classInjectors)
-   {
-      if (clazz == null || clazz.equals(Object.class))
-      {
-         return;
-      }
- 
-      if (handlers != null)
-      {
-         Field[] fields = clazz.getDeclaredFields();
-         for (Field field : fields)
-         {
-            log.trace("process field annotation for " + field.toGenericString());
-            for (InjectionHandler handler : handlers)
-            {
-               handler.handleFieldAnnotations(field, container, classInjectors);
-            }
-         }
-      }
-      
-      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
-      processFieldAnnotations(container, handlers, clazz.getSuperclass(), classInjectors);
-   }
-
-   public static void processClassAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Class clazz)
-   {
-      if (clazz == null || clazz.equals(Object.class))
-      {
-         return;
-      }
-    
-      if (handlers != null)
-      {
-         for (InjectionHandler handler : handlers)
-         {
-            handler.handleClassAnnotations(clazz, container);
-         }
-      }
-      
-      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
-      processClassAnnotations(container, handlers, clazz.getSuperclass());
-   }
-
-   public static Map<AccessibleObject, Injector> processAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Class clazz)
-   {
-      Map<AccessibleObject, Injector> classInjectors = new HashMap<AccessibleObject, Injector>();
-      HashSet<String> visitedMethods = new HashSet<String>();
-      collapseXmlMethodInjectors(visitedMethods, clazz, container.getEncInjections(), classInjectors);
-
-      processClassAnnotations(container, handlers, clazz);
-      visitedMethods = new HashSet<String>();
-      processMethodAnnotations(container, handlers, visitedMethods, clazz, classInjectors);
-      processFieldAnnotations(container, handlers, clazz, classInjectors);
-      return classInjectors;
-   }
-
-   public static AccessibleObject findInjectionTarget(ClassLoader loader, InjectionTarget target)
-   {
-      Class clazz = null;
-      try
-      {
-         clazz = loader.loadClass(target.getTargetClass());
-      }
-      catch (ClassNotFoundException e)
-      {
-         throw new RuntimeException("<injection-target> class: " + target.getTargetClass() + " was not found nin deployment");
-      }
-
-      for (Field field : clazz.getDeclaredFields())
-      {
-         if (target.getTargetName().equals(field.getName())) return field;
-      }
-
-      for (java.lang.reflect.Method method : clazz.getDeclaredMethods())
-      {
-         if (method.getName().equals(target.getTargetName())) return method;
-      }
-
-      throw new RuntimeException("<injection-target> could not be found: " + target.getTargetClass() + "." + target.getTargetName());
-
-   }
-
-   public static String getEncName(Class type)
-   {
-      return "env/" + type.getName();
-   }
-
-   public static String getEncName(Method method)
-   {
-      String encName = method.getName().substring(3);
-      if (encName.length() > 1)
-      {
-         encName = encName.substring(0, 1).toLowerCase() + encName.substring(1);
-      }
-      else
-      {
-         encName = encName.toLowerCase();
-      }
-
-      encName = getEncName(method.getDeclaringClass()) + "/" + encName;
-      return encName;
-   }
-
-   public static String getEncName(Field field)
-   {
-      return getEncName(field.getDeclaringClass()) + "/" + field.getName();
-   }
-
-   public static Object getAnnotation(Class annotation, EJBContainer container, Class annotatedClass, boolean isContainer)
-   {
-      if (isContainer)
-      {
-         return container.resolveAnnotation(annotation);
-      }
-      else
-      {
-         return annotatedClass.getAnnotation(annotation);
-      }
-   }
-
-   public static Object getAnnotation(Class annotation, EJBContainer container, Method method, boolean isContainer)
-   {
-      if (isContainer)
-      {
-         return container.resolveAnnotation(method, annotation);
-      }
-      else
-      {
-         return method.getAnnotation(annotation);
-      }
-   }
-
-   public static Object getAnnotation(Class annotation, EJBContainer container, Field field, boolean isContainer)
-   {
-      if (isContainer)
-      {
-         return container.resolveAnnotation(field, annotation);
-      }
-      else
-      {
-         return field.getAnnotation(annotation);
-      }
-   }
-
-   public static Class injectionTarget(String encName, Ref ref, InjectionContainer container, Map<String, Map<AccessibleObject, Injector>> classInjectors)
-   {
-      if (ref.getInjectionTarget() != null)
-      {
-         Class injectionType;
-         // todo, get injection target class
-         AccessibleObject ao = findInjectionTarget(container.getClassloader(), ref.getInjectionTarget());
-         Map<AccessibleObject, Injector> injectors = classInjectors.get(ref.getInjectionTarget().getTargetClass());
-         if (injectors == null)
-         {
-            injectors = new HashMap<AccessibleObject, Injector>();
-            classInjectors.put(ref.getInjectionTarget().getTargetClass().trim(), injectors);
-         }
-         if (ao instanceof Field)
-         {
-            injectionType = ((Field) ao).getType();
-            injectors.put(ao, new JndiFieldInjector((Field) ao, encName, container.getEnc()));
-         }
-         else
-         {
-            injectionType = ((Method) ao).getParameterTypes()[0];
-            injectors.put(ao, new JndiMethodInjector((Method) ao, encName, container.getEnc()));
-         }
-         return injectionType;
-      }
-      else
-      {
-         return null;
-      }
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/InjectionUtil.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,297 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.InjectionTarget;
+import org.jboss.metamodel.descriptor.Ref;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class InjectionUtil
+{
+   private static final Logger log = Logger
+           .getLogger(InjectionUtil.class);
+
+
+   /**
+    * This method will take a set of XML loaded injectors and collapse them based on spec inheritance rules
+    * It will remove injectors that should not be used in the injection of the base component class.
+    *
+    * @param visitedMethods
+    * @param clazz
+    * @param xmlDefinedInjectors
+    * @param classInjectors
+    */
+   public static void collapseXmlMethodInjectors(Set<String> visitedMethods, Class clazz, Map<String, Map<AccessibleObject, Injector>> xmlDefinedInjectors, Map<AccessibleObject, Injector> classInjectors)
+   {
+      if (clazz == null || clazz.equals(Object.class))
+      {
+         return;
+      }
+      Map<AccessibleObject, Injector> xmlInjectors = xmlDefinedInjectors.get(clazz.getName());
+      if (xmlInjectors != null)
+      {
+         Method[] methods = clazz.getDeclaredMethods();
+         for (Method method : methods)
+         {
+            if (method.getParameterTypes().length != 1) continue;
+
+            if (!Modifier.isPrivate(method.getModifiers()))
+            {
+               if (visitedMethods.contains(method.getName()))
+               {
+                  xmlInjectors.remove(method); // if not private then it has been overriden
+                  continue;
+               }
+               visitedMethods.add(method.getName());
+            }
+         }
+         classInjectors.putAll(xmlInjectors);
+      }
+      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
+      collapseXmlMethodInjectors(visitedMethods, clazz.getSuperclass(), xmlDefinedInjectors, classInjectors);
+   }
+
+   public static void processMethodAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Set<String> visitedMethods, Class clazz, Map<AccessibleObject, Injector> classInjectors)
+   {
+      if (clazz == null || clazz.equals(Object.class))
+      {
+         return;
+      }
+      Method[] methods = clazz.getDeclaredMethods();
+      for (Method method : methods)
+      {
+         if (method.getParameterTypes().length != 1) continue;
+
+         if (!Modifier.isPrivate(method.getModifiers()))
+         {
+            if (visitedMethods.contains(method.getName()))
+            {
+               continue;
+            }
+            visitedMethods.add(method.getName());
+         }
+        
+         if (handlers != null)
+         {
+            for (InjectionHandler handler : handlers)
+            {
+               handler.handleMethodAnnotations(method, container, classInjectors);
+            }
+         }
+      }
+      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
+      processMethodAnnotations(container, handlers, visitedMethods, clazz.getSuperclass(), classInjectors);
+   }
+
+   public static void processFieldAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Class clazz, Map<AccessibleObject, Injector> classInjectors)
+   {
+      if (clazz == null || clazz.equals(Object.class))
+      {
+         return;
+      }
+ 
+      if (handlers != null)
+      {
+         Field[] fields = clazz.getDeclaredFields();
+         for (Field field : fields)
+         {
+            log.trace("process field annotation for " + field.toGenericString());
+            for (InjectionHandler handler : handlers)
+            {
+               handler.handleFieldAnnotations(field, container, classInjectors);
+            }
+         }
+      }
+      
+      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
+      processFieldAnnotations(container, handlers, clazz.getSuperclass(), classInjectors);
+   }
+
+   public static void processClassAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Class clazz)
+   {
+      if (clazz == null || clazz.equals(Object.class))
+      {
+         return;
+      }
+    
+      if (handlers != null)
+      {
+         for (InjectionHandler handler : handlers)
+         {
+            handler.handleClassAnnotations(clazz, container);
+         }
+      }
+      
+      // recursion needs to come last as the method could be overriden and we don't want the overriding method to be ignored
+      processClassAnnotations(container, handlers, clazz.getSuperclass());
+   }
+
+   public static Map<AccessibleObject, Injector> processAnnotations(InjectionContainer container, Collection<InjectionHandler> handlers, Class clazz)
+   {
+      Map<AccessibleObject, Injector> classInjectors = new HashMap<AccessibleObject, Injector>();
+      HashSet<String> visitedMethods = new HashSet<String>();
+      collapseXmlMethodInjectors(visitedMethods, clazz, container.getEncInjections(), classInjectors);
+
+      processClassAnnotations(container, handlers, clazz);
+      visitedMethods = new HashSet<String>();
+      processMethodAnnotations(container, handlers, visitedMethods, clazz, classInjectors);
+      processFieldAnnotations(container, handlers, clazz, classInjectors);
+      return classInjectors;
+   }
+
+   public static AccessibleObject findInjectionTarget(ClassLoader loader, InjectionTarget target)
+   {
+      Class clazz = null;
+      try
+      {
+         clazz = loader.loadClass(target.getTargetClass());
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new RuntimeException("<injection-target> class: " + target.getTargetClass() + " was not found nin deployment");
+      }
+
+      for (Field field : clazz.getDeclaredFields())
+      {
+         if (target.getTargetName().equals(field.getName())) return field;
+      }
+
+      for (java.lang.reflect.Method method : clazz.getDeclaredMethods())
+      {
+         if (method.getName().equals(target.getTargetName())) return method;
+      }
+
+      throw new RuntimeException("<injection-target> could not be found: " + target.getTargetClass() + "." + target.getTargetName());
+
+   }
+
+   public static String getEncName(Class type)
+   {
+      return "env/" + type.getName();
+   }
+
+   public static String getEncName(Method method)
+   {
+      String encName = method.getName().substring(3);
+      if (encName.length() > 1)
+      {
+         encName = encName.substring(0, 1).toLowerCase() + encName.substring(1);
+      }
+      else
+      {
+         encName = encName.toLowerCase();
+      }
+
+      encName = getEncName(method.getDeclaringClass()) + "/" + encName;
+      return encName;
+   }
+
+   public static String getEncName(Field field)
+   {
+      return getEncName(field.getDeclaringClass()) + "/" + field.getName();
+   }
+
+   public static Object getAnnotation(Class annotation, EJBContainer container, Class annotatedClass, boolean isContainer)
+   {
+      if (isContainer)
+      {
+         return container.resolveAnnotation(annotation);
+      }
+      else
+      {
+         return annotatedClass.getAnnotation(annotation);
+      }
+   }
+
+   public static Object getAnnotation(Class annotation, EJBContainer container, Method method, boolean isContainer)
+   {
+      if (isContainer)
+      {
+         return container.resolveAnnotation(method, annotation);
+      }
+      else
+      {
+         return method.getAnnotation(annotation);
+      }
+   }
+
+   public static Object getAnnotation(Class annotation, EJBContainer container, Field field, boolean isContainer)
+   {
+      if (isContainer)
+      {
+         return container.resolveAnnotation(field, annotation);
+      }
+      else
+      {
+         return field.getAnnotation(annotation);
+      }
+   }
+
+   public static Class injectionTarget(String encName, Ref ref, InjectionContainer container, Map<String, Map<AccessibleObject, Injector>> classInjectors)
+   {
+      if (ref.getInjectionTarget() != null)
+      {
+         Class injectionType;
+         // todo, get injection target class
+         AccessibleObject ao = findInjectionTarget(container.getClassloader(), ref.getInjectionTarget());
+         Map<AccessibleObject, Injector> injectors = classInjectors.get(ref.getInjectionTarget().getTargetClass());
+         if (injectors == null)
+         {
+            injectors = new HashMap<AccessibleObject, Injector>();
+            classInjectors.put(ref.getInjectionTarget().getTargetClass().trim(), injectors);
+         }
+         if (ao instanceof Field)
+         {
+            injectionType = ((Field) ao).getType();
+            injectors.put(ao, new JndiFieldInjector((Field) ao, encName, container.getEnc()));
+         }
+         else
+         {
+            injectionType = ((Method) ao).getParameterTypes()[0];
+            injectors.put(ao, new JndiMethodInjector((Method) ao, encName, container.getEnc()));
+         }
+         return injectionType;
+      }
+      else
+      {
+         return null;
+      }
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/InjectionUtil.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/Injector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import org.jboss.ejb3.BeanContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Injector
-{
-   void inject(BeanContext ctx);
-
-   void inject(Object instance);
-   
-   Class getInjectionClass();
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/Injector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.ejb3.BeanContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Injector
+{
+   void inject(BeanContext ctx);
+
+   void inject(Object instance);
+   
+   Class getInjectionClass();
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/Injector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,128 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-
-import org.jboss.ejb3.BeanContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated  use JndiPropertyInjector
- */
-public class JndiFieldInjector implements Injector, PojoInjector
-{
-   private static final Logger log = Logger.getLogger(JndiFieldInjector.class);
-   
-   private Field field;
-   private String jndiName;
-   private Context ctx;
-
-   public JndiFieldInjector(Field field, String jndiName, Context ctx)
-   {
-      this.field = field;
-      this.field.setAccessible(true);
-      this.jndiName = jndiName;
-      this.ctx = ctx;
-   }
-
-   public JndiFieldInjector(Field field, Context ctx)
-   {
-      this(field, field.getName(), ctx);
-   }
-
-   public void inject(BeanContext bctx)
-   {
-      inject(bctx, bctx.getInstance());
-   }
-
-   public Class getInjectionClass()
-   {
-      return field.getType();
-   }
-
-   public Field getField()
-   {
-      return field;
-   }
-
-   protected Object lookup(String jndiName, Class field)
-   {
-      Object dependency = null;
-
-      try
-      {
-         dependency = ctx.lookup(jndiName);
-      }
-      catch (NamingException e)
-      {
-         e.printStackTrace();
-         throw new RuntimeException("Unable to inject jndi dependency: " + jndiName + " into field " + field, e);
-      }
-      
-      return dependency;
-   }
-   
-   public void inject(BeanContext bctx, Object instance)
-   {
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      
-      Object dependency = lookup(jndiName, field.getType());
-      
-      try
-      {
-         field.set(instance, dependency);
-      }
-      catch (IllegalArgumentException e)
-      {
-         String type = "UNKNOWN";
-         String interfaces = "";
-         if (dependency != null)
-         {
-            type = dependency.getClass().getName();
-            Class[] intfs = dependency.getClass().getInterfaces();
-            for (Class intf : intfs) interfaces += ", " + intf.getName();
-         }
-         throw new RuntimeException("Non matching type for inject of field: " + field + " for type: " + type + " of jndiName " + jndiName + "\nintfs: " + interfaces, e);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   public String toString()
-   {
-      return super.toString() + "{field=" + field + ",jndiName=" + jndiName + "}";
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.Field;
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.logging.Logger;
+
+import org.jboss.ejb3.BeanContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated  use JndiPropertyInjector
+ */
+public class JndiFieldInjector implements Injector, PojoInjector
+{
+   private static final Logger log = Logger.getLogger(JndiFieldInjector.class);
+   
+   private Field field;
+   private String jndiName;
+   private Context ctx;
+
+   public JndiFieldInjector(Field field, String jndiName, Context ctx)
+   {
+      this.field = field;
+      this.field.setAccessible(true);
+      this.jndiName = jndiName;
+      this.ctx = ctx;
+   }
+
+   public JndiFieldInjector(Field field, Context ctx)
+   {
+      this(field, field.getName(), ctx);
+   }
+
+   public void inject(BeanContext bctx)
+   {
+      inject(bctx, bctx.getInstance());
+   }
+
+   public Class getInjectionClass()
+   {
+      return field.getType();
+   }
+
+   public Field getField()
+   {
+      return field;
+   }
+
+   protected Object lookup(String jndiName, Class field)
+   {
+      Object dependency = null;
+
+      try
+      {
+         dependency = ctx.lookup(jndiName);
+
+         if (dependency instanceof javax.xml.rpc.Service && !field.isAssignableFrom(javax.xml.rpc.Service.class))
+         {
+            javax.xml.rpc.Service service = (javax.xml.rpc.Service)dependency;
+            dependency = service.getPort(field);
+         }
+      }
+      catch (NamingException e)
+      {
+         e.printStackTrace();
+         throw new RuntimeException("Unable to inject jndi dependency: " + jndiName + " into field " + field, e);
+      }
+      catch (javax.xml.rpc.ServiceException e)
+      {
+         e.printStackTrace();
+         throw new RuntimeException("Unable to inject jndi webservice dependency: " + jndiName + " into field " + field, e);
+      }
+      
+      return dependency;
+   }
+   
+   public void inject(BeanContext bctx, Object instance)
+   {
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      
+      Object dependency = lookup(jndiName, field.getType());
+      
+      try
+      {
+         field.set(instance, dependency);
+      }
+      catch (IllegalArgumentException e)
+      {
+         String type = "UNKNOWN";
+         String interfaces = "";
+         if (dependency != null)
+         {
+            type = dependency.getClass().getName();
+            Class[] intfs = dependency.getClass().getInterfaces();
+            for (Class intf : intfs) interfaces += ", " + intf.getName();
+         }
+         throw new RuntimeException("Non matching type for inject of field: " + field + " for type: " + type + " of jndiName " + jndiName + "\nintfs: " + interfaces, e);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   public String toString()
+   {
+      return super.toString() + "{field=" + field + ",jndiName=" + jndiName + "}";
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiFieldInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import org.jboss.annotation.JndiInject;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.metamodel.descriptor.JndiRef;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * Searches bean class for all @Inject and create Injectors
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JndiInjectHandler implements InjectionHandler
-{
-   private static final Logger log = Logger.getLogger(JndiInjectHandler.class);
-   
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
-   {
-      if (xml == null) return;
-      if (xml.getJndiRefs() == null) return;
-      for (JndiRef ref : xml.getJndiRefs())
-      {
-         if (ref.getMappedName() == null || ref.getMappedName().equals(""))
-            throw new RuntimeException("mapped-name is required for " + ref.getJndiRefName() + " of container " + container.getIdentifier());
-
-         String encName = "env/" + ref.getJndiRefName();
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.getMappedName(), "jndi ref"));
-         }
-         InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
-      }
-   }
-
-   public void handleClassAnnotations(Class clazz, InjectionContainer container)
-   {
-      // complete
-   }
-
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      JndiInject ref = method.getAnnotation(JndiInject.class);
-      if (ref != null)
-      {
-         if (!method.getName().startsWith("set"))
-            throw new RuntimeException("@EJB can only be used with a set method: " + method);
-         String encName = InjectionUtil.getEncName(method);
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.jndiName(), "@JndiInject"));
-         }
-         injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
-      }
-   }
-   
-   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      JndiInject ref = field.getAnnotation(JndiInject.class);
-      if (ref != null)
-      {
-         String encName = InjectionUtil.getEncName(field);
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.jndiName(), "@JndiInject"));
-         }
-         injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.annotation.JndiInject;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+import org.jboss.metamodel.descriptor.JndiRef;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Searches bean class for all @Inject and create Injectors
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JndiInjectHandler implements InjectionHandler
+{
+   private static final Logger log = Logger.getLogger(JndiInjectHandler.class);
+   
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
+   {
+      if (xml == null) return;
+      if (xml.getJndiRefs() == null) return;
+      for (JndiRef ref : xml.getJndiRefs())
+      {
+         if (ref.getMappedName() == null || ref.getMappedName().equals(""))
+            throw new RuntimeException("mapped-name is required for " + ref.getJndiRefName() + " of container " + container.getIdentifier());
+
+         String encName = "env/" + ref.getJndiRefName();
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.getMappedName(), "jndi ref"));
+         }
+         InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
+      }
+   }
+
+   public void handleClassAnnotations(Class clazz, InjectionContainer container)
+   {
+      // complete
+   }
+
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      JndiInject ref = method.getAnnotation(JndiInject.class);
+      if (ref != null)
+      {
+         if (!method.getName().startsWith("set"))
+            throw new RuntimeException("@EJB can only be used with a set method: " + method);
+         String encName = InjectionUtil.getEncName(method);
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.jndiName(), "@JndiInject"));
+         }
+         injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
+      }
+   }
+   
+   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      JndiInject ref = field.getAnnotation(JndiInject.class);
+      if (ref != null)
+      {
+         String encName = InjectionUtil.getEncName(field);
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.jndiName(), "@JndiInject"));
+         }
+         injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,110 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use JndiPropertyInjector
- */
-public class JndiMethodInjector implements Injector, PojoInjector
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(JndiMethodInjector.class);
-   
-   private Method setMethod;
-   private String jndiName;
-   private Context ctx;
-
-   public JndiMethodInjector(Method setMethod, String jndiName, Context ctx)
-   {
-      this.setMethod = setMethod;
-      setMethod.setAccessible(true);
-      this.jndiName = jndiName;
-      this.ctx = ctx;
-   }
-
-   public void inject(BeanContext bctx)
-   {
-      inject(bctx, bctx.getInstance());
-   }
-   
-   public Class getInjectionClass()
-   {
-      return setMethod.getParameterTypes()[0];
-   }
-   
-   protected Object lookup(String jndiName, Class param)
-   {
-      Object dependency = null;
-      
-      try
-      {
-         dependency = ctx.lookup(jndiName);
-      }
-      catch (NamingException e)
-      {
-         e.printStackTrace();
-         throw new RuntimeException("Unable to @Inject jndi dependency: " + jndiName + " into method " + setMethod, e);
-      }
-      return dependency;
-   }
-   
-   public void inject(BeanContext bctx, Object instance)
-   {
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      Object dependency = lookup(jndiName, setMethod.getParameterTypes()[0]);
-
-      Object[] args = {dependency};
-      try
-      {
-         setMethod.invoke(instance, args);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         String type = "UNKNOWN";
-         if (dependency != null) type = dependency.getClass().getName();
-         throw new RuntimeException("Non matching type for @Inject of setter: " + setMethod + " for type: " + type, e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated use JndiPropertyInjector
+ */
+public class JndiMethodInjector implements Injector, PojoInjector
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(JndiMethodInjector.class);
+   
+   private Method setMethod;
+   private String jndiName;
+   private Context ctx;
+
+   public JndiMethodInjector(Method setMethod, String jndiName, Context ctx)
+   {
+      this.setMethod = setMethod;
+      setMethod.setAccessible(true);
+      this.jndiName = jndiName;
+      this.ctx = ctx;
+   }
+
+   public void inject(BeanContext bctx)
+   {
+      inject(bctx, bctx.getInstance());
+   }
+   
+   public Class getInjectionClass()
+   {
+      return setMethod.getParameterTypes()[0];
+   }
+   
+   protected Object lookup(String jndiName, Class param)
+   {
+      Object dependency = null;
+      
+      try
+      {
+         dependency = ctx.lookup(jndiName);
+      }
+      catch (NamingException e)
+      {
+         e.printStackTrace();
+         throw new RuntimeException("Unable to @Inject jndi dependency: " + jndiName + " into method " + setMethod, e);
+      }
+      return dependency;
+   }
+   
+   public void inject(BeanContext bctx, Object instance)
+   {
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      Object dependency = lookup(jndiName, setMethod.getParameterTypes()[0]);
+
+      Object[] args = {dependency};
+      try
+      {
+         setMethod.invoke(instance, args);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         String type = "UNKNOWN";
+         if (dependency != null) type = dependency.getClass().getName();
+         throw new RuntimeException("Non matching type for @Inject of setter: " + setMethod + " for type: " + type, e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiMethodInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.injection.lang.reflect.BeanProperty;
-import org.jboss.logging.Logger;
-
-/**
- * Injects a jndi dependency into a bean property.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class JndiPropertyInjector extends AbstractPropertyInjector implements PojoInjector
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(JndiPropertyInjector.class);
-   
-   private String jndiName;
-   private Context ctx;
-
-   public JndiPropertyInjector(BeanProperty property, String jndiName, Context ctx)
-   {
-      super(property);
-      this.jndiName = jndiName;
-      this.ctx = ctx;
-   }
-
-   public void inject(BeanContext bctx)
-   {
-      inject(bctx, bctx.getInstance());
-   }
-   
-   public Class<?> getInjectionClass()
-   {
-      return property.getType();
-   }
-   
-   protected Object lookup(String jndiName)
-   {
-      Object dependency = null;
-      
-      try
-      {
-         dependency = ctx.lookup(jndiName);
-      }
-      catch (NamingException e)
-      {
-         Throwable cause = e;
-         while(cause.getCause() != null)
-            cause = cause.getCause();
-         throw new RuntimeException("Unable to inject jndi dependency: " + jndiName + " into property " + property + ": " + cause.getMessage(), e);
-      }
-      return dependency;
-   }
-   
-   public void inject(BeanContext bctx, Object instance)
-   {
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      Object value = lookup(jndiName);
-      property.set(instance, value);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/JndiPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.injection.lang.reflect.BeanProperty;
+import org.jboss.logging.Logger;
+
+/**
+ * Injects a jndi dependency into a bean property.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class JndiPropertyInjector extends AbstractPropertyInjector implements PojoInjector
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(JndiPropertyInjector.class);
+   
+   private String jndiName;
+   private Context ctx;
+
+   public JndiPropertyInjector(BeanProperty property, String jndiName, Context ctx)
+   {
+      super(property);
+      this.jndiName = jndiName;
+      this.ctx = ctx;
+   }
+
+   public void inject(BeanContext bctx)
+   {
+      inject(bctx, bctx.getInstance());
+   }
+   
+   public Class<?> getInjectionClass()
+   {
+      return property.getType();
+   }
+   
+   protected Object lookup(String jndiName)
+   {
+      Object dependency = null;
+      
+      try
+      {
+         dependency = ctx.lookup(jndiName);
+      }
+      catch (NamingException e)
+      {
+         Throwable cause = e;
+         while(cause.getCause() != null)
+            cause = cause.getCause();
+         throw new RuntimeException("Unable to inject jndi dependency: " + jndiName + " into property " + property + ": " + cause.getMessage(), e);
+      }
+      return dependency;
+   }
+   
+   public void inject(BeanContext bctx, Object instance)
+   {
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      Object value = lookup(jndiName);
+      property.set(instance, value);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import org.jboss.naming.Util;
-
-import javax.naming.LinkRef;
-import javax.naming.NamingException;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class LinkRefEncInjector implements EncInjector
-{
-   private String jndiName;
-   private String error;
-   private String encName;
-
-   public LinkRefEncInjector(String name, String mappedName, String error)
-   {
-      this.jndiName = mappedName;
-      this.error = error;
-      this.encName = name;
-   }
-
-   public void inject(InjectionContainer container)
-   {
-      try
-      {
-         Util.rebind(container.getEnc(), encName, new LinkRef(jndiName));
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(new StringBuilder().append("could not bind enc name '").append(encName).append("' for ").append(error).append(" for container ").append(container.getIdentifier()).append(e.getMessage()).toString());
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.naming.Util;
+
+import javax.naming.LinkRef;
+import javax.naming.NamingException;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class LinkRefEncInjector implements EncInjector
+{
+   private String jndiName;
+   private String error;
+   private String encName;
+
+   public LinkRefEncInjector(String name, String mappedName, String error)
+   {
+      this.jndiName = mappedName;
+      this.error = error;
+      this.encName = name;
+   }
+
+   public void inject(InjectionContainer container)
+   {
+      try
+      {
+         Util.rebind(container.getEnc(), encName, new LinkRef(jndiName));
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(new StringBuilder().append("could not bind enc name '").append(encName).append("' for ").append(error).append(" for container ").append(container.getIdentifier()).append(e.getMessage()).toString());
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PcEncInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import org.jboss.ejb3.entity.ManagedEntityManagerFactory;
-import org.jboss.ejb3.entity.ExtendedEntityManager;
-import org.jboss.ejb3.entity.ExtendedHibernateSession;
-import org.jboss.ejb3.entity.TransactionScopedEntityManager;
-import org.jboss.ejb3.entity.TransactionScopedHibernateSession;
-import org.jboss.ejb3.stateful.StatefulContainer;
-import org.jboss.naming.Util;
-
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class PcEncInjector implements EncInjector
-{
-   private String encName;
-   private String unitName;
-   private PersistenceContextType type;
-   private Class injectionType;
-   private String error;
-
-   public PcEncInjector(String encName, String unitName, PersistenceContextType type, Class injectionType, String error)
-   {
-      this.encName = encName;
-      this.unitName = unitName;
-      this.type = type;
-      this.injectionType = injectionType;
-      this.error = error;
-   }
-
-   public void inject(InjectionContainer container)
-   {
-      String error1 = error;
-      ManagedEntityManagerFactory factory = null;
-      try
-      {
-         factory = PersistenceUnitHandler.getManagedEntityManagerFactory(
-                 container, unitName);
-      }
-      catch (NameNotFoundException e)
-      {
-         error1 += " " + e.getMessage();
-      }
-      if (factory == null)
-      {
-         throw new RuntimeException(error1);
-      }
-      if (type == PersistenceContextType.EXTENDED)
-      {
-         if (!(container instanceof StatefulContainer))
-            throw new RuntimeException("It is illegal to inject an EXTENDED PC into something other than a SFSB");
-         container.getInjectors().add(0, new ExtendedPersistenceContextInjector(factory));
-         Object extendedPc = null;
-         if (injectionType == null
-                 || injectionType.getName().equals(EntityManager.class.getName()))
-         {
-            extendedPc = new ExtendedEntityManager(factory.getKernelName());
-         }
-         else
-         {
-            extendedPc = new ExtendedHibernateSession(factory.getKernelName());
-         }
-         try
-         {
-            Util.rebind(container.getEnc(), encName, extendedPc);
-         }
-         catch (NamingException e)
-         {
-            throw new RuntimeException(error1, e);
-         }
-      }
-      else
-      {
-         Object entityManager = null;
-         if (injectionType == null
-                 || injectionType.getName().equals(EntityManager.class.getName()))
-         {
-            entityManager = new TransactionScopedEntityManager(factory);
-         }
-         else
-         {
-            entityManager = new TransactionScopedHibernateSession(factory);
-         }
-         try
-         {
-            Util.rebind(container.getEnc(), encName, entityManager);
-         }
-         catch (NamingException e)
-         {
-            throw new RuntimeException(error1, e);
-         }
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PcEncInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.ejb3.entity.ManagedEntityManagerFactory;
+import org.jboss.ejb3.entity.ExtendedEntityManager;
+import org.jboss.ejb3.entity.ExtendedHibernateSession;
+import org.jboss.ejb3.entity.TransactionScopedEntityManager;
+import org.jboss.ejb3.entity.TransactionScopedHibernateSession;
+import org.jboss.ejb3.stateful.StatefulContainer;
+import org.jboss.naming.Util;
+
+import javax.persistence.PersistenceContextType;
+import javax.persistence.EntityManager;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class PcEncInjector implements EncInjector
+{
+   private String encName;
+   private String unitName;
+   private PersistenceContextType type;
+   private Class injectionType;
+   private String error;
+
+   public PcEncInjector(String encName, String unitName, PersistenceContextType type, Class injectionType, String error)
+   {
+      this.encName = encName;
+      this.unitName = unitName;
+      this.type = type;
+      this.injectionType = injectionType;
+      this.error = error;
+   }
+
+   public void inject(InjectionContainer container)
+   {
+      String error1 = error;
+      ManagedEntityManagerFactory factory = null;
+      try
+      {
+         factory = PersistenceUnitHandler.getManagedEntityManagerFactory(
+                 container, unitName);
+      }
+      catch (NameNotFoundException e)
+      {
+         error1 += " " + e.getMessage();
+      }
+      if (factory == null)
+      {
+         throw new RuntimeException(error1);
+      }
+      if (type == PersistenceContextType.EXTENDED)
+      {
+         if (!(container instanceof StatefulContainer))
+            throw new RuntimeException("It is illegal to inject an EXTENDED PC into something other than a SFSB");
+         container.getInjectors().add(0, new ExtendedPersistenceContextInjector(factory));
+         Object extendedPc = null;
+         if (injectionType == null
+                 || injectionType.getName().equals(EntityManager.class.getName()))
+         {
+            extendedPc = new ExtendedEntityManager(factory.getKernelName());
+         }
+         else
+         {
+            extendedPc = new ExtendedHibernateSession(factory.getKernelName());
+         }
+         try
+         {
+            Util.rebind(container.getEnc(), encName, extendedPc);
+         }
+         catch (NamingException e)
+         {
+            throw new RuntimeException(error1, e);
+         }
+      }
+      else
+      {
+         Object entityManager = null;
+         if (injectionType == null
+                 || injectionType.getName().equals(EntityManager.class.getName()))
+         {
+            entityManager = new TransactionScopedEntityManager(factory);
+         }
+         else
+         {
+            entityManager = new TransactionScopedHibernateSession(factory);
+         }
+         try
+         {
+            Util.rebind(container.getEnc(), encName, entityManager);
+         }
+         catch (NamingException e)
+         {
+            throw new RuntimeException(error1, e);
+         }
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,193 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import org.jboss.metamodel.descriptor.PersistenceContextRef;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.IgnoreDependency;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-
-import javax.naming.NameNotFoundException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContexts;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * Searches bean class for all
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @Inject and create Injectors
- */
-public class PersistenceContextHandler implements InjectionHandler
-{
-   private static final Logger log = Logger
-           .getLogger(PersistenceContextHandler.class);
-
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
-   {
-      if (xml == null) return;
-      if (xml.getPersistenceContextRefs() == null) return;
-      for (PersistenceContextRef ref : xml.getPersistenceContextRefs())
-      {
-         String encName = "env/" + ref.getRefName();
-         // we add injection target no matter what.  enc injection might be overridden but
-         // XML injection cannot be overriden
-         Class injectionType = InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
-
-         if (container.getEncInjectors().containsKey(encName))
-            continue;
-         // add it to list of
-         String error = "unable to load <persistence-context-ref> for unitName: "
-                 + ref.getUnitName() + " <ref-name>: " + ref.getRefName();
-         PersistenceContextType type = ref.getPersistenceContextType();
-         String unitName = ref.getUnitName();
-         container.getEncInjectors().put(encName, new PcEncInjector(encName, unitName, type, injectionType, error));
-         try
-         {
-            PersistenceUnitHandler.addPUDependency(ref.getUnitName(), container);
-         }
-         catch (NameNotFoundException e)
-         {
-            throw new RuntimeException("Illegal <persistence-context-ref> of " + ref.getRefName() + " :" + e.getMessage());
-         }
-      }
-   }
-
-   public void handleClassAnnotations(Class clazz, InjectionContainer container)
-   {
-      PersistenceContexts resources = container.getAnnotation(PersistenceContexts.class, clazz);
-      if (resources != null)
-      {
-         for (PersistenceContext ref : resources.value())
-         {
-            loadPersistenceContextClassAnnotation(ref, container, clazz);
-         }
-      }
-      PersistenceContext pc = container.getAnnotation(PersistenceContext.class, clazz);
-
-      if (pc != null)
-      {
-         loadPersistenceContextClassAnnotation(pc, container, clazz);
-      }
-
-   }
-
-   private static void loadPersistenceContextClassAnnotation(
-           PersistenceContext ref, InjectionContainer container, Class clazz)
-   {
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         throw new RuntimeException(
-                 "JBoss requires name() for class level @PersistenceContext");
-      }
-      encName = "env/" + ref.name();
-      if (container.getEncInjectors().containsKey(encName)) return;
-
-      String error = "Unable to load class-level @PersistenceContext("
-              + ref.unitName() + ") on " + container.getIdentifier();
-      container.getEncInjectors().put(encName, new PcEncInjector(encName, ref.unitName(), ref.type(), null, error));
-      try
-      {
-         PersistenceUnitHandler.addPUDependency(ref.unitName(), container);
-      }
-      catch (NameNotFoundException e)
-      {
-         throw new RuntimeException("Illegal @PersistenceUnit on " + clazz.getName() + " of unitname " + ref.unitName() + " :" + e.getMessage());
-      }
-   }
-
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      PersistenceContext ref = method.getAnnotation(PersistenceContext.class);
-      if (ref == null) return;
-      if (!method.getName().startsWith("set"))
-         throw new RuntimeException("@PersistenceUnit can only be used with a set method: " + method);
-
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         encName = InjectionUtil.getEncName(method);
-      }
-      else
-      {
-         encName = "env/" + ref.name();
-      }
-      if (!container.getEncInjectors().containsKey(encName))
-      {
-         try
-         {
-            if (!method.isAnnotationPresent(IgnoreDependency.class)) PersistenceUnitHandler.addPUDependency(ref.unitName(), container);
-         }
-         catch (NameNotFoundException e)
-         {
-            throw new RuntimeException("Illegal @PersistenceUnit on " + method + " :" + e.getMessage());
-         }
-         String error = "@PersistenceContext(name='" + encName
-                 + "',unitName='" + ref.unitName() + "') on EJB: "
-                 + container.getIdentifier() + " failed to inject on method "
-                 + method.toString();
-         container.getEncInjectors().put(encName, new PcEncInjector(encName, ref.unitName(), ref.type(), method.getParameterTypes()[0], error));
-      }
-      injectors.put(method, new JndiMethodInjector(method,
-              encName, container.getEnc()));
-   }
-
-   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      PersistenceContext ref = field.getAnnotation(PersistenceContext.class);
-      if (ref == null) return;
-
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         encName = InjectionUtil.getEncName(field);
-      }
-      else
-      {
-         encName = "env/" + ref.name();
-      }
-      if (!container.getEncInjectors().containsKey(encName))
-      {
-         try
-         {
-            if (!field.isAnnotationPresent(IgnoreDependency.class)) PersistenceUnitHandler.addPUDependency(ref.unitName(), container);
-         }
-         catch (NameNotFoundException e)
-         {
-            throw new RuntimeException("Illegal @PersistenceUnit on " + field + " :" + e.getMessage());
-         }
-         String error = "@PersistenceContext(name='" + encName
-                 + "',unitName='" + ref.unitName() + "') on EJB: "
-                 + container.getIdentifier() + " failed to inject on field "
-                 + field.toString();
-         container.getEncInjectors().put(encName, new PcEncInjector(encName, ref.unitName(), ref.type(), field.getType(), error));
-      }
-      injectors.put(field, new JndiFieldInjector(field,
-              encName, container.getEnc()));
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.metamodel.descriptor.PersistenceContextRef;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.IgnoreDependency;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+
+import javax.naming.NameNotFoundException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.PersistenceContexts;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Searches bean class for all
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @Inject and create Injectors
+ */
+public class PersistenceContextHandler implements InjectionHandler
+{
+   private static final Logger log = Logger
+           .getLogger(PersistenceContextHandler.class);
+
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
+   {
+      if (xml == null) return;
+      if (xml.getPersistenceContextRefs() == null) return;
+      for (PersistenceContextRef ref : xml.getPersistenceContextRefs())
+      {
+         String encName = "env/" + ref.getRefName();
+         // we add injection target no matter what.  enc injection might be overridden but
+         // XML injection cannot be overriden
+         Class injectionType = InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
+
+         if (container.getEncInjectors().containsKey(encName))
+            continue;
+         // add it to list of
+         String error = "unable to load <persistence-context-ref> for unitName: "
+                 + ref.getUnitName() + " <ref-name>: " + ref.getRefName();
+         PersistenceContextType type = ref.getPersistenceContextType();
+         String unitName = ref.getUnitName();
+         container.getEncInjectors().put(encName, new PcEncInjector(encName, unitName, type, injectionType, error));
+         try
+         {
+            PersistenceUnitHandler.addPUDependency(ref.getUnitName(), container);
+         }
+         catch (NameNotFoundException e)
+         {
+            throw new RuntimeException("Illegal <persistence-context-ref> of " + ref.getRefName() + " :" + e.getMessage());
+         }
+      }
+   }
+
+   public void handleClassAnnotations(Class clazz, InjectionContainer container)
+   {
+      PersistenceContexts resources = container.getAnnotation(PersistenceContexts.class, clazz);
+      if (resources != null)
+      {
+         for (PersistenceContext ref : resources.value())
+         {
+            loadPersistenceContextClassAnnotation(ref, container, clazz);
+         }
+      }
+      PersistenceContext pc = container.getAnnotation(PersistenceContext.class, clazz);
+
+      if (pc != null)
+      {
+         loadPersistenceContextClassAnnotation(pc, container, clazz);
+      }
+
+   }
+
+   private static void loadPersistenceContextClassAnnotation(
+           PersistenceContext ref, InjectionContainer container, Class clazz)
+   {
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         throw new RuntimeException(
+                 "JBoss requires name() for class level @PersistenceContext");
+      }
+      encName = "env/" + ref.name();
+      if (container.getEncInjectors().containsKey(encName)) return;
+
+      String error = "Unable to load class-level @PersistenceContext("
+              + ref.unitName() + ") on " + container.getIdentifier();
+      container.getEncInjectors().put(encName, new PcEncInjector(encName, ref.unitName(), ref.type(), null, error));
+      try
+      {
+         PersistenceUnitHandler.addPUDependency(ref.unitName(), container);
+      }
+      catch (NameNotFoundException e)
+      {
+         throw new RuntimeException("Illegal @PersistenceUnit on " + clazz.getName() + " of unitname " + ref.unitName() + " :" + e.getMessage());
+      }
+   }
+
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      PersistenceContext ref = method.getAnnotation(PersistenceContext.class);
+      if (ref == null) return;
+      if (!method.getName().startsWith("set"))
+         throw new RuntimeException("@PersistenceUnit can only be used with a set method: " + method);
+
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         encName = InjectionUtil.getEncName(method);
+      }
+      else
+      {
+         encName = "env/" + ref.name();
+      }
+      if (!container.getEncInjectors().containsKey(encName))
+      {
+         try
+         {
+            if (!method.isAnnotationPresent(IgnoreDependency.class)) PersistenceUnitHandler.addPUDependency(ref.unitName(), container);
+         }
+         catch (NameNotFoundException e)
+         {
+            throw new RuntimeException("Illegal @PersistenceUnit on " + method + " :" + e.getMessage());
+         }
+         String error = "@PersistenceContext(name='" + encName
+                 + "',unitName='" + ref.unitName() + "') on EJB: "
+                 + container.getIdentifier() + " failed to inject on method "
+                 + method.toString();
+         container.getEncInjectors().put(encName, new PcEncInjector(encName, ref.unitName(), ref.type(), method.getParameterTypes()[0], error));
+      }
+      injectors.put(method, new JndiMethodInjector(method,
+              encName, container.getEnc()));
+   }
+
+   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      PersistenceContext ref = field.getAnnotation(PersistenceContext.class);
+      if (ref == null) return;
+
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         encName = InjectionUtil.getEncName(field);
+      }
+      else
+      {
+         encName = "env/" + ref.name();
+      }
+      if (!container.getEncInjectors().containsKey(encName))
+      {
+         try
+         {
+            if (!field.isAnnotationPresent(IgnoreDependency.class)) PersistenceUnitHandler.addPUDependency(ref.unitName(), container);
+         }
+         catch (NameNotFoundException e)
+         {
+            throw new RuntimeException("Illegal @PersistenceUnit on " + field + " :" + e.getMessage());
+         }
+         String error = "@PersistenceContext(name='" + encName
+                 + "',unitName='" + ref.unitName() + "') on EJB: "
+                 + container.getIdentifier() + " failed to inject on field "
+                 + field.toString();
+         container.getEncInjectors().put(encName, new PcEncInjector(encName, ref.unitName(), ref.type(), field.getType(), error));
+      }
+      injectors.put(field, new JndiFieldInjector(field,
+              encName, container.getEnc()));
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,253 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Map;
-import javax.naming.NameNotFoundException;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.PersistenceUnits;
-
-import org.hibernate.SessionFactory;
-import org.jboss.annotation.IgnoreDependency;
-import org.jboss.ejb3.entity.InjectedEntityManagerFactory;
-import org.jboss.ejb3.entity.InjectedSessionFactory;
-import org.jboss.ejb3.entity.ManagedEntityManagerFactory;
-import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.metamodel.descriptor.PersistenceUnitRef;
-
-/**
- * Searches bean class for all @Inject and create Injectors
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class PersistenceUnitHandler implements InjectionHandler
-{
-   private static final Logger log = Logger.getLogger(PersistenceUnitHandler.class);
-
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
-   {
-      if (xml == null) return;
-      if (xml.getPersistenceUnitRefs() == null) return;
-
-      for (PersistenceUnitRef ref : xml.getPersistenceUnitRefs())
-      {
-         String encName = "env/" + ref.getRefName();
-         // we add injection target no matter what.  enc injection might be overridden but
-         // XML injection cannot be overriden
-         Class injectionType = InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
-         if (container.getEncInjectors().containsKey(encName))
-            return;
-         container.getEncInjectors().put(encName, new PuEncInjector(encName, injectionType, ref.getUnitName(), "<persistence-unit-ref>"));
-         try
-         {
-            addPUDependency(ref.getUnitName(), container);
-         }
-         catch (NameNotFoundException e)
-         {
-            throw new RuntimeException("Illegal <persistence-unit-ref> of " + ref.getRefName() + " :" + e.getMessage());
-         }
-      }
-   }
-
-
-   public void handleClassAnnotations(Class clazz, InjectionContainer container)
-   {
-      PersistenceUnits resources = container.getAnnotation(
-              PersistenceUnits.class, clazz);
-      if (resources != null)
-      {
-         for (PersistenceUnit ref : resources.value())
-         {
-            handleClassAnnotation(ref, container, clazz);
-         }
-      }
-      PersistenceUnit pu = container.getAnnotation(PersistenceUnit.class, clazz);
-      if (pu != null)
-      {
-         handleClassAnnotation(pu, container, clazz);
-      }
-   }
-
-   private static void handleClassAnnotation(PersistenceUnit ref, InjectionContainer container, Class clazz)
-   {
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         throw new RuntimeException("JBoss requires name() for class level @PersistenceUnit");
-      }
-      encName = "env/" + encName;
-      if (container.getEncInjectors().containsKey(encName)) return;
-      container.getEncInjectors().put(encName, new PuEncInjector(encName, null, ref.unitName(), "@PersistenceUnit"));
-      try
-      {
-         addPUDependency(ref.unitName(), container);
-      }
-      catch (NameNotFoundException e)
-      {
-         throw new RuntimeException("Illegal @PersistenceUnit on " + clazz.getName() + " of unitname " + ref.unitName() + " :" + e.getMessage());
-      }
-   }
-
-   public static void addPUDependency(String unitName, InjectionContainer container) throws NameNotFoundException
-   {
-      PersistenceUnitDeployment deployment = null;
-      // look in EAR first
-      deployment = container.getPersistenceUnitDeployment(unitName);
-      if (deployment != null)
-      {
-         container.getDependencyPolicy().addDependency(deployment.getKernelName());
-         log.debug("***** adding PU dependency from located persistence unit: " + deployment.getKernelName());
-         return;
-      }
-      // probably not deployed yet.
-      // todo not sure if we should do this in JBoss 5
-      log.debug("******* could not find PU dependency so adding a default: " + PersistenceUnitDeployment.getDefaultKernelName(unitName));
-      container.getDependencyPolicy().addDependency(PersistenceUnitDeployment.getDefaultKernelName(unitName));
-   }
-
-   public static ManagedEntityManagerFactory getManagedEntityManagerFactory(InjectionContainer container, String unitName)
-           throws NameNotFoundException
-   {
-      ManagedEntityManagerFactory factory;
-      PersistenceUnitDeployment deployment = container.getPersistenceUnitDeployment(unitName);
-      if (deployment != null)
-      {
-         factory = deployment.getManagedFactory();
-      }
-      else
-      {
-         throw new NameNotFoundException("Unable to find persistence unit: " + unitName + " for deployment: " + container.getIdentifier());
-      }
-      return factory;
-   }
-
-
-   public static EntityManagerFactory getEntityManagerFactory(PersistenceUnit ref, InjectionContainer container) throws NameNotFoundException
-   {
-      return getEntityManagerFactory(ref.unitName(), container);
-   }
-
-   public static Object getFactory(Class type, String unitName, InjectionContainer container) throws NameNotFoundException
-   {
-      if (type != null && type.getName().equals(SessionFactory.class.getName()))
-         return getSessionFactory(unitName, container);
-      return getEntityManagerFactory(unitName, container);
-   }
-
-   public static EntityManagerFactory getEntityManagerFactory(String unitName, InjectionContainer container) throws NameNotFoundException
-   {
-      ManagedEntityManagerFactory managedFactory;
-      PersistenceUnitDeployment deployment = container.getPersistenceUnitDeployment(unitName);
-      if (deployment != null)
-      {
-         managedFactory = deployment.getManagedFactory();
-      }
-      else
-      {
-         return null;
-      }
-      return new InjectedEntityManagerFactory(managedFactory);
-   }
-
-
-   private static SessionFactory getSessionFactory(String ref, InjectionContainer container) throws NameNotFoundException
-   {
-      ManagedEntityManagerFactory managedFactory;
-      PersistenceUnitDeployment deployment = container.getPersistenceUnitDeployment(ref);
-      if (deployment != null)
-      {
-         managedFactory = deployment.getManagedFactory();
-      }
-      else
-      {
-         return null;
-      }
-      return new InjectedSessionFactory(managedFactory);
-   }
-
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      PersistenceUnit ref = method.getAnnotation(PersistenceUnit.class);
-      if (ref == null) return;
-      if (!method.getName().startsWith("set"))
-         throw new RuntimeException("@PersistenceUnit can only be used with a set method: " + method);
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         encName = InjectionUtil.getEncName(method);
-      }
-      else
-      {
-         encName = "env/" + encName;
-      }
-      if (!container.getEncInjectors().containsKey(encName))
-      {
-         container.getEncInjectors().put(encName, new PuEncInjector(encName, method.getParameterTypes()[0], ref.unitName(), "@PersistenceUnit"));
-         try
-         {
-            if (!method.isAnnotationPresent(IgnoreDependency.class)) addPUDependency(ref.unitName(), container);
-         }
-         catch (NameNotFoundException e)
-         {
-            throw new RuntimeException("Illegal @PersistenceUnit on " + method + " :" + e.getMessage());
-         }
-      }
-
-      injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
-   }
-
-   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      PersistenceUnit ref = field.getAnnotation(PersistenceUnit.class);
-      if (ref == null) return;
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         encName = InjectionUtil.getEncName(field);
-      }
-      else
-      {
-         encName = "env/" + encName;
-      }
-      if (!container.getEncInjectors().containsKey(encName))
-      {
-         container.getEncInjectors().put(encName, new PuEncInjector(encName, field.getType(), ref.unitName(), "@PersistenceUnit"));
-         try
-         {
-            if (!field.isAnnotationPresent(IgnoreDependency.class)) addPUDependency(ref.unitName(), container);
-         }
-         catch (NameNotFoundException e)
-         {
-            throw new RuntimeException("Illegal @PersistenceUnit on " + field + " :" + e.getMessage());
-         }
-      }
-
-      injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,253 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+import javax.naming.NameNotFoundException;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnit;
+import javax.persistence.PersistenceUnits;
+
+import org.hibernate.SessionFactory;
+import org.jboss.annotation.IgnoreDependency;
+import org.jboss.ejb3.entity.InjectedEntityManagerFactory;
+import org.jboss.ejb3.entity.InjectedSessionFactory;
+import org.jboss.ejb3.entity.ManagedEntityManagerFactory;
+import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+import org.jboss.metamodel.descriptor.PersistenceUnitRef;
+
+/**
+ * Searches bean class for all @Inject and create Injectors
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class PersistenceUnitHandler implements InjectionHandler
+{
+   private static final Logger log = Logger.getLogger(PersistenceUnitHandler.class);
+
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
+   {
+      if (xml == null) return;
+      if (xml.getPersistenceUnitRefs() == null) return;
+
+      for (PersistenceUnitRef ref : xml.getPersistenceUnitRefs())
+      {
+         String encName = "env/" + ref.getRefName();
+         // we add injection target no matter what.  enc injection might be overridden but
+         // XML injection cannot be overriden
+         Class injectionType = InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
+         if (container.getEncInjectors().containsKey(encName))
+            return;
+         container.getEncInjectors().put(encName, new PuEncInjector(encName, injectionType, ref.getUnitName(), "<persistence-unit-ref>"));
+         try
+         {
+            addPUDependency(ref.getUnitName(), container);
+         }
+         catch (NameNotFoundException e)
+         {
+            throw new RuntimeException("Illegal <persistence-unit-ref> of " + ref.getRefName() + " :" + e.getMessage());
+         }
+      }
+   }
+
+
+   public void handleClassAnnotations(Class clazz, InjectionContainer container)
+   {
+      PersistenceUnits resources = container.getAnnotation(
+              PersistenceUnits.class, clazz);
+      if (resources != null)
+      {
+         for (PersistenceUnit ref : resources.value())
+         {
+            handleClassAnnotation(ref, container, clazz);
+         }
+      }
+      PersistenceUnit pu = container.getAnnotation(PersistenceUnit.class, clazz);
+      if (pu != null)
+      {
+         handleClassAnnotation(pu, container, clazz);
+      }
+   }
+
+   private static void handleClassAnnotation(PersistenceUnit ref, InjectionContainer container, Class clazz)
+   {
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         throw new RuntimeException("JBoss requires name() for class level @PersistenceUnit");
+      }
+      encName = "env/" + encName;
+      if (container.getEncInjectors().containsKey(encName)) return;
+      container.getEncInjectors().put(encName, new PuEncInjector(encName, null, ref.unitName(), "@PersistenceUnit"));
+      try
+      {
+         addPUDependency(ref.unitName(), container);
+      }
+      catch (NameNotFoundException e)
+      {
+         throw new RuntimeException("Illegal @PersistenceUnit on " + clazz.getName() + " of unitname " + ref.unitName() + " :" + e.getMessage());
+      }
+   }
+
+   public static void addPUDependency(String unitName, InjectionContainer container) throws NameNotFoundException
+   {
+      PersistenceUnitDeployment deployment = null;
+      // look in EAR first
+      deployment = container.getPersistenceUnitDeployment(unitName);
+      if (deployment != null)
+      {
+         container.getDependencyPolicy().addDependency(deployment.getKernelName());
+         log.debug("***** adding PU dependency from located persistence unit: " + deployment.getKernelName());
+         return;
+      }
+      // probably not deployed yet.
+      // todo not sure if we should do this in JBoss 5
+      log.debug("******* could not find PU dependency so adding a default: " + PersistenceUnitDeployment.getDefaultKernelName(unitName));
+      container.getDependencyPolicy().addDependency(PersistenceUnitDeployment.getDefaultKernelName(unitName));
+   }
+
+   public static ManagedEntityManagerFactory getManagedEntityManagerFactory(InjectionContainer container, String unitName)
+           throws NameNotFoundException
+   {
+      ManagedEntityManagerFactory factory;
+      PersistenceUnitDeployment deployment = container.getPersistenceUnitDeployment(unitName);
+      if (deployment != null)
+      {
+         factory = deployment.getManagedFactory();
+      }
+      else
+      {
+         throw new NameNotFoundException("Unable to find persistence unit: " + unitName + " for deployment: " + container.getIdentifier());
+      }
+      return factory;
+   }
+
+
+   public static EntityManagerFactory getEntityManagerFactory(PersistenceUnit ref, InjectionContainer container) throws NameNotFoundException
+   {
+      return getEntityManagerFactory(ref.unitName(), container);
+   }
+
+   public static Object getFactory(Class type, String unitName, InjectionContainer container) throws NameNotFoundException
+   {
+      if (type != null && type.getName().equals(SessionFactory.class.getName()))
+         return getSessionFactory(unitName, container);
+      return getEntityManagerFactory(unitName, container);
+   }
+
+   public static EntityManagerFactory getEntityManagerFactory(String unitName, InjectionContainer container) throws NameNotFoundException
+   {
+      ManagedEntityManagerFactory managedFactory;
+      PersistenceUnitDeployment deployment = container.getPersistenceUnitDeployment(unitName);
+      if (deployment != null)
+      {
+         managedFactory = deployment.getManagedFactory();
+      }
+      else
+      {
+         return null;
+      }
+      return new InjectedEntityManagerFactory(managedFactory);
+   }
+
+
+   private static SessionFactory getSessionFactory(String ref, InjectionContainer container) throws NameNotFoundException
+   {
+      ManagedEntityManagerFactory managedFactory;
+      PersistenceUnitDeployment deployment = container.getPersistenceUnitDeployment(ref);
+      if (deployment != null)
+      {
+         managedFactory = deployment.getManagedFactory();
+      }
+      else
+      {
+         return null;
+      }
+      return new InjectedSessionFactory(managedFactory);
+   }
+
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      PersistenceUnit ref = method.getAnnotation(PersistenceUnit.class);
+      if (ref == null) return;
+      if (!method.getName().startsWith("set"))
+         throw new RuntimeException("@PersistenceUnit can only be used with a set method: " + method);
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         encName = InjectionUtil.getEncName(method);
+      }
+      else
+      {
+         encName = "env/" + encName;
+      }
+      if (!container.getEncInjectors().containsKey(encName))
+      {
+         container.getEncInjectors().put(encName, new PuEncInjector(encName, method.getParameterTypes()[0], ref.unitName(), "@PersistenceUnit"));
+         try
+         {
+            if (!method.isAnnotationPresent(IgnoreDependency.class)) addPUDependency(ref.unitName(), container);
+         }
+         catch (NameNotFoundException e)
+         {
+            throw new RuntimeException("Illegal @PersistenceUnit on " + method + " :" + e.getMessage());
+         }
+      }
+
+      injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
+   }
+
+   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      PersistenceUnit ref = field.getAnnotation(PersistenceUnit.class);
+      if (ref == null) return;
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         encName = InjectionUtil.getEncName(field);
+      }
+      else
+      {
+         encName = "env/" + encName;
+      }
+      if (!container.getEncInjectors().containsKey(encName))
+      {
+         container.getEncInjectors().put(encName, new PuEncInjector(encName, field.getType(), ref.unitName(), "@PersistenceUnit"));
+         try
+         {
+            if (!field.isAnnotationPresent(IgnoreDependency.class)) addPUDependency(ref.unitName(), container);
+         }
+         catch (NameNotFoundException e)
+         {
+            throw new RuntimeException("Illegal @PersistenceUnit on " + field + " :" + e.getMessage());
+         }
+      }
+
+      injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PojoInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.injection;
-
-import org.jboss.ejb3.BeanContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface PojoInjector
-{
-   void inject(BeanContext ctx, Object instance);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PojoInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.injection;
+
+import org.jboss.ejb3.BeanContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface PojoInjector
+{
+   void inject(BeanContext ctx, Object instance);
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PojoInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PuEncInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import org.jboss.naming.Util;
-
-import javax.naming.NameNotFoundException;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class PuEncInjector implements EncInjector
-{
-   private String encName;
-   private Class injectionType;
-   private String unitName;
-   private String error;
-
-   public PuEncInjector(String encName, Class injectionType, String unitName, String error)
-   {
-      this.encName = encName;
-      this.injectionType = injectionType;
-      this.error = error;
-      this.unitName = unitName;
-   }
-
-   public void inject(InjectionContainer container)
-   {
-      Object factory = null;
-      try
-      {
-         factory = PersistenceUnitHandler.getFactory(injectionType, unitName, container);
-      }
-      catch (NameNotFoundException e)
-      {
-         throw new RuntimeException(e);
-      }
-      if (factory == null)
-      {
-         throw new RuntimeException("Failed to locate " + error + " of unit name: " + unitName + " for " + container.getIdentifier());
-      }
-
-      try
-      {
-         Util.rebind(container.getEnc(), encName, factory);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException("Failed to bind " + error + " of unit name: " + unitName + " ref-name" + encName + " for container " + container.getIdentifier(), e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/PuEncInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.naming.Util;
+
+import javax.naming.NameNotFoundException;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class PuEncInjector implements EncInjector
+{
+   private String encName;
+   private Class injectionType;
+   private String unitName;
+   private String error;
+
+   public PuEncInjector(String encName, Class injectionType, String unitName, String error)
+   {
+      this.encName = encName;
+      this.injectionType = injectionType;
+      this.error = error;
+      this.unitName = unitName;
+   }
+
+   public void inject(InjectionContainer container)
+   {
+      Object factory = null;
+      try
+      {
+         factory = PersistenceUnitHandler.getFactory(injectionType, unitName, container);
+      }
+      catch (NameNotFoundException e)
+      {
+         throw new RuntimeException(e);
+      }
+      if (factory == null)
+      {
+         throw new RuntimeException("Failed to locate " + error + " of unit name: " + unitName + " for " + container.getIdentifier());
+      }
+
+      try
+      {
+         Util.rebind(container.getEnc(), encName, factory);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException("Failed to bind " + error + " of unit name: " + unitName + " ref-name" + encName + " for container " + container.getIdentifier(), e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PuEncInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,512 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import org.jboss.ejb3.Container;
-import org.jboss.injection.lang.reflect.BeanProperty;
-import org.jboss.injection.lang.reflect.BeanPropertyFactory;
-import org.jboss.injection.lang.reflect.FieldBeanProperty;
-import org.jboss.injection.lang.reflect.MethodBeanProperty;
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvEntry;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.reflect.plugins.ValueConvertor;
-
-import javax.annotation.Resource;
-import javax.annotation.Resources;
-import javax.ejb.EJBContext;
-import javax.ejb.EJBException;
-import javax.ejb.TimerService;
-import javax.transaction.UserTransaction;
-import javax.xml.ws.WebServiceContext;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Map;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-/**
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ResourceHandler implements InjectionHandler
-{
-   private static final Logger log = Logger.getLogger(ResourceHandler.class);
-
-   private static void loadEnvEntry(InjectionContainer container, Collection<EnvEntry> envEntries)
-   {
-      for (EnvEntry envEntry : envEntries)
-      {
-         String encName = "env/" + envEntry.getEnvEntryName();
-         InjectionUtil.injectionTarget(encName, envEntry, container, container.getEncInjections());
-         if (container.getEncInjectors().containsKey(encName)) continue;
-         log.trace("adding env-entry injector " + encName);
-         container.getEncInjectors().put(encName, new EnvEntryEncInjector(encName, envEntry.getEnvEntryType(), envEntry.getEnvEntryValue()));
-      }
-   }
-
-   private static void loadXmlResourceRefs(InjectionContainer container, Collection<ResourceRef> refs)
-   {
-      for (ResourceRef envRef : refs)
-      {
-         String encName = "env/" + envRef.getResRefName();
-         if (container.getEncInjectors().containsKey(encName)) continue;
-         if (envRef.getMappedName() == null || envRef.getMappedName().equals(""))
-         {
-            if (envRef.getResUrl() != null)
-            {
-               try
-               {
-                  container.getEncInjectors().put(encName, new ValueEncInjector(encName, new URL(envRef.getResUrl().trim()), "<resource-ref>"));
-               }
-               catch (MalformedURLException e)
-               {
-                  throw new RuntimeException(e);
-               }
-            }
-            else
-            {
-               throw new RuntimeException("mapped-name is required for " + envRef.getResRefName() + " of deployment " + container.getIdentifier());
-            }
-         }
-         else
-         {
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, envRef.getMappedName(), "<resource-ref>"));
-         }
-         InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
-      }
-   }
-
-   private static void loadXmlResourceEnvRefs(InjectionContainer container, Collection<ResourceEnvRef> refs)
-   {
-      for (ResourceEnvRef envRef : refs)
-      {
-         // EJBTHREE-712
-         // TODO: refactor with handlePropertyAnnotation
-         String resTypeName = envRef.getResType();
-         try
-         {
-            if(resTypeName != null)
-            {
-               Class<?> resType = Class.forName(resTypeName);
-               if(EJBContext.class.isAssignableFrom(resType))
-               {
-                  AccessibleObject ao = InjectionUtil.findInjectionTarget(container.getClassloader(), envRef.getInjectionTarget());
-                  container.getInjectors().add(new EJBContextPropertyInjector(BeanPropertyFactory.create(ao)));
-                  continue;
-               }
-            }
-         }
-         catch(ClassNotFoundException e)
-         {
-            throw new EJBException(e);
-         }
-         
-         String encName = "env/" + envRef.getResRefName();
-         if (container.getEncInjectors().containsKey(encName)) continue;
-         if (envRef.getMappedName() == null || envRef.getMappedName().equals(""))
-         {
-            throw new RuntimeException("mapped-name is required for " + envRef.getResRefName() + " of deployment " + container.getIdentifier());
-         }
-         container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, envRef.getMappedName(), "<resource-ref>"));
-         InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
-      }
-   }
-
-   private static void loadXmlMessageDestinationRefs(InjectionContainer container, Collection<MessageDestinationRef> refs)
-   {
-      for (MessageDestinationRef envRef : refs)
-      {
-         String encName = "env/" + envRef.getMessageDestinationRefName();
-         if (container.getEncInjectors().containsKey(encName)) continue;
-         if (envRef.getMappedName() == null || envRef.getMappedName().equals(""))
-         {
-            // Look for a message-destination-link
-            String link = envRef.getMessageDestinationLink();
-            if( link != null )
-            {
-               // TODO: Resolve the link...
-            }
-            throw new RuntimeException("mapped-name is required for " + envRef.getMessageDestinationRefName() + " of deployment " + container.getIdentifier());
-         }
-         container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, envRef.getMappedName(), "<message-destination-ref>"));
-         InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
-      }
-   }
-
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
-   {
-      if (xml == null) return;
-      if (xml.getMessageDestinationRefs() != null) loadXmlMessageDestinationRefs(container, xml.getMessageDestinationRefs());
-      if (xml.getResourceEnvRefs() != null) loadXmlResourceEnvRefs(container, xml.getResourceEnvRefs());
-      if (xml.getResourceRefs() != null) loadXmlResourceRefs(container, xml.getResourceRefs());
-      if (xml.getEnvEntries() != null) loadEnvEntry(container, xml.getEnvEntries());
-   }
-
-   public void handleClassAnnotations(Class clazz, InjectionContainer container)
-   {
-      Resources resources = container.getAnnotation(Resources.class, clazz);
-      if (resources != null)
-      {
-      for (Resource ref : resources.value())
-      {
-         handleClassAnnotation(ref, container, clazz);
-      }
-      }
-      Resource res = container.getAnnotation(Resource.class, clazz);
-      if (res != null) handleClassAnnotation(res, container, clazz);
-   }
-
-   private void handleClassAnnotation(Resource ref, InjectionContainer container, Class clazz)
-   {
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         throw new RuntimeException("JBoss requires name() for class level @Resource");
-      }
-      encName = "env/" + ref.name();
-      if (container.getEncInjectors().containsKey(encName)) return;
-
-      String mappedName = ref.mappedName();
-      if (mappedName == null || mappedName.equals(""))
-      {
-         throw new RuntimeException("You did not specify a @Resource.mappedName() for name: "
-               +ref.name()+", class: " + clazz.getName() + " and there is no binding for that enc name in XML");
-      }
-
-      if (ref.type() == URL.class)
-      {
-         // Create a URL from the mappedName
-         try
-         {
-            URL url = new URL(ref.mappedName().trim());
-            container.getEncInjectors().put(encName, new ValueEncInjector(encName, url, "@Resource"));
-         }
-         catch (MalformedURLException e)
-         {
-            throw new RuntimeException(e);
-         }
-      }
-      else
-      {
-         container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
-      }
-   }
-
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      Resource ref = method.getAnnotation(Resource.class);
-      if (ref == null) return;
-
-      log.trace("method " + method + " has @Resource");
-      
-      handlePropertyAnnotation(ref, new MethodBeanProperty(method), container, injectors);
-      /*
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         encName = InjectionUtil.getEncName(method);
-      }
-      else
-      {
-         encName = "env/" + encName;
-      }
-
-      method.setAccessible(true);
-
-      if (!method.getName().startsWith("set"))
-         throw new RuntimeException("@Resource can only be used with a set method: " + method);
-      if (method.getParameterTypes().length != 1)
-         throw new RuntimeException("@Resource can only be used with a set method of one parameter: " + method);
-
-      Class type = method.getParameterTypes()[0];
-      if (!ref.type().equals(Object.class))
-      {
-         type = ref.type();
-      }
-      if (type.equals(UserTransaction.class))
-      {
-         injectors.put(method, new UserTransactionMethodInjector(method, container));
-      }
-      else if (type.equals(TimerService.class))
-      {
-         injectors.put(method, new TimerServiceMethodInjector(method, (Container) container)); // only EJBs
-      }
-      else if (EJBContext.class.isAssignableFrom(type))
-      {
-         injectors.put(method, new EJBContextMethodInjector(method));
-      }
-      else if (type.equals(WebServiceContext.class))
-      {
-         // FIXME: For now we skip it, and rely on the WS stack to perform the injection
-      }
-      else if (type.equals(String.class)
-              || type.equals(Character.class)
-              || type.equals(Byte.class)
-              || type.equals(Short.class)
-              || type.equals(Integer.class)
-              || type.equals(Long.class)
-              || type.equals(Boolean.class)
-              || type.equals(Double.class)
-              || type.equals(Float.class)
-              || type.isPrimitive()
-              )
-      {
-
-         // don't add an injector if no XML <env-entry is present as there will be no value to inject
-         if (container.getEncInjectors().containsKey(encName))
-         {
-            injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
-         }
-         else if (ref.mappedName() != null && ref.mappedName().length() > 0)
-         {
-            // Use the mappedName as the string value
-            String s = ref.mappedName().trim();
-            try
-            {
-               Object value = ValueConvertor.convertValue(type, s);
-               container.getEncInjectors().put(encName, new ValueEncInjector(encName, value, "@Resource"));
-               injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
-            }
-            catch(Throwable t)
-            {
-               throw new RuntimeException("Failed to convert: "+ref.mappedName()+" to type:"+type, t);
-            }
-         }
-      }
-      else
-      {
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            String mappedName = ref.mappedName();
-            if (mappedName == null || mappedName.equals(""))
-            {
-              throw new RuntimeException("You did not specify a @Resource.mappedName() on " + method + " and there is no binding for that enc name in XML");
-            }
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
-         }
-         injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
-      }
-      */
-   }
-   
-   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      Resource ref = field.getAnnotation(Resource.class);
-      if (ref == null) return;
-
-      log.trace("field " + field + " has @Resource");
-      
-      handlePropertyAnnotation(ref, new FieldBeanProperty(field), container, injectors);
-      /*
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         encName = InjectionUtil.getEncName(field);
-      }
-      else
-      {
-         encName = "env/" + encName;
-      }
-
-      field.setAccessible(true);
-
-      Class type = field.getType();
-      if (!ref.type().equals(Object.class))
-      {
-         type = ref.type();
-      }
-      if (type.equals(UserTransaction.class))
-      {
-         injectors.put(field, new UserTransactionFieldInjector(field, container));
-      }
-      else if (type.equals(TimerService.class))
-      {
-         injectors.put(field, new TimerServiceFieldInjector(field, (Container) container)); // only EJBs
-      }
-      else if (EJBContext.class.isAssignableFrom(type))
-      {
-         injectors.put(field, new EJBContextFieldInjector(field));
-      }
-      else if (type.equals(WebServiceContext.class))
-      {
-         // FIXME: For now we skip it, and rely on the WS stack to perform the injection
-      }
-      else if (type.equals(String.class)
-              || type.equals(Character.class)
-              || type.equals(Byte.class)
-              || type.equals(Short.class)
-              || type.equals(Integer.class)
-              || type.equals(Long.class)
-              || type.equals(Boolean.class)
-              || type.equals(Double.class)
-              || type.equals(Float.class)
-              || type.isPrimitive()
-              )
-      {
-         // don't add an injector if no XML <env-entry is present as there will be no value to inject
-         if (container.getEncInjectors().containsKey(encName))
-         {
-            injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
-         }
-         else if (ref.mappedName() != null && ref.mappedName().length() > 0)
-         {
-            // Use the mappedName as the string value
-            String s = ref.mappedName().trim();
-            try
-            {
-               Object value = ValueConvertor.convertValue(type, s);
-               container.getEncInjectors().put(encName, new ValueEncInjector(encName, value, "@Resource"));
-               injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
-            }
-            catch(Throwable t)
-            {
-               throw new RuntimeException("Failed to convert: "+ref.mappedName()+" to type:"+type, t);
-            }
-         }
-         else
-         {
-            log.warn("Not injecting " + field.getName() + ", no matching enc injector " + encName + " found");
-         }
-      }
-      else
-      {
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            String mappedName = ref.mappedName();
-            if (mappedName == null || mappedName.equals(""))
-            {
-              throw new RuntimeException("You did not specify a @Resource.mappedName() on " + field + " and there is no binding for enc name " + encName + " in XML");
-            }
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
-         }
-         injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
-      }
-      */
-   }
-
-   private void handlePropertyAnnotation(Resource ref, BeanProperty property, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      assert ref != null;
-      assert property != null;
-      assert container != null;
-      assert injectors != null;
-      
-      String encName = ref.name();
-      if (encName == null || encName.equals(""))
-      {
-         //encName = InjectionUtil.getEncName(field);
-         encName = property.getDeclaringClass().getName() + "/" + property.getName();
-      }
-      if (!encName.startsWith("env/"))
-      {
-         encName = "env/" + encName;
-      }
-
-      AccessibleObject accObj = property.getAccessibleObject();
-      
-      Class<?> type = property.getType();
-      if (!ref.type().equals(Object.class))
-      {
-         type = ref.type();
-      }
-      if (type.equals(UserTransaction.class))
-      {
-         injectors.put(accObj, new UserTransactionPropertyInjector(property, container));
-      }
-      else if (type.equals(TimerService.class))
-      {
-         injectors.put(accObj, new TimerServicePropertyInjector(property, (Container) container)); // only EJBs
-      }
-      else if (EJBContext.class.isAssignableFrom(type))
-      {
-         injectors.put(accObj, new EJBContextPropertyInjector(property));
-      }
-      else if (type.equals(WebServiceContext.class))
-      {
-         injectors.put(accObj, new WebServiceContextPropertyInjector(property));
-      }
-      else if (type.equals(String.class)
-              || type.equals(Character.class)
-              || type.equals(Byte.class)
-              || type.equals(Short.class)
-              || type.equals(Integer.class)
-              || type.equals(Long.class)
-              || type.equals(Boolean.class)
-              || type.equals(Double.class)
-              || type.equals(Float.class)
-              || type.isPrimitive()
-              )
-      {
-         // don't add an injector if no XML <env-entry is present as there will be no value to inject
-         if (container.getEncInjectors().containsKey(encName))
-         {
-            injectors.put(accObj, new JndiPropertyInjector(property, encName, container.getEnc()));
-         }
-         else if (ref.mappedName() != null && ref.mappedName().length() > 0)
-         {
-            // Use the mappedName as the string value
-            String s = ref.mappedName().trim();
-            try
-            {
-               Object value = ValueConvertor.convertValue(type, s);
-               container.getEncInjectors().put(encName, new ValueEncInjector(encName, value, "@Resource"));
-               injectors.put(accObj, new JndiPropertyInjector(property, encName, container.getEnc()));
-            }
-            catch(Throwable t)
-            {
-               throw new RuntimeException("Failed to convert: "+ref.mappedName()+" to type:"+type, t);
-            }
-         }
-         else
-         {
-            log.warn("Not injecting " + property.getName() + ", no matching enc injector " + encName + " found");
-         }
-      }
-      else
-      {
-         if (!container.getEncInjectors().containsKey(encName))
-         {
-            String mappedName = ref.mappedName();
-            if (mappedName == null || mappedName.equals(""))
-            {
-               // TODO: is this a nice trick?
-//               if(ConnectionFactory.class.isAssignableFrom(type))
-//               {
-//                  // neat little trick
-//                  mappedName = "java:/ConnectionFactory";
-//               }
-//               else
-                  throw new RuntimeException("You did not specify a @Resource.mappedName() on " + accObj + " and there is no binding for enc name " + encName + " in XML");
-            }
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
-         }
-         injectors.put(accObj, new JndiPropertyInjector(property, encName, container.getEnc()));
-      }      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/ResourceHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,513 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.ejb3.Container;
+import org.jboss.injection.lang.reflect.BeanProperty;
+import org.jboss.injection.lang.reflect.BeanPropertyFactory;
+import org.jboss.injection.lang.reflect.FieldBeanProperty;
+import org.jboss.injection.lang.reflect.MethodBeanProperty;
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvEntry;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
+//import org.jboss.reflect.plugins.ValueConvertor;
+
+import javax.annotation.Resource;
+import javax.annotation.Resources;
+import javax.ejb.EJBContext;
+import javax.ejb.EJBException;
+import javax.ejb.TimerService;
+import javax.transaction.UserTransaction;
+import javax.xml.ws.WebServiceContext;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+import java.net.URL;
+import java.net.MalformedURLException;
+
+/**
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ResourceHandler implements InjectionHandler
+{
+   private static final Logger log = Logger.getLogger(ResourceHandler.class);
+
+   private static void loadEnvEntry(InjectionContainer container, Collection<EnvEntry> envEntries)
+   {
+      for (EnvEntry envEntry : envEntries)
+      {
+         String encName = "env/" + envEntry.getEnvEntryName();
+         InjectionUtil.injectionTarget(encName, envEntry, container, container.getEncInjections());
+         if (container.getEncInjectors().containsKey(encName)) continue;
+         log.trace("adding env-entry injector " + encName);
+         container.getEncInjectors().put(encName, new EnvEntryEncInjector(encName, envEntry.getEnvEntryType(), envEntry.getEnvEntryValue()));
+      }
+   }
+
+   private static void loadXmlResourceRefs(InjectionContainer container, Collection<ResourceRef> refs)
+   {
+      for (ResourceRef envRef : refs)
+      {
+         String encName = "env/" + envRef.getResRefName();
+         if (container.getEncInjectors().containsKey(encName)) continue;
+         if (envRef.getMappedName() == null || envRef.getMappedName().equals(""))
+         {
+            if (envRef.getResUrl() != null)
+            {
+               try
+               {
+                  container.getEncInjectors().put(encName, new ValueEncInjector(encName, new URL(envRef.getResUrl().trim()), "<resource-ref>"));
+               }
+               catch (MalformedURLException e)
+               {
+                  throw new RuntimeException(e);
+               }
+            }
+            else
+            {
+               throw new RuntimeException("mapped-name is required for " + envRef.getResRefName() + " of deployment " + container.getIdentifier());
+            }
+         }
+         else
+         {
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, envRef.getMappedName(), "<resource-ref>"));
+         }
+         InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
+      }
+   }
+
+   private static void loadXmlResourceEnvRefs(InjectionContainer container, Collection<ResourceEnvRef> refs)
+   {
+      for (ResourceEnvRef envRef : refs)
+      {
+         // EJBTHREE-712
+         // TODO: refactor with handlePropertyAnnotation
+         String resTypeName = envRef.getResType();
+         try
+         {
+            if(resTypeName != null)
+            {
+               Class<?> resType = Class.forName(resTypeName);
+               if(EJBContext.class.isAssignableFrom(resType))
+               {
+                  AccessibleObject ao = InjectionUtil.findInjectionTarget(container.getClassloader(), envRef.getInjectionTarget());
+                  container.getInjectors().add(new EJBContextPropertyInjector(BeanPropertyFactory.create(ao)));
+                  continue;
+               }
+            }
+         }
+         catch(ClassNotFoundException e)
+         {
+            throw new EJBException(e);
+         }
+         
+         String encName = "env/" + envRef.getResRefName();
+         if (container.getEncInjectors().containsKey(encName)) continue;
+         if (envRef.getMappedName() == null || envRef.getMappedName().equals(""))
+         {
+            throw new RuntimeException("mapped-name is required for " + envRef.getResRefName() + " of deployment " + container.getIdentifier());
+         }
+         container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, envRef.getMappedName(), "<resource-ref>"));
+         InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
+      }
+   }
+
+   private static void loadXmlMessageDestinationRefs(InjectionContainer container, Collection<MessageDestinationRef> refs)
+   {
+      for (MessageDestinationRef envRef : refs)
+      {
+         String encName = "env/" + envRef.getMessageDestinationRefName();
+         if (container.getEncInjectors().containsKey(encName)) continue;
+         if (envRef.getMappedName() == null || envRef.getMappedName().equals(""))
+         {
+            // Look for a message-destination-link
+            String link = envRef.getMessageDestinationLink();
+            if( link != null )
+            {
+               // TODO: Resolve the link...
+            }
+            throw new RuntimeException("mapped-name is required for " + envRef.getMessageDestinationRefName() + " of deployment " + container.getIdentifier());
+         }
+         container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, envRef.getMappedName(), "<message-destination-ref>"));
+         InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
+      }
+   }
+
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
+   {
+      if (xml == null) return;
+      if (xml.getMessageDestinationRefs() != null) loadXmlMessageDestinationRefs(container, xml.getMessageDestinationRefs());
+      if (xml.getResourceEnvRefs() != null) loadXmlResourceEnvRefs(container, xml.getResourceEnvRefs());
+      if (xml.getResourceRefs() != null) loadXmlResourceRefs(container, xml.getResourceRefs());
+      if (xml.getEnvEntries() != null) loadEnvEntry(container, xml.getEnvEntries());
+   }
+
+   public void handleClassAnnotations(Class clazz, InjectionContainer container)
+   {
+      Resources resources = container.getAnnotation(Resources.class, clazz);
+      if (resources != null)
+      {
+      for (Resource ref : resources.value())
+      {
+         handleClassAnnotation(ref, container, clazz);
+      }
+      }
+      Resource res = container.getAnnotation(Resource.class, clazz);
+      if (res != null) handleClassAnnotation(res, container, clazz);
+   }
+
+   private void handleClassAnnotation(Resource ref, InjectionContainer container, Class clazz)
+   {
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         throw new RuntimeException("JBoss requires name() for class level @Resource");
+      }
+      encName = "env/" + ref.name();
+      if (container.getEncInjectors().containsKey(encName)) return;
+
+      String mappedName = ref.mappedName();
+      if (mappedName == null || mappedName.equals(""))
+      {
+         throw new RuntimeException("You did not specify a @Resource.mappedName() for name: "
+               +ref.name()+", class: " + clazz.getName() + " and there is no binding for that enc name in XML");
+      }
+
+      if (ref.type() == URL.class)
+      {
+         // Create a URL from the mappedName
+         try
+         {
+            URL url = new URL(ref.mappedName().trim());
+            container.getEncInjectors().put(encName, new ValueEncInjector(encName, url, "@Resource"));
+         }
+         catch (MalformedURLException e)
+         {
+            throw new RuntimeException(e);
+         }
+      }
+      else
+      {
+         container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
+      }
+   }
+
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      Resource ref = method.getAnnotation(Resource.class);
+      if (ref == null) return;
+
+      log.trace("method " + method + " has @Resource");
+      
+      handlePropertyAnnotation(ref, new MethodBeanProperty(method), container, injectors);
+      /*
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         encName = InjectionUtil.getEncName(method);
+      }
+      else
+      {
+         encName = "env/" + encName;
+      }
+
+      method.setAccessible(true);
+
+      if (!method.getName().startsWith("set"))
+         throw new RuntimeException("@Resource can only be used with a set method: " + method);
+      if (method.getParameterTypes().length != 1)
+         throw new RuntimeException("@Resource can only be used with a set method of one parameter: " + method);
+
+      Class type = method.getParameterTypes()[0];
+      if (!ref.type().equals(Object.class))
+      {
+         type = ref.type();
+      }
+      if (type.equals(UserTransaction.class))
+      {
+         injectors.put(method, new UserTransactionMethodInjector(method, container));
+      }
+      else if (type.equals(TimerService.class))
+      {
+         injectors.put(method, new TimerServiceMethodInjector(method, (Container) container)); // only EJBs
+      }
+      else if (EJBContext.class.isAssignableFrom(type))
+      {
+         injectors.put(method, new EJBContextMethodInjector(method));
+      }
+      else if (type.equals(WebServiceContext.class))
+      {
+         // FIXME: For now we skip it, and rely on the WS stack to perform the injection
+      }
+      else if (type.equals(String.class)
+              || type.equals(Character.class)
+              || type.equals(Byte.class)
+              || type.equals(Short.class)
+              || type.equals(Integer.class)
+              || type.equals(Long.class)
+              || type.equals(Boolean.class)
+              || type.equals(Double.class)
+              || type.equals(Float.class)
+              || type.isPrimitive()
+              )
+      {
+
+         // don't add an injector if no XML <env-entry is present as there will be no value to inject
+         if (container.getEncInjectors().containsKey(encName))
+         {
+            injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
+         }
+         else if (ref.mappedName() != null && ref.mappedName().length() > 0)
+         {
+            // Use the mappedName as the string value
+            String s = ref.mappedName().trim();
+            try
+            {
+               Object value = ValueConvertor.convertValue(type, s);
+               container.getEncInjectors().put(encName, new ValueEncInjector(encName, value, "@Resource"));
+               injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
+            }
+            catch(Throwable t)
+            {
+               throw new RuntimeException("Failed to convert: "+ref.mappedName()+" to type:"+type, t);
+            }
+         }
+      }
+      else
+      {
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            String mappedName = ref.mappedName();
+            if (mappedName == null || mappedName.equals(""))
+            {
+              throw new RuntimeException("You did not specify a @Resource.mappedName() on " + method + " and there is no binding for that enc name in XML");
+            }
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
+         }
+         injectors.put(method, new JndiMethodInjector(method, encName, container.getEnc()));
+      }
+      */
+   }
+   
+   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      Resource ref = field.getAnnotation(Resource.class);
+      if (ref == null) return;
+
+      log.trace("field " + field + " has @Resource");
+      
+      handlePropertyAnnotation(ref, new FieldBeanProperty(field), container, injectors);
+      /*
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         encName = InjectionUtil.getEncName(field);
+      }
+      else
+      {
+         encName = "env/" + encName;
+      }
+
+      field.setAccessible(true);
+
+      Class type = field.getType();
+      if (!ref.type().equals(Object.class))
+      {
+         type = ref.type();
+      }
+      if (type.equals(UserTransaction.class))
+      {
+         injectors.put(field, new UserTransactionFieldInjector(field, container));
+      }
+      else if (type.equals(TimerService.class))
+      {
+         injectors.put(field, new TimerServiceFieldInjector(field, (Container) container)); // only EJBs
+      }
+      else if (EJBContext.class.isAssignableFrom(type))
+      {
+         injectors.put(field, new EJBContextFieldInjector(field));
+      }
+      else if (type.equals(WebServiceContext.class))
+      {
+         // FIXME: For now we skip it, and rely on the WS stack to perform the injection
+      }
+      else if (type.equals(String.class)
+              || type.equals(Character.class)
+              || type.equals(Byte.class)
+              || type.equals(Short.class)
+              || type.equals(Integer.class)
+              || type.equals(Long.class)
+              || type.equals(Boolean.class)
+              || type.equals(Double.class)
+              || type.equals(Float.class)
+              || type.isPrimitive()
+              )
+      {
+         // don't add an injector if no XML <env-entry is present as there will be no value to inject
+         if (container.getEncInjectors().containsKey(encName))
+         {
+            injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
+         }
+         else if (ref.mappedName() != null && ref.mappedName().length() > 0)
+         {
+            // Use the mappedName as the string value
+            String s = ref.mappedName().trim();
+            try
+            {
+               Object value = ValueConvertor.convertValue(type, s);
+               container.getEncInjectors().put(encName, new ValueEncInjector(encName, value, "@Resource"));
+               injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
+            }
+            catch(Throwable t)
+            {
+               throw new RuntimeException("Failed to convert: "+ref.mappedName()+" to type:"+type, t);
+            }
+         }
+         else
+         {
+            log.warn("Not injecting " + field.getName() + ", no matching enc injector " + encName + " found");
+         }
+      }
+      else
+      {
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            String mappedName = ref.mappedName();
+            if (mappedName == null || mappedName.equals(""))
+            {
+              throw new RuntimeException("You did not specify a @Resource.mappedName() on " + field + " and there is no binding for enc name " + encName + " in XML");
+            }
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
+         }
+         injectors.put(field, new JndiFieldInjector(field, encName, container.getEnc()));
+      }
+      */
+   }
+
+   private void handlePropertyAnnotation(Resource ref, BeanProperty property, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      assert ref != null;
+      assert property != null;
+      assert container != null;
+      assert injectors != null;
+      
+      String encName = ref.name();
+      if (encName == null || encName.equals(""))
+      {
+         //encName = InjectionUtil.getEncName(field);
+         encName = property.getDeclaringClass().getName() + "/" + property.getName();
+      }
+      if (!encName.startsWith("env/"))
+      {
+         encName = "env/" + encName;
+      }
+
+      AccessibleObject accObj = property.getAccessibleObject();
+      
+      Class<?> type = property.getType();
+      if (!ref.type().equals(Object.class))
+      {
+         type = ref.type();
+      }
+      if (type.equals(UserTransaction.class))
+      {
+         injectors.put(accObj, new UserTransactionPropertyInjector(property, container));
+      }
+      else if (type.equals(TimerService.class))
+      {
+         injectors.put(accObj, new TimerServicePropertyInjector(property, (Container) container)); // only EJBs
+      }
+      else if (EJBContext.class.isAssignableFrom(type))
+      {
+         injectors.put(accObj, new EJBContextPropertyInjector(property));
+      }
+      else if (type.equals(WebServiceContext.class))
+      {
+         injectors.put(accObj, new WebServiceContextPropertyInjector(property));
+      }
+      else if (type.equals(String.class)
+              || type.equals(Character.class)
+              || type.equals(Byte.class)
+              || type.equals(Short.class)
+              || type.equals(Integer.class)
+              || type.equals(Long.class)
+              || type.equals(Boolean.class)
+              || type.equals(Double.class)
+              || type.equals(Float.class)
+              || type.isPrimitive()
+              )
+      {
+         // don't add an injector if no XML <env-entry is present as there will be no value to inject
+         if (container.getEncInjectors().containsKey(encName))
+         {
+            injectors.put(accObj, new JndiPropertyInjector(property, encName, container.getEnc()));
+         }
+         else if (ref.mappedName() != null && ref.mappedName().length() > 0)
+         {
+            // Use the mappedName as the string value
+            String s = ref.mappedName().trim();
+            try
+            {
+               throw new RuntimeException("NYI");
+//               Object value = ValueConvertor.convertValue(type, s);
+//               container.getEncInjectors().put(encName, new ValueEncInjector(encName, value, "@Resource"));
+//               injectors.put(accObj, new JndiPropertyInjector(property, encName, container.getEnc()));
+            }
+            catch(Throwable t)
+            {
+               throw new RuntimeException("Failed to convert: "+ref.mappedName()+" to type:"+type, t);
+            }
+         }
+         else
+         {
+            log.warn("Not injecting " + property.getName() + ", no matching enc injector " + encName + " found");
+         }
+      }
+      else
+      {
+         if (!container.getEncInjectors().containsKey(encName))
+         {
+            String mappedName = ref.mappedName();
+            if (mappedName == null || mappedName.equals(""))
+            {
+               // TODO: is this a nice trick?
+//               if(ConnectionFactory.class.isAssignableFrom(type))
+//               {
+//                  // neat little trick
+//                  mappedName = "java:/ConnectionFactory";
+//               }
+//               else
+                  throw new RuntimeException("You did not specify a @Resource.mappedName() on " + accObj + " and there is no binding for enc name " + encName + " in XML");
+            }
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
+         }
+         injectors.put(accObj, new JndiPropertyInjector(property, encName, container.getEnc()));
+      }      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ResourceHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use TimerServicePropertyInjector
- */
-public class TimerServiceFieldInjector implements Injector
-{
-   private Field field;
-   private Container container;
-
-   public TimerServiceFieldInjector(Field field, Container container)
-   {
-      this.field = field;
-      this.field.setAccessible(true);
-      this.container = container;
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("SHOULD NOT BE INVOKED");
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      try
-      {
-         field.set(ctx.getInstance(), container.getTimerService());
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Failed in setting EntityManager on setter field: " + field.toString());
-      }
-   }
-   
-   public Class getInjectionClass()
-   {
-      return field.getType();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.Field;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.Container;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated use TimerServicePropertyInjector
+ */
+public class TimerServiceFieldInjector implements Injector
+{
+   private Field field;
+   private Container container;
+
+   public TimerServiceFieldInjector(Field field, Container container)
+   {
+      this.field = field;
+      this.field.setAccessible(true);
+      this.container = container;
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("SHOULD NOT BE INVOKED");
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      try
+      {
+         field.set(ctx.getInstance(), container.getTimerService());
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException("Failed in setting EntityManager on setter field: " + field.toString());
+      }
+   }
+   
+   public Class getInjectionClass()
+   {
+      return field.getType();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceFieldInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use TimerServicePropertyInjector
- */
-public class TimerServiceMethodInjector implements Injector
-{
-   private Method setMethod;
-   private Container container;
-
-   public TimerServiceMethodInjector(Method setMethod, Container container)
-   {
-      this.setMethod = setMethod;
-      setMethod.setAccessible(true);
-      this.container = container;
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("SHOULD NOT BE INVOKED");
-   }
-
-   public void inject(BeanContext ctx)
-   {
-
-      Object[] args = {container.getTimerService()};
-      try
-      {
-         setMethod.invoke(ctx.getInstance(), args);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
-      }
-   }
-   
-   public Class getInjectionClass()
-   {
-      return setMethod.getParameterTypes()[0];
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.Container;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated use TimerServicePropertyInjector
+ */
+public class TimerServiceMethodInjector implements Injector
+{
+   private Method setMethod;
+   private Container container;
+
+   public TimerServiceMethodInjector(Method setMethod, Container container)
+   {
+      this.setMethod = setMethod;
+      setMethod.setAccessible(true);
+      this.container = container;
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("SHOULD NOT BE INVOKED");
+   }
+
+   public void inject(BeanContext ctx)
+   {
+
+      Object[] args = {container.getTimerService()};
+      try
+      {
+         setMethod.invoke(ctx.getInstance(), args);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
+      }
+   }
+   
+   public Class getInjectionClass()
+   {
+      return setMethod.getParameterTypes()[0];
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServiceMethodInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-import org.jboss.injection.lang.reflect.BeanProperty;
-
-/**
- * Injects a timer service into an ejb.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: 1.1 $
- */
-public class TimerServicePropertyInjector implements Injector
-{
-   private BeanProperty property;
-   private Container container;
-
-   public TimerServicePropertyInjector(BeanProperty property, Container container)
-   {
-      this.property = property;
-      this.container = container;
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("Illegal operation");
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      property.set(ctx.getInstance(), container.getTimerService());
-   }
-   
-   public Class getInjectionClass()
-   {
-      return property.getType();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/TimerServicePropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.Container;
+import org.jboss.injection.lang.reflect.BeanProperty;
+
+/**
+ * Injects a timer service into an ejb.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: 1.1 $
+ */
+public class TimerServicePropertyInjector implements Injector
+{
+   private BeanProperty property;
+   private Container container;
+
+   public TimerServicePropertyInjector(BeanProperty property, Container container)
+   {
+      this.property = property;
+      this.container = container;
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("Illegal operation");
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      property.set(ctx.getInstance(), container.getTimerService());
+   }
+   
+   public Class getInjectionClass()
+   {
+      return property.getType();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-import javax.ejb.TransactionManagementType;
-import javax.transaction.UserTransaction;
-import org.jboss.aop.Advisor;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.tx.UserTransactionImpl;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use UserTransactionPropertyInjector
- */
-public class UserTransactionFieldInjector implements Injector
-{
-   private Field field;
-
-   public UserTransactionFieldInjector(Field field, InjectionContainer container)
-   {
-      if (container instanceof Container)
-      {
-         TransactionManagementType type = TxUtil.getTransactionManagementType(((Advisor) container));
-         if (type != TransactionManagementType.BEAN)
-            throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
-      }
-      this.field = field;
-      this.field.setAccessible(true);
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      Object instance = ctx.getInstance();
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      UserTransaction ut = new UserTransactionImpl();
-      try
-      {
-         field.set(instance, ut);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Failed in setting EntityManager on setter field: " + field.toString());
-      }
-   }
-
-   public Class getInjectionClass()
-   {
-      return field.getType();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import java.lang.reflect.Field;
+import javax.ejb.TransactionManagementType;
+import javax.transaction.UserTransaction;
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.ejb3.tx.UserTransactionImpl;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated use UserTransactionPropertyInjector
+ */
+public class UserTransactionFieldInjector implements Injector
+{
+   private Field field;
+
+   public UserTransactionFieldInjector(Field field, InjectionContainer container)
+   {
+      if (container instanceof Container)
+      {
+         TransactionManagementType type = TxUtil.getTransactionManagementType(((Advisor) container));
+         if (type != TransactionManagementType.BEAN)
+            throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
+      }
+      this.field = field;
+      this.field.setAccessible(true);
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      Object instance = ctx.getInstance();
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      UserTransaction ut = new UserTransactionImpl();
+      try
+      {
+         field.set(instance, ut);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException("Failed in setting EntityManager on setter field: " + field.toString());
+      }
+   }
+
+   public Class getInjectionClass()
+   {
+      return field.getType();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionFieldInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.injection;
-
-import org.jboss.aop.Advisor;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.tx.UserTransactionImpl;
-
-import javax.ejb.TransactionManagementType;
-import javax.transaction.UserTransaction;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use UserTransactionPropertyInjector
- */
-public class UserTransactionMethodInjector implements Injector
-{
-   private Method setMethod;
-
-   public UserTransactionMethodInjector(Method setMethod, InjectionContainer container)
-   {
-      if (container instanceof Container)
-      {
-         TransactionManagementType type = TxUtil.getTransactionManagementType(((Advisor) container));
-         if (type != TransactionManagementType.BEAN)
-            throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
-      }
-      this.setMethod = setMethod;
-      setMethod.setAccessible(true);
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      Object instance = ctx.getInstance();
-      inject(instance);
-   }
-
-   public void inject(Object instance)
-   {
-      UserTransaction ut = new UserTransactionImpl();
-      Object[] args = {ut};
-      try
-      {
-         setMethod.invoke(instance, args);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
-      }
-      catch (InvocationTargetException e)
-      {
-         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
-      }
-   }
-
-   public Class getInjectionClass()
-   {
-      return setMethod.getParameterTypes()[0];
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.ejb3.tx.UserTransactionImpl;
+
+import javax.ejb.TransactionManagementType;
+import javax.transaction.UserTransaction;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ * @deprecated use UserTransactionPropertyInjector
+ */
+public class UserTransactionMethodInjector implements Injector
+{
+   private Method setMethod;
+
+   public UserTransactionMethodInjector(Method setMethod, InjectionContainer container)
+   {
+      if (container instanceof Container)
+      {
+         TransactionManagementType type = TxUtil.getTransactionManagementType(((Advisor) container));
+         if (type != TransactionManagementType.BEAN)
+            throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
+      }
+      this.setMethod = setMethod;
+      setMethod.setAccessible(true);
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      Object instance = ctx.getInstance();
+      inject(instance);
+   }
+
+   public void inject(Object instance)
+   {
+      UserTransaction ut = new UserTransactionImpl();
+      Object[] args = {ut};
+      try
+      {
+         setMethod.invoke(instance, args);
+      }
+      catch (IllegalAccessException e)
+      {
+         throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
+      }
+      catch (IllegalArgumentException e)
+      {
+         throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
+      }
+      catch (InvocationTargetException e)
+      {
+         throw new RuntimeException(e.getCause());  //To change body of catch statement use Options | File Templates.
+      }
+   }
+
+   public Class getInjectionClass()
+   {
+      return setMethod.getParameterTypes()[0];
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionMethodInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import javax.ejb.TransactionManagementType;
-import javax.transaction.UserTransaction;
-
-import org.jboss.aop.Advisor;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.tx.UserTransactionImpl;
-import org.jboss.injection.lang.reflect.BeanProperty;
-
-/**
- * Injects a user transaction into a bean property.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class UserTransactionPropertyInjector extends AbstractPropertyInjector
-{
-   public UserTransactionPropertyInjector(BeanProperty property, InjectionContainer container)
-   {
-      super(property);
-      
-      if (container instanceof Container)
-      {
-         TransactionManagementType type = TxUtil.getTransactionManagementType(((Advisor) container));
-         if (type != TransactionManagementType.BEAN)
-            throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
-      }
-   }
-
-   public void inject(Object instance)
-   {
-      UserTransaction ut = new UserTransactionImpl();
-      property.set(instance, ut);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/UserTransactionPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import javax.ejb.TransactionManagementType;
+import javax.transaction.UserTransaction;
+
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.ejb3.tx.UserTransactionImpl;
+import org.jboss.injection.lang.reflect.BeanProperty;
+
+/**
+ * Injects a user transaction into a bean property.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class UserTransactionPropertyInjector extends AbstractPropertyInjector
+{
+   public UserTransactionPropertyInjector(BeanProperty property, InjectionContainer container)
+   {
+      super(property);
+      
+      if (container instanceof Container)
+      {
+         TransactionManagementType type = TxUtil.getTransactionManagementType(((Advisor) container));
+         if (type != TransactionManagementType.BEAN)
+            throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
+      }
+   }
+
+   public void inject(Object instance)
+   {
+      UserTransaction ut = new UserTransactionImpl();
+      property.set(instance, ut);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ValueEncInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/ValueEncInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ValueEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.injection;
-
-import org.jboss.naming.Util;
-
-import javax.naming.LinkRef;
-import javax.naming.NamingException;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 46510 $
- */
-public class ValueEncInjector implements EncInjector
-{
-   private Object obj;
-   private String encName;
-   private String error;
-
-   public ValueEncInjector(String name, Object obj, String error)
-   {
-      this.obj = obj;
-      this.encName = name;
-      this.error = error;
-   }
-
-   public void inject(InjectionContainer container)
-   {
-      try
-      {
-         Util.rebind(container.getEnc(), encName, obj);
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(new StringBuilder().append("could not bind enc name '").append(encName).append("' for ").append(error).append(" for container ").append(container.getIdentifier()).append(e.getMessage()).toString());
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ValueEncInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/ValueEncInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ValueEncInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/ValueEncInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.injection;
+
+import org.jboss.naming.Util;
+
+import javax.naming.LinkRef;
+import javax.naming.NamingException;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 46510 $
+ */
+public class ValueEncInjector implements EncInjector
+{
+   private Object obj;
+   private String encName;
+   private String error;
+
+   public ValueEncInjector(String name, Object obj, String error)
+   {
+      this.obj = obj;
+      this.encName = name;
+      this.error = error;
+   }
+
+   public void inject(InjectionContainer container)
+   {
+      try
+      {
+         Util.rebind(container.getEnc(), encName, obj);
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(new StringBuilder().append("could not bind enc name '").append(encName).append("' for ").append(error).append(" for container ").append(container.getIdentifier()).append(e.getMessage()).toString());
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import javax.ejb.EJBContext;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.stateless.StatelessBeanContext;
-import org.jboss.injection.lang.reflect.BeanProperty;
-
-/**
- * Injects a WebServiceContext into a bean.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author Thomas.Diesler at jboss.com
- * @version $Revision: $
- */
-public class WebServiceContextPropertyInjector implements Injector
-{
-   private BeanProperty property;
-   
-   protected WebServiceContextPropertyInjector(BeanProperty property)
-   {
-      assert property != null : "property must be set";
-      
-      this.property = property;
-   }
-
-   public void inject(Object instance)
-   {
-      throw new RuntimeException("Illegal operation");
-   }
-
-   public void inject(BeanContext ctx)
-   {
-      if(!(ctx instanceof StatelessBeanContext))
-         throw new RuntimeException("Can only inject on stateless bean context");
-      
-      ((StatelessBeanContext)ctx).setWebServiceContextProperty(property);
-   }
-   
-   public Class getInjectionClass()
-   {
-      return property.getType();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceContextPropertyInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+import javax.ejb.EJBContext;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.stateless.StatelessBeanContext;
+import org.jboss.injection.lang.reflect.BeanProperty;
+
+/**
+ * Injects a WebServiceContext into a bean.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Thomas.Diesler at jboss.com
+ * @version $Revision: $
+ */
+public class WebServiceContextPropertyInjector implements Injector
+{
+   private BeanProperty property;
+   
+   protected WebServiceContextPropertyInjector(BeanProperty property)
+   {
+      assert property != null : "property must be set";
+      
+      this.property = property;
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("Illegal operation");
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      if(!(ctx instanceof StatelessBeanContext))
+         throw new RuntimeException("Can only inject on stateless bean context");
+      
+      ((StatelessBeanContext)ctx).setWebServiceContextProperty(property);
+   }
+   
+   public Class getInjectionClass()
+   {
+      return property.getType();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,150 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-// $Id$
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.WebServiceRefs;
-
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.metamodel.descriptor.ServiceRef;
-
-/**
- * Handle @WebServiceRef annotations
- * 
- * @author Thomas.Diesler at jboss.com
- */
-public class WebServiceRefHandler implements InjectionHandler
-{
-   private static final Logger log = Logger.getLogger(WebServiceRefHandler.class);
-   private Map<String, ServiceRef> srefMap = new HashMap<String, ServiceRef>();
-
-   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
-   {
-      if (xml == null) return;
-      if (xml.getServiceRefs() == null) return;
-      for (ServiceRef sref : xml.getServiceRefs())
-      {
-         log.debug("@WebServiceRef override: " + sref);
-         if (srefMap.get(sref.getServiceRefName()) != null)
-               throw new IllegalStateException ("Duplicate <service-ref-name> in " + sref);
-         
-         srefMap.put(sref.getServiceRefName(), sref);
-      }
-   }
-
-   public void handleClassAnnotations(Class type, InjectionContainer container)
-   {
-      WebServiceRef wsref = container.getAnnotation(WebServiceRef.class, type);
-      if (wsref != null)
-      {
-         bindRefOnType(type, container, wsref);
-      }
-
-      WebServiceRefs refs = container.getAnnotation(WebServiceRefs.class, type);
-      if (refs != null)
-      {
-         for (WebServiceRef refItem : refs.value())
-         {
-            bindRefOnType(type, container, refItem);
-         }
-      }
-   }
-
-   private void bindRefOnType(Class type, InjectionContainer container, WebServiceRef wsref)
-   {
-      String name = wsref.name();
-      if (name.equals(""))
-         name = InjectionUtil.getEncName(type).substring(4);
-      
-      if (!container.getEncInjectors().containsKey(name))
-      {
-         String encName = "env/" + name;
-         ServiceRef sref = getServiceRef(name);
-         container.getEncInjectors().put(name, new WebServiceRefInjector(encName, type, sref));
-      }
-   }
-
-   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      WebServiceRef wsref = method.getAnnotation(WebServiceRef.class);
-      if (wsref == null) return;
-
-      if (!method.getName().startsWith("set"))
-         throw new RuntimeException("@WebServiceRef can only be used with a set method: " + method);
-
-      String name = wsref.name();
-      if (name.equals(""))
-         name = InjectionUtil.getEncName(method).substring(4);
-      
-      String encName = "env/" + name;
-      Context encCtx = container.getEnc();
-      if (!container.getEncInjectors().containsKey(name))
-      {
-         ServiceRef sref = getServiceRef(name);
-         container.getEncInjectors().put(name, new WebServiceRefInjector(encName, method, sref));
-      }
-
-      injectors.put(method, new JndiMethodInjector(method, encName, encCtx));
-   }
-
-   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
-   {
-      WebServiceRef wsref = field.getAnnotation(WebServiceRef.class);
-      if (wsref == null) return;
-
-      String name = wsref.name();
-      if (name.equals(""))
-         name = InjectionUtil.getEncName(field).substring(4);
-
-      String encName = "env/" + name;
-      Context encCtx = container.getEnc();
-      if (!container.getEncInjectors().containsKey(name))
-      {
-         ServiceRef sref = getServiceRef(name);
-         container.getEncInjectors().put(name, new WebServiceRefInjector(encName, field, sref));
-      }
-
-      injectors.put(field, new JndiFieldInjector(field, encName, encCtx));
-   }
-
-   private ServiceRef getServiceRef(String name)
-   {
-      ServiceRef sref = srefMap.get(name);
-      if (sref == null)
-      {
-         log.debug("No override for @WebServiceRef.name: " + name);
-         sref = new ServiceRef();
-         sref.setServiceRefName(name);
-      }
-      return sref;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+// $Id$
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.xml.ws.WebServiceRef;
+import javax.xml.ws.WebServiceRefs;
+
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
+import org.jboss.metamodel.descriptor.ServiceRef;
+
+/**
+ * Handle @WebServiceRef annotations
+ * 
+ * @author Thomas.Diesler at jboss.com
+ */
+public class WebServiceRefHandler implements InjectionHandler
+{
+   private static final Logger log = Logger.getLogger(WebServiceRefHandler.class);
+   private Map<String, ServiceRef> srefMap = new HashMap<String, ServiceRef>();
+
+   public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)
+   {
+      if (xml == null) return;
+      if (xml.getServiceRefs() == null) return;
+      for (ServiceRef sref : xml.getServiceRefs())
+      {
+         log.debug("@WebServiceRef override: " + sref);
+         if (srefMap.get(sref.getServiceRefName()) != null)
+               throw new IllegalStateException ("Duplicate <service-ref-name> in " + sref);
+         
+         srefMap.put(sref.getServiceRefName(), sref);
+      }
+   }
+
+   public void handleClassAnnotations(Class type, InjectionContainer container)
+   {
+      WebServiceRef wsref = container.getAnnotation(WebServiceRef.class, type);
+      if (wsref != null)
+      {
+         bindRefOnType(type, container, wsref);
+      }
+
+      WebServiceRefs refs = container.getAnnotation(WebServiceRefs.class, type);
+      if (refs != null)
+      {
+         for (WebServiceRef refItem : refs.value())
+         {
+            bindRefOnType(type, container, refItem);
+         }
+      }
+   }
+
+   private void bindRefOnType(Class type, InjectionContainer container, WebServiceRef wsref)
+   {
+      String name = wsref.name();
+      if (name.equals(""))
+         name = InjectionUtil.getEncName(type).substring(4);
+      
+      if (!container.getEncInjectors().containsKey(name))
+      {
+         String encName = "env/" + name;
+         ServiceRef sref = getServiceRef(name);
+         container.getEncInjectors().put(name, new WebServiceRefInjector(encName, type, sref));
+      }
+   }
+
+   public void handleMethodAnnotations(Method method, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      WebServiceRef wsref = method.getAnnotation(WebServiceRef.class);
+      if (wsref == null) return;
+
+      if (!method.getName().startsWith("set"))
+         throw new RuntimeException("@WebServiceRef can only be used with a set method: " + method);
+
+      String name = wsref.name();
+      if (name.equals(""))
+         name = InjectionUtil.getEncName(method).substring(4);
+      
+      String encName = "env/" + name;
+      Context encCtx = container.getEnc();
+      if (!container.getEncInjectors().containsKey(name))
+      {
+         ServiceRef sref = getServiceRef(name);
+         container.getEncInjectors().put(name, new WebServiceRefInjector(encName, method, sref));
+      }
+
+      injectors.put(method, new JndiMethodInjector(method, encName, encCtx));
+   }
+
+   public void handleFieldAnnotations(Field field, InjectionContainer container, Map<AccessibleObject, Injector> injectors)
+   {
+      WebServiceRef wsref = field.getAnnotation(WebServiceRef.class);
+      if (wsref == null) return;
+
+      String name = wsref.name();
+      if (name.equals(""))
+         name = InjectionUtil.getEncName(field).substring(4);
+
+      String encName = "env/" + name;
+      Context encCtx = container.getEnc();
+      if (!container.getEncInjectors().containsKey(name))
+      {
+         ServiceRef sref = getServiceRef(name);
+         container.getEncInjectors().put(name, new WebServiceRefInjector(encName, field, sref));
+      }
+
+      injectors.put(field, new JndiFieldInjector(field, encName, encCtx));
+   }
+
+   private ServiceRef getServiceRef(String name)
+   {
+      ServiceRef sref = srefMap.get(name);
+      if (sref == null)
+      {
+         log.debug("No override for @WebServiceRef.name: " + name);
+         sref = new ServiceRef();
+         sref.setServiceRefName(name);
+      }
+      return sref;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-// $Id$
-
-import java.io.IOException;
-import java.lang.reflect.AnnotatedElement;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.ServiceRef;
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.virtual.VirtualFile;
-import org.w3c.dom.Element;
-
-/**
- * Inject a jaxws web service ref.
- *
- * @author Thomas.Diesler at jboss.com
- * @version $Revision$
- */
-public class WebServiceRefInjector implements EncInjector
-{
-   private static final Logger log = Logger.getLogger(WebServiceRefInjector.class);
-
-   private String name;
-   private AnnotatedElement anElement;
-
-   private ServiceRef sref;
-
-   // The @WebServiceRef handler MBean interface
-   // is duplicated here to avoid a binary dependency on JBossWS
-   public interface WebServiceRefHandlerMBean
-   {
-      ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceRefHandler");
-      void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, Source metadata) throws NamingException;
-   }
-
-   public WebServiceRefInjector(String name, AnnotatedElement anElement, ServiceRef sref)
-   {
-      this.name = name;
-      this.anElement = anElement;
-      this.sref = sref;
-   }
-
-   public void inject(InjectionContainer container)
-   {
-      try
-      {
-         Context encCtx = container.getEnc();
-         VirtualFile vfsRoot = container.getRootFile();
-
-         // Decoupled invocation to JBossWS 
-         MBeanServer server = MBeanServerLocator.locateJBoss();
-         ObjectName oname = WebServiceRefHandlerMBean.OBJECT_NAME;
-         WebServiceRefHandlerMBean handler = (WebServiceRefHandlerMBean)MBeanProxy.get(WebServiceRefHandlerMBean.class, oname, server);
-         handler.setupWebServiceRef(encCtx, name, anElement, vfsRoot, getMetaData());
-         
-         log.debug("@WebServiceRef bound [env=" + name + "]");
-      }
-      catch (Exception e)
-      {
-         throw new WebServiceException("Unable to bind @WebServiceRef [enc=" + name + "]", e);
-      }
-   }
-
-   private Source getMetaData() throws IOException
-   {
-      String xmlFragment = sref.toXMLFragment();
-      Element root = DOMUtils.parse(xmlFragment);
-      return new DOMSource(root);
-   }
-
-   public String toString()
-   {
-      return super.toString() + "{enc=" + name + "}";
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection;
+
+// $Id$
+
+import java.io.IOException;
+import java.lang.reflect.AnnotatedElement;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.ServiceRef;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.ObjectNameFactory;
+import org.jboss.util.xml.DOMUtils;
+//import org.jboss.virtual.VirtualFile;
+import org.w3c.dom.Element;
+
+/**
+ * Inject a jaxws web service ref.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @version $Revision$
+ */
+public class WebServiceRefInjector implements EncInjector
+{
+   private static final Logger log = Logger.getLogger(WebServiceRefInjector.class);
+
+   private String name;
+   private AnnotatedElement anElement;
+
+   private ServiceRef sref;
+
+   // The @WebServiceRef handler MBean interface
+   // is duplicated here to avoid a binary dependency on JBossWS
+   public interface WebServiceRefHandlerMBean
+   {
+      ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceRefHandler");
+//      void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, Source metadata) throws NamingException;
+   }
+
+   public WebServiceRefInjector(String name, AnnotatedElement anElement, ServiceRef sref)
+   {
+      this.name = name;
+      this.anElement = anElement;
+      this.sref = sref;
+   }
+
+   public void inject(InjectionContainer container)
+   {
+      try
+      {
+         Context encCtx = container.getEnc();
+//         VirtualFile vfsRoot = container.getRootFile();
+
+         // Decoupled invocation to JBossWS 
+         MBeanServer server = MBeanServerLocator.locateJBoss();
+         ObjectName oname = WebServiceRefHandlerMBean.OBJECT_NAME;
+         WebServiceRefHandlerMBean handler = (WebServiceRefHandlerMBean)MBeanProxy.get(WebServiceRefHandlerMBean.class, oname, server);
+//         handler.setupWebServiceRef(encCtx, name, anElement, vfsRoot, getMetaData());
+         
+         log.debug("@WebServiceRef bound [env=" + name + "]");
+      }
+      catch (Exception e)
+      {
+         throw new WebServiceException("Unable to bind @WebServiceRef [enc=" + name + "]", e);
+      }
+   }
+
+   private Source getMetaData() throws IOException
+   {
+      String xmlFragment = sref.toXMLFragment();
+      Element root = DOMUtils.parse(xmlFragment);
+      return new DOMSource(root);
+   }
+
+   public String toString()
+   {
+      return super.toString() + "{enc=" + name + "}";
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang)

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect)

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection.lang.reflect;
-
-import java.lang.reflect.AccessibleObject;
-
-/**
- * Makes sure that the accessible object is accessible.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class AbstractAccessibleObjectBeanProperty<T extends AccessibleObject>
-   implements BeanProperty
-{
-   private T obj;
-   
-   protected AbstractAccessibleObjectBeanProperty(T obj)
-   {
-      this.obj = obj;
-      obj.setAccessible(true);
-   }
-   
-   public T getAccessibleObject()
-   {
-      return obj;
-   }
-   
-   
-   public String toString()
-   {
-      return getDeclaringClass().getName() + "." + getName();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/AbstractAccessibleObjectBeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection.lang.reflect;
+
+import java.lang.reflect.AccessibleObject;
+
+/**
+ * Makes sure that the accessible object is accessible.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public abstract class AbstractAccessibleObjectBeanProperty<T extends AccessibleObject>
+   implements BeanProperty
+{
+   private T obj;
+   
+   protected AbstractAccessibleObjectBeanProperty(T obj)
+   {
+      this.obj = obj;
+      obj.setAccessible(true);
+   }
+   
+   public T getAccessibleObject()
+   {
+      return obj;
+   }
+   
+   
+   public String toString()
+   {
+      return getDeclaringClass().getName() + "." + getName();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection.lang.reflect;
-
-import java.lang.reflect.AccessibleObject;
-
-/**
- * A bean property defines a propery of a pojo from the EJB3 point of view.
- * It can be used to inject values into it.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface BeanProperty
-{
-   // TODO: should not be exposed
-   AccessibleObject getAccessibleObject();
-   
-   Class<?> getDeclaringClass();
-   
-   String getName();
-   
-   Class<?> getType();
-   
-   void set(Object instance, Object value);
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection.lang.reflect;
+
+import java.lang.reflect.AccessibleObject;
+
+/**
+ * A bean property defines a propery of a pojo from the EJB3 point of view.
+ * It can be used to inject values into it.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface BeanProperty
+{
+   // TODO: should not be exposed
+   AccessibleObject getAccessibleObject();
+   
+   Class<?> getDeclaringClass();
+   
+   String getName();
+   
+   Class<?> getType();
+   
+   void set(Object instance, Object value);
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection.lang.reflect;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * BeanProperty factory.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class BeanPropertyFactory
-{
-   private BeanPropertyFactory()
-   {
-      // do not instantiate
-   }
-   
-   public static BeanProperty create(AccessibleObject ao)
-   {
-      if(ao instanceof Field)
-         return new FieldBeanProperty((Field) ao);
-      if(ao instanceof Method)
-         return new MethodBeanProperty((Method) ao);
-      
-      throw new IllegalArgumentException("can't handle " + ao.getClass().getName());
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/BeanPropertyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection.lang.reflect;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * BeanProperty factory.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class BeanPropertyFactory
+{
+   private BeanPropertyFactory()
+   {
+      // do not instantiate
+   }
+   
+   public static BeanProperty create(AccessibleObject ao)
+   {
+      if(ao instanceof Field)
+         return new FieldBeanProperty((Field) ao);
+      if(ao instanceof Method)
+         return new MethodBeanProperty((Method) ao);
+      
+      throw new IllegalArgumentException("can't handle " + ao.getClass().getName());
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection.lang.reflect;
-
-import java.lang.reflect.Field;
-
-import org.jboss.logging.Logger;
-
-/**
- * Morphes a field into a bean property.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class FieldBeanProperty extends AbstractAccessibleObjectBeanProperty<Field>
-{
-   private static final Logger log = Logger.getLogger(FieldBeanProperty.class);
-   
-   /**
-    * @param field
-    */
-   public FieldBeanProperty(Field field)
-   {
-      super(field);
-   }
-   
-   public Class<?> getDeclaringClass()
-   {
-      return getField().getDeclaringClass();
-   }
-   
-   protected Field getField()
-   {
-      return getAccessibleObject();
-   }
-   
-   public String getName()
-   {
-      return getField().getName();
-   }
-   
-   public Class<?> getType()
-   {
-      return getField().getType();
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.injection.lang.reflect.BeanProperty#set(java.lang.Object)
-    */
-   public void set(Object instance, Object value)
-   {
-      Field field = getField();
-      try
-      {
-         field.set(instance, value);
-      }
-      catch(IllegalAccessException e)
-      {
-         log.fatal("illegal access on field " + field, e);
-         throw new RuntimeException(e);
-      }
-      catch(IllegalArgumentException e)
-      {
-         String msg = "failed to set value " + value + " on field " + field;
-         log.error(msg, e);
-         throw new IllegalArgumentException(msg);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/FieldBeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection.lang.reflect;
+
+import java.lang.reflect.Field;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Morphes a field into a bean property.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class FieldBeanProperty extends AbstractAccessibleObjectBeanProperty<Field>
+{
+   private static final Logger log = Logger.getLogger(FieldBeanProperty.class);
+   
+   /**
+    * @param field
+    */
+   public FieldBeanProperty(Field field)
+   {
+      super(field);
+   }
+   
+   public Class<?> getDeclaringClass()
+   {
+      return getField().getDeclaringClass();
+   }
+   
+   protected Field getField()
+   {
+      return getAccessibleObject();
+   }
+   
+   public String getName()
+   {
+      return getField().getName();
+   }
+   
+   public Class<?> getType()
+   {
+      return getField().getType();
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.injection.lang.reflect.BeanProperty#set(java.lang.Object)
+    */
+   public void set(Object instance, Object value)
+   {
+      Field field = getField();
+      try
+      {
+         field.set(instance, value);
+      }
+      catch(IllegalAccessException e)
+      {
+         log.fatal("illegal access on field " + field, e);
+         throw new RuntimeException(e);
+      }
+      catch(IllegalArgumentException e)
+      {
+         String msg = "failed to set value " + value + " on field " + field;
+         log.error(msg, e);
+         throw new IllegalArgumentException(msg);
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,119 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection.lang.reflect;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.jboss.logging.Logger;
-
-/**
- * Morphs a setter method into a bean property.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class MethodBeanProperty extends AbstractAccessibleObjectBeanProperty<Method>
-{
-   private final Logger log = Logger.getLogger(MethodBeanProperty.class);
-   
-   private String name = null; // lazily initialized
-   
-   /**
-    * @param method
-    */
-   public MethodBeanProperty(Method method)
-   {
-      super(method);
-      
-      assert method.getReturnType() == Void.TYPE;
-      assert method.getParameterTypes().length == 1;
-      assert method.getName().startsWith("set");
-   }
-
-   public Class<?> getDeclaringClass()
-   {
-      return getMethod().getDeclaringClass();
-   }
-   
-   public String getName()
-   {
-      if(name == null)
-      {
-         String name = getMethod().getName().substring(3);
-         if (name.length() > 1)
-         {
-            name = name.substring(0, 1).toLowerCase() + name.substring(1);
-         }
-         else
-         {
-            name = name.toLowerCase();
-         }
-         this.name = name; // atomair, no synch
-      }
-      return name;
-   }
-   
-   protected Method getMethod()
-   {
-      return getAccessibleObject();
-   }
-   
-   public Class<?> getType()
-   {
-      return getMethod().getParameterTypes()[0];
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.injection.lang.reflect.BeanProperty#set(java.lang.Object, java.lang.Object)
-    */
-   public void set(Object instance, Object value)
-   {
-      Method method = getMethod();
-      Object args[] = { value };
-      try
-      {
-         method.invoke(instance, args);
-      }
-      catch (IllegalAccessException e)
-      {
-         log.fatal("illegal access on method " + method, e);
-         throw new RuntimeException(e);
-      }
-      catch (IllegalArgumentException e)
-      {
-         String msg = "failed to set value " + value + " with setter " + method;
-         log.error(msg, e);
-         throw new IllegalArgumentException(msg);
-      }
-      catch (InvocationTargetException e)
-      {
-         Throwable cause = e.getCause();
-         if(cause instanceof Error)
-            throw (Error) cause;
-         if(cause instanceof RuntimeException)
-            throw (RuntimeException) cause;
-         throw new RuntimeException(cause);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/lang/reflect/MethodBeanProperty.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.injection.lang.reflect;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Morphs a setter method into a bean property.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class MethodBeanProperty extends AbstractAccessibleObjectBeanProperty<Method>
+{
+   private final Logger log = Logger.getLogger(MethodBeanProperty.class);
+   
+   private String name = null; // lazily initialized
+   
+   /**
+    * @param method
+    */
+   public MethodBeanProperty(Method method)
+   {
+      super(method);
+      
+      assert method.getReturnType() == Void.TYPE;
+      assert method.getParameterTypes().length == 1;
+      assert method.getName().startsWith("set");
+   }
+
+   public Class<?> getDeclaringClass()
+   {
+      return getMethod().getDeclaringClass();
+   }
+   
+   public String getName()
+   {
+      if(name == null)
+      {
+         String name = getMethod().getName().substring(3);
+         if (name.length() > 1)
+         {
+            name = name.substring(0, 1).toLowerCase() + name.substring(1);
+         }
+         else
+         {
+            name = name.toLowerCase();
+         }
+         this.name = name; // atomair, no synch
+      }
+      return name;
+   }
+   
+   protected Method getMethod()
+   {
+      return getAccessibleObject();
+   }
+   
+   public Class<?> getType()
+   {
+      return getMethod().getParameterTypes()[0];
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.injection.lang.reflect.BeanProperty#set(java.lang.Object, java.lang.Object)
+    */
+   public void set(Object instance, Object value)
+   {
+      Method method = getMethod();
+      Object args[] = { value };
+      try
+      {
+         method.invoke(instance, args);
+      }
+      catch (IllegalAccessException e)
+      {
+         log.fatal("illegal access on method " + method, e);
+         throw new RuntimeException(e);
+      }
+      catch (IllegalArgumentException e)
+      {
+         String msg = "failed to set value " + value + " with setter " + method;
+         log.error(msg, e);
+         throw new IllegalArgumentException(msg);
+      }
+      catch (InvocationTargetException e)
+      {
+         Throwable cause = e.getCause();
+         if(cause instanceof Error)
+            throw (Error) cause;
+         if(cause instanceof RuntimeException)
+            throw (RuntimeException) cause;
+         throw new RuntimeException(cause);
+      }
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    JCA Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- TODO this should be removed later on when ENC gets changed -->
+   <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
+   <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
+
+   <bean name="EJBRegistrationDeployer" class="org.jboss.ejb3.deployers.EJBRegistrationDeployer">
+      <install bean="MainDeployer" method="addDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="MainDeployer" method="removeDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <property name="type">ejb3x</property>
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+      <property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
+      <property name="ignoredJarsSet">
+         <set elementClass="java.lang.String">
+            <value>snmp-adaptor.jar</value>
+            <value>otherimages.jar</value>
+            <value>applet.jar</value>
+            <value>jcommon.jar</value>
+            <value>console-mgr-classes.jar</value>
+            <value>jfreechart.jar</value>
+            <value>juddi-service.jar</value>
+            <value>wsdl4j.jar</value>
+            <value>commons-collections.jar</value>
+            <value>commons-pool.jar</value>
+            <value>juddi.jar</value>
+            <value>commons-discovery.jar</value>
+            <value>uddi4j.jar</value>
+            <value>axis.jar</value>
+            <value>commons-dbcp.jar</value>
+            <value>jboss-juddiaxis.jar</value>
+            <value>trove.jar</value>
+            <value>javassist.jar</value>
+            <value>jboss-aop-jdk50.jar</value>
+            <value>jboss-aspect-library-jdk50.jar</value>
+            <value>ejb3-persistence.jar</value>
+            <value>commons-validator-1.1.3.jar</value>
+            <value>commons-collections.jar</value>
+            <value>commons-fileupload.jar</value>
+            <value>commons-pool.jar</value>
+            <value>hibernate-entitymanager.jar</value>
+            <value>jboss-ejb3x.jar</value>
+            <value>commons-digester-1.6.jar</value>
+            <value>cglib-2.1.1.jar</value>
+            <value>commons-discovery.jar</value>
+            <value>jboss-annotations-ejb3.jar</value>
+            <value>jaxen-1.1-beta-4.jar</value>
+            <value>hibernate-annotations.jar</value>
+            <value>commons-httpclient.jar</value>
+            <value>commons-logging.jar</value>
+            <value>commons-vfs.jar</value>
+            <value>hibernate3.jar</value>
+            <value>commons-logging-api.jar</value>
+            <value>asm.jar</value>
+            <value>asm-attrs.jar</value>
+            <value>commons-lang-2.0.jar</value>
+            <value>commons-beanutils.jar</value>
+            <value>jboss-ejb3.jar</value>
+            <value>dom4j.jar</value>
+            <value>commons-codec-1.2.jar</value>
+            <value>wsdl4j.jar</value>
+            <value>xmlsec.jar</value>
+            <value>jbossws.jar</value>
+            <value>jboss-bean-deployer.jar</value>
+            <value>jboss-microcontainer.jar</value>
+            <value>jboss-dependency.jar</value>
+            <value>jboss-container.jar</value>
+            <value>tomcat-coyote.jar</value>
+            <value>commons-collections.jar</value>
+            <value>myfaces.jar</value>
+            <value>jstl.jar</value>
+            <value>commons-digester-1.6.jar</value>
+            <value>myfaces-impl.jar</value>
+            <value>commons-beanutils.jar</value>
+            <value>myfaces-jsf-api.jar</value>
+            <value>commons-codec-1.2.jar</value>
+            <value>catalina-optional.jar</value>
+            <value>tomcat-util.jar</value>
+            <value>jasper-compiler.jar</value>
+            <value>commons-el.jar</value>
+            <value>jasper-compiler-jdt.jar</value>
+            <value>tomcat-http.jar</value>
+            <value>catalina-manager.jar</value>
+            <value>jasper-runtime.jar</value>
+            <value>tomcat55-service.jar</value>
+            <value>servlets-invoker.jar</value>
+            <value>catalina.jar</value>
+            <value>naming-resources.jar</value>
+            <value>servlets-default.jar</value>
+            <value>tomcat-ajp.jar</value>
+            <value>commons-modeler.jar</value>
+            <value>tomcat-apr.jar</value>
+            <value>servlets-webdav.jar</value>
+         </set>
+      </property>
+      <depends>AspectLibrary</depends>
+   </bean>
+   <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
+      <install bean="MainDeployer" method="addDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="MainDeployer" method="removeDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>AspectLibrary</depends>
+   </bean>
+   
+   <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
+      <install bean="MainDeployer" method="addDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="MainDeployer" method="removeDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <property name="type">car</property>
+      <!-- TODO: check depends -->
+      <depends>AspectLibrary</depends>
+   </bean>
+   
+   <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
+      <install bean="MainDeployer" method="addDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="MainDeployer" method="removeDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <property name="type">car</property>
+      <depends>AppClientParsingDeployer</depends>
+   </bean>
+   
+   <bean name="AppClientScanningDeployer" class="org.jboss.ejb3.deployers.AppClientScanningDeployer">
+      <install bean="MainDeployer" method="addDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="MainDeployer" method="removeDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>JBossClientParsingDeployer</depends>
+   </bean>
+   
+   <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
+      <install bean="MainDeployer" method="addDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="MainDeployer" method="removeDeployer">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <property name="type">car</property>
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+      <!-- TODO: check depends -->
+      <depends>AspectLibrary</depends>
+      <depends>AppClientScanningDeployer</depends>
+   </bean>
+</deployment>

Copied: branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/META-INF/ejb3-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/META-INF/ejb3-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   JBoss EJB3Deployer
+
+   $Id: jboss-service.xml 41488 2006-02-25 00:14:09Z dimitris $
+-->
+<server>
+
+   <mbean code="org.jboss.remoting.transport.Connector"
+          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
+      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+      <attribute name="Configuration">
+         <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+         </handlers>
+      </attribute>
+   </mbean>
+
+   <!--  ================================================ -->
+   <!--  Defines the Quartz configuration for             -->
+   <!--  the EJB3 Timer Service                           -->
+   <!--  ================================================ -->
+   <mbean code="org.jboss.ejb3.timerservice.quartz.jmx.EJB3TimerService" name="jboss.ejb:service=EJB3TimerService">
+      <depends>jboss:service=Naming</depends>
+      <depends>jboss:service=TransactionManager</depends>
+      <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <attribute name="Properties">
+           org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
+            org.quartz.jobStore.nonManagedTXDataSource=myDS
+            org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
+            org.quartz.jobStore.tablePrefix=QRTZ_
+            org.quartz.jobStore.dataSource=myDS
+
+           # To get it to work with hypersonic
+           # FIXME: this doesn't lock the row
+            org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
+
+           # from quartz.properties
+            org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
+            org.quartz.scheduler.rmi.export=false
+            org.quartz.scheduler.rmi.proxy=false
+            org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
+
+            org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
+            org.quartz.threadPool.threadCount=10
+            org.quartz.threadPool.threadPriority=5
+            org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
+
+           org.quartz.jobStore.misfireThreshold=60000
+      </attribute>
+      <attribute name="SqlProperties">
+         CREATE_DB_ON_STARTUP = TRUE
+
+         CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
+            DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
+            IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
+            JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
+         CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
+            JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
+            REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
+         CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
+            JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
+            NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
+            TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
+            MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
+            REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
+         CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
+            TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
+            PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
+            FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
+            PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
+            PRIMARY KEY (CALENDAR_NAME))
+         CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
+            PRIMARY KEY (TRIGGER_GROUP))
+         CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
+            FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
+            IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
+         CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
+            LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
+            PRIMARY KEY (INSTANCE_NAME))
+         CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
+         INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
+         INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
+         INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
+         INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
+         INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
+      </attribute>
+   </mbean>
+
+</server>

Modified: branches/Branch_4_2/ejb3/src/resources/META-INF/jboss-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/META-INF/jboss-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -63,7 +63,7 @@
          commons-beanutils.jar,
          jboss-ejb3.jar,
          dom4j.jar,
-         commons-codec.jar,
+         commons-codec-1.2.jar,
          wsdl4j.jar,
          xmlsec.jar,
          jbossws.jar,
@@ -79,7 +79,7 @@
          myfaces-impl.jar,
          commons-beanutils.jar,
          myfaces-jsf-api.jar,
-         commons-codec.jar,
+         commons-codec-1.2.jar,
          catalina-optional.jar,
          tomcat-util.jar,
          jasper-compiler.jar,
@@ -88,7 +88,7 @@
          tomcat-http.jar,
          catalina-manager.jar,
          jasper-runtime.jar,
-         jboss-web-service.jar,
+         tomcat55-service.jar,
          servlets-invoker.jar,
          catalina.jar,
          naming-resources.jar,

Copied: branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- First we create a Configuration object for the cache -->
+   <bean name="EJB3SFSBCacheConfig"
+   		 class="org.jboss.cache.config.Configuration">
+      
+      <!-- Externally injected services -->  
+      <property name="runtimeConfig">
+         <bean name="EJB3SFSBCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+            <!--property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="transactionManager"/></property-->
+            <property name="muxChannelFactory"><inject bean="jgroups.mux:name=Multiplexer"/></property>
+         </bean>
+      </property>
+      
+      <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
+
+      <property name="clusterName">${jboss.partition.name:DefaultPartition}-SFSBCache</property>
+      
+      <!--
+              Node locking level : SERIALIZABLE
+                                   REPEATABLE_READ (default)
+                                   READ_COMMITTED
+                                   READ_UNCOMMITTED
+                                   NONE
+      -->
+      <property name="isolationLevelString">REPEATABLE_READ</property>
+
+      <!--     Valid modes are LOCAL
+                               REPL_ASYNC
+                               REPL_SYNC
+      -->
+      <property name="cacheModeString">REPL_ASYNC</property>
+
+      <!--    Number of milliseconds to wait until all responses for a
+              synchronous call have been received.
+      -->
+      <property name="syncReplTimeout">17500</property>
+
+      <!--  Max number of milliseconds to wait for a lock acquisition -->
+      <property name="lockAcquisitionTimeout">15000</property>
+        
+      <property name="exposeManagementStatistics">true</property>
+
+      <!--  Specific eviction policy configurations. This is LRU -->
+      <property name="evictionConfig">
+      	 <bean name="EJB3SFSBEvictionConfig" class="org.jboss.cache.config.EvictionConfig">
+      	   <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</property>
+            <property name="wakeupIntervalSeconds">5</property>
+            <property name="evictionRegionConfigs">
+            	<list>
+            		<!-- So default region would never timeout -->
+            		<bean name="EJB3SFSBDefaultEvictionRegionConfig" class="org.jboss.cache.config.EvictionRegionConfig">
+            			<property name="regionName">/_default_</property>
+            			<property name="evictionPolicyConfig">
+            				<bean name="EJB3SFSBDefaultLRUConfig" class="org.jboss.cache.eviction.LRUConfiguration">
+               					<property name="maxNodes">0</property>
+               					<property name="timeToLiveSeconds">0</property>
+               				</bean>
+               			</property>
+            		</bean>
+            	</list>
+			</property>
+         </bean>
+      </property>
+      
+      <property name="cacheLoaderConfig">
+      	<bean name="EJB3SFSBCacheLoaderConfig" 
+      		class="org.jboss.cache.config.CacheLoaderConfig">
+      		
+      		<property name="passivation">true</property>
+            <property name="preload">/</property>
+            <property name="shared">false</property>
+            <property name="individualCacheLoaderConfigs">
+              	<list>
+              		<bean name="EJB3SFSBFileCacheLoader" class="org.jboss.cache.loader.FileCacheLoaderConfig">
+               			<!-- Temporary workaround to a bug in JBC 2.0.0.ALPHA1 -->
+               			<property name="className">org.jboss.ejb3.cache.tree.SFSBFileCacheLoader</property>
+               			<property name="location">${jboss.server.data.dir}${/}sfsb</property>
+                   		<property name="async">false</property>
+                   		<property name="fetchPersistentState">true</property>
+                   		<property name="ignoreModifications">false</property>
+               		</bean>
+               	</list>
+            </property>
+      	 </bean>
+      </property>     
+   </bean>
+    
+   <!-- Now we use the above configuration to construct the cache itself -->
+   <bean name="EJB3SFSBClusteredCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=EJB3SFSBClusteredCache", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="configuration"><inject bean="EJB3SFSBCacheConfig"/></property>
+        
+   </bean>
+
+</deployment>
+

Modified: branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
-   <mbean code="org.jboss.ejb3.cache.tree.PassivationTreeCache" name="jboss.cache:service=EJB3SFSBClusteredCache">
-   
-      <!-- uncomment next three statements if using JGroups multiplexer,
-             requires JGroups 2.3 or later, JBossCache 1.4 or later -->
-      <!--
-      <depends>jgroups.mux:name=Multiplexer</depends>
-      <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
-      <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
-      -->
+
+   <!-- ========================================================== -->
+   <!-- Clustered SFSB cache config for use with JBoss Cache 1.4.x --> 
+   <!-- ========================================================== -->
+   <mbean code="org.jboss.cache.TreeCache" 
+          name="jboss.cache:service=EJB3SFSBClusteredCache">
+        
+      <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-SFSBCache</attribute>
       
       <!--
               Node locking level : SERIALIZABLE
@@ -17,48 +16,80 @@
                                    READ_UNCOMMITTED
                                    NONE
       -->
-      <attribute name="IsolationLevel">READ_UNCOMMITTED</attribute>
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
 
       <!--     Valid modes are LOCAL
                                REPL_ASYNC
                                REPL_SYNC
       -->
-      <attribute name="CacheMode">REPL_SYNC</attribute>
+      <attribute name="CacheMode">REPL_ASYNC</attribute>
 
-      <attribute name="ClusterName">SFSB-Cache</attribute>
-
+	  <!-- 
+	       JGroups protocol stack config in XML format.
+		   If your CacheMode is set to REPL_SYNC we recommend you comment
+           out the FC (flow control) protocol
+			 
+           On Windows machines, because of the media sense feature
+           being broken with multicast (even after disabling media sense)
+           set the UDP.loopback attribute to true
+	  -->     
       <attribute name="ClusterConfig">
          <config>
-            <!-- UDP: if you have a multihomed machine,
-                    set the bind_addr attribute to the appropriate NIC IP address
-            -->
-            <!-- UDP: On Windows machines, because of the media sense feature
-                     being broken with multicast (even after disabling media sense)
-                     set the loopback attribute to true
-            -->
-            <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="45551" ip_ttl="${jgroups.mcast.ip_ttl:64}" ip_mcast="true"
-               mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000"
-               ucast_recv_buf_size="80000" loopback="false"/>
-            <PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false"/>
-            <MERGE2 min_interval="10000" max_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>
-            <FD shun="true" up_thread="false" down_thread="false"
-               timeout="20000" max_tries="5"/>
-            <VERIFY_SUSPECT timeout="1500" up_thread="false" down_thread="false"/>
-            <pbcast.NAKACK gc_lag="50" max_xmit_size="8192" retransmit_timeout="600,1200,2400,4800" up_thread="false"
-               down_thread="false"/>
-            <UNICAST timeout="600,1200,2400" down_thread="false"/>
-            <pbcast.STABLE desired_avg_gossip="20000" up_thread="false" down_thread="false"/>
-            <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
-            <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" shun="true" print_local_addr="true"/>
-            <pbcast.STATE_TRANSFER up_thread="false" down_thread="false"/>
-         </config>
+            <UDP mcast_addr="${jgroups.udp.mcast_addr:228.1.2.3}" 
+             mcast_port="${jboss.ejb3sfsbpartition.mcast_port:45551}"
+             tos="8"
+             ucast_recv_buf_size="20000000"
+             ucast_send_buf_size="640000"
+             mcast_recv_buf_size="25000000"
+             mcast_send_buf_size="640000"
+             loopback="false"
+             discard_incompatible_packets="true"
+             max_bundle_size="64000"
+             max_bundle_timeout="30"
+             use_incoming_packet_handler="true"
+             use_outgoing_packet_handler="false"
+             ip_ttl="${jgroups.udp.ip_ttl:2}"
+             down_thread="false" up_thread="false"
+             enable_bundling="true"/>
+          <PING timeout="2000"
+             down_thread="false" up_thread="false" num_initial_members="3"/>
+          <MERGE2 max_interval="100000"
+             down_thread="false" up_thread="false" min_interval="20000"/>
+          <FD_SOCK down_thread="false" up_thread="false"/>
+          <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+          <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+          <pbcast.NAKACK max_xmit_size="60000"
+                   use_mcast_xmit="false" gc_lag="0"
+                   retransmit_timeout="300,600,1200,2400,4800"
+                   down_thread="false" up_thread="false"
+                   discard_delivered_msgs="true"/>
+          <UNICAST timeout="300,600,1200,2400,3600"
+             down_thread="false" up_thread="false"/>
+          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                   down_thread="false" up_thread="false"
+                   max_bytes="400000"/>
+          <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                   down_thread="false" up_thread="false"
+                   join_retry_timeout="2000" shun="true"
+                   view_bundling="true"
+                   view_ack_collection_timeout="5000"/>
+          <FC max_credits="2000000" down_thread="false" up_thread="false"
+              min_threshold="0.10"/>
+          <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+          <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+        </config>
       </attribute>
 
+      <!--    The max amount of time (in milliseconds) we wait until the
+            initial state (ie. the contents of the cache) are retrieved from
+            existing members.
+      -->
+      <attribute name="InitialStateRetrievalTimeout">17500</attribute>
+
       <!--    Number of milliseconds to wait until all responses for a
               synchronous call have been received.
       -->
-      <attribute name="SyncReplTimeout">10000</attribute>
+      <attribute name="SyncReplTimeout">17500</attribute>
 
       <!--  Max number of milliseconds to wait for a lock acquisition -->
       <attribute name="LockAcquisitionTimeout">15000</attribute>
@@ -66,7 +97,7 @@
       <!--  Name of the eviction policy class. -->
       <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
 
-      <!--  Specific eviction policy configurations. This is LRU -->
+      <!--  Specific eviction policy configurations. -->
       <attribute name="EvictionPolicyConfig">
          <config>
             <attribute name="wakeUpIntervalSeconds">5</attribute>
@@ -80,33 +111,27 @@
          </config>
       </attribute>
 
-
-      <!-- New 1.3.x cache loader config block -->
-      <!-- Note this is used for AS5.0 only -->
+      <!-- Store passivated sessions to the file system -->
       <attribute name="CacheLoaderConfiguration">
           <config>
-              <!-- We need to turn it on
-              <passivation>false</passivation>
-              -->
+              
               <passivation>true</passivation>
               <preload>/</preload>
               <shared>false</shared>
 
               <cacheloader>
                   <class>org.jboss.cache.loader.FileCacheLoader</class>
-                      <!--
-                      -->
+                  <!-- Passivate to the server data dir -->
                   <properties>
-                       location=${jboss.server.data.dir}${/}sfsb
+                       location=${jboss.server.data.dir}${/}sfsb 
                   </properties>
                   <async>false</async>
-                  <fetchPersistentState>false</fetchPersistentState>
+                  <fetchPersistentState>true</fetchPersistentState>
                   <ignoreModifications>false</ignoreModifications>
               </cacheloader>
 
           </config>
       </attribute>
-
    </mbean>
 
 </server>

Copied: branches/Branch_4_2/ejb3/src/resources/ejb3-connectors-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/ejb3-connectors-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-connectors-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-connectors-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   JBoss EJB3Deployer
+   
+   $Id: jboss-service.xml 41488 2006-02-25 00:14:09Z dimitris $
+-->
+<server>
+
+   <mbean code="org.jboss.remoting.transport.Connector"
+          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
+      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+      <attribute name="Configuration">
+         <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+         </handlers>
+      </attribute>
+   </mbean>
+
+</server>

Copied: branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-beans.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/ejb3-entity-cache-beans.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-beans.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- First we create a Configuration object for the cache -->
+   <bean name="EJB3EntityCacheConfig"
+   		 class="org.jboss.cache.config.Configuration">
+      
+      <!-- Externally injected services -->  
+      <property name="runtimeConfig">
+         <bean name="EJB3EntityCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+            <property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="TransactionManager"/></property>
+            <property name="muxChannelFactory"><inject bean="jgroups.mux:name=Multiplexer"/></property>
+         </bean>
+      </property>
+      
+      <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
+
+      <property name="clusterName">${jboss.partition.name:DefaultPartition}-EntityCache</property>
+        
+      <!--
+              Node locking level : SERIALIZABLE
+                                   REPEATABLE_READ (default)
+                                   READ_COMMITTED
+                                   READ_UNCOMMITTED
+                                   NONE
+      -->
+      <property name="isolationLevelString">REPEATABLE_READ</property>
+
+      <!--     Valid modes are LOCAL
+                               REPL_ASYNC
+                               REPL_SYNC
+      -->
+      <property name="cacheModeString">REPL_SYNC</property>
+
+      <!--  The max amount of time (in milliseconds) we wait until the
+            initial state (ie. the contents of the cache) are retrieved from
+            existing members in a clustered environment
+      -->
+      <property name="initialStateRetrievalTimeout">15000</property>
+
+      <!--    Number of milliseconds to wait until all responses for a
+              synchronous call have been received.
+      -->
+      <property name="syncReplTimeout">20000</property>
+
+      <!--  Max number of milliseconds to wait for a lock acquisition -->
+      <property name="lockAcquisitionTimeout">15000</property>
+        
+      <property name="exposeManagementStatistics">true</property>
+      
+      <!-- Must be true if any entity deployment uses a scoped classloader -->
+      <property name="useRegionBasedMarshalling">true</property>
+      <!-- Must match the value of "useRegionBasedMarshalling" -->
+      <property name="inactiveOnStartup">true</property>
+
+      <!--  Specific eviction policy configurations. This is LRU -->
+      <property name="evictionConfig">
+      	 <bean name="EJB3EntityEvictionConfig" class="org.jboss.cache.config.EvictionConfig">
+      	    <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</property>
+            <property name="wakeupIntervalSeconds">5</property>
+            <property name="evictionRegionConfigs">
+            	<list>
+            		<!-- Default region will never timeout -->
+            		<bean name="EJB3EntityDefaultEvictionRegionConfig" class="org.jboss.cache.config.EvictionRegionConfig">
+            			<property name="regionName">/_default_</property>
+            			<property name="evictionPolicyConfig">
+            				<bean name="EJB3EntityDefaultLRUConfig" class="org.jboss.cache.eviction.LRUConfiguration">
+               					<property name="maxNodes">5000</property>
+               					<property name="timeToLiveSeconds">1000</property>
+               				</bean>
+               			</property>
+            		</bean>
+            		<!-- EJB3 integration code will programatically create other
+            		     regions as beans are deployed -->
+            	</list>
+			</property>
+         </bean>
+      </property>
+      
+   </bean>
+    
+   <!-- Now we use the above configuration to construct the cache itself -->
+   <bean name="EJB3EntityCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=EJB3EntityTreeCache", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="configuration"><inject bean="EJB3EntityCacheConfig"/></property>
+          
+   </bean>
+
+</deployment>
+

Modified: branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-entity-cache-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
 
-  <!--  ====================================================================  -->
-  <!--  Defines TreeCache configuration                                       -->
-  <!--  ====================================================================  -->
-  <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=EJB3EntityTreeCache">
+   <!-- ============================================================ -->
+   <!-- Clustered entity cache config for use with JBoss Cache 1.4.x --> 
+   <!-- ============================================================ -->
+   <mbean code="org.jboss.cache.TreeCache" 
+         name="jboss.cache:service=EJB3EntityTreeCache">
+         
     <depends>jboss:service=Naming</depends>
     <depends>jboss:service=TransactionManager</depends>
     
-    <!-- uncomment next three statements if using JGroups multiplexer,
-          requires JGroups 2.3 or later, JBossCache 1.4 or later -->
-    <!--
-    <depends>jgroups.mux:name=Multiplexer</depends>
-    <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
-    <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
-    -->
-
+    <!-- Name of cluster. Needs to be the same on all nodes in the clusters, 
+         in order to find each other -->
+    <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-EntityCache</attribute>
+        
     <!-- Configure the TransactionManager -->
     <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
 
@@ -33,49 +31,73 @@
                              REPL_SYNC
     -->
     <attribute name="CacheMode">REPL_SYNC</attribute>
+      
+      <!-- Must be true if any entity deployment uses a scoped classloader -->
+      <attribute name="UseRegionBasedMarshalling">true</attribute>
+      <!-- Must match the value of "useRegionBasedMarshalling" -->
+      <attribute name="InactiveOnStartup">true</attribute>
 
-    <!-- Name of cluster. Needs to be the same for all clusters, in order
-             to find each other -->
-    <attribute name="ClusterName">EJB3-entity-cache</attribute>
+	  <!-- 
+	        JGroups protocol stack config in XML format.
+		    
+		    On Windows machines, because of the media sense feature
+            being broken with multicast (even after disabling media sense)
+            set the UDP.loopback attribute to true
+      -->     
+      <attribute name="ClusterConfig">
+         <config>
+            <UDP mcast_addr="${jgroups.udp.mcast_addr:228.1.2.3}" 
+                 mcast_port="${jboss.ejb3entitypartition.mcast_port:43333}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="false"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 ip_ttl="${jgroups.udp.ip_ttl:2}"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="false"/>
+            <PING timeout="2000"
+                  down_thread="false" up_thread="false" num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                    use_mcast_xmit="false" gc_lag="0"
+                    retransmit_timeout="300,600,1200,2400,4800"
+                    down_thread="false" up_thread="false"
+                    discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"
+                    down_thread="false" up_thread="false"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                    down_thread="false" up_thread="false"
+                    max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                    down_thread="false" up_thread="false"
+                    join_retry_timeout="2000" shun="true"
+                    view_bundling="true"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+        </config>
+      </attribute>
 
-    <attribute name="ClusterConfig">
-      <config>
-        <!-- UDP: if you have a multihomed machine,
-                set the bind_addr attribute to the appropriate NIC IP address
-        -->
-        <!-- UDP: On Windows machines, because of the media sense feature
-                 being broken with multicast (even after disabling media sense)
-                 set the loopback attribute to true
-        -->
-        <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="43333" ip_ttl="${jgroups.mcast.ip_ttl:2}" ip_mcast="true"
-           mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000"
-           ucast_recv_buf_size="80000" loopback="false" />
-        <PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false" />
-        <MERGE2 min_interval="10000" max_interval="20000" />
-        <FD_SOCK down_thread="false" up_thread="false"/>
-        <FD shun="true" up_thread="false" down_thread="false"
-           timeout="20000" max_tries="5"/>
-        <VERIFY_SUSPECT timeout="1500" up_thread="false" down_thread="false" />
-        <pbcast.NAKACK gc_lag="50" max_xmit_size="8192" retransmit_timeout="600,1200,2400,4800" up_thread="false"
-           down_thread="false" />
-        <UNICAST timeout="600,1200,2400" down_thread="false" />
-        <pbcast.STABLE desired_avg_gossip="20000" up_thread="false" down_thread="false" />
-        <FRAG frag_size="8192" down_thread="false" up_thread="false" />
-        <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" shun="true" print_local_addr="true" />
-        <pbcast.STATE_TRANSFER up_thread="false" down_thread="false" />
-      </config>
-    </attribute>
-
     <!--    The max amount of time (in milliseconds) we wait until the
             initial state (ie. the contents of the cache) are retrieved from
-            existing members in a clustered environment
+            existing members.
     -->
-    <attribute name="InitialStateRetrievalTimeout">5000</attribute>
+    <attribute name="InitialStateRetrievalTimeout">17500</attribute>
 
     <!--    Number of milliseconds to wait until all responses for a
             synchronous call have been received.
     -->
-    <attribute name="SyncReplTimeout">10000</attribute>
+    <attribute name="SyncReplTimeout">17500</attribute>
 
     <!--  Max number of milliseconds to wait for a lock acquisition -->
     <attribute name="LockAcquisitionTimeout">15000</attribute>

Modified: branches/Branch_4_2/ejb3/src/resources/ejb3-interceptors-aop.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-interceptors-aop.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE aop PUBLIC
    "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
 
 <aop>
    <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
@@ -169,12 +169,16 @@
       <bind pointcut="execution(public * *->*(..))">
          <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
          <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
       </bind>
 
       <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
          <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
       </bind>
+
+      <bind pointcut="execution(public * *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+
       <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
          @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
       </annotation>
@@ -284,7 +288,7 @@
          @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
       </annotation>
    </domain>
-   
+
    <domain name="Consumer Bean">
       <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
          <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
@@ -313,7 +317,7 @@
       </bind>
       <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
          <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>      
+      </bind>
       <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
          <interceptor-ref name="Basic Authorization"/>
       </bind>
@@ -338,7 +342,7 @@
       </bind>
       <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
          <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>      
+      </bind>
       <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
          <interceptor-ref name="Basic Authorization"/>
       </bind>

Deleted: branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-	<!-- TODO: the ejb deployer must depend on this -->
-	
-	<!--  ================================================ -->
-	<!--  Defines the Quartz configuration for             -->
-	<!--  the EJB3 Timer Service                           -->
-	<!--  ================================================ -->
-	<mbean code="org.jboss.ejb3.timerservice.quartz.jmx.EJB3TimerService" name="jboss.ejb:service=EJB3TimerService">
-		<depends>jboss:service=Naming</depends>
-		<depends>jboss:service=TransactionManager</depends>
-		<depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-		
-		<attribute name="Properties">
-        	org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
-            org.quartz.jobStore.nonManagedTXDataSource=myDS
-            org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
-            org.quartz.jobStore.tablePrefix=QRTZ_
-            org.quartz.jobStore.dataSource=myDS
-         
-	        # To get it to work with hypersonic
-	        # FIXME: this doesn't lock the row
-            org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
-         
-        	# from quartz.properties
-            org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
-            org.quartz.scheduler.rmi.export=false
-            org.quartz.scheduler.rmi.proxy=false
-            org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
-   
-            org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-            org.quartz.threadPool.threadCount=10
-            org.quartz.threadPool.threadPriority=5
-            org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
-   
-        	org.quartz.jobStore.misfireThreshold=60000
-		</attribute>
-		<attribute name="SqlProperties">
-			CREATE_DB_ON_STARTUP = TRUE
-			
-			CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
-			   DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
-			   IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
-			   JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
-			CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
-			   JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
-			   REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
-			CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
-			   JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
-			   NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
-			   TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
-			   MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
-			   REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
-			CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
-			   TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
-			   PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
-			   FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
-			   PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
-			   PRIMARY KEY (CALENDAR_NAME))
-			CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
-			   PRIMARY KEY (TRIGGER_GROUP))
-			CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
-			   FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
-			   IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
-			CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
-			   LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
-			   PRIMARY KEY (INSTANCE_NAME))
-			CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
-			INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
-			INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
-			INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
-			INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
-			INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
-		</attribute>
-	</mbean>
-</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/ejb3-timer-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/ejb3-timer-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+	<!-- TODO: the ejb deployer must depend on this -->
+	
+	<!--  ================================================ -->
+	<!--  Defines the Quartz configuration for             -->
+	<!--  the EJB3 Timer Service                           -->
+	<!--  ================================================ -->
+	<mbean code="org.jboss.ejb3.timerservice.quartz.jmx.EJB3TimerService" name="jboss.ejb:service=EJB3TimerService">
+		<depends>jboss:service=Naming</depends>
+		<depends>jboss:service=TransactionManager</depends>
+		<depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+		
+		<attribute name="Properties">
+        	org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
+            org.quartz.jobStore.nonManagedTXDataSource=myDS
+            org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
+            org.quartz.jobStore.tablePrefix=QRTZ_
+            org.quartz.jobStore.dataSource=myDS
+         
+	        # To get it to work with hypersonic
+	        # FIXME: this doesn't lock the row
+            org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
+         
+        	# from quartz.properties
+            org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
+            org.quartz.scheduler.rmi.export=false
+            org.quartz.scheduler.rmi.proxy=false
+            org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
+   
+            org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
+            org.quartz.threadPool.threadCount=10
+            org.quartz.threadPool.threadPriority=5
+            org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
+   
+        	org.quartz.jobStore.misfireThreshold=60000
+		</attribute>
+		<attribute name="SqlProperties">
+			CREATE_DB_ON_STARTUP = TRUE
+			
+			CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
+			   DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
+			   IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
+			   JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
+			CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
+			   JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
+			   REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
+			CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
+			   JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
+			   NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
+			   TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
+			   MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
+			   REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
+			CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+			   TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
+			   TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+			CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+			   TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
+			   PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+			CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+			   TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
+			   FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+			CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+			   TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
+			   PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+			CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
+			   PRIMARY KEY (CALENDAR_NAME))
+			CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
+			   PRIMARY KEY (TRIGGER_GROUP))
+			CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
+			   TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
+			   FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
+			   IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
+			CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
+			   LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
+			   PRIMARY KEY (INSTANCE_NAME))
+			CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
+			INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
+			INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
+			INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
+			INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
+			INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
+		</attribute>
+	</mbean>
+</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/schema (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema)

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/application-client_5.xsd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/schema/application-client_5.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/application-client_5.xsd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/application_5.xsd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/schema/application_5.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/application_5.xsd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/ejb-jar_3_0.xsd
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/ejb-jar_3_0.xsd	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/schema/ejb-jar_3_0.xsd	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2705 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="3.0">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)ejb-jar_3_0.xsds	1.51 02/23/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2006 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the EJB 3.0 deployment descriptor.
-	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
-	the EJB's jar file.  All EJB deployment descriptors must indicate
-	the ejb-jar schema by using the Java EE namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <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">
-	      ...
-	    </ejb-jar>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for the
-	Java EE namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="ejb-jar" type="javaee:ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is the root of the ejb-jar deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-name element contains the name of an enterprise
-	  bean. The name must be unique within the ejb-jar file.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:enterprise-beans/*"/>
-      <xsd:field    xpath="javaee:ejb-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="ejb-name-references"
-		refer="javaee:ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  relationship-role-source must be to a specific ejb-name
-	  defined within the scope of enterprise-beans element.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector
-xpath=".//javaee:ejb-relationship-role/javaee:relationship-role-source"/>
-      <xsd:field
-	   xpath="javaee:ejb-name"/>
-    </xsd:keyref>
-
-    <xsd:key name="role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  A role-name-key is specified to allow the references
-	  from the security-role-refs.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:assembly-descriptor/javaee:security-role"/>
-      <xsd:field    xpath="javaee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="role-name-references"
-		refer="javaee:role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  security-role-ref to a specified role-name.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:enterprise-beans/*/javaee:security-role-ref"/>
-      <xsd:field    xpath="javaee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-config-propertyType contains a name/value
-	configuration property pair for a message-driven bean.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="activation-config-property-name"
-		   type="javaee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-name element contains
-	    the name for an activation configuration property of
-	    a message-driven bean.
-
-	    For JMS message-driven beans, the following property
-	    names are recognized: acknowledgeMode,
-	    messageSelector, destinationType, subscriptionDurability
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="activation-config-property-value"
-		   type="javaee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-value element
-	    contains the value for an activation configuration
-	    property of a message-driven bean.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-configType defines information about the
-	expected configuration properties of the message-driven bean
-	in its operational environment. This may include information
-	about message acknowledgement, message selector, expected
-	destination type, etc.
-
-	The configuration information is expressed in terms of
-	name/value configuration properties.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="activation-config-property"
-		   type="javaee:activation-config-propertyType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="application-exceptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The application-exceptionType declares an application
-        exception. The declaration consists of:
-
-            - the exception class. When the container receives
-              an exception of this type, it is required to
-              forward this exception as an applcation exception
-              to the client regardless of whether it is a checked
-              or unchecked exception.
-            - an optional rollback element. If this element is
-              set to true, the container must rollback the current
-              transaction before forwarding the exception to the
-              client.  If not specified, it defaults to false.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="exception-class"
-		   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="rollback"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="around-invokeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The around-invoke type specifies a method on a
-        class to be called during the around invoke portion of an
-        ejb invocation.  Note that each class may have only one
-        around invoke method and that the method may not be
-        overloaded.
-
-        If the class element is missing then
-        the class defining the callback is assumed to be the
-        interceptor class or component class in scope at the
-        location in the descriptor in which the around invoke
-        definition appears.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"/>
-      <xsd:element name="method-name"
-                   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="assembly-descriptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The assembly-descriptorType defines
-	application-assembly information.
-
-	The application-assembly information consists of the
-	following parts: the definition of security roles, the
-	definition of method permissions, the definition of
-	transaction attributes for enterprise beans with
-	container-managed transaction demarcation, the definition
-        of interceptor bindings, a list of
-	methods to be excluded from being invoked, and a list of
-        exception types that should be treated as application exceptions.
-
-	All the parts are optional in the sense that they are
-	omitted if the lists represented by them are empty.
-
-	Providing an assembly-descriptor in the deployment
-	descriptor is optional for the ejb-jar file producer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="security-role"
-		   type="javaee:security-roleType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method-permission"
-		   type="javaee:method-permissionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="container-transaction"
-		   type="javaee:container-transactionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor-binding"
-                   type="javaee:interceptor-bindingType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination"
-		   type="javaee:message-destinationType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="exclude-list"
-		   type="javaee:exclude-listType"
-		   minOccurs="0"/>
-      <xsd:element name="application-exception"
-                   type="javaee:application-exceptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-fieldType describes a container-managed field. The
-	cmp-fieldType contains an optional description of the field,
-	and the name of the field.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="field-name"
-		   type="javaee:java-identifierType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The field-name element specifies the name of a
-	    container managed field.
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 2.x must begin with a lowercase
-	    letter. This field is accessed by methods whose
-	    names consists of the name of the field specified by
-	    field-name in which the first letter is uppercased,
-	    prefixed by "get" or "set".
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 1.x must denote a public field of the
-	    enterprise bean class or one of its superclasses.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-versionType specifies the version of an entity bean
-	with container-managed persistence. It is used by
-	cmp-version elements.
-
-	The value must be one of the two following:
-
-	    1.x
-	    2.x
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="1.x"/>
-	<xsd:enumeration value="2.x"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-field-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-field-type element specifies the class of a
-	collection-valued logical relationship field in the entity
-	bean class. The value of an element using cmr-field-typeType
-	must be either: java.util.Collection or java.util.Set.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="java.util.Collection"/>
-	<xsd:enumeration value="java.util.Set"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-fieldType describes the bean provider's view of
-	a relationship. It consists of an optional description, and
-	the name and the class type of a field in the source of a
-	role of a relationship. The cmr-field-name element
-	corresponds to the name used for the get and set accessor
-	methods for the relationship. The cmr-field-type element is
-	used only for collection-valued cmr-fields. It specifies the
-	type of the collection that is used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="cmr-field-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cmr-field-name element specifies the name of a
-	    logical relationship field in the entity bean
-	    class. The name of the cmr-field must begin with a
-	    lowercase letter. This field is accessed by methods
-	    whose names consist of the name of the field
-	    specified by cmr-field-name in which the first
-	    letter is uppercased, prefixed by "get" or "set".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmr-field-type"
-		   type="javaee:cmr-field-typeType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="container-transactionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The container-transactionType specifies how the container
-	must manage transaction scopes for the enterprise bean's
-	method invocations. It defines an optional description, a
-	list of method elements, and a transaction attribute. The
-	transaction attribute is to be applied to all the specified
-	methods.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="javaee:methodType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="trans-attribute"
-		   type="javaee:trans-attributeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-classType contains the fully-qualified name of the
-	  enterprise bean's class. It is used by ejb-class elements.
-
-	  Example:
-
-	      <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-jarType defines the root element of the EJB
-	deployment descriptor. It contains
-
-	    - an optional description of the ejb-jar file
-	    - an optional display name
-	    - an optional icon that contains a small and a large
-	      icon file name
-	    - structural information about all included
-	      enterprise beans that is not specified through
-              annotations
-            - structural information about interceptor classes
-	    - a descriptor for container managed relationships,
-	      if any.
-	    - an optional application-assembly descriptor
-	    - an optional name of an ejb-client-jar file for the
-	      ejb-jar.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="enterprise-beans"
-		   type="javaee:enterprise-beansType"
-                   minOccurs="0"/>
-      <xsd:element name="interceptors"
-		   type="javaee:interceptorsType"
-                   minOccurs="0"/>
-      <xsd:element name="relationships"
-		   type="javaee:relationshipsType"
-		   minOccurs="0">
-	<xsd:unique name="relationship-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relation-name contains the name of a
-	      relation. The name must be unique within
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-relation"/>
-	  <xsd:field    xpath="javaee:ejb-relation-name"/>
-	</xsd:unique>
-      </xsd:element>
-      <xsd:element name="assembly-descriptor"
-		   type="javaee:assembly-descriptorType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Providing an assembly-descriptor in the deployment
-	    descriptor is optional for the ejb-jar file
-	    producer.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-client-jar"
-		   type="javaee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The optional ejb-client-jar element specifies a JAR
-	      file that contains the class files necessary for a
-	      client program to access the
-	      enterprise beans in the ejb-jar file.
-
-	      Example:
-
-		  <ejb-client-jar>employee_service_client.jar
-		  </ejb-client-jar>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="3.0"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The version specifies the version of the
-	  EJB specification that the instance document must
-	  comply with. This information enables deployment tools
-	  to validate a particular EJB Deployment
-	  Descriptor with respect to a specific version of the EJB
-	  schema.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The metadata-complete attribute defines whether this
-	  deployment descriptor and other related deployment
-	  descriptors for this module (e.g., web service
-	  descriptors) are complete, or whether the class
-	  files available to this module and packaged with
-	  this application should be examined for annotations
-	  that specify deployment information.
-
-	  If metadata-complete is set to "true", the deployment
-	  tool must ignore any annotations that specify deployment
-	  information, which might be present in the class files
-	  of the application.
-
-	  If metadata-complete is not specified or is set to
-	  "false", the deployment tool must examine the class
-	  files of the application for annotations, as
-	  specified by the specifications.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-nameType specifies an enterprise bean's name. It is
-	  used by ejb-name elements. This name is assigned by the
-	  ejb-jar file producer to name the enterprise bean in the
-	  ejb-jar file's deployment descriptor. The name must be
-	  unique among the names of the enterprise beans in the same
-	  ejb-jar file.
-
-	  There is no architected relationship between the used
-	  ejb-name in the deployment descriptor and the JNDI name that
-	  the Deployer will assign to the enterprise bean's home.
-
-	  The name for an entity bean must conform to the lexical
-	  rules for an NMTOKEN.
-
-	  Example:
-
-	  <ejb-name>EmployeeService</ejb-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdNMTOKENType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-relationType describes a relationship between two
-	entity beans with container-managed persistence.  It is used
-	by ejb-relation elements. It contains a description; an
-	optional ejb-relation-name element; and exactly two
-	relationship role declarations, defined by the
-	ejb-relationship-role elements. The name of the
-	relationship, if specified, is unique within the ejb-jar
-	file.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation-name"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relation-name element provides a unique name
-	    within the ejb-jar file for a relationship.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-relationship-role"
-		   type="javaee:ejb-relationship-roleType"/>
-      <xsd:element name="ejb-relationship-role"
-		   type="javaee:ejb-relationship-roleType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationship-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-relationship-roleType describes a role within a
-	  relationship. There are two roles in each relationship.
-
-	  The ejb-relationship-roleType contains an optional
-	  description; an optional name for the relationship role; a
-	  specification of the multiplicity of the role; an optional
-	  specification of cascade-delete functionality for the role;
-	  the role source; and a declaration of the cmr-field, if any,
-	  by means of which the other side of the relationship is
-	  accessed from the perspective of the role source.
-
-	  The multiplicity and role-source element are mandatory.
-
-	  The relationship-role-source element designates an entity
-	  bean by means of an ejb-name element. For bidirectional
-	  relationships, both roles of a relationship must declare a
-	  relationship-role-source element that specifies a cmr-field
-	  in terms of which the relationship is accessed. The lack of
-	  a cmr-field element in an ejb-relationship-role specifies
-	  that the relationship is unidirectional in navigability and
-	  the entity bean that participates in the relationship is
-	  "not aware" of the relationship.
-
-	  Example:
-
-	  <ejb-relation>
-	      <ejb-relation-name>Product-LineItem</ejb-relation-name>
-	      <ejb-relationship-role>
-		  <ejb-relationship-role-name>product-has-lineitems
-		  </ejb-relationship-role-name>
-		  <multiplicity>One</multiplicity>
-		  <relationship-role-source>
-		  <ejb-name>ProductEJB</ejb-name>
-		  </relationship-role-source>
-	       </ejb-relationship-role>
-	  </ejb-relation>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relationship-role-name"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relationship-role-name element defines a
-	    name for a role that is unique within an
-	    ejb-relation. Different relationships can use the
-	    same name for a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="multiplicity"
-		   type="javaee:multiplicityType"/>
-      <xsd:element name="cascade-delete"
-		   type="javaee:emptyType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cascade-delete element specifies that, within a
-	    particular relationship, the lifetime of one or more
-	    entity beans is dependent upon the lifetime of
-	    another entity bean. The cascade-delete element can
-	    only be specified for an ejb-relationship-role
-	    element contained in an ejb-relation element in
-	    which the other ejb-relationship-role
-	    element specifies a multiplicity of One.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="relationship-role-source"
-		   type="javaee:relationship-role-sourceType"/>
-      <xsd:element name="cmr-field"
-		   type="javaee:cmr-fieldType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="enterprise-beansType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The enterprise-beansType declares one or more enterprise
-	beans. Each bean can be a session, entity or message-driven
-	bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="session"
-		   type="javaee:session-beanType">
-	<xsd:unique name="session-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-local-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-env-ref"/>
-	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:message-destination-ref"/>
-	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-ref"/>
-	  <xsd:field    xpath="javaee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:env-entry"/>
-	  <xsd:field    xpath="javaee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="entity"
-		   type="javaee:entity-beanType">
-	<xsd:unique name="entity-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-local-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-env-ref"/>
-	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:message-destination-ref"/>
-	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-ref"/>
-	  <xsd:field    xpath="javaee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:env-entry"/>
-	  <xsd:field    xpath="javaee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="message-driven"
-		   type="javaee:message-driven-beanType">
-	<xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-local-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-env-ref"/>
-	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:message-destination-ref"/>
-	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-ref"/>
-	  <xsd:field    xpath="javaee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:env-entry"/>
-	  <xsd:field    xpath="javaee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="entity-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The entity-beanType declares an entity bean. The declaration
-	consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a unique name assigned to the enterprise bean
-	      in the deployment descriptor
-            - an optional mapped-name element that can be used to provide
-              vendor-specific deployment information such as the physical
-              jndi-name of the entity bean's remote home interface. This
-              element is not required to be supported by all implementations.
-              Any use of this element is non-portable.
-	    - the names of the entity bean's remote home
-	      and remote interfaces, if any
-	    - the names of the entity bean's local home and local
-	      interfaces, if any
-	    - the entity bean's implementation class
-	    - the optional entity bean's persistence management type. If
-              this element is not specified it is defaulted to Container.
-	    - the entity bean's primary key class name
-	    - an indication of the entity bean's reentrancy
-	    - an optional specification of the
-	      entity bean's cmp-version
-	    - an optional specification of the entity bean's
-	      abstract schema name
-	    - an optional list of container-managed fields
-	    - an optional specification of the primary key
-	      field
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB
-	      references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory references
-	    - an optional declaration of the bean's
-	      resource environment references
-	    - an optional declaration of the bean's message
-	      destination references
-	    - an optional set of query declarations
-	      for finder and select methods for an entity
-	      bean with cmp-version 2.x.
-
-	The optional abstract-schema-name element must be specified
-	for an entity bean with container-managed persistence and
-	cmp-version 2.x.
-
-	The optional primkey-field may be present in the descriptor
-	if the entity's persistence-type is Container.
-
-	The optional cmp-version element may be present in the
-	descriptor if the entity's persistence-type is Container. If
-	the persistence-type is Container and the cmp-version
-	element is not specified, its value defaults to 2.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean cmp-version is 1.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean has a remote home and remote interface.
-
-	The optional local-home and local elements must be specified
-	if the entity bean has a local home and local interface.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified.
-
-	The optional query elements must be present if the
-	persistence-type is Container and the cmp-version is 2.x and
-	query methods other than findByPrimaryKey have been defined
-	for the entity bean.
-
-	The other elements that are optional are "optional" in the
-	sense that they are omitted if the lists represented by them
-	are empty.
-
-	At least one cmp-field element must be present in the
-	descriptor if the entity's persistence-type is Container and
-	the cmp-version is 1.x, and none must not be present if the
-	entity's persistence-type is Bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="javaee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="javaee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="javaee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="javaee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-		   type="javaee:ejb-classType"/>
-      <xsd:element name="persistence-type"
-		   type="javaee:persistence-typeType"/>
-      <xsd:element name="prim-key-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The prim-key-class element contains the
-	    fully-qualified name of an
-	    entity bean's primary key class.
-
-	    If the definition of the primary key class is
-	    deferred to deployment time, the prim-key-class
-	    element should specify java.lang.Object.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="reentrant"
-		   type="javaee:true-falseType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The reentrant element specifies whether an entity
-	    bean is reentrant or not.
-
-	    The reentrant element must be one of the two
-	    following: true or false
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-version"
-		   type="javaee:cmp-versionType"
-		   minOccurs="0"/>
-      <xsd:element name="abstract-schema-name"
-		   type="javaee:java-identifierType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The abstract-schema-name element specifies the name
-	    of the abstract schema type of an entity bean with
-	    cmp-version 2.x. It is used in EJB QL queries.
-
-	    For example, the abstract-schema-name for an entity
-	    bean whose local interface is
-	    com.acme.commerce.Order might be Order.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-field"
-		   type="javaee:cmp-fieldType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="primkey-field"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The primkey-field element is used to specify the
-	    name of the primary key field for an entity with
-	    container-managed persistence.
-
-	    The primkey-field must be one of the fields declared
-	    in the cmp-field element, and the type of the field
-	    must be the same as the primary key type.
-
-	    The primkey-field element is not used if the primary
-	    key maps to multiple container-managed fields
-	    (i.e. the key is a compound key). In this case, the
-	    fields of the primary key class must be public, and
-	    their names must correspond to the field names of
-	    the entity bean class that comprise the key.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-		   type="javaee:security-role-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="security-identity"
-		   type="javaee:security-identityType"
-		   minOccurs="0"/>
-      <xsd:element name="query"
-		   type="javaee:queryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="exclude-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The exclude-listType specifies one or more methods which
-	the Assembler marks to be uncallable.
-
-	If the method permission relation contains methods that are
-	in the exclude list, the Deployer should consider those
-	methods to be uncallable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="javaee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="init-methodType">
-    <xsd:sequence>
-      <xsd:element name="create-method"
-		   type="javaee:named-methodType"/>
-      <xsd:element name="bean-method"
-		   type="javaee:named-methodType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptor-bindingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptor-bindingType element describes the binding of
-        interceptor classes to beans within the ejb-jar.
-        It consists of :
-
-          - An optional description.
-          - The name of an ejb within the ejb-jar or the wildcard value "*",
-            which is used to define interceptors that are bound to all
-            beans in the ejb-jar.
-          - A list of interceptor classes that are bound to the contents of
-            the ejb-name element or a specification of the total ordering
-            over the interceptors defined for the given level and above.
-          - An optional exclude-default-interceptors element.  If set to true,
-            specifies that default interceptors are not to be applied to
-            a bean-class and/or business method.
-          - An optional exclude-class-interceptors element.  If set to true,
-            specifies that class interceptors are not to be applied to
-            a business method.
-          - An optional set of method elements for describing the name/params
-            of a method-level interceptor.
-
-         Interceptors bound to all classes using the wildcard syntax
-         "*" are default interceptors for the components in the ejb-jar.
-         In addition, interceptors may be bound at the level of the bean
-         class (class-level interceptors) or business methods (method-level
-         interceptors ).
-
-         The binding of interceptors to classes is additive.  If interceptors
-         are bound at the class-level and/or default-level as well as the
-         method-level, both class-level and/or default-level as well as
-         method-level will apply.
-
-         There are four possible styles of the interceptor element syntax :
-
-         1.
-         <interceptor-binding>
-           <ejb-name>*</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-         </interceptor-binding>
-
-         Specifying the ejb-name as the wildcard value "*" designates
-         default interceptors (interceptors that apply to all session and
-         message-driven beans contained in the ejb-jar).
-
-         2.
-         <interceptor-binding>
-           <ejb-name>EJBNAME</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-         </interceptor-binding>
-
-         This style is used to refer to interceptors associated with the
-         specified enterprise bean(class-level interceptors).
-
-         3.
-         <interceptor-binding>
-           <ejb-name>EJBNAME</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-           <method>
-             <method-name>METHOD</method-name>
-           </method>
-         </interceptor-binding>
-
-         This style is used to associate a method-level interceptor with
-         the specified enterprise bean.  If there are multiple methods
-         with the same overloaded name, the element of this style refers
-         to all the methods with the overloaded name.  Method-level
-         interceptors can only be associated with business methods of the
-         bean class.   Note that the wildcard value "*" cannot be used
-         to specify method-level interceptors.
-
-         4.
-         <interceptor-binding>
-           <ejb-name>EJBNAME</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-           <method>
-             <method-name>METHOD</method-name>
-             <method-params>
-               <method-param>PARAM-1</method-param>
-               <method-param>PARAM-2</method-param>
-               ...
-               <method-param>PARAM-N</method-param>
-             </method-params>
-           </method>
-         </interceptor-binding>
-
-         This style is used to associate a method-level interceptor with
-         the specified method of the specified enterprise bean.  This
-         style is used to refer to a single method within a set of methods
-         with an overloaded name.  The values PARAM-1 through PARAM-N
-         are the fully-qualified Java types of the method's input parameters
-         (if the method has no input arguments, the method-params element
-         contains no method-param elements). Arrays are specified by the
-         array element's type, followed by one or more pair of square
-         brackets (e.g. int[][]).
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:string"/>
-      <xsd:choice>
-        <xsd:element name="interceptor-class"
-                     type="javaee:fully-qualified-classType"
-		     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="interceptor-order"
-		     type="javaee:interceptor-orderType"
-		     minOccurs="1"/>
-      </xsd:choice>
-      <xsd:element name="exclude-default-interceptors"
-		   type="javaee:true-falseType"
-		   minOccurs="0"/>
-      <xsd:element name="exclude-class-interceptors"
-		   type="javaee:true-falseType"
-		   minOccurs="0"/>
-      <xsd:element name="method"
-		   type="javaee:named-methodType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptor-orderType">
-    <xsd:annotation>
-      <xsd:documentation>
-        The interceptor-orderType element describes a total ordering
-        of interceptor classes.
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:element name="interceptor-class"
-                   type="javaee:fully-qualified-classType"
-		   minOccurs="1"
-                   maxOccurs="unbounded"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptorType element declares information about a single
-        interceptor class.  It consists of :
-
-            - An optional description.
-            - The fully-qualified name of the interceptor class.
-            - An optional list of around invoke methods declared on the
-              interceptor class and/or its super-classes.
-            - An optional list environment dependencies for the interceptor
-              class and/or its super-classes.
-            - An optional list of post-activate methods declared on the
-              interceptor class and/or its super-classes.
-            - An optional list of pre-passivate methods declared on the
-              interceptor class and/or its super-classes.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor-class"
-		   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="post-activate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-passivate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptorsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptorsType element declares one or more interceptor
-        classes used by components within this ejb-jar.  The declaration
-        consists of :
-
-            - An optional description.
-            - One or more interceptor elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor"
-		   type="javaee:interceptorType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-driven-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-driven element declares a message-driven
-	bean. The declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name.
-	    - a name assigned to the enterprise bean in
-	      the deployment descriptor
-            - an optional mapped-name element that can be used to provide
-              vendor-specific deployment information such as the physical
-              jndi-name of destination from which this message-driven bean
-              should consume.  This element is not required to be supported
-              by all implementations.  Any use of this element is non-portable.
-	    - the message-driven bean's implementation class
-	    - an optional declaration of the bean's messaging
-	      type
-            - an optional declaration of the bean's timeout method.
-	    - the optional message-driven bean's transaction management
-              type. If it is not defined, it is defaulted to Container.
-	    - an optional declaration of the bean's
-	      message-destination-type
-	    - an optional declaration of the bean's
-	      message-destination-link
-	    - an optional declaration of the message-driven bean's
-	      activation configuration properties
-            - an optional list of the message-driven bean class and/or
-              superclass around-invoke methods.
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local EJB
-	      references
-	    - an optional declaration of the bean's web service
-	      references
-	    - an optional declaration of the security
-	      identity to be used for the execution of the bean's
-	      methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory
-	      references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-		   type="javaee:ejb-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-             The ejb-class element specifies the fully qualified name
-             of the bean class for this ejb.  It is required unless
-             there is a component-defining annotation for the same
-             ejb-name.
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="messaging-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The messaging-type element specifies the message
-	    listener interface of the message-driven bean.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="transaction-type"
-		   type="javaee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="message-destination-type"
-		   type="javaee:message-destination-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-		   type="javaee:message-destination-linkType"
-		   minOccurs="0"/>
-      <xsd:element name="activation-config"
-		   type="javaee:activation-configType"
-		   minOccurs="0"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-identity"
-		   type="javaee:security-identityType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-intfType">
-
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-intf element allows a method element to
-	differentiate between the methods with the same name and
-	signature that are multiply defined across the home and
-	component interfaces (e.g, in both an enterprise bean's
-	remote and local interfaces or in both an enterprise bean's
-	home and remote interfaces, etc.); the component and web
-	service endpoint interfaces, and so on. The Local applies to
-        both local component interface and local business interface.
-        Similarly, Remote applies to both remote component interface
-        and the remote business interface.
-
-	The method-intf element must be one of the following:
-
-	    Home
-	    Remote
-	    LocalHome
-	    Local
-	    ServiceEndpoint
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Home"/>
-	<xsd:enumeration value="Remote"/>
-	<xsd:enumeration value="LocalHome"/>
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="ServiceEndpoint"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-nameType contains a name of an enterprise
-	bean method or the asterisk (*) character. The asterisk is
-	used when the element denotes all the methods of an
-	enterprise bean's client view interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-paramsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-paramsType defines a list of the
-	fully-qualified Java type names of the method parameters.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-param"
-		   type="javaee:java-typeType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The method-param element contains a primitive
-	    or a fully-qualified Java type name of a method
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-permissionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-permissionType specifies that one or more
-	security roles are allowed to invoke one or more enterprise
-	bean methods. The method-permissionType consists of an
-	optional description, a list of security role names or an
-	indicator to state that the method is unchecked for
-	authorization, and a list of method elements.
-
-	The security roles used in the method-permissionType
-	must be defined in the security-role elements of the
-	deployment descriptor, and the methods must be methods
-	defined in the enterprise bean's business, home, component
-        and/or web service endpoint interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="role-name"
-		     type="javaee:role-nameType"
-		     maxOccurs="unbounded"/>
-	<xsd:element name="unchecked"
-		     type="javaee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The unchecked element specifies that a method is
-	      not checked for authorization by the container
-	      prior to invocation of the method.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-      <xsd:element name="method"
-		   type="javaee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The methodType is used to denote a method of an enterprise
-	  bean's business, home, component, and/or web service endpoint
-	  interface, or, in the case of a message-driven bean, the
-	  bean's message listener method, or a set of such
-	  methods. The ejb-name element must be the name of one of the
-	  enterprise beans declared in the deployment descriptor; the
-	  optional method-intf element allows to distinguish between a
-	  method with the same signature that is multiply defined
-	  across the business, home, component, and/or web service
-          endpoint nterfaces; the method-name element specifies the
-          method name; and the optional method-params elements identify
-          a single method among multiple methods with an overloaded
-	  method name.
-
-	  There are three possible styles of using methodType element
-	  within a method element:
-
-	  1.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	     This style is used to refer to all the methods of the
-	     specified enterprise bean's business, home, component,
-             and/or web service endpoint interfaces.
-
-	  2.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	  </method>
-
-	     This style is used to refer to the specified method of
-	     the specified enterprise bean. If there are multiple
-	     methods with the same overloaded name, the element of
-	     this style refers to all the methods with the overloaded
-	     name.
-
-	  3.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	      <method-params>
-		  <method-param>PARAM-1</method-param>
-		  <method-param>PARAM-2</method-param>
-		  ...
-		  <method-param>PARAM-n</method-param>
-	      </method-params>
-	  </method>
-
-	     This style is used to refer to a single method within a
-	     set of methods with an overloaded name. PARAM-1 through
-	     PARAM-n are the fully-qualified Java types of the
-	     method's input parameters (if the method has no input
-	     arguments, the method-params element contains no
-	     method-param elements). Arrays are specified by the
-	     array element's type, followed by one or more pair of
-	     square brackets (e.g. int[][]). If there are multiple
-	     methods with the same overloaded name, this style refers
-	     to all of the overloaded methods.
-
-	  Examples:
-
-	  Style 1: The following method element refers to all the
-	  methods of the EmployeeService bean's business, home,
-          component, and/or web service endpoint interfaces:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	  Style 2: The following method element refers to all the
-	  create methods of the EmployeeService bean's home
-	  interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	  </method>
-
-	  Style 3: The following method element refers to the
-	  create(String firstName, String LastName) method of the
-	  EmployeeService bean's home interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The following example illustrates a Style 3 element with
-	  more complex parameter types. The method
-	  foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
-	  mypackage.MyClass[][] myclaar) would be specified as:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>foobar</method-name>
-	      <method-params>
-		  <method-param>char</method-param>
-		  <method-param>int</method-param>
-		  <method-param>int[]</method-param>
-		  <method-param>mypackage.MyClass</method-param>
-		  <method-param>mypackage.MyClass[][]</method-param>
-	      </method-params>
-	  </method>
-
-	  The optional method-intf element can be used when it becomes
-	  necessary to differentiate between a method that is multiply
-	  defined across the enterprise bean's business, home, component,
-          and/or web service endpoint interfaces with the same name and
-	  signature. However, if the same method is a method of both the
-          local business interface, and the local component interface,
-          the same attribute applies to the method for both interfaces.
-          Likewise, if the same method is a method of both the remote
-          business interface and the remote component interface, the same
-          attribute applies to the method for both interfaces.
-
-	  For example, the method element
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Remote</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  can be used to differentiate the create(String, String)
-	  method defined in the remote interface from the
-	  create(String, String) method defined in the remote home
-	  interface, which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  and the create method that is defined in the local home
-	  interface which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>LocalHome</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The method-intf element can be used with all three Styles
-	  of the method element usage. For example, the following
-	  method element example could be used to refer to all the
-	  methods of the EmployeeService bean's remote home interface
-          and the remote business interface.
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>*</method-name>
-	  </method>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="method-intf"
-		   type="javaee:method-intfType"
-		   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="method-name"
-		   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="multiplicityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The multiplicityType describes the multiplicity of the
-	role that participates in a relation.
-
-	The value must be one of the two following:
-
-	    One
-	    Many
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="One"/>
-	<xsd:enumeration value="Many"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="named-methodType">
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="javaee:string"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The persistence-typeType specifies an entity bean's persistence
-	management type.
-
-	The persistence-type element must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="query-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The query-method specifies the method for a finder or select
-	  query.
-
-	  The method-name element specifies the name of a finder or select
-	  method in the entity bean's implementation class.
-
-	  Each method-param must be defined for a query-method using the
-	  method-params element.
-
-	  It is used by the query-method element.
-
-	  Example:
-
-	  <query>
-	      <description>Method finds large orders</description>
-	      <query-method>
-		  <method-name>findLargeOrders</method-name>
-		  <method-params></method-params>
-	      </query-method>
-	      <ejb-ql>
-		SELECT OBJECT(o) FROM Order o
-		  WHERE o.amount &gt; 1000
-	      </ejb-ql>
-	  </query>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="queryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The queryType defines a finder or select
-	query. It contains
-	    - an optional description of the query
-	    - the specification of the finder or select
-	      method it is used by
-		- an optional specification of the result type
-		  mapping, if the query is for a select method
-		  and entity objects are returned.
-		- the EJB QL query string that defines the query.
-
-	Queries that are expressible in EJB QL must use the ejb-ql
-	element to specify the query. If a query is not expressible
-	in EJB QL, the description element should be used to
-	describe the semantics of the query and the ejb-ql element
-	should be empty.
-
-	The result-type-mapping is an optional element. It can only
-	be present if the query-method specifies a select method
-	that returns entity objects.  The default value for the
-	result-type-mapping element is "Local".
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType" minOccurs="0"/>
-      <xsd:element name="query-method"
-		   type="javaee:query-methodType"/>
-      <xsd:element name="result-type-mapping"
-		   type="javaee:result-type-mappingType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-ql"
-		   type="javaee:xsdStringType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationship-role-sourceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationship-role-sourceType designates the source of a
-	role that participates in a relationship. A
-	relationship-role-sourceType is used by
-	relationship-role-source elements to uniquely identify an
-	entity bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationshipsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationshipsType describes the relationships in
-	which entity beans with container-managed persistence
-	participate. The relationshipsType contains an optional
-	description; and a list of ejb-relation elements, which
-	specify the container managed relationships.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation"
-		   type="javaee:ejb-relationType"
-		   maxOccurs="unbounded">
-
-	<xsd:unique name="role-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relationship-role-name contains the name of a
-	      relationship role. The name must be unique within
-	      a relationship, but can be reused in different
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector
-	       xpath=".//javaee:ejb-relationship-role-name"/>
-	  <xsd:field
-	       xpath="."/>
-	</xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remove-methodType">
-    <xsd:sequence>
-      <xsd:element name="bean-method"
-		   type="javaee:named-methodType"/>
-      <xsd:element name="retain-if-exception"
-		   type="javaee:true-falseType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="result-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The result-type-mappingType is used in the query element to
-	specify whether an abstract schema type returned by a query
-	for a select method is to be mapped to an EJBLocalObject or
-	EJBObject type.
-
-	The value must be one of the following:
-
-	    Local
-	    Remote
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="Remote"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-identityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-identityType specifies whether the caller's
-	security identity is to be used for the execution of the
-	methods of the enterprise bean or whether a specific run-as
-	identity is to be used. It contains an optional description
-	and a specification of the security identity to be used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="use-caller-identity"
-		     type="javaee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The use-caller-identity element specifies that
-	      the caller's security identity be used as the
-	      security identity for the execution of the
-	      enterprise bean's methods.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="run-as"
-		     type="javaee:run-asType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-beanType declares an session bean. The
-	declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a name assigned to the enterprise bean
-	      in the deployment description
-            - an optional mapped-name element that can be used to provide
-              vendor-specific deployment information such as the physical
-              jndi-name of the session bean's remote home/business interface.
-              This element is not required to be supported by all
-              implementations. Any use of this element is non-portable.
-            - the names of all the remote or local business interfaces,
-              if any
-	    - the names of the session bean's remote home and
-	      remote interfaces, if any
-	    - the names of the session bean's local home and
-	      local interfaces, if any
-	    - the name of the session bean's web service endpoint
-	      interface, if any
-	    - the session bean's implementation class
-	    - the session bean's state management type
-            - an optional declaration of the session bean's timeout method.
-	    - the optional session bean's transaction management type.
-              If it is not present, it is defaulted to Container.
-            - an optional list of the session bean class and/or
-              superclass around-invoke methods.
-	    - an optional declaration of the bean's
-	      environment entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's resource
-	      manager connection factory references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-	The elements that are optional are "optional" in the sense
-	that they are omitted when if lists represented by them are
-	empty.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified for the
-	session bean.
-
-	The service-endpoint element may only be specified if the
-	bean is a stateless session bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="javaee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="javaee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="javaee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="javaee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="business-local"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="business-remote"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="service-endpoint"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint element contains the
-	    fully-qualified name of the enterprise bean's web
-	    service endpoint interface. The service-endpoint
-	    element may only be specified for a stateless
-	    session bean. The specified interface must be a
-	    valid JAX-RPC service endpoint interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-class"
-		   type="javaee:ejb-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-             The ejb-class element specifies the fully qualified name
-             of the bean class for this ejb.  It is required unless
-             there is a component-defining annotation for the same
-             ejb-name.
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="session-type"
-		   type="javaee:session-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="init-method"
-                   type="javaee:init-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-method element specifies the mappings for
-	    EJB 2.x style create methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="remove-method"
-                   type="javaee:remove-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The remove-method element specifies the mappings for
-	    EJB 2.x style remove methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="transaction-type"
-		   type="javaee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="post-activate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-passivate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="security-role-ref"
-		   type="javaee:security-role-refType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="security-identity"
-		   type="javaee:security-identityType"
-		   minOccurs="0">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-typeType describes whether the session bean is a
-	stateful session or stateless session. It is used by
-	session-type elements.
-
-	The value must be one of the two following:
-
-	    Stateful
-	    Stateless
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Stateful"/>
-	<xsd:enumeration value="Stateless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="trans-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The trans-attributeType specifies how the container must
-	manage the transaction boundaries when delegating a method
-	invocation to an enterprise bean's business method.
-
-	The value must be one of the following:
-
-	    NotSupported
-	    Supports
-	    Required
-	    RequiresNew
-	    Mandatory
-	    Never
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="NotSupported"/>
-	<xsd:enumeration value="Supports"/>
-	<xsd:enumeration value="Required"/>
-	<xsd:enumeration value="RequiresNew"/>
-	<xsd:enumeration value="Mandatory"/>
-	<xsd:enumeration value="Never"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transaction-typeType specifies an enterprise bean's
-	transaction management type.
-
-	The transaction-type must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-

Copied: branches/Branch_4_2/ejb3/src/resources/schema/ejb-jar_3_0.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/ejb-jar_3_0.xsd)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/schema/ejb-jar_3_0.xsd	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/schema/ejb-jar_3_0.xsd	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2705 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/javaee"
+	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="3.0">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)ejb-jar_3_0.xsds	1.51 02/23/06
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003-2006 Sun Microsystems, Inc.
+      4150 Network Circle
+      Santa Clara, California 95054
+      U.S.A
+      All rights reserved.
+
+      Sun Microsystems, Inc. has intellectual property rights
+      relating to technology described in this document. In
+      particular, and without limitation, these intellectual
+      property rights may include one or more of the U.S. patents
+      listed at http://www.sun.com/patents and one or more
+      additional patents or pending patent applications in the
+      U.S. and other countries.
+
+      This document and the technology which it describes are
+      distributed under licenses restricting their use, copying,
+      distribution, and decompilation. No part of this document
+      may be reproduced in any form by any means without prior
+      written authorization of Sun and its licensors, if any.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+      Cup logo are trademarks or registered trademarks of Sun
+      Microsystems, Inc. in the U.S. and other countries.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
+
+	This is the XML Schema for the EJB 3.0 deployment descriptor.
+	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
+	the EJB's jar file.  All EJB deployment descriptors must indicate
+	the ejb-jar schema by using the Java EE namespace:
+
+	http://java.sun.com/xml/ns/javaee
+
+	and by indicating the version of the schema by
+	using the version element as shown below:
+
+	    <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">
+	      ...
+	    </ejb-jar>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for the
+	Java EE namespace with the following location:
+
+	http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all Java EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="javaee_5.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:element name="ejb-jar" type="javaee:ejb-jarType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This is the root of the ejb-jar deployment descriptor.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:key name="ejb-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The ejb-name element contains the name of an enterprise
+	  bean. The name must be unique within the ejb-jar file.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:enterprise-beans/*"/>
+      <xsd:field    xpath="javaee:ejb-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="ejb-name-references"
+		refer="javaee:ejb-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The keyref indicates the references from
+	  relationship-role-source must be to a specific ejb-name
+	  defined within the scope of enterprise-beans element.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector
+xpath=".//javaee:ejb-relationship-role/javaee:relationship-role-source"/>
+      <xsd:field
+	   xpath="javaee:ejb-name"/>
+    </xsd:keyref>
+
+    <xsd:key name="role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  A role-name-key is specified to allow the references
+	  from the security-role-refs.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:assembly-descriptor/javaee:security-role"/>
+      <xsd:field    xpath="javaee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="role-name-references"
+		refer="javaee:role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The keyref indicates the references from
+	  security-role-ref to a specified role-name.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:enterprise-beans/*/javaee:security-role-ref"/>
+      <xsd:field    xpath="javaee:role-link"/>
+    </xsd:keyref>
+  </xsd:element>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="activation-config-propertyType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The activation-config-propertyType contains a name/value
+	configuration property pair for a message-driven bean.
+
+	The properties that are recognized for a particular
+	message-driven bean are determined by the messaging type.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="activation-config-property-name"
+		   type="javaee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The activation-config-property-name element contains
+	    the name for an activation configuration property of
+	    a message-driven bean.
+
+	    For JMS message-driven beans, the following property
+	    names are recognized: acknowledgeMode,
+	    messageSelector, destinationType, subscriptionDurability
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="activation-config-property-value"
+		   type="javaee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The activation-config-property-value element
+	    contains the value for an activation configuration
+	    property of a message-driven bean.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="activation-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The activation-configType defines information about the
+	expected configuration properties of the message-driven bean
+	in its operational environment. This may include information
+	about message acknowledgement, message selector, expected
+	destination type, etc.
+
+	The configuration information is expressed in terms of
+	name/value configuration properties.
+
+	The properties that are recognized for a particular
+	message-driven bean are determined by the messaging type.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="activation-config-property"
+		   type="javaee:activation-config-propertyType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="application-exceptionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        The application-exceptionType declares an application
+        exception. The declaration consists of:
+
+            - the exception class. When the container receives
+              an exception of this type, it is required to
+              forward this exception as an applcation exception
+              to the client regardless of whether it is a checked
+              or unchecked exception.
+            - an optional rollback element. If this element is
+              set to true, the container must rollback the current
+              transaction before forwarding the exception to the
+              client.  If not specified, it defaults to false.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="exception-class"
+		   type="javaee:fully-qualified-classType"/>
+      <xsd:element name="rollback"
+                   type="javaee:true-falseType"
+                   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="around-invokeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        The around-invoke type specifies a method on a
+        class to be called during the around invoke portion of an
+        ejb invocation.  Note that each class may have only one
+        around invoke method and that the method may not be
+        overloaded.
+
+        If the class element is missing then
+        the class defining the callback is assumed to be the
+        interceptor class or component class in scope at the
+        location in the descriptor in which the around invoke
+        definition appears.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="class"
+                   type="javaee:fully-qualified-classType"
+                   minOccurs="0"/>
+      <xsd:element name="method-name"
+                   type="javaee:java-identifierType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="assembly-descriptorType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The assembly-descriptorType defines
+	application-assembly information.
+
+	The application-assembly information consists of the
+	following parts: the definition of security roles, the
+	definition of method permissions, the definition of
+	transaction attributes for enterprise beans with
+	container-managed transaction demarcation, the definition
+        of interceptor bindings, a list of
+	methods to be excluded from being invoked, and a list of
+        exception types that should be treated as application exceptions.
+
+	All the parts are optional in the sense that they are
+	omitted if the lists represented by them are empty.
+
+	Providing an assembly-descriptor in the deployment
+	descriptor is optional for the ejb-jar file producer.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="security-role"
+		   type="javaee:security-roleType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method-permission"
+		   type="javaee:method-permissionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="container-transaction"
+		   type="javaee:container-transactionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="interceptor-binding"
+                   type="javaee:interceptor-bindingType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="message-destination"
+		   type="javaee:message-destinationType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="exclude-list"
+		   type="javaee:exclude-listType"
+		   minOccurs="0"/>
+      <xsd:element name="application-exception"
+                   type="javaee:application-exceptionType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmp-fieldType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmp-fieldType describes a container-managed field. The
+	cmp-fieldType contains an optional description of the field,
+	and the name of the field.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="field-name"
+		   type="javaee:java-identifierType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The field-name element specifies the name of a
+	    container managed field.
+
+	    The name of the cmp-field of an entity bean with
+	    cmp-version 2.x must begin with a lowercase
+	    letter. This field is accessed by methods whose
+	    names consists of the name of the field specified by
+	    field-name in which the first letter is uppercased,
+	    prefixed by "get" or "set".
+
+	    The name of the cmp-field of an entity bean with
+	    cmp-version 1.x must denote a public field of the
+	    enterprise bean class or one of its superclasses.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmp-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmp-versionType specifies the version of an entity bean
+	with container-managed persistence. It is used by
+	cmp-version elements.
+
+	The value must be one of the two following:
+
+	    1.x
+	    2.x
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="1.x"/>
+	<xsd:enumeration value="2.x"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmr-field-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmr-field-type element specifies the class of a
+	collection-valued logical relationship field in the entity
+	bean class. The value of an element using cmr-field-typeType
+	must be either: java.util.Collection or java.util.Set.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="java.util.Collection"/>
+	<xsd:enumeration value="java.util.Set"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmr-fieldType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmr-fieldType describes the bean provider's view of
+	a relationship. It consists of an optional description, and
+	the name and the class type of a field in the source of a
+	role of a relationship. The cmr-field-name element
+	corresponds to the name used for the get and set accessor
+	methods for the relationship. The cmr-field-type element is
+	used only for collection-valued cmr-fields. It specifies the
+	type of the collection that is used.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="cmr-field-name"
+		   type="javaee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The cmr-field-name element specifies the name of a
+	    logical relationship field in the entity bean
+	    class. The name of the cmr-field must begin with a
+	    lowercase letter. This field is accessed by methods
+	    whose names consist of the name of the field
+	    specified by cmr-field-name in which the first
+	    letter is uppercased, prefixed by "get" or "set".
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmr-field-type"
+		   type="javaee:cmr-field-typeType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="container-transactionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The container-transactionType specifies how the container
+	must manage transaction scopes for the enterprise bean's
+	method invocations. It defines an optional description, a
+	list of method elements, and a transaction attribute. The
+	transaction attribute is to be applied to all the specified
+	methods.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method"
+		   type="javaee:methodType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="trans-attribute"
+		   type="javaee:trans-attributeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-classType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The ejb-classType contains the fully-qualified name of the
+	  enterprise bean's class. It is used by ejb-class elements.
+
+	  Example:
+
+	      <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-jarType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The ejb-jarType defines the root element of the EJB
+	deployment descriptor. It contains
+
+	    - an optional description of the ejb-jar file
+	    - an optional display name
+	    - an optional icon that contains a small and a large
+	      icon file name
+	    - structural information about all included
+	      enterprise beans that is not specified through
+              annotations
+            - structural information about interceptor classes
+	    - a descriptor for container managed relationships,
+	      if any.
+	    - an optional application-assembly descriptor
+	    - an optional name of an ejb-client-jar file for the
+	      ejb-jar.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="enterprise-beans"
+		   type="javaee:enterprise-beansType"
+                   minOccurs="0"/>
+      <xsd:element name="interceptors"
+		   type="javaee:interceptorsType"
+                   minOccurs="0"/>
+      <xsd:element name="relationships"
+		   type="javaee:relationshipsType"
+		   minOccurs="0">
+	<xsd:unique name="relationship-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-relation-name contains the name of a
+	      relation. The name must be unique within
+	      relationships.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:ejb-relation"/>
+	  <xsd:field    xpath="javaee:ejb-relation-name"/>
+	</xsd:unique>
+      </xsd:element>
+      <xsd:element name="assembly-descriptor"
+		   type="javaee:assembly-descriptorType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Providing an assembly-descriptor in the deployment
+	    descriptor is optional for the ejb-jar file
+	    producer.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-client-jar"
+		   type="javaee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The optional ejb-client-jar element specifies a JAR
+	      file that contains the class files necessary for a
+	      client program to access the
+	      enterprise beans in the ejb-jar file.
+
+	      Example:
+
+		  <ejb-client-jar>employee_service_client.jar
+		  </ejb-client-jar>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="javaee:dewey-versionType"
+		   fixed="3.0"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The version specifies the version of the
+	  EJB specification that the instance document must
+	  comply with. This information enables deployment tools
+	  to validate a particular EJB Deployment
+	  Descriptor with respect to a specific version of the EJB
+	  schema.
+
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="metadata-complete" type="xsd:boolean">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The metadata-complete attribute defines whether this
+	  deployment descriptor and other related deployment
+	  descriptors for this module (e.g., web service
+	  descriptors) are complete, or whether the class
+	  files available to this module and packaged with
+	  this application should be examined for annotations
+	  that specify deployment information.
+
+	  If metadata-complete is set to "true", the deployment
+	  tool must ignore any annotations that specify deployment
+	  information, which might be present in the class files
+	  of the application.
+
+	  If metadata-complete is not specified or is set to
+	  "false", the deployment tool must examine the class
+	  files of the application for annotations, as
+	  specified by the specifications.
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The ejb-nameType specifies an enterprise bean's name. It is
+	  used by ejb-name elements. This name is assigned by the
+	  ejb-jar file producer to name the enterprise bean in the
+	  ejb-jar file's deployment descriptor. The name must be
+	  unique among the names of the enterprise beans in the same
+	  ejb-jar file.
+
+	  There is no architected relationship between the used
+	  ejb-name in the deployment descriptor and the JNDI name that
+	  the Deployer will assign to the enterprise bean's home.
+
+	  The name for an entity bean must conform to the lexical
+	  rules for an NMTOKEN.
+
+	  Example:
+
+	  <ejb-name>EmployeeService</ejb-name>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:xsdNMTOKENType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-relationType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The ejb-relationType describes a relationship between two
+	entity beans with container-managed persistence.  It is used
+	by ejb-relation elements. It contains a description; an
+	optional ejb-relation-name element; and exactly two
+	relationship role declarations, defined by the
+	ejb-relationship-role elements. The name of the
+	relationship, if specified, is unique within the ejb-jar
+	file.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relation-name"
+		   type="javaee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The ejb-relation-name element provides a unique name
+	    within the ejb-jar file for a relationship.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-relationship-role"
+		   type="javaee:ejb-relationship-roleType"/>
+      <xsd:element name="ejb-relationship-role"
+		   type="javaee:ejb-relationship-roleType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-relationship-roleType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The ejb-relationship-roleType describes a role within a
+	  relationship. There are two roles in each relationship.
+
+	  The ejb-relationship-roleType contains an optional
+	  description; an optional name for the relationship role; a
+	  specification of the multiplicity of the role; an optional
+	  specification of cascade-delete functionality for the role;
+	  the role source; and a declaration of the cmr-field, if any,
+	  by means of which the other side of the relationship is
+	  accessed from the perspective of the role source.
+
+	  The multiplicity and role-source element are mandatory.
+
+	  The relationship-role-source element designates an entity
+	  bean by means of an ejb-name element. For bidirectional
+	  relationships, both roles of a relationship must declare a
+	  relationship-role-source element that specifies a cmr-field
+	  in terms of which the relationship is accessed. The lack of
+	  a cmr-field element in an ejb-relationship-role specifies
+	  that the relationship is unidirectional in navigability and
+	  the entity bean that participates in the relationship is
+	  "not aware" of the relationship.
+
+	  Example:
+
+	  <ejb-relation>
+	      <ejb-relation-name>Product-LineItem</ejb-relation-name>
+	      <ejb-relationship-role>
+		  <ejb-relationship-role-name>product-has-lineitems
+		  </ejb-relationship-role-name>
+		  <multiplicity>One</multiplicity>
+		  <relationship-role-source>
+		  <ejb-name>ProductEJB</ejb-name>
+		  </relationship-role-source>
+	       </ejb-relationship-role>
+	  </ejb-relation>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relationship-role-name"
+		   type="javaee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The ejb-relationship-role-name element defines a
+	    name for a role that is unique within an
+	    ejb-relation. Different relationships can use the
+	    same name for a role.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="multiplicity"
+		   type="javaee:multiplicityType"/>
+      <xsd:element name="cascade-delete"
+		   type="javaee:emptyType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The cascade-delete element specifies that, within a
+	    particular relationship, the lifetime of one or more
+	    entity beans is dependent upon the lifetime of
+	    another entity bean. The cascade-delete element can
+	    only be specified for an ejb-relationship-role
+	    element contained in an ejb-relation element in
+	    which the other ejb-relationship-role
+	    element specifies a multiplicity of One.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="relationship-role-source"
+		   type="javaee:relationship-role-sourceType"/>
+      <xsd:element name="cmr-field"
+		   type="javaee:cmr-fieldType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="enterprise-beansType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The enterprise-beansType declares one or more enterprise
+	beans. Each bean can be a session, entity or message-driven
+	bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:element name="session"
+		   type="javaee:session-beanType">
+	<xsd:unique name="session-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of
+	      an EJB reference. The EJB reference is an entry in
+	      the component's environment and is relative to the
+	      java:comp/env context.  The name must be unique within
+	      the component.
+
+	      It is recommended that name be prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:ejb-local-ref"/>
+	  <xsd:field    xpath="javaee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of an EJB
+	      reference. The EJB reference is an entry in the
+	      component's environment and is relative to the
+	      java:comp/env context. The name must be unique
+	      within the component.
+
+	      It is recommended that name is prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:ejb-ref"/>
+	  <xsd:field    xpath="javaee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The resource-env-ref-name element specifies the name
+	      of a resource environment reference; its value is
+	      the environment entry name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:resource-env-ref"/>
+	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The message-destination-ref-name element specifies the name
+	      of a message destination reference; its value is
+	      the message destination reference name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:message-destination-ref"/>
+	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The res-ref-name element specifies the name of a
+	      resource manager connection factory reference.  The name
+	      is a JNDI name relative to the java:comp/env context.
+	      The name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:resource-ref"/>
+	  <xsd:field    xpath="javaee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The env-entry-name element contains the name of a
+	      component's environment entry.  The name is a JNDI
+	      name relative to the java:comp/env context.  The
+	      name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:env-entry"/>
+	  <xsd:field    xpath="javaee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+      <xsd:element name="entity"
+		   type="javaee:entity-beanType">
+	<xsd:unique name="entity-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of
+	      an EJB reference. The EJB reference is an entry in
+	      the component's environment and is relative to the
+	      java:comp/env context.  The name must be unique within
+	      the component.
+
+	      It is recommended that name be prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:ejb-local-ref"/>
+	  <xsd:field    xpath="javaee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of an EJB
+	      reference. The EJB reference is an entry in the
+	      component's environment and is relative to the
+	      java:comp/env context. The name must be unique
+	      within the component.
+
+	      It is recommended that name is prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:ejb-ref"/>
+	  <xsd:field    xpath="javaee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The resource-env-ref-name element specifies the name
+	      of a resource environment reference; its value is
+	      the environment entry name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:resource-env-ref"/>
+	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The message-destination-ref-name element specifies the name
+	      of a message destination reference; its value is
+	      the message destination reference name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:message-destination-ref"/>
+	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The res-ref-name element specifies the name of a
+	      resource manager connection factory reference.  The name
+	      is a JNDI name relative to the java:comp/env context.
+	      The name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:resource-ref"/>
+	  <xsd:field    xpath="javaee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The env-entry-name element contains the name of a
+	      component's environment entry.  The name is a JNDI
+	      name relative to the java:comp/env context.  The
+	      name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:env-entry"/>
+	  <xsd:field    xpath="javaee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+      <xsd:element name="message-driven"
+		   type="javaee:message-driven-beanType">
+	<xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of
+	      an EJB reference. The EJB reference is an entry in
+	      the component's environment and is relative to the
+	      java:comp/env context.  The name must be unique within
+	      the component.
+
+	      It is recommended that name be prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:ejb-local-ref"/>
+	  <xsd:field    xpath="javaee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of an EJB
+	      reference. The EJB reference is an entry in the
+	      component's environment and is relative to the
+	      java:comp/env context. The name must be unique
+	      within the component.
+
+	      It is recommended that name is prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:ejb-ref"/>
+	  <xsd:field    xpath="javaee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The resource-env-ref-name element specifies the name
+	      of a resource environment reference; its value is
+	      the environment entry name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:resource-env-ref"/>
+	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The message-destination-ref-name element specifies the name
+	      of a message destination reference; its value is
+	      the message destination reference name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:message-destination-ref"/>
+	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The res-ref-name element specifies the name of a
+	      resource manager connection factory reference.  The name
+	      is a JNDI name relative to the java:comp/env context.
+	      The name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:resource-ref"/>
+	  <xsd:field    xpath="javaee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The env-entry-name element contains the name of a
+	      component's environment entry.  The name is a JNDI
+	      name relative to the java:comp/env context.  The
+	      name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="javaee:env-entry"/>
+	  <xsd:field    xpath="javaee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+    </xsd:choice>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="entity-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The entity-beanType declares an entity bean. The declaration
+	consists of:
+
+	    - an optional description
+	    - an optional display name
+	    - an optional icon element that contains a small and a large
+	      icon file name
+	    - a unique name assigned to the enterprise bean
+	      in the deployment descriptor
+            - an optional mapped-name element that can be used to provide
+              vendor-specific deployment information such as the physical
+              jndi-name of the entity bean's remote home interface. This
+              element is not required to be supported by all implementations.
+              Any use of this element is non-portable.
+	    - the names of the entity bean's remote home
+	      and remote interfaces, if any
+	    - the names of the entity bean's local home and local
+	      interfaces, if any
+	    - the entity bean's implementation class
+	    - the optional entity bean's persistence management type. If
+              this element is not specified it is defaulted to Container.
+	    - the entity bean's primary key class name
+	    - an indication of the entity bean's reentrancy
+	    - an optional specification of the
+	      entity bean's cmp-version
+	    - an optional specification of the entity bean's
+	      abstract schema name
+	    - an optional list of container-managed fields
+	    - an optional specification of the primary key
+	      field
+	    - an optional declaration of the bean's environment
+	      entries
+	    - an optional declaration of the bean's EJB
+	      references
+	    - an optional declaration of the bean's local
+	      EJB references
+	    - an optional declaration of the bean's web
+	      service references
+	    - an optional declaration of the security role
+	      references
+	    - an optional declaration of the security identity
+	      to be used for the execution of the bean's methods
+	    - an optional declaration of the bean's
+	      resource manager connection factory references
+	    - an optional declaration of the bean's
+	      resource environment references
+	    - an optional declaration of the bean's message
+	      destination references
+	    - an optional set of query declarations
+	      for finder and select methods for an entity
+	      bean with cmp-version 2.x.
+
+	The optional abstract-schema-name element must be specified
+	for an entity bean with container-managed persistence and
+	cmp-version 2.x.
+
+	The optional primkey-field may be present in the descriptor
+	if the entity's persistence-type is Container.
+
+	The optional cmp-version element may be present in the
+	descriptor if the entity's persistence-type is Container. If
+	the persistence-type is Container and the cmp-version
+	element is not specified, its value defaults to 2.x.
+
+	The optional home and remote elements must be specified if
+	the entity bean cmp-version is 1.x.
+
+	The optional home and remote elements must be specified if
+	the entity bean has a remote home and remote interface.
+
+	The optional local-home and local elements must be specified
+	if the entity bean has a local home and local interface.
+
+	Either both the local-home and the local elements or both
+	the home and the remote elements must be specified.
+
+	The optional query elements must be present if the
+	persistence-type is Container and the cmp-version is 2.x and
+	query methods other than findByPrimaryKey have been defined
+	for the entity bean.
+
+	The other elements that are optional are "optional" in the
+	sense that they are omitted if the lists represented by them
+	are empty.
+
+	At least one cmp-field element must be present in the
+	descriptor if the entity's persistence-type is Container and
+	the cmp-version is 1.x, and none must not be present if the
+	entity's persistence-type is Bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="javaee:ejb-nameType"/>
+      <xsd:element name="mapped-name"
+		   type="javaee:xsdStringType"
+		   minOccurs="0"/>
+      <xsd:element name="home"
+		   type="javaee:homeType"
+		   minOccurs="0"/>
+      <xsd:element name="remote"
+		   type="javaee:remoteType"
+		   minOccurs="0"/>
+      <xsd:element name="local-home"
+		   type="javaee:local-homeType"
+		   minOccurs="0"/>
+      <xsd:element name="local"
+		   type="javaee:localType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-class"
+		   type="javaee:ejb-classType"/>
+      <xsd:element name="persistence-type"
+		   type="javaee:persistence-typeType"/>
+      <xsd:element name="prim-key-class"
+		   type="javaee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The prim-key-class element contains the
+	    fully-qualified name of an
+	    entity bean's primary key class.
+
+	    If the definition of the primary key class is
+	    deferred to deployment time, the prim-key-class
+	    element should specify java.lang.Object.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="reentrant"
+		   type="javaee:true-falseType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The reentrant element specifies whether an entity
+	    bean is reentrant or not.
+
+	    The reentrant element must be one of the two
+	    following: true or false
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmp-version"
+		   type="javaee:cmp-versionType"
+		   minOccurs="0"/>
+      <xsd:element name="abstract-schema-name"
+		   type="javaee:java-identifierType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The abstract-schema-name element specifies the name
+	    of the abstract schema type of an entity bean with
+	    cmp-version 2.x. It is used in EJB QL queries.
+
+	    For example, the abstract-schema-name for an entity
+	    bean whose local interface is
+	    com.acme.commerce.Order might be Order.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmp-field"
+		   type="javaee:cmp-fieldType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="primkey-field"
+		   type="javaee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The primkey-field element is used to specify the
+	    name of the primary key field for an entity with
+	    container-managed persistence.
+
+	    The primkey-field must be one of the fields declared
+	    in the cmp-field element, and the type of the field
+	    must be the same as the primary key type.
+
+	    The primkey-field element is not used if the primary
+	    key maps to multiple container-managed fields
+	    (i.e. the key is a compound key). In this case, the
+	    fields of the primary key class must be public, and
+	    their names must correspond to the field names of
+	    the entity bean class that comprise the key.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-role-ref"
+		   type="javaee:security-role-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="security-identity"
+		   type="javaee:security-identityType"
+		   minOccurs="0"/>
+      <xsd:element name="query"
+		   type="javaee:queryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="exclude-listType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The exclude-listType specifies one or more methods which
+	the Assembler marks to be uncallable.
+
+	If the method permission relation contains methods that are
+	in the exclude list, the Deployer should consider those
+	methods to be uncallable.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method"
+		   type="javaee:methodType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="init-methodType">
+    <xsd:sequence>
+      <xsd:element name="create-method"
+		   type="javaee:named-methodType"/>
+      <xsd:element name="bean-method"
+		   type="javaee:named-methodType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="interceptor-bindingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        The interceptor-bindingType element describes the binding of
+        interceptor classes to beans within the ejb-jar.
+        It consists of :
+
+          - An optional description.
+          - The name of an ejb within the ejb-jar or the wildcard value "*",
+            which is used to define interceptors that are bound to all
+            beans in the ejb-jar.
+          - A list of interceptor classes that are bound to the contents of
+            the ejb-name element or a specification of the total ordering
+            over the interceptors defined for the given level and above.
+          - An optional exclude-default-interceptors element.  If set to true,
+            specifies that default interceptors are not to be applied to
+            a bean-class and/or business method.
+          - An optional exclude-class-interceptors element.  If set to true,
+            specifies that class interceptors are not to be applied to
+            a business method.
+          - An optional set of method elements for describing the name/params
+            of a method-level interceptor.
+
+         Interceptors bound to all classes using the wildcard syntax
+         "*" are default interceptors for the components in the ejb-jar.
+         In addition, interceptors may be bound at the level of the bean
+         class (class-level interceptors) or business methods (method-level
+         interceptors ).
+
+         The binding of interceptors to classes is additive.  If interceptors
+         are bound at the class-level and/or default-level as well as the
+         method-level, both class-level and/or default-level as well as
+         method-level will apply.
+
+         There are four possible styles of the interceptor element syntax :
+
+         1.
+         <interceptor-binding>
+           <ejb-name>*</ejb-name>
+           <interceptor-class>INTERCEPTOR</interceptor-class>
+         </interceptor-binding>
+
+         Specifying the ejb-name as the wildcard value "*" designates
+         default interceptors (interceptors that apply to all session and
+         message-driven beans contained in the ejb-jar).
+
+         2.
+         <interceptor-binding>
+           <ejb-name>EJBNAME</ejb-name>
+           <interceptor-class>INTERCEPTOR</interceptor-class>
+         </interceptor-binding>
+
+         This style is used to refer to interceptors associated with the
+         specified enterprise bean(class-level interceptors).
+
+         3.
+         <interceptor-binding>
+           <ejb-name>EJBNAME</ejb-name>
+           <interceptor-class>INTERCEPTOR</interceptor-class>
+           <method>
+             <method-name>METHOD</method-name>
+           </method>
+         </interceptor-binding>
+
+         This style is used to associate a method-level interceptor with
+         the specified enterprise bean.  If there are multiple methods
+         with the same overloaded name, the element of this style refers
+         to all the methods with the overloaded name.  Method-level
+         interceptors can only be associated with business methods of the
+         bean class.   Note that the wildcard value "*" cannot be used
+         to specify method-level interceptors.
+
+         4.
+         <interceptor-binding>
+           <ejb-name>EJBNAME</ejb-name>
+           <interceptor-class>INTERCEPTOR</interceptor-class>
+           <method>
+             <method-name>METHOD</method-name>
+             <method-params>
+               <method-param>PARAM-1</method-param>
+               <method-param>PARAM-2</method-param>
+               ...
+               <method-param>PARAM-N</method-param>
+             </method-params>
+           </method>
+         </interceptor-binding>
+
+         This style is used to associate a method-level interceptor with
+         the specified method of the specified enterprise bean.  This
+         style is used to refer to a single method within a set of methods
+         with an overloaded name.  The values PARAM-1 through PARAM-N
+         are the fully-qualified Java types of the method's input parameters
+         (if the method has no input arguments, the method-params element
+         contains no method-param elements). Arrays are specified by the
+         array element's type, followed by one or more pair of square
+         brackets (e.g. int[][]).
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-name"
+		   type="javaee:string"/>
+      <xsd:choice>
+        <xsd:element name="interceptor-class"
+                     type="javaee:fully-qualified-classType"
+		     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="interceptor-order"
+		     type="javaee:interceptor-orderType"
+		     minOccurs="1"/>
+      </xsd:choice>
+      <xsd:element name="exclude-default-interceptors"
+		   type="javaee:true-falseType"
+		   minOccurs="0"/>
+      <xsd:element name="exclude-class-interceptors"
+		   type="javaee:true-falseType"
+		   minOccurs="0"/>
+      <xsd:element name="method"
+		   type="javaee:named-methodType"
+                   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="interceptor-orderType">
+    <xsd:annotation>
+      <xsd:documentation>
+        The interceptor-orderType element describes a total ordering
+        of interceptor classes.
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+
+      <xsd:element name="interceptor-class"
+                   type="javaee:fully-qualified-classType"
+		   minOccurs="1"
+                   maxOccurs="unbounded"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="interceptorType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        The interceptorType element declares information about a single
+        interceptor class.  It consists of :
+
+            - An optional description.
+            - The fully-qualified name of the interceptor class.
+            - An optional list of around invoke methods declared on the
+              interceptor class and/or its super-classes.
+            - An optional list environment dependencies for the interceptor
+              class and/or its super-classes.
+            - An optional list of post-activate methods declared on the
+              interceptor class and/or its super-classes.
+            - An optional list of pre-passivate methods declared on the
+              interceptor class and/or its super-classes.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="interceptor-class"
+		   type="javaee:fully-qualified-classType"/>
+      <xsd:element name="around-invoke"
+                   type="javaee:around-invokeType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="post-activate"
+                   type="javaee:lifecycle-callbackType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="pre-passivate"
+                   type="javaee:lifecycle-callbackType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="interceptorsType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        The interceptorsType element declares one or more interceptor
+        classes used by components within this ejb-jar.  The declaration
+        consists of :
+
+            - An optional description.
+            - One or more interceptor elements.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="interceptor"
+		   type="javaee:interceptorType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-driven-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The message-driven element declares a message-driven
+	bean. The declaration consists of:
+
+	    - an optional description
+	    - an optional display name
+	    - an optional icon element that contains a small and a large
+	      icon file name.
+	    - a name assigned to the enterprise bean in
+	      the deployment descriptor
+            - an optional mapped-name element that can be used to provide
+              vendor-specific deployment information such as the physical
+              jndi-name of destination from which this message-driven bean
+              should consume.  This element is not required to be supported
+              by all implementations.  Any use of this element is non-portable.
+	    - the message-driven bean's implementation class
+	    - an optional declaration of the bean's messaging
+	      type
+            - an optional declaration of the bean's timeout method.
+	    - the optional message-driven bean's transaction management
+              type. If it is not defined, it is defaulted to Container.
+	    - an optional declaration of the bean's
+	      message-destination-type
+	    - an optional declaration of the bean's
+	      message-destination-link
+	    - an optional declaration of the message-driven bean's
+	      activation configuration properties
+            - an optional list of the message-driven bean class and/or
+              superclass around-invoke methods.
+	    - an optional declaration of the bean's environment
+	      entries
+	    - an optional declaration of the bean's EJB references
+	    - an optional declaration of the bean's local EJB
+	      references
+	    - an optional declaration of the bean's web service
+	      references
+	    - an optional declaration of the security
+	      identity to be used for the execution of the bean's
+	      methods
+	    - an optional declaration of the bean's
+	      resource manager connection factory
+	      references
+	    - an optional declaration of the bean's resource
+	      environment references.
+	    - an optional declaration of the bean's message
+	      destination references
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="javaee:ejb-nameType"/>
+      <xsd:element name="mapped-name"
+		   type="javaee:xsdStringType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-class"
+		   type="javaee:ejb-classType"
+                   minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>
+
+             The ejb-class element specifies the fully qualified name
+             of the bean class for this ejb.  It is required unless
+             there is a component-defining annotation for the same
+             ejb-name.
+
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="messaging-type"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The messaging-type element specifies the message
+	    listener interface of the message-driven bean.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="timeout-method"
+                   type="javaee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="transaction-type"
+		   type="javaee:transaction-typeType"
+                   minOccurs="0"/>
+      <xsd:element name="message-destination-type"
+		   type="javaee:message-destination-typeType"
+		   minOccurs="0"/>
+      <xsd:element name="message-destination-link"
+		   type="javaee:message-destination-linkType"
+		   minOccurs="0"/>
+      <xsd:element name="activation-config"
+		   type="javaee:activation-configType"
+		   minOccurs="0"/>
+      <xsd:element name="around-invoke"
+                   type="javaee:around-invokeType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-identity"
+		   type="javaee:security-identityType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-intfType">
+
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-intf element allows a method element to
+	differentiate between the methods with the same name and
+	signature that are multiply defined across the home and
+	component interfaces (e.g, in both an enterprise bean's
+	remote and local interfaces or in both an enterprise bean's
+	home and remote interfaces, etc.); the component and web
+	service endpoint interfaces, and so on. The Local applies to
+        both local component interface and local business interface.
+        Similarly, Remote applies to both remote component interface
+        and the remote business interface.
+
+	The method-intf element must be one of the following:
+
+	    Home
+	    Remote
+	    LocalHome
+	    Local
+	    ServiceEndpoint
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Home"/>
+	<xsd:enumeration value="Remote"/>
+	<xsd:enumeration value="LocalHome"/>
+	<xsd:enumeration value="Local"/>
+	<xsd:enumeration value="ServiceEndpoint"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-nameType contains a name of an enterprise
+	bean method or the asterisk (*) character. The asterisk is
+	used when the element denotes all the methods of an
+	enterprise bean's client view interfaces.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-paramsType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-paramsType defines a list of the
+	fully-qualified Java type names of the method parameters.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="method-param"
+		   type="javaee:java-typeType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The method-param element contains a primitive
+	    or a fully-qualified Java type name of a method
+	    parameter.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-permissionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-permissionType specifies that one or more
+	security roles are allowed to invoke one or more enterprise
+	bean methods. The method-permissionType consists of an
+	optional description, a list of security role names or an
+	indicator to state that the method is unchecked for
+	authorization, and a list of method elements.
+
+	The security roles used in the method-permissionType
+	must be defined in the security-role elements of the
+	deployment descriptor, and the methods must be methods
+	defined in the enterprise bean's business, home, component
+        and/or web service endpoint interfaces.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="role-name"
+		     type="javaee:role-nameType"
+		     maxOccurs="unbounded"/>
+	<xsd:element name="unchecked"
+		     type="javaee:emptyType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The unchecked element specifies that a method is
+	      not checked for authorization by the container
+	      prior to invocation of the method.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+      <xsd:element name="method"
+		   type="javaee:methodType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The methodType is used to denote a method of an enterprise
+	  bean's business, home, component, and/or web service endpoint
+	  interface, or, in the case of a message-driven bean, the
+	  bean's message listener method, or a set of such
+	  methods. The ejb-name element must be the name of one of the
+	  enterprise beans declared in the deployment descriptor; the
+	  optional method-intf element allows to distinguish between a
+	  method with the same signature that is multiply defined
+	  across the business, home, component, and/or web service
+          endpoint nterfaces; the method-name element specifies the
+          method name; and the optional method-params elements identify
+          a single method among multiple methods with an overloaded
+	  method name.
+
+	  There are three possible styles of using methodType element
+	  within a method element:
+
+	  1.
+	  <method>
+	      <ejb-name>EJBNAME</ejb-name>
+	      <method-name>*</method-name>
+	  </method>
+
+	     This style is used to refer to all the methods of the
+	     specified enterprise bean's business, home, component,
+             and/or web service endpoint interfaces.
+
+	  2.
+	  <method>
+	      <ejb-name>EJBNAME</ejb-name>
+	      <method-name>METHOD</method-name>
+	  </method>
+
+	     This style is used to refer to the specified method of
+	     the specified enterprise bean. If there are multiple
+	     methods with the same overloaded name, the element of
+	     this style refers to all the methods with the overloaded
+	     name.
+
+	  3.
+	  <method>
+	      <ejb-name>EJBNAME</ejb-name>
+	      <method-name>METHOD</method-name>
+	      <method-params>
+		  <method-param>PARAM-1</method-param>
+		  <method-param>PARAM-2</method-param>
+		  ...
+		  <method-param>PARAM-n</method-param>
+	      </method-params>
+	  </method>
+
+	     This style is used to refer to a single method within a
+	     set of methods with an overloaded name. PARAM-1 through
+	     PARAM-n are the fully-qualified Java types of the
+	     method's input parameters (if the method has no input
+	     arguments, the method-params element contains no
+	     method-param elements). Arrays are specified by the
+	     array element's type, followed by one or more pair of
+	     square brackets (e.g. int[][]). If there are multiple
+	     methods with the same overloaded name, this style refers
+	     to all of the overloaded methods.
+
+	  Examples:
+
+	  Style 1: The following method element refers to all the
+	  methods of the EmployeeService bean's business, home,
+          component, and/or web service endpoint interfaces:
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>*</method-name>
+	  </method>
+
+	  Style 2: The following method element refers to all the
+	  create methods of the EmployeeService bean's home
+	  interface(s).
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>create</method-name>
+	  </method>
+
+	  Style 3: The following method element refers to the
+	  create(String firstName, String LastName) method of the
+	  EmployeeService bean's home interface(s).
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  The following example illustrates a Style 3 element with
+	  more complex parameter types. The method
+	  foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
+	  mypackage.MyClass[][] myclaar) would be specified as:
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>foobar</method-name>
+	      <method-params>
+		  <method-param>char</method-param>
+		  <method-param>int</method-param>
+		  <method-param>int[]</method-param>
+		  <method-param>mypackage.MyClass</method-param>
+		  <method-param>mypackage.MyClass[][]</method-param>
+	      </method-params>
+	  </method>
+
+	  The optional method-intf element can be used when it becomes
+	  necessary to differentiate between a method that is multiply
+	  defined across the enterprise bean's business, home, component,
+          and/or web service endpoint interfaces with the same name and
+	  signature. However, if the same method is a method of both the
+          local business interface, and the local component interface,
+          the same attribute applies to the method for both interfaces.
+          Likewise, if the same method is a method of both the remote
+          business interface and the remote component interface, the same
+          attribute applies to the method for both interfaces.
+
+	  For example, the method element
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>Remote</method-intf>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  can be used to differentiate the create(String, String)
+	  method defined in the remote interface from the
+	  create(String, String) method defined in the remote home
+	  interface, which would be defined as
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>Home</method-intf>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  and the create method that is defined in the local home
+	  interface which would be defined as
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>LocalHome</method-intf>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  The method-intf element can be used with all three Styles
+	  of the method element usage. For example, the following
+	  method element example could be used to refer to all the
+	  methods of the EmployeeService bean's remote home interface
+          and the remote business interface.
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>Home</method-intf>
+	      <method-name>*</method-name>
+	  </method>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-name"
+		   type="javaee:ejb-nameType"/>
+      <xsd:element name="method-intf"
+		   type="javaee:method-intfType"
+		   minOccurs="0">
+      </xsd:element>
+      <xsd:element name="method-name"
+		   type="javaee:method-nameType"/>
+      <xsd:element name="method-params"
+		   type="javaee:method-paramsType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="multiplicityType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The multiplicityType describes the multiplicity of the
+	role that participates in a relation.
+
+	The value must be one of the two following:
+
+	    One
+	    Many
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="One"/>
+	<xsd:enumeration value="Many"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="named-methodType">
+    <xsd:sequence>
+      <xsd:element name="method-name"
+		   type="javaee:string"/>
+      <xsd:element name="method-params"
+		   type="javaee:method-paramsType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="persistence-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The persistence-typeType specifies an entity bean's persistence
+	management type.
+
+	The persistence-type element must be one of the two following:
+
+	    Bean
+	    Container
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Bean"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="query-methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The query-method specifies the method for a finder or select
+	  query.
+
+	  The method-name element specifies the name of a finder or select
+	  method in the entity bean's implementation class.
+
+	  Each method-param must be defined for a query-method using the
+	  method-params element.
+
+	  It is used by the query-method element.
+
+	  Example:
+
+	  <query>
+	      <description>Method finds large orders</description>
+	      <query-method>
+		  <method-name>findLargeOrders</method-name>
+		  <method-params></method-params>
+	      </query-method>
+	      <ejb-ql>
+		SELECT OBJECT(o) FROM Order o
+		  WHERE o.amount &gt; 1000
+	      </ejb-ql>
+	  </query>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="method-name"
+		   type="javaee:method-nameType"/>
+      <xsd:element name="method-params"
+		   type="javaee:method-paramsType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="queryType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The queryType defines a finder or select
+	query. It contains
+	    - an optional description of the query
+	    - the specification of the finder or select
+	      method it is used by
+		- an optional specification of the result type
+		  mapping, if the query is for a select method
+		  and entity objects are returned.
+		- the EJB QL query string that defines the query.
+
+	Queries that are expressible in EJB QL must use the ejb-ql
+	element to specify the query. If a query is not expressible
+	in EJB QL, the description element should be used to
+	describe the semantics of the query and the ejb-ql element
+	should be empty.
+
+	The result-type-mapping is an optional element. It can only
+	be present if the query-method specifies a select method
+	that returns entity objects.  The default value for the
+	result-type-mapping element is "Local".
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType" minOccurs="0"/>
+      <xsd:element name="query-method"
+		   type="javaee:query-methodType"/>
+      <xsd:element name="result-type-mapping"
+		   type="javaee:result-type-mappingType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-ql"
+		   type="javaee:xsdStringType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="relationship-role-sourceType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The relationship-role-sourceType designates the source of a
+	role that participates in a relationship. A
+	relationship-role-sourceType is used by
+	relationship-role-source elements to uniquely identify an
+	entity bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-name"
+		   type="javaee:ejb-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="relationshipsType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The relationshipsType describes the relationships in
+	which entity beans with container-managed persistence
+	participate. The relationshipsType contains an optional
+	description; and a list of ejb-relation elements, which
+	specify the container managed relationships.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relation"
+		   type="javaee:ejb-relationType"
+		   maxOccurs="unbounded">
+
+	<xsd:unique name="role-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-relationship-role-name contains the name of a
+	      relationship role. The name must be unique within
+	      a relationship, but can be reused in different
+	      relationships.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector
+	       xpath=".//javaee:ejb-relationship-role-name"/>
+	  <xsd:field
+	       xpath="."/>
+	</xsd:unique>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="remove-methodType">
+    <xsd:sequence>
+      <xsd:element name="bean-method"
+		   type="javaee:named-methodType"/>
+      <xsd:element name="retain-if-exception"
+		   type="javaee:true-falseType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="result-type-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The result-type-mappingType is used in the query element to
+	specify whether an abstract schema type returned by a query
+	for a select method is to be mapped to an EJBLocalObject or
+	EJBObject type.
+
+	The value must be one of the following:
+
+	    Local
+	    Remote
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Local"/>
+	<xsd:enumeration value="Remote"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-identityType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The security-identityType specifies whether the caller's
+	security identity is to be used for the execution of the
+	methods of the enterprise bean or whether a specific run-as
+	identity is to be used. It contains an optional description
+	and a specification of the security identity to be used.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="use-caller-identity"
+		     type="javaee:emptyType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The use-caller-identity element specifies that
+	      the caller's security identity be used as the
+	      security identity for the execution of the
+	      enterprise bean's methods.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="run-as"
+		     type="javaee:run-asType"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The session-beanType declares an session bean. The
+	declaration consists of:
+
+	    - an optional description
+	    - an optional display name
+	    - an optional icon element that contains a small and a large
+	      icon file name
+	    - a name assigned to the enterprise bean
+	      in the deployment description
+            - an optional mapped-name element that can be used to provide
+              vendor-specific deployment information such as the physical
+              jndi-name of the session bean's remote home/business interface.
+              This element is not required to be supported by all
+              implementations. Any use of this element is non-portable.
+            - the names of all the remote or local business interfaces,
+              if any
+	    - the names of the session bean's remote home and
+	      remote interfaces, if any
+	    - the names of the session bean's local home and
+	      local interfaces, if any
+	    - the name of the session bean's web service endpoint
+	      interface, if any
+	    - the session bean's implementation class
+	    - the session bean's state management type
+            - an optional declaration of the session bean's timeout method.
+	    - the optional session bean's transaction management type.
+              If it is not present, it is defaulted to Container.
+            - an optional list of the session bean class and/or
+              superclass around-invoke methods.
+	    - an optional declaration of the bean's
+	      environment entries
+	    - an optional declaration of the bean's EJB references
+	    - an optional declaration of the bean's local
+	      EJB references
+	    - an optional declaration of the bean's web
+	      service references
+	    - an optional declaration of the security role
+	      references
+	    - an optional declaration of the security identity
+	      to be used for the execution of the bean's methods
+	    - an optional declaration of the bean's resource
+	      manager connection factory references
+	    - an optional declaration of the bean's resource
+	      environment references.
+	    - an optional declaration of the bean's message
+	      destination references
+
+	The elements that are optional are "optional" in the sense
+	that they are omitted when if lists represented by them are
+	empty.
+
+	Either both the local-home and the local elements or both
+	the home and the remote elements must be specified for the
+	session bean.
+
+	The service-endpoint element may only be specified if the
+	bean is a stateless session bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="javaee:ejb-nameType"/>
+      <xsd:element name="mapped-name"
+		   type="javaee:xsdStringType"
+		   minOccurs="0"/>
+      <xsd:element name="home"
+		   type="javaee:homeType"
+		   minOccurs="0"/>
+      <xsd:element name="remote"
+		   type="javaee:remoteType"
+		   minOccurs="0"/>
+      <xsd:element name="local-home"
+		   type="javaee:local-homeType"
+		   minOccurs="0"/>
+      <xsd:element name="local"
+		   type="javaee:localType"
+		   minOccurs="0"/>
+      <xsd:element name="business-local"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="business-remote"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="service-endpoint"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-endpoint element contains the
+	    fully-qualified name of the enterprise bean's web
+	    service endpoint interface. The service-endpoint
+	    element may only be specified for a stateless
+	    session bean. The specified interface must be a
+	    valid JAX-RPC service endpoint interface.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-class"
+		   type="javaee:ejb-classType"
+                   minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>
+
+             The ejb-class element specifies the fully qualified name
+             of the bean class for this ejb.  It is required unless
+             there is a component-defining annotation for the same
+             ejb-name.
+
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="session-type"
+		   type="javaee:session-typeType"
+                   minOccurs="0"/>
+      <xsd:element name="timeout-method"
+                   type="javaee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="init-method"
+                   type="javaee:init-methodType"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+        <xsd:annotation>
+	  <xsd:documentation>
+
+	    The init-method element specifies the mappings for
+	    EJB 2.x style create methods for an EJB 3.0 bean.
+	    This element can only be specified for stateful
+            session beans.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="remove-method"
+                   type="javaee:remove-methodType"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+        <xsd:annotation>
+	  <xsd:documentation>
+
+	    The remove-method element specifies the mappings for
+	    EJB 2.x style remove methods for an EJB 3.0 bean.
+	    This element can only be specified for stateful
+            session beans.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="transaction-type"
+		   type="javaee:transaction-typeType"
+                   minOccurs="0"/>
+      <xsd:element name="around-invoke"
+                   type="javaee:around-invokeType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="post-activate"
+                   type="javaee:lifecycle-callbackType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="pre-passivate"
+                   type="javaee:lifecycle-callbackType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="security-role-ref"
+		   type="javaee:security-role-refType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+      </xsd:element>
+      <xsd:element name="security-identity"
+		   type="javaee:security-identityType"
+		   minOccurs="0">
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The session-typeType describes whether the session bean is a
+	stateful session or stateless session. It is used by
+	session-type elements.
+
+	The value must be one of the two following:
+
+	    Stateful
+	    Stateless
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Stateful"/>
+	<xsd:enumeration value="Stateless"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="trans-attributeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The trans-attributeType specifies how the container must
+	manage the transaction boundaries when delegating a method
+	invocation to an enterprise bean's business method.
+
+	The value must be one of the following:
+
+	    NotSupported
+	    Supports
+	    Required
+	    RequiresNew
+	    Mandatory
+	    Never
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="NotSupported"/>
+	<xsd:enumeration value="Supports"/>
+	<xsd:enumeration value="Required"/>
+	<xsd:enumeration value="RequiresNew"/>
+	<xsd:enumeration value="Mandatory"/>
+	<xsd:enumeration value="Never"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="transaction-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The transaction-typeType specifies an enterprise bean's
+	transaction management type.
+
+	The transaction-type must be one of the two following:
+
+	    Bean
+	    Container
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="Bean"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+</xsd:schema>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/javaee_5.xsd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/schema/javaee_5.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/javaee_5.xsd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_1_2.xsd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_1_2.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/javaee_web_services_1_2.xsd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_client_1_2.xsd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/schema/javaee_web_services_client_1_2.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/javaee_web_services_client_1_2.xsd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.dtd
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/jboss_5_0.dtd	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.dtd	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,1655 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!--
-This is the XML DTD for the JBoss 4.0 EJB deployment descriptor.
-The DOCTYPE is:
-
-$Id$
-
-  <!DOCTYPE jboss PUBLIC
-      "-//JBoss//DTD JBOSS 4.0//EN"
-      "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
-
-Overview of the architecture of jboss.xml
-
-<jboss>
-
-  <enforce-ejb-restrictions />
-  <security-domain />
-  <unauthenticated-principal />
-
-  <enterprise-beans>
-
-    <entity>
-      <ejb-name />
-      <jndi-name />
-      <interceptor-stack />
-	<client-bind-url />
-      <binding-factory />
-      <local-jndi-name />
-      <call-by-value>
-      <read-only>
-      <call-by-value>
-      <aop-domain-name>
-      <security-proxy>
-      <ejb-ref>
-      <ejb-local-ref>
-      <service-ref>
-      <security-identity>
-        <run-as-principal>
-      </security-identity>
-      <resource-ref>
-        <res-ref-name />
-        <resource-name />
-      </resource-ref>
-      <resource-env-ref>
-      <clustered />
-    </entity>
-
-    <session>
-      <ejb-name />
-      <jndi-name />
-      <interceptor-stack />
-	<client-bind-url />
-      <binding-factory />
-      <local-jndi-name />
-      <call-by-value>
-      <aop-domain-name>
-      <security-proxy>
-      <ejb-ref>
-      <ejb-local-ref>
-      <service-ref>
-      <security-identity>
-        <run-as-principal>
-      </security-identity>
-      <resource-ref>
-        <res-ref-name />
-        <resource-name />
-      </resource-ref>
-      <resource-env-ref>
-      <clustered/>
-      <port-component>
-        <port-component-name>
-        <port-component-uri>
-        <auth-method>
-        <transport-guarantee>
-      </port-component>
-    </session>
-
-    <message-driven>
-      <ejb-name>
-      <destination-jndi-name>
-      <mdb-user>
-      <mdb-passwd>
-      <mdb-client-id>
-      <mdb-subscription-id>
-      <resource-adapter-name>
-      <aop-domain-name>
-      <security-proxy>
-      <ejb-ref>
-      <service-ref>
-      <security-identity>
-        <run-as-principal>
-      </security-identity>
-      <resource-ref>
-      <resource-env-ref>
-    </message-driven>
-
-    <webservice-description>
-      <webservice-description-name>
-      <wsdl-publish-location>
-    </webservice-description>
-
-  </enterprise-beans>
-
-  <assembly-descriptor>
-    <security-role>
-      <role-name>
-      <principal-name>
-    </security-role>
-  </assembly-descriptor>
-
-  <resource-managers>
-
-    <resource-manager>
-      <res-name />
-      <res-jndi-name />
-    </resource-manager>
-
-    <resource-manager>
-      <res-name />
-      <res-url />
-    </resource-manager>
-
-  </resource-managers>
-
-  <container-configurations>
-
-    <container-configuration>
-      <container-name />
-      <container-interceptors />
-      <client-interceptors />
-      <instance-pool />
-      <instance-cache />
-      <persistence-manager />
-      <web-class-loader />
-      <locking-policy />
-      <container-cache-conf />
-      <container-pool-conf />
-      <commit-option />
-      <optiond-refresh-rate />
-      <security-domain/>
-    </container-configuration>
-
-  </container-configurations>
-
-</jboss>
--->
-
-<!--
-  The jboss element is the root element of the jboss.xml file. It
-  contains all the information used by jboss but not described in the
-  ejb-jar.xml file. All of it is optional.
-
-  1- the application assembler can define custom container configurations
-     for the beans. Standard configurations are provided in standardjboss.xml
-  2- the deployer can override the jndi names under which the beans are deployed
-  3- the deployer can specify runtime jndi names for resource managers.
-
--->
-<!ELEMENT jboss (loader-repository?, jmx-name?, enforce-ejb-restrictions?,
- security-domain?, missing-method-permissions-excluded-mode?,
- unauthenticated-principal?, exception-on-rollback? , enterprise-beans?, assembly-descriptor?,
- resource-managers?, invoker-proxy-bindings?, container-configurations?)>
-
-<!-- The loader-repository specifies the name of the UnifiedLoaderRepository
-   MBean to use for the ear to provide ear level scoping of classes deployed
-   in the ear. It is a unique JMX ObjectName string. It may also specify
-   an arbitrary configuration by including a loader-repository-config element.
-
-Examples:
-   <loader-repository>jboss.test:loader=cts-cmp2v1-sar.ear</loader-repository>
-
-   <loader-repository loaderRepositoryClass='dot.com.LoaderRepository'>
-      <value>dot.com:loader=unique-archive-name</value>
-      <loader-repository-config configParserClass='dot.com.LoaderParser'>
-         <value>java2ParentDelegaton=true</value>
-      </loader-repository-config>
-   </loader-repository>
--->
-<!ELEMENT loader-repository (value | loader-repository-config)*>
-<!-- The loaderRepositoryClass attribute gives the classname of the
-org.jboss.mx.loading.LoaderRepository implementation.
--->
-<!ATTLIST loader-repository loaderRepositoryClass CDATA #IMPLIED>
-
-<!-- The loader-repository-config element specifies any arbitrary configuration
-fragment for use in configuring the loader-repository instance. The actual
-content of this element is specific to the loaderRepositoryClass and the
-code parsing the element.
--->
-<!ELEMENT loader-repository-config (value)>
-<!-- The configParserClass attribute gives the classname of the
-org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfigParser
-implementation to use to parse the loader-repository-config content.
--->
-<!ATTLIST loader-repository-config configParserClass CDATA #IMPLIED>
-
-<!ELEMENT value (#PCDATA)>
-
-<!-- The jmx-name element allows one to specify the JMX ObjectName to use
-for the MBean associated with the ejb-jar module. This must be a unique
-name and valid JMX ObjectName string.
-
-   Used in: jboss
--->
-<!ELEMENT jmx-name (#PCDATA)>
-
-<!--
-  The enforce-ejb-restrictions element tells the container to enforce ejb1.1 restrictions
-  It must be one of the following :
-    <enforce-ejb-restrictions>true</enforce-ejb-restrictions>
-    <enforce-ejb-restrictions>false</enforce-ejb-restrictions>
-
-  Used in: jboss
--->
-<!ELEMENT enforce-ejb-restrictions (#PCDATA)>
-
-<!--
-  The security-domain element specifies the JNDI name of the security
-  manager that implements the EJBSecurityManager and RealmMapping for
-  the domain. When specified at the jboss level it specifies the security
-  domain for all j2ee components in the deployment unit.
-  One can override the global security-domain at the container
-  level using the security-domain element at the container-configuration
-  level.
-
-  Used in: jboss, container-configuration
--->
-<!ELEMENT security-domain (#PCDATA)>
-
-<!-- The missing-method-permissions-excluded-mode determines the treatment
-of missing method-permission mappings in the ejb-jar descriptor. The ejb 2.1
-spec states: "It is possible that some methods are not assigned to any security
-roles nor contained in the exclude-list element. In this case, it is the
-responsibility of the Deployer to assign method permissions for all of the
-unspecified methods, either by assigning them to security roles, or by marking
-them as unchecked." The missing-method-permissions-excluded-mode is a boolean
-that allows the deployer to globally indicate that all methods without a
-method-permission element should be treated as excluded(= true and the default),
-or that methods without a method-permission element should be treated as
-unchecked(= false)
-
-<missing-method-permissions-excluded-mode>true</missing-method-permissions-excluded-mode>
-<missing-method-permissions-excluded-mode>false</missing-method-permissions-excluded-mode>
-
--->
-<!ELEMENT missing-method-permissions-excluded-mode (#PCDATA)>
-
-<!--
-  The unauthenticated-principal element specifies the name of the principal
-  that will be returned by the EJBContext.getCallerPrincipal() method if there
-  is no authenticated user. This Principal has no roles or privaledges to call
-  any other beans.
--->
-<!ELEMENT unauthenticated-principal (#PCDATA)>
-
-<!-- The invoker-proxy-bindings defines the invokers available for use with
-the ejb container configurations.
--->
-<!ELEMENT invoker-proxy-bindings (invoker-proxy-binding*)>
-<!-- The invoker-proxy-binding defines an invoker service and proxy factory
--->
-<!ELEMENT invoker-proxy-binding (name, invoker-mbean, proxy-factory, proxy-factory-config)>
-<!-- The name gives a unique name for the invoker-proxy-binding
--->
-<!ELEMENT name (#PCDATA)>
-<!-- The invoker-mbean gives the JMX ObjectName of the invoker MBean service
--->
-<!ELEMENT invoker-mbean (#PCDATA)>
-<!-- The org.jboss.ejb.EJBProxyFactory implementation class
--->
-<!ELEMENT proxy-factory (#PCDATA)>
-<!-- The proxy-factory-config defines the client-interceptors stack
-and other configuration options to use for the various EJB proxies.
--->
-<!ELEMENT proxy-factory-config (client-interceptors?, endpoint-interceptors? , web-class-loader? ,
-activation-config?, JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? , 
-CreateJBossMQDestination? , MinimumSize? , MaximumSize? ,
-KeepAliveMillis? , MaxMessages? , MDBConfig? , poa? , register-ejbs-in-jnp-context? , 
-jnp-context? , interface-repository-supported?)>
-
-<!--
-  The jndi name of the jms provider adapter in the java:/ namespace.
-  This is mandatory for an MDB and must implement
-  org.jboss.jms.jndi.JMSProviderAdapter
-
-  Used in: proxy-factory-config for JMSContainerInvoker
--->
-<!ELEMENT JMSProviderAdapterJNDI (#PCDATA)>
-<!--
-  The jndi name of the session pool in the java:/ namespace.
-  This is mandatory for an MDB and must implement
-  org.jboss.jms.asf.ServerSessionPoolFactory
-
-  Used in: proxy-factory-config for JMSContainerInvoker
--->
-<!ELEMENT ServerSessionPoolFactoryJNDI (#PCDATA)>
-<!--
-  Whether to create destinations in JBossMQ if the
-  destination cannot be found.
-
-  Used in: proxy-factory-config for JMSContainerInvoker
--->
-<!ELEMENT CreateJBossMQDestination (#PCDATA)>
-<!--
-  The maximum number of messages parameter for the mdb's
-  connection consumer.
-
-  Used in: proxy-factory-config for JMSContainerInvoker
--->
-<!ELEMENT MaxMessages (#PCDATA)>
-<!--
-  Configuration for the MDB
-
-  Used in: proxy-factory-config for JMSContainerInvoker
--->
-<!ELEMENT MDBConfig (ReconnectIntervalSec , DeliveryActive? , DLQConfig?)>
-<!--
-  The time to wait (in seconds) before trying to recover
-  the connection to the JMS server.
-
-  Used in: MDBConfig
--->
-<!ELEMENT ReconnectIntervalSec (#PCDATA)>
-<!--
-  Whether delivery of messages is active at startup,
-  valid values are "True" or "False".
-
-  Used in: MDBConfig
--->
-<!ELEMENT DeliveryActive (#PCDATA)>
-<!--
-  Configuration for an MDB's dead letter queue, used
-  when messages are redelivered too many times.
-
-  Used in: MDBConfig
--->
-<!ELEMENT DLQConfig (DestinationQueue , MaxTimesRedelivered , TimeToLive, DLQUser?,  DLQPassword?)>
-<!--
-  The jndi name of the queue to use as the dead letter queue.
-
-  Used in: DLQConfig
--->
-<!ELEMENT DestinationQueue (#PCDATA)>
-<!--
-  The maximum number of times a message is redelivered before it
-  is placed in the dead letter queue.
-
-  Used in: DLQConfig
--->
-<!ELEMENT MaxTimesRedelivered (#PCDATA)>
-<!--
-  The time-to-live of the message in the dead letter queue.
-  See javax.jms.Message
-
-  Used in: DLQConfig
--->
-<!ELEMENT TimeToLive (#PCDATA)>
-
-<!--
-  The user for the dlq connection
-
-  Used in: DLQConfig
--->
-<!ELEMENT DLQUser (#PCDATA)>
-
-<!--
-  The password for the dlq connection
-
-  Used in: DLQConfig
--->
-<!ELEMENT DLQPassword (#PCDATA)>
-<!--
-  The portable object adapter usage, one of
-  <poa>per-servent</poa>
-  <poa>shared</poa>
-
-  Used in: proxy-factory-config for IORFactory
--->
-<!ELEMENT poa (#PCDATA)>
-<!--
-  Whether to register ejbs in jnp (jndi)
-
-  Used in: proxy-factory-config for IORFactory
--->
-<!ELEMENT register-ejbs-in-jnp-context (#PCDATA)>
-<!--
-  The jndi context in which to register ejbs
-
-  Used in: proxy-factory-config for IORFactory
--->
-<!ELEMENT jnp-context (#PCDATA)>
-<!--
-  Whether a deployed ejb has its own CORBA interface repository or not
-
-  Used in: proxy-factory-config for IORFactory
--->
-<!ELEMENT interface-repository-supported (#PCDATA)>
-
-<!--
-  The enterprise-beans element contains additional information about
-  the beans. These informations, such as jndi names, resource managers and
-  container configurations, are specific to jboss and not described in
-  ejb-jar.xml.
-
-  jboss will provide a standard behaviour if no enterprise-beans element
-  is found, see container-configurations, jndi-name and resource-managers
-  for defaults.
-
-  Used in: jboss
--->
-<!ELEMENT enterprise-beans ((session | entity | message-driven)*, webservice-description*)>
-
-<!--
-  The entity element holds information specific to jboss and not declared
-  in ejb-jar.xml about an entity bean, such as jndi name, container
-  configuration, and resource managers. (see tags for details)
-  The bean should already be declared in ejb-jar.xml, with the same
-  ejb-name.
-
-  Used in: enterprise-beans
--->
-<!ELEMENT entity (ejb-name , jndi-name? , interceptor-stack?, client-bind-url?, binding-factory?, local-jndi-name? , call-by-value?, read-only? , exception-on-rollback?,
- aop-domain-name? , invoker-bindings?, security-proxy? , ejb-ref* , ejb-local-ref* , service-ref*, security-identity? ,
- resource-ref* , resource-env-ref*, message-destination-ref* , method-attributes? , clustered? ,
- cache-invalidation? , cache-invalidation-config?, depends*, ior-security-config?)>
-
-<!--
-  The session element holds information specific to jboss and not declared
-  in ejb-jar.xml about a session bean, such as jndi name, container
-  configuration, and resource managers. (see tags for details)
-  The bean should already be declared in ejb-jar.xml, with the same
-  ejb-name.
-
-  Used in: enterprise-beans
--->
-<!ELEMENT session (ejb-name , jndi-name? , interceptor-stack?, client-bind-url?, binding-factory?, local-jndi-name?, call-by-value?, exception-on-rollback?, aop-domain-name?, 
- invoker-bindings?, security-proxy? , ejb-ref* ,  ejb-local-ref* , service-ref*, security-identity? ,
- resource-ref* , resource-env-ref*, message-destination-ref* , clustered? , method-attributes?, depends*,
- ior-security-config?, port-component*)>
-
-<!--
-  The message-driven element holds information specific to jboss and not declared
-  in ejb-jar.xml about a message-driven bean, such as container
-  configuration and resources.
-  The bean should already be declared in ejb-jar.xml, with the same
-  ejb-name.
-
-  Used in: enterprise-beans
--->
-<!ELEMENT message-driven (ejb-name , activation-config?, destination-jndi-name? ,
- mdb-user?,  mdb-passwd? , mdb-client-id? , mdb-subscription-id? , resource-adapter-name? ,
- exception-on-rollback? , aop-domain-name? , invoker-bindings?,
- security-proxy? , ejb-ref* ,  ejb-local-ref*, service-ref*, security-identity?, resource-ref*,
- resource-env-ref*, message-destination-ref*, depends*, ior-security-config?)>
-
-<!--
-  The ejb-name element gives the name of the bean, it must correspond to
-  an ejb-name element in ejb-jar.xml
-
-  Used in: entity, session, and message-driven
--->
-<!ELEMENT ejb-name (#PCDATA)>
-
-<!--
-  The jndi-name element gives the actual jndi name under which
-  the bean will be deployed when used in the entity, session and
-  message-driven elements. If it is not provided jboss will assume
-  "jndi-name" = "ejb-name"
-
-  When used in the ejb-ref,  ejb-local-ref, resource-ref, resource-env-ref, 
-  message-destination-ref, message-destination elements this specifies the jndi name to 
-  which the reference should link.
-
-  Used in: entity, session and message-driven
-    ejb-ref, resource-ref, resource-env-ref
--->
-<!ELEMENT jndi-name (#PCDATA)>
-
-<!ELEMENT interceptor-stack (#PCDATA)>
-
-<!ELEMENT client-bind-url (#PCDATA)>
-
-<!ELEMENT binding-factory (#PCDATA)>
-
-<!--
-  The JNDI name under with the local home interface should be bound
-
-  Used in: entity and session
--->
-<!ELEMENT local-jndi-name (#PCDATA)>
-
-<!--
-  Determine if the bean should use by value call semantics
-
-  Used in: entity and session
--->
-<!ELEMENT call-by-value (#PCDATA)>
-
-<!--
-  The read-only element flags an entity bean as read only.
-  The bean will never be ejbStored. Defaults to false.
-  It must be one of the following :
-    <read-only>true</read-only>
-    <read-only>false</read-only>
-
-  Used in: entity
--->
-<!ELEMENT read-only (#PCDATA)>
-
-<!--
-  Whether to throw an exception if the CMT controlled
-  transaction is no longer active (e.g. marked rollback)
-  but the application has not itself thrown an exception.
-  If the bean specifies false, it uses the
-  jboss/exception-on-rollback config.
-  Defaults to false.
-  It must be one of the following :
-    <exception-on-rollback>true</exception-on-rollback>
-    <exception-on-rollback>false</exception-on-rollback>
-
-  Used in: jboss, session, entity and message-driven
--->
-<!ELEMENT exception-on-rollback (#PCDATA)>
-
-<!--
-  The aop-domain-name element gives the name of the container
-  configuration for this bean. It must match one of the container-name
-  tags in the container-configurations section, or one of the standard
-  configurations. If no element is provided, jboss will automatically use the
-  right standard configuration, see container-configurations.
-
-  Note: unlike earlier releases, this element may not be specified as an
-   empty element to achieve the same effect as not specifying the element.
-
-  Used in: entity, session, and message-driven
--->
-<!ELEMENT aop-domain-name (#PCDATA)>
-
-<!-- The depends element gives a JMX ObjectName of a service on which the
-container or ejb depends.
--->
-<!ELEMENT depends (#PCDATA)>
-
-<!-- The queue/topic jndi name from which we receive messages -->
-<!ELEMENT destination-jndi-name (#PCDATA)>
-
-<!-- The optional user for the jms connection that delivers messages -->
-<!ELEMENT mdb-user (#PCDATA)>
-
-<!-- The optional password for the jms connection that delivers messages -->
-<!ELEMENT mdb-passwd (#PCDATA)>
-
-<!-- The optional client-id for the jms connection that delivers messages -->
-<!ELEMENT mdb-client-id (#PCDATA)>
-
-<!-- The subscription name for topic delivery -->
-<!ELEMENT mdb-subscription-id (#PCDATA)>
-
-<!-- The name of the rar used in JCA 1.5 message inflow
-e.g.
-   <resource-adapter-name>jms-ra.rar</resource-adapter-name>
-or for embedded rars
-   <resource-adapter-name>myapp.ear#myconnector.rar</resource-adapter-name>
--->
-<!ELEMENT resource-adapter-name (#PCDATA)>
-
-<!-- The security-proxy gives the class name of the security proxy implementation.
-  This may be an instance of org.jboss.security.SecurityProxy, or an
-  just an object that implements methods in the home or remote interface
-  of an EJB without implementating any common interface.
-
-      Used in: entity, session, and message-driven
--->
-<!ELEMENT security-proxy (#PCDATA)>
-
-<!--
-  The ejb-ref element is used to give the jndi-name of an external
-  ejb reference. In the case of an external ejb reference, you don't
-  provide a ejb-link element in ejb-jar.xml, but you provide a jndi-name
-  in jboss.xml
-
-  Used in: entity, session, and message-driven
--->
-<!ELEMENT ejb-ref (ejb-ref-name , jndi-name)>
-
-<!--
-  The ejb-ref-name element is the name of the ejb reference as given in
-  ejb-jar.xml.
-
-  Used in: ejb-ref
--->
-<!ELEMENT ejb-ref-name (#PCDATA)>
-
-
-<!--
-  The ejb-local-ref element is used to give the jndi-name of an external
-  ejb reference. This is an alternative to using ejb-link in ejb-jar.xml
-
-  Used in: entity, session, and message-driven
--->
-<!ELEMENT ejb-local-ref (ejb-ref-name , local-jndi-name)>
-
-<!-- The service-ref element provides jboss specific deployment values to
-the web service reference in ejb-jar.xml.
-Example:
-    <service-ref>
-        <service-ref-name>OrganizationService</service-ref-name>
-        <wsdl-override>file:/wsdlRepository/organization-service.wsdl</wsdl-override>
-    </service-ref>
-
-    <service-ref>
-        <service-ref-name>OrganizationService</service-ref-name>
-        <port-component-ref>
-          <service-endpoint-interface>com.dot.SEI</service-endpoint-interface>
-          <call-property>
-            <prop-name>X</prop-name>
-            <prop-value>Y</prop-value>
-          </call-property>
-        </port-component-ref>
-    </service-ref>
--->
-<!ELEMENT service-ref (service-ref-name, port-component-ref*, wsdl-override?, call-property*)>
-
-<!-- The service-ref-name element gives the ENC relative name used
-in the ejb-jar.xml service-ref-name element.
-
-Used in: service-ref
--->
-<!ELEMENT service-ref-name (#PCDATA)>
-
-<!-- The port-component-ref element provides additional information about
-the standard j2ee service-reference/port-component-ref. Currently this includes
-properties that should be associated with the call/stub for the port.
-
-Used in: service-ref
--->
-<!ELEMENT port-component-ref (service-endpoint-interface?, call-property*)>
-
-<!-- Fully qualified name of service endpoint interface
--->
-<!ELEMENT service-endpoint-interface ( #PCDATA )>
-
-<!-- Arbitrary jaxrpc property values that should be set on a Call object
-before it's returned to the web service client. The valid properties can be any
-properties supported by the jaxrpc Call implementation.
--->
-<!ELEMENT call-property ( prop-name, prop-value )>
-
-<!-- The string value of a property name
--->
-<!ELEMENT prop-name (#PCDATA)>
-
-<!-- The string value of a property value
--->
-<!ELEMENT prop-value (#PCDATA)>
-
-<!--
-  The security-identity element specifies whether a specific run-as identity is to be
-  used. If there is a run-as role defined for an enterprise bean, there can also be a
-  run-as-principal define here. If you don't define a run-as principal the callee will
-  see ctx.getCallerPrincipal() == 'anonymous'
-
-  Used in: entity, message-driven, session
--->
-<!ELEMENT security-identity (run-as-principal)>
-
-<!--
-  The run-as-principal element is the name of the principal that is used
-  when the enterprise bean calls out with a run-as role.
-
-  Used in: security-identity
--->
-<!ELEMENT run-as-principal (#PCDATA)>
-
-<!--
-  The resource-env-ref element gives a mapping between the "code name"
-  of a env resource (res-ref-name, provided by the Bean Developer) and
-  its deployed JNDI name.
-
-  Used in: session, entity, message-driven
--->
-<!ELEMENT resource-env-ref (resource-env-ref-name , jndi-name)>
-
-<!--
-  The resource-env-ref-name element gives the "code name" of a resource. It is
-  provided by the Bean Developer.
-
-  Used in: resource-env-ref
--->
-<!ELEMENT resource-env-ref-name (#PCDATA)>
-
-<!--
-  The method-attributes element can be used to specify which methods are read only
-  or idempotent.  This is used to reduce the need for locks and replication.
--->
-<!ELEMENT method-attributes (method*)>
-
-<!--
-  The method element is used to specify attributes for one method or all those
-  matching a pattern startingstring*.
--->
-<!ELEMENT method (method-name, read-only?, idempotent?, transaction-timeout?)>
-
-<!--
-  The method-name element specifies a complete method name or a pattern consisting of an
-  initial match followed by '*'
--->
-<!ELEMENT method-name (#PCDATA)>
-
-<!--
-  The idempotent element is used in method-attributes to indicate that a method
-  is completely stateless. Really the same as read-only and should be dropped.
--->
-<!ELEMENT idempotent (#PCDATA)>
-
-<!--
-  The transaction timeout in seconds (overriding the default timeout).
-  This will only work for Required (where the method starts the transaction) and RequiresNew.
-  The special value of 0 (zero) uses the default timeout configured on jboss:service=TransactionManager
-  NOTE: any subsequent use of RequiresNew that is not explicitly overridden will use this value.
--->
-<!ELEMENT transaction-timeout (#PCDATA)>
-
-<!--
-  The clustered element allows to specify cluster specific settings.
-  WARNING: session-state-manager-jndi-name is only for SFSB.
-
-  Used in: session, entity, container-configuration
--->
-<!ELEMENT clustered (partition-name? , load-balance-policy? ,
-  session-state-manager-jndi-name?)>
-
-<!--
-  The partition-name element indicates the name of the HAPartition to be used
-  by the container to exchange clustering information. This is a name and *not*
-  a JNDI name. Given name will be prefixed by "/HASessionState/" by the container to get
-  the actual JNDI name of the HAPartition. If not, jboss will assume partition-name = "DefaultPartition".
-
-  Used in: entity and session (in clustered element)
--->
-<!ELEMENT partition-name (#PCDATA)>
-
-<!--
-  The load-balance-policy element indicates the java class name to be used
-  to load balance calls in the bean proxy.
-  If not, jboss will assume :
-    - for EB and SFSB : load-balance-policy = "org.jboss.ha.framework.interfaces.RoundRobin"
-    - for SLSB        : load-balance-policy = "org.jboss.ha.framework.interfaces.RoundRobin"
-
-  Used in: entity and session (in clustered element)
--->
-<!ELEMENT load-balance-policy (#PCDATA)>
-
-<!--
-  The cache-invalidation element indicates if this bean cache should listen to cache
-  invalidation events and clear its cache accordingly as well as send cache invalidation
-  messages.
-  It is provided by the deployer. If not, jboss will assume cache-invalidation = True
-  NOTE: This value will *only* be applied if the correct cache plugin and interceptor(s)
-        are defined in the container configuration.
-  Possible values: "False", "True" (default)
-
-  Used in: entity (only commit-option A and D will invalidate their cache)
--->
-<!ELEMENT cache-invalidation (#PCDATA)>
-
-<!--
-  The cache-invalidation-config element allows to specify cache invalidation specific settings.
-
-  Used in: entity
--->
-<!ELEMENT cache-invalidation-config (invalidation-group-name? , invalidation-manager-name?)>
-
-<!--
-  The invalidation-group-name element indicates the name of a group in which all
-  invalidation messages are exchanged i.e. all beans sharing a given invalidation-group-name
-  should share the same PK semantic.
-  By default, invalidation-group-name equals to the EJB name. Thus, when using cache invalidation
-  accross a cluster, it is not necessary to specify a name as all beans will have the same name
-  accross the cluster. Nevertheless, if you deploy, on the same node, the same EJB, once with
-  commit-option C (RW access) and once in commit-option A (RO) and want the RW EJB to invalidate
-  entries of RO EJB, each one will obviously have its own EJB name. Consequently, you can assign
-  a common invalidation-group-name to both EJBs so that they share their cache invalidation messages.
-
-  Used in: entity (in cache-invalidation-config element)
--->
-<!ELEMENT invalidation-group-name (#PCDATA)>
-
-<!--
-  The invalidation-manager-name references the InvalidationManager MBean to be used.
-  By Default, the default InvalidationManager is used.
-
-  Used in: entity (in cache-invalidation-config element)
--->
-<!ELEMENT invalidation-manager-name (#PCDATA)>
-
-<!--
-  The session-state-manager-jndi-name element indicates the name of the HASessionState to be used
-  by the container as a backend for state session management in the cluster.
-  This *is* a JNDI name (not like the partition-name element).
-  If not, jboss will assume partition-name = "/HASessionState/Default".
-
-  Used in: session (in clustered element)
--->
-<!ELEMENT session-state-manager-jndi-name (#PCDATA)>
-
-<!--
-  The resource-ref element gives a mapping between the "code name"
-  of a resource (res-ref-name, provided by the Bean Developer) and
-  its "xml name" (resource-name, provided by the Application Assembler).
-  If no resource-ref is provided, jboss will assume that
-  "xml-name" = "code name"
-
-  See resource-managers.
-
-  Used in: entity, session, and message-driven
--->
-<!ELEMENT resource-ref (res-ref-name , (resource-name | jndi-name | res-url))>
-
-<!--
-  The res-ref-name element gives the "code name" of a resource. It is
-  provided by the Bean Developer. See resource-managers for the actual
-  configuration of the resource.
-
-  Used in: resource-ref
--->
-<!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-  The resource-name element gives the "xml name" of the resource. It is
-  provided by the Application Assembler. See resource-managers for the
-  actual configuration of the resource.
-
-  Used in: resource-ref
--->
-<!ELEMENT resource-name (#PCDATA)>
-
-<!--
-  The resource-managers element is used to declare resource managers.
-
-  A resource has 3 names:
-  - the "code name" is the name used in the code of the bean, supplied by
-    the Bean Developer in the resource-ref section of the ejb-jar.xml file
-
-  - the "xml name" is an intermediary name used by the Application Assembler
-    to identify resources in the XML file.
-
-  - the "runtime jndi name" is the actual jndi-name or url of the deployed
-    resource, it is supplied by the Deployer.
-
-  The mapping between the "code name" and the "xml name" is given
-  in the resource-ref section for the bean. If not, jboss will assume that
-  "xml name" = "code name".
-
-  The mapping between the "xml name" and the "runtime jndi name" is given in
-  a resource-manager section. If not, and if the datasource is of type
-  javax.sql.DataSource, jboss will look for a javax.sql.DataSource in the jndi
-  tree.
-
-  Used in: jboss
--->
-<!ELEMENT resource-managers (resource-manager*)>
-
-<!--
-  The resource-manager element is used to provide a mapping between the
-  "xml name" of a resource (res-name) and its "runtime jndi name"
-  (res-jndi-name or res-url according to the type of the resource).
-  If it is not provided, and if the type of the resource is
-  javax.sql.DataSource, jboss will look for a javax.sql.DataSource in the
-  jndi tree.
-
-  See resource-managers.
-
-  Used in: resource-managers
--->
-<!ELEMENT resource-manager (res-name , (res-jndi-name | res-url))>
-
-<!--
-  The res-name element gives the "xml name" of a resource, it is provided
-  by the Application Assembler. See resource-managers.
-
-  Used in: resource-manager
--->
-<!ELEMENT res-name (#PCDATA)>
-
-<!--
-  The res-jndi-name element is the "deployed jndi name" of a resource, it
-  is provided by the Deployer. See resource-managers.
-
-  Used in: resource-manager
--->
-<!ELEMENT res-jndi-name (#PCDATA)>
-
-<!-- The res-url element value is a URL string for a resource-ref of
-res-type = java.net.URL. Using a res-url creates a binding of the URL
-instance under the java:comp/env. If you want to link to another binding
-of a URL, you can use the jndi-name to do so.
-
-// Binds the URL(http://x.y.z) under java:comp/env/jdbc/XYZHome
-<resource-ref>
-    <res-ref-name>jdbc/XYZHome</res-ref-name>
-    <res-url>http://x.y.z</res-url>
-</resource-ref>
-// Binds a link to urls/XYZHomePage under java:comp/env/jdbc/XYZHome
-<resource-ref>
-    <res-ref-name>jdbc/XYZHome</res-ref-name>
-    <res-url>urls/XYZHomePage</res-url>
-</resource-ref>
-
-   Used in: resource-ref, resource-manager
--->
-<!ELEMENT res-url (#PCDATA)>
-
-<!--
-  The message-destination-ref element is used to configure the
-  jndi-name for a message-destination-ref in ejb-jar.xml
-
-  Used in: entity, session, and message-driven
--->
-<!ELEMENT message-destination-ref (message-destination-ref-name, jndi-name)>
-
-<!--
-  The message-destination-ref-name element identifies the
-  message-destination-ref. It must match the name in ejb-jar.xml
-
-  Used in: message-destination-ref
--->
-<!ELEMENT message-destination-ref-name (#PCDATA)>
-
-<!--
-  The assembly-descriptor element contains application-assembly information.
-
-  The definition of security roles allows you to map assembly roles to one or more
-  principals. For example, you may define a run-as principal in the security-identity
-  element and include that principal in one or more security-role(s) in the
-  assembly descriptor. When called with a run-as role, the callee will see all
-  those roles in ctx.isCallerInRole(...)
-
-  Used in: jboss
--->
-<!ELEMENT assembly-descriptor (security-role*, message-destination*)>
-
-<!--
-  The security-role element contains the definition of a security role.
-  The definition consists of an the security role name and principal name element(s).
-
-Used in: assembly-descriptor
-
-Example:
-		<security-role>
-      <role-name>Manager</role-name>
-      <principal-name>j2ee</principal-name>
-      <principal-name>javajoe</principal-name>
-		</security-role>
--->
-<!ELEMENT security-role (role-name, principal-name+)>
-
-<!--
-  The role-name element is the name of the role.
-
-  Used in: security-role
--->
-<!ELEMENT role-name (#PCDATA)>
-
-<!--
-  The principal-name element is the name of the principal that is mapped
-  to the assembly role-name.
-
-  Used in: security-role
--->
-<!ELEMENT principal-name (#PCDATA)>
-
-<!--
-  The message-destination element is used to configure the
-  jndi-name for a message-destination in ejb-jar.xml
-
-  Used in: assembly-descriptor
--->
-<!ELEMENT message-destination (message-destination-name, jndi-name)>
-
-<!--
-  The message-destination-name element identifies the
-  message-destination. It must match the name in ejb-jar.xml
-
-  Used in: message-destination
--->
-<!ELEMENT message-destination-name (#PCDATA)>
-
-<!--
-  The container-configurations element declares the different possible
-  container configurations that the beans can use. standardjboss.xml
-  provides 15 standard configurations with the following container-names:
-    - Standard CMP 2.x EntityBean
-    - Standard CMP EntityBean
-    - Clustered CMP 2.x EntityBean
-    - Clustered CMP EntityBean
-    - IIOP CMP 2.x EntityBean
-    - IIOP CMP EntityBean
-    - Standard Stateless SessionBean
-    - Clustered Stateless SessionBean
-    - IIOP Stateless SessionBean
-    - Standard Stateful SessionBean
-    - Clustered Stateful SessionBean
-    - IIOP Stateful SessionBean
-    - Standard BMP EntityBean
-    - Clustered BMP EntityBean
-    - IIOP BMP EntityBean
-    - Standard message Driven Bean
-
-  The standard configurations will automatically be used if no custom
-  configuration is specified.
-
-  The application assembler can define advanced custom configurations here.
-
-  Used in: jboss
--->
-<!ELEMENT container-configurations (container-configuration*)>
-
-<!--
-  The container-configuration element describes a configuration for the
-  container.
-  The different plugins to use are declared here, as well as their
-  configurations. The configuration-class attribute is no longer used.
-
-  Used in: container-configurations
--->
-<!ELEMENT container-configuration (container-name , call-logging?,
- invoker-proxy-binding-name?, sync-on-commit-only?,
- insert-after-ejb-post-create?, call-ejb-store-on-clean?, container-interceptors? ,
- instance-pool? , instance-cache? ,  persistence-manager? , web-class-loader? ,
- locking-policy? ,  container-cache-conf? , container-pool-conf? ,
- commit-option? , optiond-refresh-rate? , security-domain?, clustered?,
- depends*)>
-
-<!-- The extends attribute gives the container-name value of the configuration the container-configuration
-is extending. This allows one to specify an extension configuration without having to reiterate all of
-the other duplicate configuration info.
-
-        <container-configuration extends="Standard Stateful SessionBean">
-            <container-name>Secure Stateless SessionBean</container-name>
-            <security-domain>java:/jaas/other</security-domain>
-        </container-configuration>
--->
-<!ATTLIST container-configuration extends CDATA  #IMPLIED>
-
-<!--
-  The container-name element gives the name of the configuration being
-  defined. Beans may refer to this name in their aop-domain-name tag.
-
-  Used in: container-configuration
--->
-<!ELEMENT container-name (#PCDATA)>
-
-<!--
-  The call-logging element tells if the container must log every method
-  invocation for this bean or not. Its value must be true or false.
-
-  Used in: container-configuration
--->
-<!ELEMENT call-logging (#PCDATA)>
-
-<!--
-  The invoker-bindings element gives the invokers configuration for an
-  ejb container.
-
-  Used in: entity, session, message-driven
--->
-<!ELEMENT invoker-bindings (invoker+)>
-<!--
- -->
-<!ELEMENT invoker (invoker-proxy-binding-name, jndi-name?, ejb-ref*)>
-
-<!-- The invoker-proxy-binding-name elements maps to the name element of
-an invoker-proxy-binding definition.
-
-  Used in: container-configuration, invoker
--->
-<!ELEMENT invoker-proxy-binding-name (#PCDATA)>
-
-<!-- The sync-on-commit-only element determines the behavior of ejbStore
-calls on finds, selects and removes. If set to true, ejbStore will only be
-called on transaction commit.
--->
-<!ELEMENT sync-on-commit-only (#PCDATA)>
-
-<!-- The insert-after-ejb-post-create element defines when the INSERT
- statement will be executed for created entity instance.
- Possible values are:
- false - the default value, INSERT will be executed after ejbCreate but before
-         ejbPostCreate;
- true - INSERT will be executed after ejbPostCreate.
--->
-<!ELEMENT insert-after-ejb-post-create (#PCDATA)>
-
-<!-- The call-ejb-store-for-clean says whether ejbStore should be called on clean instances
- at synchronization time. By the spec it should be true. But users wanted it to be false.
- False is the default, meaning ejbStore is called only on dirty instances.
--->
-<!ELEMENT call-ejb-store-on-clean (#PCDATA)>
-
-<!--
-  The container-interceptors element gives the chain of Interceptors
-  (instances of org.jboss.ejb.Interceptor) that are associated with the container.
-  The declared order of the interceptor elements corresponds to the order of the
-  interceptor chain.
-
-  Used in: container-configuration
--->
-<!ELEMENT container-interceptors (interceptor+)>
-
-<!--
-The client-interceptors defines the home and bean client side interceptor chain
-
-  Used in: proxy-factory-config
--->
-<!ELEMENT client-interceptors (home , bean, list-entity?)>
-
-<!-- Define whether the ejb proxy should expose an org.jboss.proxy.IClientContainer
-   interface to provide access to the invocation context and interceptors.
--->
-<!ATTLIST client-interceptors exposeContainer (true | false )  "false">
-
-<!--
-The endpoint-interceptors element gives the chain of interceptors
-(instances of org.jboss.proxy.Interceptor) that are associated with the
-message endpoint.
-
-  Used in: proxy-factory-config for message inflow
--->
-<!ELEMENT endpoint-interceptors (interceptor+)>
-
-<!--
-The home element gives the chain of interceptors
-(instances of org.jboss.proxy.Interceptor) that are associated with the home
-proxy and operate in the client VM. The declared order of the interceptor
-elements corresponds to the order of the interceptor chain.
-
-  Used in: client-interceptors
--->
-<!ELEMENT home (interceptor+)>
-
-<!--
-The bean element gives the chain of interceptors
-(instances of org.jboss.proxy.Interceptor) that are associated with the remote
-proxy and operate in the client VM. The declared order of the interceptor
-elements corresponds to the order of the interceptor chain.
-
-  Used in: client-interceptors
--->
-<!ELEMENT bean (interceptor+)>
-
-<!--
-The list-entity element gives the chain of interceptors
-(instances of org.jboss.proxy.Interceptor) that are associated with the remote
-proxy and operate in the client VM. The declared order of the interceptor
-elements corresponds to the order of the interceptor chain.
-
-  Used in: client-interceptors
--->
-<!ELEMENT list-entity (interceptor+)>
-
-<!--
-  The interceptor element specifies an instance of org.jboss.ejb.Interceptor
-  that is to be added to the container interceptor stack.
-
-  Used in: home, bean, list-entity, endpoint-interceptors
--->
-<!ELEMENT interceptor (#PCDATA)>
-
-<!--
-  The transaction attribute is used to indicate what type of container its
-  interceptor applies to. It is an enumerated value that can take on one of: Bean,
-  Container or Both. A value of Bean indicates that the interceptor should only be
-  added to a container for bean-managed transaction.
-  A value of Container indicates that the interceptor should only be added to a
-  container for container-managed transactions.
-  A value of Both indicates that the interceptor should be added to all
-  containers. This is the default value if the transaction attribute is not
-  explictlygiven.
--->
-<!ATTLIST interceptor transaction     (Bean | Container | Both )  "Both">
-
-<!--
-  The metricsEnabled attributes is used to indicate if the interceptor
-  should only be included when the org.jboss.ejb.ContainerFactory metricsEnabled
-  flag is set to true. The allowed values are true and false with false being the
-  default if metricsEnabled is not explicitly given.
--->
-<!ATTLIST interceptor metricsEnabled  (true | false )  "false">
-
-<!--
-  The call-by-value attribute is used to indicate that the interceptor
-  should only be included when the value of the attribute corresponds
-  to the value of org.jboss.metadata.BeanMetaData callByValue.
-  For example, if a bean defines the element <call-by-value>true</call-by-value>
-  then a marshalling invoker interceptor will be used instead of the
-  non marshalling optimized invoker interceptor.
--->
-<!ATTLIST interceptor call-by-value  (true | false )  #IMPLIED>
-
-<!--
-  The instance-pool element gives the class name of the instance pool
-  jboss must use for in this configuration. This class must implement
-  the org.jboss.ejb.InstancePool interface. The defaults are:
-  - org.jboss.ejb.plugins.EntityInstancePool for entity beans
-  - org.jboss.ejb.plugins.StatelessSessionInstancePool for stateless
-  session beans.
-  - no pool is used for stateful session beans
-
-  Used in: container-configuration
--->
-<!ELEMENT instance-pool (#PCDATA)>
-
-<!--
-  The instance-cache element gives the class name of the instance cache
-  jboss must use for in this configuration. This class must implement
-  the org.jboss.ejb.InstanceCache interface. The defaults are:
-  - org.jboss.ejb.plugins.NoPassivationEntityInstanceCache for entity beans
-  - org.jboss.ejb.plugins.NoPassivationStatefulSessionInstanceCache for
-  stateful session beans.
-  - no cache is used for stateless session beans
-
-  Used in: container-configuration
--->
-<!ELEMENT instance-cache (#PCDATA)>
-
-<!--
-  The persistence-manager element gives the class name of the persistence
-  manager / persistence store jboss must use for in this configuration.
-  This class must implement:
-  - org.jboss.ejb.EntityPersistenceStore for CMP Entity Beans (default is
-  org.jboss.ejb.plugins.jaws.JAWSPersistenceManager)
-  - org.jboss.ejb.EntityPersistenceManager for BMP entity beans (default
-  is org.jboss.ejb.plugins.BMPPersistenceManager)
-  - org.jboss.ejb.StatefulSessionPersistenceManager for stateless session
-  beans.
-  - no persistence-manager is used for stateless session beans
-
-  Used in: container-configuration
--->
-<!ELEMENT persistence-manager (#PCDATA)>
-
-<!--
-  The locking-policy element gives the class name of the EJB lock
-  implementation JBoss must use for in this configuration. This class must
-  implement  the org.jboss.ejb.BeanLock interface. The default is
-  org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock.
-
-  Used in: container-configuration
--->
-<!ELEMENT locking-policy (#PCDATA)>
-
-<!--
-  The web-class-loader element gives the class name of the web classloader
-  jboss must use for in this configuration. This class must be a subclass
-  of org.jboss.web.WebClassLoader. The default is org.jboss.web.WebClassLoader.
-
-  Used in: container-configuration
-  Used in: proxy-factory-config
--->
-<!ELEMENT web-class-loader (#PCDATA)>
-
-<!--
-  The container-cache-conf element holds dynamic configuration data
-  for the instance cache.
-  jboss does not read directly the subtree for this element: instead,
-  it is passed to the instance cache instance (if it implements
-  org.jboss.metadata.XmlLoadable) for it to load its parameters.
-
-  Used in: container-configuration
--->
-<!ELEMENT container-cache-conf (cache-policy? , cache-policy-conf?, cache-policy-conf-other?)>
-
-<!--
-  The implementation class for the cache policy, which controls
-  when instances will be passivated, etc.
-
-  Used in: container-cache-conf
--->
-<!ELEMENT cache-policy (#PCDATA)>
-
-<!--
-  The configuration settings for the selected cache policy.  This
-  is currently only valid for the LRU cache.
-  When the cache is the LRU one for the stateful container, the elements
-  remover-period and max-bean-life specifies the period of the remover
-  task that removes stateful beans (that normally have been passivated)
-  that have age greater than the specified max-bean-life element.
-
-  Used in: container-cache-conf (when cache-policy is the LRU cache)
--->
-<!ELEMENT cache-policy-conf (min-capacity , max-capacity , remover-period? ,
- max-bean-life? , overager-period? , max-bean-age? , resizer-period? ,
- max-cache-miss-period? , min-cache-miss-period? , cache-load-factor?)>
-
-<!--
-  The minimum capacity of this cache
--->
-<!ELEMENT min-capacity (#PCDATA)>
-
-<!--
-  The maximum capacity of this cache
--->
-<!ELEMENT max-capacity (#PCDATA)>
-
-<!--
-  The period of the overager's runs
--->
-<!ELEMENT overager-period (#PCDATA)>
-
-<!--
-  The period of the remover's runs
--->
-<!ELEMENT remover-period (#PCDATA)>
-
-<!--
-  The max-bean-life specifies the period of the remover
-  task that removes stateful beans (that normally have been passivated)
-  that have age greater than the specified max-bean-life element.
--->
-<!ELEMENT max-bean-life (#PCDATA)>
-
-<!--
-  The period of the resizer's runs
--->
-<!ELEMENT resizer-period (#PCDATA)>
-
-<!--
-  The age after which a bean is automatically passivated
--->
-<!ELEMENT max-bean-age (#PCDATA)>
-
-<!--
-  Shrink cache capacity if there is a cache miss every or more
-  this member's value
--->
-<!ELEMENT max-cache-miss-period (#PCDATA)>
-
-<!--
-  Enlarge cache capacity if there is a cache miss every or less
-  this member's value
--->
-<!ELEMENT min-cache-miss-period (#PCDATA)>
-
-<!--
-  The resizer will always try to keep the cache capacity so that
-  the cache is this member's value loaded of cached objects
--->
-<!ELEMENT cache-load-factor (#PCDATA)>
-
-<!--
-  Arbitrary XML configuration
--->
-<!ELEMENT cache-policy-conf-other ANY>
-
-<!--
-  The container-pool-conf element holds configuration data for the
-  instance pool.
-  jboss does not read directly the subtree for this element: instead,
-  it is passed to the instance pool instance (if it implements
-  org.jboss.metadata.XmlLoadable) for it to load its parameters.
-
-  The default instance pools, EntityInstancePool and
-  StatelessSessionInstancePool, both accept the following configuration.
-
-  Used in: container-configuration
--->
-<!ELEMENT container-pool-conf (MinimumSize?, MaximumSize?,
-   strictMaximumSize?, strictTimeout?)>
-
-<!-- The theoretical minimum size of the pool. Currently unused by JBoss
-EJB pools.
-
-Used in: invoker-proxy-conf for JMSContainerInvoker
--->
-<!ELEMENT MinimumSize (#PCDATA)>
-
-<!--
-  The capacity of the Pool. For pools where reclaim is possible, the pool will
-  also be repopulated when the instance is free to be reused.
-  This is not an hard limit, if instances are needed when the pool is at
-  its MaximumSize, new instances will be created following the demand unless
-  a strictMaximumSize of true is specified.
-
-  Used in: container-pool-conf and invoker-proxy-conf for JMSContainerInvoker
--->
-<!ELEMENT MaximumSize (#PCDATA)>
-
-<!-- A boolean flag indicating if attempts to access the pool will block when
-MaximumSize instances are active. The default is false.
-
-  Used in: container-pool-conf
--->
-<!ELEMENT strictMaximumSize (#PCDATA)>
-
-<!-- The time in milliseconds to wait for the strictMaximumSize semaphore. The
-default is Long.MAX_VALUE or essentially enternity.
-
-  Used in: container-pool-conf
--->
-<!ELEMENT strictTimeout (#PCDATA)>
-
-<!--
-  The number of millis to keep an unused object in the pool. Currently unused by
-  JBoss EJB Pools.
-
-  Used in: invoker-proxy-conf for JMSContainerInvoker
--->
-<!ELEMENT KeepAliveMillis (#PCDATA)>
-
-<!--
-  This option is only used for entity container configurations.
-
-  The commit-option element tells the container which option to use for transactions.
-  Its value must be A, B C, or D.
-
-  - option A: the entiry instance has exclusive access to the database. The instance
-  stays ready after a transaction.
-  - option B: the entity instance does not have exclusive access to the database.
-  The state is loaded before the next transaction.
-  - option C: same as B, except the container does not keep the instance after commit:
-  a passivate is immediately performed after the commit.
-
-  - option D: a lazy update. default is every 30 secs.
-               can be updated with <optiond-refresh-rate>
-
-  See ejb1.1 specification for details (p118).
-
-  Used in: container-configuration
--->
-<!ELEMENT commit-option (#PCDATA)>
-
-<!--
-  This element is used to specify the refresh rate of commit option d
--->
-<!ELEMENT optiond-refresh-rate (#PCDATA)>
-
-<!--
-ior-security-config element describes the security configuration information for the IOR.
--->  
-<!ELEMENT ior-security-config ( transport-config? , as-context?, sas-context?  )> 
-
-<!--
-transport-config is the root element for security between the end points
--->
-<!ELEMENT transport-config ( integrity, confidentiality,
- establish-trust-in-target, establish-trust-in-client, detect-misordering?,
- detect-replay?)> 
-
-<!--
-integrity element indicates if the server (target) supports integrity protected messages. 
-The valid values are NONE, SUPPORTED or REQUIRED
--->  
-<!ELEMENT integrity ( #PCDATA)>
-
-<!--
-confidentiality element indicates if the server (target) supports privacy protected 
-messages. The values are NONE, SUPPORTED or REQUIRED
--->  
-<!ELEMENT confidentiality ( #PCDATA)>
-
-<!--
-establish-trust-in-target element indicates if the target is capable of authenticating to a client. 
-The values are NONE or SUPPORTED.
--->  
-<!ELEMENT establish-trust-in-target ( #PCDATA)>
-
-<!--
-establish-trust-in-client element indicates if the target is capable of authenticating a client. The
-values are NONE, SUPPORTED or REQUIRED.
--->  
-<!ELEMENT establish-trust-in-client ( #PCDATA)>
-
-<!--
-The optional detect-misordering indicates if the server (target) supports
-detection of message sequence errors. The values are NONE, SUPPORTED or REQUIRED.
--->  
-<!ELEMENT detect-misordering ( #PCDATA)>
-
-<!--
-The optional detect-replay indicates if the server (target) supports detection
-of message replay attempts. The values are NONE, SUPPORTED or REQUIRED.
--->  
-<!ELEMENT detect-replay ( #PCDATA)>
-
-<!--
-as-context (CSIv2 authentication service) is the element describing the authentication 
-mechanism that will be used to authenticate the client. If specified it will be the 
-username-password mechanism.
--->  
-<!ELEMENT as-context ( auth-method, realm, required )> 
-
-<!--
-required element specifies if the authentication method specified is required
-to be used for client authentication. If so the EstablishTrustInClient bit
-will be set in the target_requires field of the AS_Context. The element value
-is either true or false. 
--->  
-<!ELEMENT required ( #PCDATA )> 
-
-<!--
-auth-method element describes the authentication method. The only supported value
-for as-context is USERNAME_PASSWORD
-
-For port-component, the auth-method element is used to configure the
-authentication mechanism for the web service. As a prerequisite to gaining
-access to any web service which are protected by an authorization
-constraint, a user must have authenticated using the configured
-mechanism. Legal values for this element are "BASIC", or "CLIENT-CERT".
-
-Used in: as-context, port-component
-
--->  
-<!ELEMENT auth-method ( #PCDATA )> 
-
-<!--
-realm element describes the realm in which the user is authenticated. Must be 
-a valid realm that is registered in server configuration.
--->  
-<!ELEMENT realm ( #PCDATA )> 
-
-<!--
-sas-context (related to CSIv2 security attribute service) element describes 
-the sas-context fields.
--->  
-<!ELEMENT sas-context ( caller-propagation )> 
-
-<!--
-caller-propagation element indicates if the target will accept propagated caller identities
-The values are NONE or SUPPORTED.
--->  
-<!ELEMENT caller-propagation ( #PCDATA) >
-
-<!-- The port-component element specifies a mapping from a webservice
-port-component whose service-impl-bean/ejb-link value maps to an ejb.
-
-Used in: session
--->
-<!ELEMENT port-component (port-component-name, port-component-uri?, auth-method?,
- transport-guarantee?) >
-
-<!-- Maps to the port-component-name in the webservices.xml descriptor.
-
-Used in: port-component
--->
-<!ELEMENT port-component-name (#PCDATA) >
-
-<!-- Absolute path starting with web context root to form fully qualified
-endpoint address for a web service endpoint. The port component uri, if present
-must contain at least two token seperated by '/'. The first token is the web context root,
-which must be identical among all port component uris in a given deployment.
-
-If this element is not present, the web context root will be derived from the
-deployment canonical name.
-
-Used in: port-component
--->
-<!ELEMENT port-component-uri (#PCDATA) >
-
-<!--
-The transport-guarantee element specifies that the communication
-between client and server should be NONE, INTEGRAL, or
-CONFIDENTIAL. NONE means that the application does not require any
-transport guarantees. A value of INTEGRAL means that the application
-requires that the data sent between the client and server be sent in
-such a way that it can't be changed in transit. CONFIDENTIAL means
-that the application requires that the data be transmitted in a
-fashion that prevents other entities from observing the contents of
-the transmission. In most cases, the presence of the INTEGRAL or
-CONFIDENTIAL flag will indicate that the use of SSL is required.
-
-Used in: port-component
--->
-<!ELEMENT transport-guarantee (#PCDATA)>
-
-<!--
-Runtime information about a web service.
-
-wsdl-publish-location is optionally used to specify
-where the final wsdl and any dependent files should be stored.  This location
-resides on the file system from which deployment is initiated.
--->
-<!ELEMENT webservice-description ( webservice-description-name, wsdl-publish-location? )>
-
-<!--
-Unique name of a webservice within a module
--->
-<!ELEMENT webservice-description-name ( #PCDATA )>
-
-<!--
-This is a valid URL pointing to a final WSDL document. It is optional.
-If specified, the WSDL document at this URL will be used during
-deployment instead of the WSDL document associated with the
-service-ref in the standard deployment descriptor.
-
-Examples :
-
-  // available via HTTP
-  <wsdl-override>http://localhost:8000/myservice/myport?WSDL</wsdl-override>
-
-  // in a file
-  <wsdl-override>file:/home/user1/myfinalwsdl.wsdl</wsdl-override>
-
--->
-<!ELEMENT wsdl-override ( #PCDATA )>
-
-<!--
-file: URL of a directory to which a web-service-description's wsdl should be
-published during deployment.  Any required files will be published to this
-directory, preserving their location relative to the module-specific
-wsdl directory(META-INF/wsdl or WEB-INF/wsdl).
-
-Example :
-
-  For an ejb.jar whose webservices.xml wsdl-file element contains
-    META-INF/wsdl/a/Foo.wsdl
-
-  <wsdl-publish-location>file:/home/user1/publish
-  </wsdl-publish-location>
-
-  The final wsdl will be stored in /home/user1/publish/a/Foo.wsdl
-
--->
-<!ELEMENT wsdl-publish-location ( #PCDATA )>
-
-<!--
-Activation config
-
-used in message-driven and proxy-factory-config
--->
-<!ELEMENT activation-config ( activation-config-property* )>
-
-<!--
-Activation config properties 
-
-used in activation-config
--->
-<!ELEMENT activation-config-property ( activation-config-property-name, 
-                                       activation-config-property-value )>
-
-<!--
-Activation config property name
-
-used in activation-config-property
--->
-<!ELEMENT activation-config-property-name ( #PCDATA )>
-
-<!--
-Activation config property value
-
-used in activation-config-property
--->
-<!ELEMENT activation-config-property-value ( #PCDATA )>
-                                       

Copied: branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.dtd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/jboss_5_0.dtd)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.dtd	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.dtd	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,1655 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!--
+This is the XML DTD for the JBoss 4.0 EJB deployment descriptor.
+The DOCTYPE is:
+
+$Id$
+
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 4.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+Overview of the architecture of jboss.xml
+
+<jboss>
+
+  <enforce-ejb-restrictions />
+  <security-domain />
+  <unauthenticated-principal />
+
+  <enterprise-beans>
+
+    <entity>
+      <ejb-name />
+      <jndi-name />
+      <interceptor-stack />
+	<client-bind-url />
+      <binding-factory />
+      <local-jndi-name />
+      <call-by-value>
+      <read-only>
+      <call-by-value>
+      <aop-domain-name>
+      <security-proxy>
+      <ejb-ref>
+      <ejb-local-ref>
+      <service-ref>
+      <security-identity>
+        <run-as-principal>
+      </security-identity>
+      <resource-ref>
+        <res-ref-name />
+        <resource-name />
+      </resource-ref>
+      <resource-env-ref>
+      <clustered />
+    </entity>
+
+    <session>
+      <ejb-name />
+      <jndi-name />
+      <interceptor-stack />
+	<client-bind-url />
+      <binding-factory />
+      <local-jndi-name />
+      <call-by-value>
+      <aop-domain-name>
+      <security-proxy>
+      <ejb-ref>
+      <ejb-local-ref>
+      <service-ref>
+      <security-identity>
+        <run-as-principal>
+      </security-identity>
+      <resource-ref>
+        <res-ref-name />
+        <resource-name />
+      </resource-ref>
+      <resource-env-ref>
+      <clustered/>
+      <port-component>
+        <port-component-name>
+        <port-component-uri>
+        <auth-method>
+        <transport-guarantee>
+      </port-component>
+    </session>
+
+    <message-driven>
+      <ejb-name>
+      <destination-jndi-name>
+      <mdb-user>
+      <mdb-passwd>
+      <mdb-client-id>
+      <mdb-subscription-id>
+      <resource-adapter-name>
+      <aop-domain-name>
+      <security-proxy>
+      <ejb-ref>
+      <service-ref>
+      <security-identity>
+        <run-as-principal>
+      </security-identity>
+      <resource-ref>
+      <resource-env-ref>
+    </message-driven>
+
+    <webservice-description>
+      <webservice-description-name>
+      <wsdl-publish-location>
+    </webservice-description>
+
+  </enterprise-beans>
+
+  <assembly-descriptor>
+    <security-role>
+      <role-name>
+      <principal-name>
+    </security-role>
+  </assembly-descriptor>
+
+  <resource-managers>
+
+    <resource-manager>
+      <res-name />
+      <res-jndi-name />
+    </resource-manager>
+
+    <resource-manager>
+      <res-name />
+      <res-url />
+    </resource-manager>
+
+  </resource-managers>
+
+  <container-configurations>
+
+    <container-configuration>
+      <container-name />
+      <container-interceptors />
+      <client-interceptors />
+      <instance-pool />
+      <instance-cache />
+      <persistence-manager />
+      <web-class-loader />
+      <locking-policy />
+      <container-cache-conf />
+      <container-pool-conf />
+      <commit-option />
+      <optiond-refresh-rate />
+      <security-domain/>
+    </container-configuration>
+
+  </container-configurations>
+
+</jboss>
+-->
+
+<!--
+  The jboss element is the root element of the jboss.xml file. It
+  contains all the information used by jboss but not described in the
+  ejb-jar.xml file. All of it is optional.
+
+  1- the application assembler can define custom container configurations
+     for the beans. Standard configurations are provided in standardjboss.xml
+  2- the deployer can override the jndi names under which the beans are deployed
+  3- the deployer can specify runtime jndi names for resource managers.
+
+-->
+<!ELEMENT jboss (loader-repository?, jmx-name?, enforce-ejb-restrictions?,
+ security-domain?, missing-method-permissions-excluded-mode?,
+ unauthenticated-principal?, exception-on-rollback? , enterprise-beans?, assembly-descriptor?,
+ resource-managers?, invoker-proxy-bindings?, container-configurations?)>
+
+<!-- The loader-repository specifies the name of the UnifiedLoaderRepository
+   MBean to use for the ear to provide ear level scoping of classes deployed
+   in the ear. It is a unique JMX ObjectName string. It may also specify
+   an arbitrary configuration by including a loader-repository-config element.
+
+Examples:
+   <loader-repository>jboss.test:loader=cts-cmp2v1-sar.ear</loader-repository>
+
+   <loader-repository loaderRepositoryClass='dot.com.LoaderRepository'>
+      <value>dot.com:loader=unique-archive-name</value>
+      <loader-repository-config configParserClass='dot.com.LoaderParser'>
+         <value>java2ParentDelegaton=true</value>
+      </loader-repository-config>
+   </loader-repository>
+-->
+<!ELEMENT loader-repository (value | loader-repository-config)*>
+<!-- The loaderRepositoryClass attribute gives the classname of the
+org.jboss.mx.loading.LoaderRepository implementation.
+-->
+<!ATTLIST loader-repository loaderRepositoryClass CDATA #IMPLIED>
+
+<!-- The loader-repository-config element specifies any arbitrary configuration
+fragment for use in configuring the loader-repository instance. The actual
+content of this element is specific to the loaderRepositoryClass and the
+code parsing the element.
+-->
+<!ELEMENT loader-repository-config (value)>
+<!-- The configParserClass attribute gives the classname of the
+org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfigParser
+implementation to use to parse the loader-repository-config content.
+-->
+<!ATTLIST loader-repository-config configParserClass CDATA #IMPLIED>
+
+<!ELEMENT value (#PCDATA)>
+
+<!-- The jmx-name element allows one to specify the JMX ObjectName to use
+for the MBean associated with the ejb-jar module. This must be a unique
+name and valid JMX ObjectName string.
+
+   Used in: jboss
+-->
+<!ELEMENT jmx-name (#PCDATA)>
+
+<!--
+  The enforce-ejb-restrictions element tells the container to enforce ejb1.1 restrictions
+  It must be one of the following :
+    <enforce-ejb-restrictions>true</enforce-ejb-restrictions>
+    <enforce-ejb-restrictions>false</enforce-ejb-restrictions>
+
+  Used in: jboss
+-->
+<!ELEMENT enforce-ejb-restrictions (#PCDATA)>
+
+<!--
+  The security-domain element specifies the JNDI name of the security
+  manager that implements the EJBSecurityManager and RealmMapping for
+  the domain. When specified at the jboss level it specifies the security
+  domain for all j2ee components in the deployment unit.
+  One can override the global security-domain at the container
+  level using the security-domain element at the container-configuration
+  level.
+
+  Used in: jboss, container-configuration
+-->
+<!ELEMENT security-domain (#PCDATA)>
+
+<!-- The missing-method-permissions-excluded-mode determines the treatment
+of missing method-permission mappings in the ejb-jar descriptor. The ejb 2.1
+spec states: "It is possible that some methods are not assigned to any security
+roles nor contained in the exclude-list element. In this case, it is the
+responsibility of the Deployer to assign method permissions for all of the
+unspecified methods, either by assigning them to security roles, or by marking
+them as unchecked." The missing-method-permissions-excluded-mode is a boolean
+that allows the deployer to globally indicate that all methods without a
+method-permission element should be treated as excluded(= true and the default),
+or that methods without a method-permission element should be treated as
+unchecked(= false)
+
+<missing-method-permissions-excluded-mode>true</missing-method-permissions-excluded-mode>
+<missing-method-permissions-excluded-mode>false</missing-method-permissions-excluded-mode>
+
+-->
+<!ELEMENT missing-method-permissions-excluded-mode (#PCDATA)>
+
+<!--
+  The unauthenticated-principal element specifies the name of the principal
+  that will be returned by the EJBContext.getCallerPrincipal() method if there
+  is no authenticated user. This Principal has no roles or privaledges to call
+  any other beans.
+-->
+<!ELEMENT unauthenticated-principal (#PCDATA)>
+
+<!-- The invoker-proxy-bindings defines the invokers available for use with
+the ejb container configurations.
+-->
+<!ELEMENT invoker-proxy-bindings (invoker-proxy-binding*)>
+<!-- The invoker-proxy-binding defines an invoker service and proxy factory
+-->
+<!ELEMENT invoker-proxy-binding (name, invoker-mbean, proxy-factory, proxy-factory-config)>
+<!-- The name gives a unique name for the invoker-proxy-binding
+-->
+<!ELEMENT name (#PCDATA)>
+<!-- The invoker-mbean gives the JMX ObjectName of the invoker MBean service
+-->
+<!ELEMENT invoker-mbean (#PCDATA)>
+<!-- The org.jboss.ejb.EJBProxyFactory implementation class
+-->
+<!ELEMENT proxy-factory (#PCDATA)>
+<!-- The proxy-factory-config defines the client-interceptors stack
+and other configuration options to use for the various EJB proxies.
+-->
+<!ELEMENT proxy-factory-config (client-interceptors?, endpoint-interceptors? , web-class-loader? ,
+activation-config?, JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? , 
+CreateJBossMQDestination? , MinimumSize? , MaximumSize? ,
+KeepAliveMillis? , MaxMessages? , MDBConfig? , poa? , register-ejbs-in-jnp-context? , 
+jnp-context? , interface-repository-supported?)>
+
+<!--
+  The jndi name of the jms provider adapter in the java:/ namespace.
+  This is mandatory for an MDB and must implement
+  org.jboss.jms.jndi.JMSProviderAdapter
+
+  Used in: proxy-factory-config for JMSContainerInvoker
+-->
+<!ELEMENT JMSProviderAdapterJNDI (#PCDATA)>
+<!--
+  The jndi name of the session pool in the java:/ namespace.
+  This is mandatory for an MDB and must implement
+  org.jboss.jms.asf.ServerSessionPoolFactory
+
+  Used in: proxy-factory-config for JMSContainerInvoker
+-->
+<!ELEMENT ServerSessionPoolFactoryJNDI (#PCDATA)>
+<!--
+  Whether to create destinations in JBossMQ if the
+  destination cannot be found.
+
+  Used in: proxy-factory-config for JMSContainerInvoker
+-->
+<!ELEMENT CreateJBossMQDestination (#PCDATA)>
+<!--
+  The maximum number of messages parameter for the mdb's
+  connection consumer.
+
+  Used in: proxy-factory-config for JMSContainerInvoker
+-->
+<!ELEMENT MaxMessages (#PCDATA)>
+<!--
+  Configuration for the MDB
+
+  Used in: proxy-factory-config for JMSContainerInvoker
+-->
+<!ELEMENT MDBConfig (ReconnectIntervalSec , DeliveryActive? , DLQConfig?)>
+<!--
+  The time to wait (in seconds) before trying to recover
+  the connection to the JMS server.
+
+  Used in: MDBConfig
+-->
+<!ELEMENT ReconnectIntervalSec (#PCDATA)>
+<!--
+  Whether delivery of messages is active at startup,
+  valid values are "True" or "False".
+
+  Used in: MDBConfig
+-->
+<!ELEMENT DeliveryActive (#PCDATA)>
+<!--
+  Configuration for an MDB's dead letter queue, used
+  when messages are redelivered too many times.
+
+  Used in: MDBConfig
+-->
+<!ELEMENT DLQConfig (DestinationQueue , MaxTimesRedelivered , TimeToLive, DLQUser?,  DLQPassword?)>
+<!--
+  The jndi name of the queue to use as the dead letter queue.
+
+  Used in: DLQConfig
+-->
+<!ELEMENT DestinationQueue (#PCDATA)>
+<!--
+  The maximum number of times a message is redelivered before it
+  is placed in the dead letter queue.
+
+  Used in: DLQConfig
+-->
+<!ELEMENT MaxTimesRedelivered (#PCDATA)>
+<!--
+  The time-to-live of the message in the dead letter queue.
+  See javax.jms.Message
+
+  Used in: DLQConfig
+-->
+<!ELEMENT TimeToLive (#PCDATA)>
+
+<!--
+  The user for the dlq connection
+
+  Used in: DLQConfig
+-->
+<!ELEMENT DLQUser (#PCDATA)>
+
+<!--
+  The password for the dlq connection
+
+  Used in: DLQConfig
+-->
+<!ELEMENT DLQPassword (#PCDATA)>
+<!--
+  The portable object adapter usage, one of
+  <poa>per-servent</poa>
+  <poa>shared</poa>
+
+  Used in: proxy-factory-config for IORFactory
+-->
+<!ELEMENT poa (#PCDATA)>
+<!--
+  Whether to register ejbs in jnp (jndi)
+
+  Used in: proxy-factory-config for IORFactory
+-->
+<!ELEMENT register-ejbs-in-jnp-context (#PCDATA)>
+<!--
+  The jndi context in which to register ejbs
+
+  Used in: proxy-factory-config for IORFactory
+-->
+<!ELEMENT jnp-context (#PCDATA)>
+<!--
+  Whether a deployed ejb has its own CORBA interface repository or not
+
+  Used in: proxy-factory-config for IORFactory
+-->
+<!ELEMENT interface-repository-supported (#PCDATA)>
+
+<!--
+  The enterprise-beans element contains additional information about
+  the beans. These informations, such as jndi names, resource managers and
+  container configurations, are specific to jboss and not described in
+  ejb-jar.xml.
+
+  jboss will provide a standard behaviour if no enterprise-beans element
+  is found, see container-configurations, jndi-name and resource-managers
+  for defaults.
+
+  Used in: jboss
+-->
+<!ELEMENT enterprise-beans ((session | entity | message-driven)*, webservice-description*)>
+
+<!--
+  The entity element holds information specific to jboss and not declared
+  in ejb-jar.xml about an entity bean, such as jndi name, container
+  configuration, and resource managers. (see tags for details)
+  The bean should already be declared in ejb-jar.xml, with the same
+  ejb-name.
+
+  Used in: enterprise-beans
+-->
+<!ELEMENT entity (ejb-name , jndi-name? , interceptor-stack?, client-bind-url?, binding-factory?, local-jndi-name? , call-by-value?, read-only? , exception-on-rollback?,
+ aop-domain-name? , invoker-bindings?, security-proxy? , ejb-ref* , ejb-local-ref* , service-ref*, security-identity? ,
+ resource-ref* , resource-env-ref*, message-destination-ref* , method-attributes? , clustered? ,
+ cache-invalidation? , cache-invalidation-config?, depends*, ior-security-config?)>
+
+<!--
+  The session element holds information specific to jboss and not declared
+  in ejb-jar.xml about a session bean, such as jndi name, container
+  configuration, and resource managers. (see tags for details)
+  The bean should already be declared in ejb-jar.xml, with the same
+  ejb-name.
+
+  Used in: enterprise-beans
+-->
+<!ELEMENT session (ejb-name , jndi-name? , interceptor-stack?, client-bind-url?, binding-factory?, local-jndi-name?, call-by-value?, exception-on-rollback?, aop-domain-name?, 
+ invoker-bindings?, security-proxy? , ejb-ref* ,  ejb-local-ref* , service-ref*, security-identity? ,
+ resource-ref* , resource-env-ref*, message-destination-ref* , clustered? , method-attributes?, depends*,
+ ior-security-config?, port-component*)>
+
+<!--
+  The message-driven element holds information specific to jboss and not declared
+  in ejb-jar.xml about a message-driven bean, such as container
+  configuration and resources.
+  The bean should already be declared in ejb-jar.xml, with the same
+  ejb-name.
+
+  Used in: enterprise-beans
+-->
+<!ELEMENT message-driven (ejb-name , activation-config?, destination-jndi-name? ,
+ mdb-user?,  mdb-passwd? , mdb-client-id? , mdb-subscription-id? , resource-adapter-name? ,
+ exception-on-rollback? , aop-domain-name? , invoker-bindings?,
+ security-proxy? , ejb-ref* ,  ejb-local-ref*, service-ref*, security-identity?, resource-ref*,
+ resource-env-ref*, message-destination-ref*, depends*, ior-security-config?)>
+
+<!--
+  The ejb-name element gives the name of the bean, it must correspond to
+  an ejb-name element in ejb-jar.xml
+
+  Used in: entity, session, and message-driven
+-->
+<!ELEMENT ejb-name (#PCDATA)>
+
+<!--
+  The jndi-name element gives the actual jndi name under which
+  the bean will be deployed when used in the entity, session and
+  message-driven elements. If it is not provided jboss will assume
+  "jndi-name" = "ejb-name"
+
+  When used in the ejb-ref,  ejb-local-ref, resource-ref, resource-env-ref, 
+  message-destination-ref, message-destination elements this specifies the jndi name to 
+  which the reference should link.
+
+  Used in: entity, session and message-driven
+    ejb-ref, resource-ref, resource-env-ref
+-->
+<!ELEMENT jndi-name (#PCDATA)>
+
+<!ELEMENT interceptor-stack (#PCDATA)>
+
+<!ELEMENT client-bind-url (#PCDATA)>
+
+<!ELEMENT binding-factory (#PCDATA)>
+
+<!--
+  The JNDI name under with the local home interface should be bound
+
+  Used in: entity and session
+-->
+<!ELEMENT local-jndi-name (#PCDATA)>
+
+<!--
+  Determine if the bean should use by value call semantics
+
+  Used in: entity and session
+-->
+<!ELEMENT call-by-value (#PCDATA)>
+
+<!--
+  The read-only element flags an entity bean as read only.
+  The bean will never be ejbStored. Defaults to false.
+  It must be one of the following :
+    <read-only>true</read-only>
+    <read-only>false</read-only>
+
+  Used in: entity
+-->
+<!ELEMENT read-only (#PCDATA)>
+
+<!--
+  Whether to throw an exception if the CMT controlled
+  transaction is no longer active (e.g. marked rollback)
+  but the application has not itself thrown an exception.
+  If the bean specifies false, it uses the
+  jboss/exception-on-rollback config.
+  Defaults to false.
+  It must be one of the following :
+    <exception-on-rollback>true</exception-on-rollback>
+    <exception-on-rollback>false</exception-on-rollback>
+
+  Used in: jboss, session, entity and message-driven
+-->
+<!ELEMENT exception-on-rollback (#PCDATA)>
+
+<!--
+  The aop-domain-name element gives the name of the container
+  configuration for this bean. It must match one of the container-name
+  tags in the container-configurations section, or one of the standard
+  configurations. If no element is provided, jboss will automatically use the
+  right standard configuration, see container-configurations.
+
+  Note: unlike earlier releases, this element may not be specified as an
+   empty element to achieve the same effect as not specifying the element.
+
+  Used in: entity, session, and message-driven
+-->
+<!ELEMENT aop-domain-name (#PCDATA)>
+
+<!-- The depends element gives a JMX ObjectName of a service on which the
+container or ejb depends.
+-->
+<!ELEMENT depends (#PCDATA)>
+
+<!-- The queue/topic jndi name from which we receive messages -->
+<!ELEMENT destination-jndi-name (#PCDATA)>
+
+<!-- The optional user for the jms connection that delivers messages -->
+<!ELEMENT mdb-user (#PCDATA)>
+
+<!-- The optional password for the jms connection that delivers messages -->
+<!ELEMENT mdb-passwd (#PCDATA)>
+
+<!-- The optional client-id for the jms connection that delivers messages -->
+<!ELEMENT mdb-client-id (#PCDATA)>
+
+<!-- The subscription name for topic delivery -->
+<!ELEMENT mdb-subscription-id (#PCDATA)>
+
+<!-- The name of the rar used in JCA 1.5 message inflow
+e.g.
+   <resource-adapter-name>jms-ra.rar</resource-adapter-name>
+or for embedded rars
+   <resource-adapter-name>myapp.ear#myconnector.rar</resource-adapter-name>
+-->
+<!ELEMENT resource-adapter-name (#PCDATA)>
+
+<!-- The security-proxy gives the class name of the security proxy implementation.
+  This may be an instance of org.jboss.security.SecurityProxy, or an
+  just an object that implements methods in the home or remote interface
+  of an EJB without implementating any common interface.
+
+      Used in: entity, session, and message-driven
+-->
+<!ELEMENT security-proxy (#PCDATA)>
+
+<!--
+  The ejb-ref element is used to give the jndi-name of an external
+  ejb reference. In the case of an external ejb reference, you don't
+  provide a ejb-link element in ejb-jar.xml, but you provide a jndi-name
+  in jboss.xml
+
+  Used in: entity, session, and message-driven
+-->
+<!ELEMENT ejb-ref (ejb-ref-name , jndi-name)>
+
+<!--
+  The ejb-ref-name element is the name of the ejb reference as given in
+  ejb-jar.xml.
+
+  Used in: ejb-ref
+-->
+<!ELEMENT ejb-ref-name (#PCDATA)>
+
+
+<!--
+  The ejb-local-ref element is used to give the jndi-name of an external
+  ejb reference. This is an alternative to using ejb-link in ejb-jar.xml
+
+  Used in: entity, session, and message-driven
+-->
+<!ELEMENT ejb-local-ref (ejb-ref-name , local-jndi-name)>
+
+<!-- The service-ref element provides jboss specific deployment values to
+the web service reference in ejb-jar.xml.
+Example:
+    <service-ref>
+        <service-ref-name>OrganizationService</service-ref-name>
+        <wsdl-override>file:/wsdlRepository/organization-service.wsdl</wsdl-override>
+    </service-ref>
+
+    <service-ref>
+        <service-ref-name>OrganizationService</service-ref-name>
+        <port-component-ref>
+          <service-endpoint-interface>com.dot.SEI</service-endpoint-interface>
+          <call-property>
+            <prop-name>X</prop-name>
+            <prop-value>Y</prop-value>
+          </call-property>
+        </port-component-ref>
+    </service-ref>
+-->
+<!ELEMENT service-ref (service-ref-name, port-component-ref*, wsdl-override?, call-property*)>
+
+<!-- The service-ref-name element gives the ENC relative name used
+in the ejb-jar.xml service-ref-name element.
+
+Used in: service-ref
+-->
+<!ELEMENT service-ref-name (#PCDATA)>
+
+<!-- The port-component-ref element provides additional information about
+the standard j2ee service-reference/port-component-ref. Currently this includes
+properties that should be associated with the call/stub for the port.
+
+Used in: service-ref
+-->
+<!ELEMENT port-component-ref (service-endpoint-interface?, call-property*)>
+
+<!-- Fully qualified name of service endpoint interface
+-->
+<!ELEMENT service-endpoint-interface ( #PCDATA )>
+
+<!-- Arbitrary jaxrpc property values that should be set on a Call object
+before it's returned to the web service client. The valid properties can be any
+properties supported by the jaxrpc Call implementation.
+-->
+<!ELEMENT call-property ( prop-name, prop-value )>
+
+<!-- The string value of a property name
+-->
+<!ELEMENT prop-name (#PCDATA)>
+
+<!-- The string value of a property value
+-->
+<!ELEMENT prop-value (#PCDATA)>
+
+<!--
+  The security-identity element specifies whether a specific run-as identity is to be
+  used. If there is a run-as role defined for an enterprise bean, there can also be a
+  run-as-principal define here. If you don't define a run-as principal the callee will
+  see ctx.getCallerPrincipal() == 'anonymous'
+
+  Used in: entity, message-driven, session
+-->
+<!ELEMENT security-identity (run-as-principal)>
+
+<!--
+  The run-as-principal element is the name of the principal that is used
+  when the enterprise bean calls out with a run-as role.
+
+  Used in: security-identity
+-->
+<!ELEMENT run-as-principal (#PCDATA)>
+
+<!--
+  The resource-env-ref element gives a mapping between the "code name"
+  of a env resource (res-ref-name, provided by the Bean Developer) and
+  its deployed JNDI name.
+
+  Used in: session, entity, message-driven
+-->
+<!ELEMENT resource-env-ref (resource-env-ref-name , jndi-name)>
+
+<!--
+  The resource-env-ref-name element gives the "code name" of a resource. It is
+  provided by the Bean Developer.
+
+  Used in: resource-env-ref
+-->
+<!ELEMENT resource-env-ref-name (#PCDATA)>
+
+<!--
+  The method-attributes element can be used to specify which methods are read only
+  or idempotent.  This is used to reduce the need for locks and replication.
+-->
+<!ELEMENT method-attributes (method*)>
+
+<!--
+  The method element is used to specify attributes for one method or all those
+  matching a pattern startingstring*.
+-->
+<!ELEMENT method (method-name, read-only?, idempotent?, transaction-timeout?)>
+
+<!--
+  The method-name element specifies a complete method name or a pattern consisting of an
+  initial match followed by '*'
+-->
+<!ELEMENT method-name (#PCDATA)>
+
+<!--
+  The idempotent element is used in method-attributes to indicate that a method
+  is completely stateless. Really the same as read-only and should be dropped.
+-->
+<!ELEMENT idempotent (#PCDATA)>
+
+<!--
+  The transaction timeout in seconds (overriding the default timeout).
+  This will only work for Required (where the method starts the transaction) and RequiresNew.
+  The special value of 0 (zero) uses the default timeout configured on jboss:service=TransactionManager
+  NOTE: any subsequent use of RequiresNew that is not explicitly overridden will use this value.
+-->
+<!ELEMENT transaction-timeout (#PCDATA)>
+
+<!--
+  The clustered element allows to specify cluster specific settings.
+  WARNING: session-state-manager-jndi-name is only for SFSB.
+
+  Used in: session, entity, container-configuration
+-->
+<!ELEMENT clustered (partition-name? , load-balance-policy? ,
+  session-state-manager-jndi-name?)>
+
+<!--
+  The partition-name element indicates the name of the HAPartition to be used
+  by the container to exchange clustering information. This is a name and *not*
+  a JNDI name. Given name will be prefixed by "/HASessionState/" by the container to get
+  the actual JNDI name of the HAPartition. If not, jboss will assume partition-name = "DefaultPartition".
+
+  Used in: entity and session (in clustered element)
+-->
+<!ELEMENT partition-name (#PCDATA)>
+
+<!--
+  The load-balance-policy element indicates the java class name to be used
+  to load balance calls in the bean proxy.
+  If not, jboss will assume :
+    - for EB and SFSB : load-balance-policy = "org.jboss.ha.framework.interfaces.RoundRobin"
+    - for SLSB        : load-balance-policy = "org.jboss.ha.framework.interfaces.RoundRobin"
+
+  Used in: entity and session (in clustered element)
+-->
+<!ELEMENT load-balance-policy (#PCDATA)>
+
+<!--
+  The cache-invalidation element indicates if this bean cache should listen to cache
+  invalidation events and clear its cache accordingly as well as send cache invalidation
+  messages.
+  It is provided by the deployer. If not, jboss will assume cache-invalidation = True
+  NOTE: This value will *only* be applied if the correct cache plugin and interceptor(s)
+        are defined in the container configuration.
+  Possible values: "False", "True" (default)
+
+  Used in: entity (only commit-option A and D will invalidate their cache)
+-->
+<!ELEMENT cache-invalidation (#PCDATA)>
+
+<!--
+  The cache-invalidation-config element allows to specify cache invalidation specific settings.
+
+  Used in: entity
+-->
+<!ELEMENT cache-invalidation-config (invalidation-group-name? , invalidation-manager-name?)>
+
+<!--
+  The invalidation-group-name element indicates the name of a group in which all
+  invalidation messages are exchanged i.e. all beans sharing a given invalidation-group-name
+  should share the same PK semantic.
+  By default, invalidation-group-name equals to the EJB name. Thus, when using cache invalidation
+  accross a cluster, it is not necessary to specify a name as all beans will have the same name
+  accross the cluster. Nevertheless, if you deploy, on the same node, the same EJB, once with
+  commit-option C (RW access) and once in commit-option A (RO) and want the RW EJB to invalidate
+  entries of RO EJB, each one will obviously have its own EJB name. Consequently, you can assign
+  a common invalidation-group-name to both EJBs so that they share their cache invalidation messages.
+
+  Used in: entity (in cache-invalidation-config element)
+-->
+<!ELEMENT invalidation-group-name (#PCDATA)>
+
+<!--
+  The invalidation-manager-name references the InvalidationManager MBean to be used.
+  By Default, the default InvalidationManager is used.
+
+  Used in: entity (in cache-invalidation-config element)
+-->
+<!ELEMENT invalidation-manager-name (#PCDATA)>
+
+<!--
+  The session-state-manager-jndi-name element indicates the name of the HASessionState to be used
+  by the container as a backend for state session management in the cluster.
+  This *is* a JNDI name (not like the partition-name element).
+  If not, jboss will assume partition-name = "/HASessionState/Default".
+
+  Used in: session (in clustered element)
+-->
+<!ELEMENT session-state-manager-jndi-name (#PCDATA)>
+
+<!--
+  The resource-ref element gives a mapping between the "code name"
+  of a resource (res-ref-name, provided by the Bean Developer) and
+  its "xml name" (resource-name, provided by the Application Assembler).
+  If no resource-ref is provided, jboss will assume that
+  "xml-name" = "code name"
+
+  See resource-managers.
+
+  Used in: entity, session, and message-driven
+-->
+<!ELEMENT resource-ref (res-ref-name , (resource-name | jndi-name | res-url))>
+
+<!--
+  The res-ref-name element gives the "code name" of a resource. It is
+  provided by the Bean Developer. See resource-managers for the actual
+  configuration of the resource.
+
+  Used in: resource-ref
+-->
+<!ELEMENT res-ref-name (#PCDATA)>
+
+<!--
+  The resource-name element gives the "xml name" of the resource. It is
+  provided by the Application Assembler. See resource-managers for the
+  actual configuration of the resource.
+
+  Used in: resource-ref
+-->
+<!ELEMENT resource-name (#PCDATA)>
+
+<!--
+  The resource-managers element is used to declare resource managers.
+
+  A resource has 3 names:
+  - the "code name" is the name used in the code of the bean, supplied by
+    the Bean Developer in the resource-ref section of the ejb-jar.xml file
+
+  - the "xml name" is an intermediary name used by the Application Assembler
+    to identify resources in the XML file.
+
+  - the "runtime jndi name" is the actual jndi-name or url of the deployed
+    resource, it is supplied by the Deployer.
+
+  The mapping between the "code name" and the "xml name" is given
+  in the resource-ref section for the bean. If not, jboss will assume that
+  "xml name" = "code name".
+
+  The mapping between the "xml name" and the "runtime jndi name" is given in
+  a resource-manager section. If not, and if the datasource is of type
+  javax.sql.DataSource, jboss will look for a javax.sql.DataSource in the jndi
+  tree.
+
+  Used in: jboss
+-->
+<!ELEMENT resource-managers (resource-manager*)>
+
+<!--
+  The resource-manager element is used to provide a mapping between the
+  "xml name" of a resource (res-name) and its "runtime jndi name"
+  (res-jndi-name or res-url according to the type of the resource).
+  If it is not provided, and if the type of the resource is
+  javax.sql.DataSource, jboss will look for a javax.sql.DataSource in the
+  jndi tree.
+
+  See resource-managers.
+
+  Used in: resource-managers
+-->
+<!ELEMENT resource-manager (res-name , (res-jndi-name | res-url))>
+
+<!--
+  The res-name element gives the "xml name" of a resource, it is provided
+  by the Application Assembler. See resource-managers.
+
+  Used in: resource-manager
+-->
+<!ELEMENT res-name (#PCDATA)>
+
+<!--
+  The res-jndi-name element is the "deployed jndi name" of a resource, it
+  is provided by the Deployer. See resource-managers.
+
+  Used in: resource-manager
+-->
+<!ELEMENT res-jndi-name (#PCDATA)>
+
+<!-- The res-url element value is a URL string for a resource-ref of
+res-type = java.net.URL. Using a res-url creates a binding of the URL
+instance under the java:comp/env. If you want to link to another binding
+of a URL, you can use the jndi-name to do so.
+
+// Binds the URL(http://x.y.z) under java:comp/env/jdbc/XYZHome
+<resource-ref>
+    <res-ref-name>jdbc/XYZHome</res-ref-name>
+    <res-url>http://x.y.z</res-url>
+</resource-ref>
+// Binds a link to urls/XYZHomePage under java:comp/env/jdbc/XYZHome
+<resource-ref>
+    <res-ref-name>jdbc/XYZHome</res-ref-name>
+    <res-url>urls/XYZHomePage</res-url>
+</resource-ref>
+
+   Used in: resource-ref, resource-manager
+-->
+<!ELEMENT res-url (#PCDATA)>
+
+<!--
+  The message-destination-ref element is used to configure the
+  jndi-name for a message-destination-ref in ejb-jar.xml
+
+  Used in: entity, session, and message-driven
+-->
+<!ELEMENT message-destination-ref (message-destination-ref-name, jndi-name)>
+
+<!--
+  The message-destination-ref-name element identifies the
+  message-destination-ref. It must match the name in ejb-jar.xml
+
+  Used in: message-destination-ref
+-->
+<!ELEMENT message-destination-ref-name (#PCDATA)>
+
+<!--
+  The assembly-descriptor element contains application-assembly information.
+
+  The definition of security roles allows you to map assembly roles to one or more
+  principals. For example, you may define a run-as principal in the security-identity
+  element and include that principal in one or more security-role(s) in the
+  assembly descriptor. When called with a run-as role, the callee will see all
+  those roles in ctx.isCallerInRole(...)
+
+  Used in: jboss
+-->
+<!ELEMENT assembly-descriptor (security-role*, message-destination*)>
+
+<!--
+  The security-role element contains the definition of a security role.
+  The definition consists of an the security role name and principal name element(s).
+
+Used in: assembly-descriptor
+
+Example:
+		<security-role>
+      <role-name>Manager</role-name>
+      <principal-name>j2ee</principal-name>
+      <principal-name>javajoe</principal-name>
+		</security-role>
+-->
+<!ELEMENT security-role (role-name, principal-name+)>
+
+<!--
+  The role-name element is the name of the role.
+
+  Used in: security-role
+-->
+<!ELEMENT role-name (#PCDATA)>
+
+<!--
+  The principal-name element is the name of the principal that is mapped
+  to the assembly role-name.
+
+  Used in: security-role
+-->
+<!ELEMENT principal-name (#PCDATA)>
+
+<!--
+  The message-destination element is used to configure the
+  jndi-name for a message-destination in ejb-jar.xml
+
+  Used in: assembly-descriptor
+-->
+<!ELEMENT message-destination (message-destination-name, jndi-name)>
+
+<!--
+  The message-destination-name element identifies the
+  message-destination. It must match the name in ejb-jar.xml
+
+  Used in: message-destination
+-->
+<!ELEMENT message-destination-name (#PCDATA)>
+
+<!--
+  The container-configurations element declares the different possible
+  container configurations that the beans can use. standardjboss.xml
+  provides 15 standard configurations with the following container-names:
+    - Standard CMP 2.x EntityBean
+    - Standard CMP EntityBean
+    - Clustered CMP 2.x EntityBean
+    - Clustered CMP EntityBean
+    - IIOP CMP 2.x EntityBean
+    - IIOP CMP EntityBean
+    - Standard Stateless SessionBean
+    - Clustered Stateless SessionBean
+    - IIOP Stateless SessionBean
+    - Standard Stateful SessionBean
+    - Clustered Stateful SessionBean
+    - IIOP Stateful SessionBean
+    - Standard BMP EntityBean
+    - Clustered BMP EntityBean
+    - IIOP BMP EntityBean
+    - Standard message Driven Bean
+
+  The standard configurations will automatically be used if no custom
+  configuration is specified.
+
+  The application assembler can define advanced custom configurations here.
+
+  Used in: jboss
+-->
+<!ELEMENT container-configurations (container-configuration*)>
+
+<!--
+  The container-configuration element describes a configuration for the
+  container.
+  The different plugins to use are declared here, as well as their
+  configurations. The configuration-class attribute is no longer used.
+
+  Used in: container-configurations
+-->
+<!ELEMENT container-configuration (container-name , call-logging?,
+ invoker-proxy-binding-name?, sync-on-commit-only?,
+ insert-after-ejb-post-create?, call-ejb-store-on-clean?, container-interceptors? ,
+ instance-pool? , instance-cache? ,  persistence-manager? , web-class-loader? ,
+ locking-policy? ,  container-cache-conf? , container-pool-conf? ,
+ commit-option? , optiond-refresh-rate? , security-domain?, clustered?,
+ depends*)>
+
+<!-- The extends attribute gives the container-name value of the configuration the container-configuration
+is extending. This allows one to specify an extension configuration without having to reiterate all of
+the other duplicate configuration info.
+
+        <container-configuration extends="Standard Stateful SessionBean">
+            <container-name>Secure Stateless SessionBean</container-name>
+            <security-domain>java:/jaas/other</security-domain>
+        </container-configuration>
+-->
+<!ATTLIST container-configuration extends CDATA  #IMPLIED>
+
+<!--
+  The container-name element gives the name of the configuration being
+  defined. Beans may refer to this name in their aop-domain-name tag.
+
+  Used in: container-configuration
+-->
+<!ELEMENT container-name (#PCDATA)>
+
+<!--
+  The call-logging element tells if the container must log every method
+  invocation for this bean or not. Its value must be true or false.
+
+  Used in: container-configuration
+-->
+<!ELEMENT call-logging (#PCDATA)>
+
+<!--
+  The invoker-bindings element gives the invokers configuration for an
+  ejb container.
+
+  Used in: entity, session, message-driven
+-->
+<!ELEMENT invoker-bindings (invoker+)>
+<!--
+ -->
+<!ELEMENT invoker (invoker-proxy-binding-name, jndi-name?, ejb-ref*)>
+
+<!-- The invoker-proxy-binding-name elements maps to the name element of
+an invoker-proxy-binding definition.
+
+  Used in: container-configuration, invoker
+-->
+<!ELEMENT invoker-proxy-binding-name (#PCDATA)>
+
+<!-- The sync-on-commit-only element determines the behavior of ejbStore
+calls on finds, selects and removes. If set to true, ejbStore will only be
+called on transaction commit.
+-->
+<!ELEMENT sync-on-commit-only (#PCDATA)>
+
+<!-- The insert-after-ejb-post-create element defines when the INSERT
+ statement will be executed for created entity instance.
+ Possible values are:
+ false - the default value, INSERT will be executed after ejbCreate but before
+         ejbPostCreate;
+ true - INSERT will be executed after ejbPostCreate.
+-->
+<!ELEMENT insert-after-ejb-post-create (#PCDATA)>
+
+<!-- The call-ejb-store-for-clean says whether ejbStore should be called on clean instances
+ at synchronization time. By the spec it should be true. But users wanted it to be false.
+ False is the default, meaning ejbStore is called only on dirty instances.
+-->
+<!ELEMENT call-ejb-store-on-clean (#PCDATA)>
+
+<!--
+  The container-interceptors element gives the chain of Interceptors
+  (instances of org.jboss.ejb.Interceptor) that are associated with the container.
+  The declared order of the interceptor elements corresponds to the order of the
+  interceptor chain.
+
+  Used in: container-configuration
+-->
+<!ELEMENT container-interceptors (interceptor+)>
+
+<!--
+The client-interceptors defines the home and bean client side interceptor chain
+
+  Used in: proxy-factory-config
+-->
+<!ELEMENT client-interceptors (home , bean, list-entity?)>
+
+<!-- Define whether the ejb proxy should expose an org.jboss.proxy.IClientContainer
+   interface to provide access to the invocation context and interceptors.
+-->
+<!ATTLIST client-interceptors exposeContainer (true | false )  "false">
+
+<!--
+The endpoint-interceptors element gives the chain of interceptors
+(instances of org.jboss.proxy.Interceptor) that are associated with the
+message endpoint.
+
+  Used in: proxy-factory-config for message inflow
+-->
+<!ELEMENT endpoint-interceptors (interceptor+)>
+
+<!--
+The home element gives the chain of interceptors
+(instances of org.jboss.proxy.Interceptor) that are associated with the home
+proxy and operate in the client VM. The declared order of the interceptor
+elements corresponds to the order of the interceptor chain.
+
+  Used in: client-interceptors
+-->
+<!ELEMENT home (interceptor+)>
+
+<!--
+The bean element gives the chain of interceptors
+(instances of org.jboss.proxy.Interceptor) that are associated with the remote
+proxy and operate in the client VM. The declared order of the interceptor
+elements corresponds to the order of the interceptor chain.
+
+  Used in: client-interceptors
+-->
+<!ELEMENT bean (interceptor+)>
+
+<!--
+The list-entity element gives the chain of interceptors
+(instances of org.jboss.proxy.Interceptor) that are associated with the remote
+proxy and operate in the client VM. The declared order of the interceptor
+elements corresponds to the order of the interceptor chain.
+
+  Used in: client-interceptors
+-->
+<!ELEMENT list-entity (interceptor+)>
+
+<!--
+  The interceptor element specifies an instance of org.jboss.ejb.Interceptor
+  that is to be added to the container interceptor stack.
+
+  Used in: home, bean, list-entity, endpoint-interceptors
+-->
+<!ELEMENT interceptor (#PCDATA)>
+
+<!--
+  The transaction attribute is used to indicate what type of container its
+  interceptor applies to. It is an enumerated value that can take on one of: Bean,
+  Container or Both. A value of Bean indicates that the interceptor should only be
+  added to a container for bean-managed transaction.
+  A value of Container indicates that the interceptor should only be added to a
+  container for container-managed transactions.
+  A value of Both indicates that the interceptor should be added to all
+  containers. This is the default value if the transaction attribute is not
+  explictlygiven.
+-->
+<!ATTLIST interceptor transaction     (Bean | Container | Both )  "Both">
+
+<!--
+  The metricsEnabled attributes is used to indicate if the interceptor
+  should only be included when the org.jboss.ejb.ContainerFactory metricsEnabled
+  flag is set to true. The allowed values are true and false with false being the
+  default if metricsEnabled is not explicitly given.
+-->
+<!ATTLIST interceptor metricsEnabled  (true | false )  "false">
+
+<!--
+  The call-by-value attribute is used to indicate that the interceptor
+  should only be included when the value of the attribute corresponds
+  to the value of org.jboss.metadata.BeanMetaData callByValue.
+  For example, if a bean defines the element <call-by-value>true</call-by-value>
+  then a marshalling invoker interceptor will be used instead of the
+  non marshalling optimized invoker interceptor.
+-->
+<!ATTLIST interceptor call-by-value  (true | false )  #IMPLIED>
+
+<!--
+  The instance-pool element gives the class name of the instance pool
+  jboss must use for in this configuration. This class must implement
+  the org.jboss.ejb.InstancePool interface. The defaults are:
+  - org.jboss.ejb.plugins.EntityInstancePool for entity beans
+  - org.jboss.ejb.plugins.StatelessSessionInstancePool for stateless
+  session beans.
+  - no pool is used for stateful session beans
+
+  Used in: container-configuration
+-->
+<!ELEMENT instance-pool (#PCDATA)>
+
+<!--
+  The instance-cache element gives the class name of the instance cache
+  jboss must use for in this configuration. This class must implement
+  the org.jboss.ejb.InstanceCache interface. The defaults are:
+  - org.jboss.ejb.plugins.NoPassivationEntityInstanceCache for entity beans
+  - org.jboss.ejb.plugins.NoPassivationStatefulSessionInstanceCache for
+  stateful session beans.
+  - no cache is used for stateless session beans
+
+  Used in: container-configuration
+-->
+<!ELEMENT instance-cache (#PCDATA)>
+
+<!--
+  The persistence-manager element gives the class name of the persistence
+  manager / persistence store jboss must use for in this configuration.
+  This class must implement:
+  - org.jboss.ejb.EntityPersistenceStore for CMP Entity Beans (default is
+  org.jboss.ejb.plugins.jaws.JAWSPersistenceManager)
+  - org.jboss.ejb.EntityPersistenceManager for BMP entity beans (default
+  is org.jboss.ejb.plugins.BMPPersistenceManager)
+  - org.jboss.ejb.StatefulSessionPersistenceManager for stateless session
+  beans.
+  - no persistence-manager is used for stateless session beans
+
+  Used in: container-configuration
+-->
+<!ELEMENT persistence-manager (#PCDATA)>
+
+<!--
+  The locking-policy element gives the class name of the EJB lock
+  implementation JBoss must use for in this configuration. This class must
+  implement  the org.jboss.ejb.BeanLock interface. The default is
+  org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock.
+
+  Used in: container-configuration
+-->
+<!ELEMENT locking-policy (#PCDATA)>
+
+<!--
+  The web-class-loader element gives the class name of the web classloader
+  jboss must use for in this configuration. This class must be a subclass
+  of org.jboss.web.WebClassLoader. The default is org.jboss.web.WebClassLoader.
+
+  Used in: container-configuration
+  Used in: proxy-factory-config
+-->
+<!ELEMENT web-class-loader (#PCDATA)>
+
+<!--
+  The container-cache-conf element holds dynamic configuration data
+  for the instance cache.
+  jboss does not read directly the subtree for this element: instead,
+  it is passed to the instance cache instance (if it implements
+  org.jboss.metadata.XmlLoadable) for it to load its parameters.
+
+  Used in: container-configuration
+-->
+<!ELEMENT container-cache-conf (cache-policy? , cache-policy-conf?, cache-policy-conf-other?)>
+
+<!--
+  The implementation class for the cache policy, which controls
+  when instances will be passivated, etc.
+
+  Used in: container-cache-conf
+-->
+<!ELEMENT cache-policy (#PCDATA)>
+
+<!--
+  The configuration settings for the selected cache policy.  This
+  is currently only valid for the LRU cache.
+  When the cache is the LRU one for the stateful container, the elements
+  remover-period and max-bean-life specifies the period of the remover
+  task that removes stateful beans (that normally have been passivated)
+  that have age greater than the specified max-bean-life element.
+
+  Used in: container-cache-conf (when cache-policy is the LRU cache)
+-->
+<!ELEMENT cache-policy-conf (min-capacity , max-capacity , remover-period? ,
+ max-bean-life? , overager-period? , max-bean-age? , resizer-period? ,
+ max-cache-miss-period? , min-cache-miss-period? , cache-load-factor?)>
+
+<!--
+  The minimum capacity of this cache
+-->
+<!ELEMENT min-capacity (#PCDATA)>
+
+<!--
+  The maximum capacity of this cache
+-->
+<!ELEMENT max-capacity (#PCDATA)>
+
+<!--
+  The period of the overager's runs
+-->
+<!ELEMENT overager-period (#PCDATA)>
+
+<!--
+  The period of the remover's runs
+-->
+<!ELEMENT remover-period (#PCDATA)>
+
+<!--
+  The max-bean-life specifies the period of the remover
+  task that removes stateful beans (that normally have been passivated)
+  that have age greater than the specified max-bean-life element.
+-->
+<!ELEMENT max-bean-life (#PCDATA)>
+
+<!--
+  The period of the resizer's runs
+-->
+<!ELEMENT resizer-period (#PCDATA)>
+
+<!--
+  The age after which a bean is automatically passivated
+-->
+<!ELEMENT max-bean-age (#PCDATA)>
+
+<!--
+  Shrink cache capacity if there is a cache miss every or more
+  this member's value
+-->
+<!ELEMENT max-cache-miss-period (#PCDATA)>
+
+<!--
+  Enlarge cache capacity if there is a cache miss every or less
+  this member's value
+-->
+<!ELEMENT min-cache-miss-period (#PCDATA)>
+
+<!--
+  The resizer will always try to keep the cache capacity so that
+  the cache is this member's value loaded of cached objects
+-->
+<!ELEMENT cache-load-factor (#PCDATA)>
+
+<!--
+  Arbitrary XML configuration
+-->
+<!ELEMENT cache-policy-conf-other ANY>
+
+<!--
+  The container-pool-conf element holds configuration data for the
+  instance pool.
+  jboss does not read directly the subtree for this element: instead,
+  it is passed to the instance pool instance (if it implements
+  org.jboss.metadata.XmlLoadable) for it to load its parameters.
+
+  The default instance pools, EntityInstancePool and
+  StatelessSessionInstancePool, both accept the following configuration.
+
+  Used in: container-configuration
+-->
+<!ELEMENT container-pool-conf (MinimumSize?, MaximumSize?,
+   strictMaximumSize?, strictTimeout?)>
+
+<!-- The theoretical minimum size of the pool. Currently unused by JBoss
+EJB pools.
+
+Used in: invoker-proxy-conf for JMSContainerInvoker
+-->
+<!ELEMENT MinimumSize (#PCDATA)>
+
+<!--
+  The capacity of the Pool. For pools where reclaim is possible, the pool will
+  also be repopulated when the instance is free to be reused.
+  This is not an hard limit, if instances are needed when the pool is at
+  its MaximumSize, new instances will be created following the demand unless
+  a strictMaximumSize of true is specified.
+
+  Used in: container-pool-conf and invoker-proxy-conf for JMSContainerInvoker
+-->
+<!ELEMENT MaximumSize (#PCDATA)>
+
+<!-- A boolean flag indicating if attempts to access the pool will block when
+MaximumSize instances are active. The default is false.
+
+  Used in: container-pool-conf
+-->
+<!ELEMENT strictMaximumSize (#PCDATA)>
+
+<!-- The time in milliseconds to wait for the strictMaximumSize semaphore. The
+default is Long.MAX_VALUE or essentially enternity.
+
+  Used in: container-pool-conf
+-->
+<!ELEMENT strictTimeout (#PCDATA)>
+
+<!--
+  The number of millis to keep an unused object in the pool. Currently unused by
+  JBoss EJB Pools.
+
+  Used in: invoker-proxy-conf for JMSContainerInvoker
+-->
+<!ELEMENT KeepAliveMillis (#PCDATA)>
+
+<!--
+  This option is only used for entity container configurations.
+
+  The commit-option element tells the container which option to use for transactions.
+  Its value must be A, B C, or D.
+
+  - option A: the entiry instance has exclusive access to the database. The instance
+  stays ready after a transaction.
+  - option B: the entity instance does not have exclusive access to the database.
+  The state is loaded before the next transaction.
+  - option C: same as B, except the container does not keep the instance after commit:
+  a passivate is immediately performed after the commit.
+
+  - option D: a lazy update. default is every 30 secs.
+               can be updated with <optiond-refresh-rate>
+
+  See ejb1.1 specification for details (p118).
+
+  Used in: container-configuration
+-->
+<!ELEMENT commit-option (#PCDATA)>
+
+<!--
+  This element is used to specify the refresh rate of commit option d
+-->
+<!ELEMENT optiond-refresh-rate (#PCDATA)>
+
+<!--
+ior-security-config element describes the security configuration information for the IOR.
+-->  
+<!ELEMENT ior-security-config ( transport-config? , as-context?, sas-context?  )> 
+
+<!--
+transport-config is the root element for security between the end points
+-->
+<!ELEMENT transport-config ( integrity, confidentiality,
+ establish-trust-in-target, establish-trust-in-client, detect-misordering?,
+ detect-replay?)> 
+
+<!--
+integrity element indicates if the server (target) supports integrity protected messages. 
+The valid values are NONE, SUPPORTED or REQUIRED
+-->  
+<!ELEMENT integrity ( #PCDATA)>
+
+<!--
+confidentiality element indicates if the server (target) supports privacy protected 
+messages. The values are NONE, SUPPORTED or REQUIRED
+-->  
+<!ELEMENT confidentiality ( #PCDATA)>
+
+<!--
+establish-trust-in-target element indicates if the target is capable of authenticating to a client. 
+The values are NONE or SUPPORTED.
+-->  
+<!ELEMENT establish-trust-in-target ( #PCDATA)>
+
+<!--
+establish-trust-in-client element indicates if the target is capable of authenticating a client. The
+values are NONE, SUPPORTED or REQUIRED.
+-->  
+<!ELEMENT establish-trust-in-client ( #PCDATA)>
+
+<!--
+The optional detect-misordering indicates if the server (target) supports
+detection of message sequence errors. The values are NONE, SUPPORTED or REQUIRED.
+-->  
+<!ELEMENT detect-misordering ( #PCDATA)>
+
+<!--
+The optional detect-replay indicates if the server (target) supports detection
+of message replay attempts. The values are NONE, SUPPORTED or REQUIRED.
+-->  
+<!ELEMENT detect-replay ( #PCDATA)>
+
+<!--
+as-context (CSIv2 authentication service) is the element describing the authentication 
+mechanism that will be used to authenticate the client. If specified it will be the 
+username-password mechanism.
+-->  
+<!ELEMENT as-context ( auth-method, realm, required )> 
+
+<!--
+required element specifies if the authentication method specified is required
+to be used for client authentication. If so the EstablishTrustInClient bit
+will be set in the target_requires field of the AS_Context. The element value
+is either true or false. 
+-->  
+<!ELEMENT required ( #PCDATA )> 
+
+<!--
+auth-method element describes the authentication method. The only supported value
+for as-context is USERNAME_PASSWORD
+
+For port-component, the auth-method element is used to configure the
+authentication mechanism for the web service. As a prerequisite to gaining
+access to any web service which are protected by an authorization
+constraint, a user must have authenticated using the configured
+mechanism. Legal values for this element are "BASIC", or "CLIENT-CERT".
+
+Used in: as-context, port-component
+
+-->  
+<!ELEMENT auth-method ( #PCDATA )> 
+
+<!--
+realm element describes the realm in which the user is authenticated. Must be 
+a valid realm that is registered in server configuration.
+-->  
+<!ELEMENT realm ( #PCDATA )> 
+
+<!--
+sas-context (related to CSIv2 security attribute service) element describes 
+the sas-context fields.
+-->  
+<!ELEMENT sas-context ( caller-propagation )> 
+
+<!--
+caller-propagation element indicates if the target will accept propagated caller identities
+The values are NONE or SUPPORTED.
+-->  
+<!ELEMENT caller-propagation ( #PCDATA) >
+
+<!-- The port-component element specifies a mapping from a webservice
+port-component whose service-impl-bean/ejb-link value maps to an ejb.
+
+Used in: session
+-->
+<!ELEMENT port-component (port-component-name, port-component-uri?, auth-method?,
+ transport-guarantee?) >
+
+<!-- Maps to the port-component-name in the webservices.xml descriptor.
+
+Used in: port-component
+-->
+<!ELEMENT port-component-name (#PCDATA) >
+
+<!-- Absolute path starting with web context root to form fully qualified
+endpoint address for a web service endpoint. The port component uri, if present
+must contain at least two token seperated by '/'. The first token is the web context root,
+which must be identical among all port component uris in a given deployment.
+
+If this element is not present, the web context root will be derived from the
+deployment canonical name.
+
+Used in: port-component
+-->
+<!ELEMENT port-component-uri (#PCDATA) >
+
+<!--
+The transport-guarantee element specifies that the communication
+between client and server should be NONE, INTEGRAL, or
+CONFIDENTIAL. NONE means that the application does not require any
+transport guarantees. A value of INTEGRAL means that the application
+requires that the data sent between the client and server be sent in
+such a way that it can't be changed in transit. CONFIDENTIAL means
+that the application requires that the data be transmitted in a
+fashion that prevents other entities from observing the contents of
+the transmission. In most cases, the presence of the INTEGRAL or
+CONFIDENTIAL flag will indicate that the use of SSL is required.
+
+Used in: port-component
+-->
+<!ELEMENT transport-guarantee (#PCDATA)>
+
+<!--
+Runtime information about a web service.
+
+wsdl-publish-location is optionally used to specify
+where the final wsdl and any dependent files should be stored.  This location
+resides on the file system from which deployment is initiated.
+-->
+<!ELEMENT webservice-description ( webservice-description-name, wsdl-publish-location? )>
+
+<!--
+Unique name of a webservice within a module
+-->
+<!ELEMENT webservice-description-name ( #PCDATA )>
+
+<!--
+This is a valid URL pointing to a final WSDL document. It is optional.
+If specified, the WSDL document at this URL will be used during
+deployment instead of the WSDL document associated with the
+service-ref in the standard deployment descriptor.
+
+Examples :
+
+  // available via HTTP
+  <wsdl-override>http://localhost:8000/myservice/myport?WSDL</wsdl-override>
+
+  // in a file
+  <wsdl-override>file:/home/user1/myfinalwsdl.wsdl</wsdl-override>
+
+-->
+<!ELEMENT wsdl-override ( #PCDATA )>
+
+<!--
+file: URL of a directory to which a web-service-description's wsdl should be
+published during deployment.  Any required files will be published to this
+directory, preserving their location relative to the module-specific
+wsdl directory(META-INF/wsdl or WEB-INF/wsdl).
+
+Example :
+
+  For an ejb.jar whose webservices.xml wsdl-file element contains
+    META-INF/wsdl/a/Foo.wsdl
+
+  <wsdl-publish-location>file:/home/user1/publish
+  </wsdl-publish-location>
+
+  The final wsdl will be stored in /home/user1/publish/a/Foo.wsdl
+
+-->
+<!ELEMENT wsdl-publish-location ( #PCDATA )>
+
+<!--
+Activation config
+
+used in message-driven and proxy-factory-config
+-->
+<!ELEMENT activation-config ( activation-config-property* )>
+
+<!--
+Activation config properties 
+
+used in activation-config
+-->
+<!ELEMENT activation-config-property ( activation-config-property-name, 
+                                       activation-config-property-value )>
+
+<!--
+Activation config property name
+
+used in activation-config-property
+-->
+<!ELEMENT activation-config-property-name ( #PCDATA )>
+
+<!--
+Activation config property value
+
+used in activation-config-property
+-->
+<!ELEMENT activation-config-property-value ( #PCDATA )>
+                                       

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.xsd
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/schema/jboss_5_0.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/jboss_5_0.xsd)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="3.0">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)ejb-jar_3_0.xsds	1.44 06/07/05
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-	This is the XML Schema for the EJB 3.0 deployment descriptor.
-	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
-	the EJB's jar file.  All EJB deployment descriptors must indicate
-	the ejb-jar schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <ejb-jar 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/ejb-jar_3_0.xsd"
-	      version="3.0">
-	      ...
-	    </ejb-jar>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for the
-	J2EE namespace with the following location:
-
-	http://java.sun.com/xml/ns/j2ee/ejb-jar_3_0.xsd
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_5_0.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="ejb-jar" type="j2ee:ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is the root of the ejb-jar deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-name element contains the name of an enterprise
-	  bean. The name must be unique within the ejb-jar file.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:enterprise-beans/*"/>
-      <xsd:field    xpath="j2ee:ejb-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="ejb-name-references"
-		refer="j2ee:ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  relationship-role-source must be to a specific ejb-name
-	  defined within the scope of enterprise-beans element.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector
-	   xpath=".//j2ee:ejb-relationship-role/j2ee:relationship-role-source"/>
-      <xsd:field
-	   xpath="j2ee:ejb-name"/>
-    </xsd:keyref>
-
-    <xsd:key name="role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  A role-name-key is specified to allow the references
-	  from the security-role-refs.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:assembly-descriptor/j2ee:security-role"/>
-      <xsd:field    xpath="j2ee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="role-name-references"
-		refer="j2ee:role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  security-role-ref to a specified role-name.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role-ref"/>
-      <xsd:field    xpath="j2ee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-config-propertyType contains a name/value
-	configuration property pair for a message-driven bean.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="activation-config-property-name"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-name element contains
-	    the name for an activation configuration property of
-	    a message-driven bean.
-
-	    For JMS message-driven beans, the following property
-	    names are recognized: acknowledgeMode,
-	    messageSelector, destinationType, subscriptionDurability
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="activation-config-property-value"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-value element
-	    contains the value for an activation configuration
-	    property of a message-driven bean.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-configType defines information about the
-	expected configuration properties of the message-driven bean
-	in its operational environment. This may include information
-	about message acknowledgement, message selector, expected
-	destination type, etc.
-
-	The configuration information is expressed in terms of
-	name/value configuration properties.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="activation-config-property"
-		   type="j2ee:activation-config-propertyType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="application-exceptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The application-exceptionType declares an application
-        exception. The declaration consists of:
-
-            - the exception class. When the container receives
-              an exception of this type, it is required to
-              forward this exception as an applcation exception
-              to the client regardless of whether it is a checked
-              or unchecked exception.
-            - an optional rollback element. If this element is
-              present, the container must rollback the current
-              transaction before forwarding the exception to the
-              client.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="exception-class"
-		   type="j2ee:fully-qualified-classType"/>
-      <xsd:element name="rollback"
-                   type="j2ee:emptyType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="assembly-descriptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The assembly-descriptorType defines
-	application-assembly information.
-
-	The application-assembly information consists of the
-	following parts: the definition of security roles, the
-	definition of method permissions, the definition of
-	transaction attributes for enterprise beans with
-	container-managed transaction demarcation and a list of
-	methods to be excluded from being invoked.
-
-	All the parts are optional in the sense that they are
-	omitted if the lists represented by them are empty.
-
-	Providing an assembly-descriptor in the deployment
-	descriptor is optional for the ejb-jar file producer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="security-role"
-		   type="j2ee:security-roleType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method-permission"
-		   type="j2ee:method-permissionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="container-transaction"
-		   type="j2ee:container-transactionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination"
-		   type="j2ee:message-destinationType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="exclude-list"
-		   type="j2ee:exclude-listType"
-		   minOccurs="0"/>
-      <xsd:element name="application-exception"
-                   type="j2ee:application-exceptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="callback-listenerType">
-    <xsd:sequence>
-      <xsd:element name="callback-listener-class"
-		   type="j2ee:fully-qualified-classType"/>
-      <xsd:element name="post-construct-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="pre-destroy-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="post-activate-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="pre-passivate-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-fieldType describes a container-managed field. The
-	cmp-fieldType contains an optional description of the field,
-	and the name of the field.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="field-name"
-		   type="j2ee:java-identifierType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The field-name element specifies the name of a
-	    container managed field.
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 2.x must begin with a lowercase
-	    letter. This field is accessed by methods whose
-	    names consists of the name of the field specified by
-	    field-name in which the first letter is uppercased,
-	    prefixed by "get" or "set".
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 1.x must denote a public field of the
-	    enterprise bean class or one of its superclasses.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-versionType specifies the version of an entity bean
-	with container-managed persistence. It is used by
-	cmp-version elements.
-
-	The value must be one of the two following:
-
-	    1.x
-	    2.x
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="1.x"/>
-	<xsd:enumeration value="2.x"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-field-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-field-type element specifies the class of a
-	collection-valued logical relationship field in the entity
-	bean class. The value of an element using cmr-field-typeType
-	must be either: java.util.Collection or java.util.Set.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="java.util.Collection"/>
-	<xsd:enumeration value="java.util.Set"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-fieldType describes the bean provider's view of
-	a relationship. It consists of an optional description, and
-	the name and the class type of a field in the source of a
-	role of a relationship. The cmr-field-name element
-	corresponds to the name used for the get and set accessor
-	methods for the relationship. The cmr-field-type element is
-	used only for collection-valued cmr-fields. It specifies the
-	type of the collection that is used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="cmr-field-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cmr-field-name element specifies the name of a
-	    logical relationship field in the entity bean
-	    class. The name of the cmr-field must begin with a
-	    lowercase letter. This field is accessed by methods
-	    whose names consist of the name of the field
-	    specified by cmr-field-name in which the first
-	    letter is uppercased, prefixed by "get" or "set".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmr-field-type"
-		   type="j2ee:cmr-field-typeType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="container-transactionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The container-transactionType specifies how the container
-	must manage transaction scopes for the enterprise bean's
-	method invocations. It defines an optional description, a
-	list of method elements, and a transaction attribute. The
-	transaction attribute is to be applied to all the specified
-	methods.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="j2ee:methodType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="trans-attribute"
-		   type="j2ee:trans-attributeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	  The ejb-classType contains the fully-qualified name of the
-	  enterprise bean's class. It is used by ejb-class elements.
-
-	  Example:
-
-	      <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-jarType defines the root element of the EJB
-	deployment descriptor. It contains
-
-	    - an optional description of the ejb-jar file
-	    - an optional display name
-	    - an optional icon that contains a small and a large
-	      icon file name
-	    - structural information about all included
-	      enterprise beans that is not specified through annotations
-	    - a descriptor for container managed relationships,
-	      if any.
-	    - an optional application-assembly descriptor
-	    - an optional name of an ejb-client-jar file for the
-	      ejb-jar.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="enterprise-beans"
-		   type="j2ee:enterprise-beansType"
-                   minOccurs="0"/>
-      <xsd:element name="relationships"
-		   type="j2ee:relationshipsType"
-		   minOccurs="0">
-	<xsd:unique name="relationship-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relation-name contains the name of a
-	      relation. The name must be unique within
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-relation"/>
-	  <xsd:field    xpath="j2ee:ejb-relation-name"/>
-	</xsd:unique>
-      </xsd:element>
-      <xsd:element name="assembly-descriptor"
-		   type="j2ee:assembly-descriptorType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Providing an assembly-descriptor in the deployment
-	    descriptor is optional for the ejb-jar file
-	    producer.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-client-jar"
-		   type="j2ee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	      The optional ejb-client-jar element specifies a JAR
-	      file that contains the class files necessary for a
-	      client program to access the
-	      enterprise beans in the ejb-jar file.
-
-	      Example:
-
-		  <ejb-client-jar>employee_service_client.jar
-		  </ejb-client-jar>
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="3.0"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The version specifies the version of the
-	  EJB specification that the instance document must
-	  comply with. This information enables deployment tools
-	  to validate a particular EJB Deployment
-	  Descriptor with respect to a specific version of the EJB
-	  schema.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="full" type="xsd:boolean">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The full attribute defines whether this deployment
-	  descriptor is complete, or whether the class files
-	  of the jar file should be examined for annotations
-	  that specify deployment information.
-
-	  If full is set to "true", the deployment tool
-	  must ignore any EJB annotations present in the
-	  class files of the application.
-
-	  If full is not specified or is set to "false", the
-	  deployment tool must examine the class files of the
-	  application for annotations, as specified by the EJB
-	  specifications.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	  The ejb-nameType specifies an enterprise bean's name. It is
-	  used by ejb-name elements. This name is assigned by the
-	  ejb-jar file producer to name the enterprise bean in the
-	  ejb-jar file's deployment descriptor. The name must be
-	  unique among the names of the enterprise beans in the same
-	  ejb-jar file.
-
-	  There is no architected relationship between the used
-	  ejb-name in the deployment descriptor and the JNDI name that
-	  the Deployer will assign to the enterprise bean's home.
-
-	  The name for an entity bean must conform to the lexical
-	  rules for an NMTOKEN.
-
-	  Example:
-
-	  <ejb-name>EmployeeService</ejb-name>
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdNMTOKENType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-relationType describes a relationship between two
-	entity beans with container-managed persistence.  It is used
-	by ejb-relation elements. It contains a description; an
-	optional ejb-relation-name element; and exactly two
-	relationship role declarations, defined by the
-	ejb-relationship-role elements. The name of the
-	relationship, if specified, is unique within the ejb-jar
-	file.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation-name"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relation-name element provides a unique name
-	    within the ejb-jar file for a relationship.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-relationship-role"
-		   type="j2ee:ejb-relationship-roleType"/>
-      <xsd:element name="ejb-relationship-role"
-		   type="j2ee:ejb-relationship-roleType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationship-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	  The ejb-relationship-roleType describes a role within a
-	  relationship. There are two roles in each relationship.
-
-	  The ejb-relationship-roleType contains an optional
-	  description; an optional name for the relationship role; a
-	  specification of the multiplicity of the role; an optional
-	  specification of cascade-delete functionality for the role;
-	  the role source; and a declaration of the cmr-field, if any,
-	  by means of which the other side of the relationship is
-	  accessed from the perspective of the role source.
-
-	  The multiplicity and role-source element are mandatory.
-
-	  The relationship-role-source element designates an entity
-	  bean by means of an ejb-name element. For bidirectional
-	  relationships, both roles of a relationship must declare a
-	  relationship-role-source element that specifies a cmr-field
-	  in terms of which the relationship is accessed. The lack of
-	  a cmr-field element in an ejb-relationship-role specifies
-	  that the relationship is unidirectional in navigability and
-	  the entity bean that participates in the relationship is
-	  "not aware" of the relationship.
-
-	  Example:
-
-	  <ejb-relation>
-	      <ejb-relation-name>Product-LineItem</ejb-relation-name>
-	      <ejb-relationship-role>
-		  <ejb-relationship-role-name>product-has-lineitems
-		  </ejb-relationship-role-name>
-		  <multiplicity>One</multiplicity>
-		  <relationship-role-source>
-		  <ejb-name>ProductEJB</ejb-name>
-		  </relationship-role-source>
-	       </ejb-relationship-role>
-	  </ejb-relation>
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relationship-role-name"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relationship-role-name element defines a
-	    name for a role that is unique within an
-	    ejb-relation. Different relationships can use the
-	    same name for a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="multiplicity"
-		   type="j2ee:multiplicityType"/>
-      <xsd:element name="cascade-delete"
-		   type="j2ee:emptyType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cascade-delete element specifies that, within a
-	    particular relationship, the lifetime of one or more
-	    entity beans is dependent upon the lifetime of
-	    another entity bean. The cascade-delete element can
-	    only be specified for an ejb-relationship-role
-	    element contained in an ejb-relation element in
-	    which the other ejb-relationship-role
-	    element specifies a multiplicity of One.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="relationship-role-source"
-		   type="j2ee:relationship-role-sourceType"/>
-      <xsd:element name="cmr-field"
-		   type="j2ee:cmr-fieldType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="enterprise-beansType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The enterprise-beansType declares one or more enterprise
-	beans. Each bean can be a session, entity or message-driven
-	bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="session"
-		   type="j2ee:session-beanType">
-	<xsd:unique name="session-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-env-ref"/>
-	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:message-destination-ref"/>
-	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-ref"/>
-	  <xsd:field    xpath="j2ee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:env-entry"/>
-	  <xsd:field    xpath="j2ee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="entity"
-		   type="j2ee:entity-beanType">
-	<xsd:unique name="entity-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-env-ref"/>
-	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:message-destination-ref"/>
-	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-ref"/>
-	  <xsd:field    xpath="j2ee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:env-entry"/>
-	  <xsd:field    xpath="j2ee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="message-driven"
-		   type="j2ee:message-driven-beanType">
-	<xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-env-ref"/>
-	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:message-destination-ref"/>
-	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-ref"/>
-	  <xsd:field    xpath="j2ee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:env-entry"/>
-	  <xsd:field    xpath="j2ee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="entity-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The entity-beanType declares an entity bean. The declaration
-	consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a unique name assigned to the enterprise bean
-	      in the deployment descriptor
-	    - the names of the entity bean's remote home
-	      and remote interfaces, if any
-	    - the names of the entity bean's local home and local
-	      interfaces, if any
-	    - the entity bean's implementation class
-	    - the optional entity bean's persistence management type. If
-              this element is not specified it is defaulted to Container.
-	    - the entity bean's primary key class name
-	    - an indication of the entity bean's reentrancy
-	    - an optional specification of the
-	      entity bean's cmp-version
-	    - an optional specification of the entity bean's
-	      abstract schema name
-	    - an optional list of container-managed fields
-	    - an optional specification of the primary key
-	      field
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB
-	      references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory references
-	    - an optional declaration of the bean's
-	      resource environment references
-	    - an optional declaration of the bean's message
-	      destination references
-	    - an optional set of query declarations
-	      for finder and select methods for an entity
-	      bean with cmp-version 2.x.
-
-	The optional abstract-schema-name element must be specified
-	for an entity bean with container-managed persistence and
-	cmp-version 2.x.
-
-	The optional primkey-field may be present in the descriptor
-	if the entity's persistence-type is Container.
-
-	The optional cmp-version element may be present in the
-	descriptor if the entity's persistence-type is Container. If
-	the persistence-type is Container and the cmp-version
-	element is not specified, its value defaults to 2.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean cmp-version is 1.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean has a remote home and remote interface.
-
-	The optional local-home and local elements must be specified
-	if the entity bean has a local home and local interface.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified.
-
-	The optional query elements must be present if the
-	persistence-type is Container and the cmp-version is 2.x and
-	query methods other than findByPrimaryKey have been defined
-	for the entity bean.
-
-	The other elements that are optional are "optional" in the
-	sense that they are omitted if the lists represented by them
-	are empty.
-
-	At least one cmp-field element must be present in the
-	descriptor if the entity's persistence-type is Container and
-	the cmp-version is 1.x, and none must not be present if the
-	entity's persistence-type is Bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-      <xsd:element name="home"
-		   type="j2ee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="j2ee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="j2ee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="j2ee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-		   type="j2ee:ejb-classType"/>
-      <xsd:element name="persistence-type"
-		   type="j2ee:persistence-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="prim-key-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The prim-key-class element contains the
-	    fully-qualified name of an
-	    entity bean's primary key class.
-
-	    If the definition of the primary key class is
-	    deferred to deployment time, the prim-key-class
-	    element should specify java.lang.Object.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="reentrant"
-		   type="j2ee:true-falseType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The reentrant element specifies whether an entity
-	    bean is reentrant or not.
-
-	    The reentrant element must be one of the two
-	    following: true or false
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-version"
-		   type="j2ee:cmp-versionType"
-		   minOccurs="0"/>
-      <xsd:element name="abstract-schema-name"
-		   type="j2ee:java-identifierType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The abstract-schema-name element specifies the name
-	    of the abstract schema type of an entity bean with
-	    cmp-version 2.x. It is used in EJB QL queries.
-
-	    For example, the abstract-schema-name for an entity
-	    bean whose local interface is
-	    com.acme.commerce.Order might be Order.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-field"
-		   type="j2ee:cmp-fieldType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="primkey-field"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The primkey-field element is used to specify the
-	    name of the primary key field for an entity with
-	    container-managed persistence.
-
-	    The primkey-field must be one of the fields declared
-	    in the cmp-field element, and the type of the field
-	    must be the same as the primary key type.
-
-	    The primkey-field element is not used if the primary
-	    key maps to multiple container-managed fields
-	    (i.e. the key is a compound key). In this case, the
-	    fields of the primary key class must be public, and
-	    their names must correspond to the field names of
-	    the entity bean class that comprise the key.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-		   type="j2ee:security-role-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="security-identity"
-		   type="j2ee:security-identityType"
-		   minOccurs="0"/>
-      <xsd:element name="query"
-		   type="j2ee:queryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="exclude-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The exclude-listType specifies one or more methods which
-	the Assembler marks to be uncallable.
-
-	If the method permission relation contains methods that are
-	in the exclude list, the Deployer should consider those
-	methods to be uncallable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="j2ee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="init-methodType">
-    <xsd:sequence>
-      <xsd:element name="create-method"
-		   type="j2ee:named-methodType"/>
-      <xsd:element name="bean-method"
-		   type="j2ee:named-methodType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptorType">
-    <xsd:sequence>
-      <xsd:element name="interceptor-class"
-		   type="j2ee:fully-qualified-classType"/>
-      <xsd:element name="around-invoke-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-driven-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-driven element declares a message-driven
-	bean. The declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name.
-	    - an optional declaration of the enterprise bean's name
-	    - an optional declaration of the message-driven bean's 
-	      implementation class
-	    - an optional declaration of the bean's messaging
-	      type
-	    - the optional message-driven bean's transaction management
-              type. If it is not defined, it is defaulted to Container.
-	    - an optional declaration of the bean's
-	      message-destination-type
-	    - an optional declaration of the bean's
-	      message-destination-link
-	    - an optional declaration of the message-driven bean's
-	      activation configuration properties
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local EJB
-	      references
-	    - an optional declaration of the bean's web service
-	      references
-	    - an optional declaration of the security
-	      identity to be used for the execution of the bean's
-	      methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory
-	      references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-		   type="j2ee:ejb-classType"
-		   minOccurs="0"/>
-      <xsd:element name="messaging-type"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The messaging-type element specifies the message
-	    listener interface of the message-driven bean. If
-	    the messaging-type element is not specified, it is
-	    assumed to be javax.jms.MessageListener.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="interceptor"
-                   type="j2ee:interceptorType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="around-invoke-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="callback-listener"
-                   type="j2ee:callback-listenerType"
-                   minOccurs="0"/>
-      <xsd:element name="post-construct-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="pre-destroy-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="post-activate-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="pre-passivate-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="timeout-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="transaction-type"
-		   type="j2ee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="message-destination-type"
-		   type="j2ee:message-destination-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-		   type="j2ee:message-destination-linkType"
-		   minOccurs="0"/>
-      <xsd:element name="activation-config"
-		   type="j2ee:activation-configType"
-		   minOccurs="0"/>
-      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-identity"
-		   type="j2ee:security-identityType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-intfType">
-
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-intf element allows a method element to
-	differentiate between the methods with the same name and
-	signature that are multiply defined across the home and
-	component interfaces (e.g, in both an enterprise bean's
-	remote and local interfaces or in both an enterprise bean's
-	home and remote interfaces, etc.); the component and web
-	service endpoint interfaces, and so on. The Local applies to
-        both local component interface and local business interface.
-        Similarly, Remote applies to both remote component interface
-        and the remote business interface.
-
-	The method-intf element must be one of the following:
-
-	    Home
-	    Remote
-	    LocalHome
-	    Local
-	    ServiceEndpoint
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Home"/>
-	<xsd:enumeration value="Remote"/>
-	<xsd:enumeration value="LocalHome"/>
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="ServiceEndpoint"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-nameType contains a name of an enterprise
-	bean method or the asterisk (*) character. The asterisk is
-	used when the element denotes all the methods of an
-	enterprise bean's client view interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-paramsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-paramsType defines a list of the
-	fully-qualified Java type names of the method parameters.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-param"
-		   type="j2ee:java-typeType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The method-param element contains a primitive
-	    or a fully-qualified Java type name of a method
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-permissionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-permissionType specifies that one or more
-	security roles are allowed to invoke one or more enterprise
-	bean methods. The method-permissionType consists of an
-	optional description, a list of security role names or an
-	indicator to state that the method is unchecked for
-	authorization, and a list of method elements.
-
-	The security roles used in the method-permissionType
-	must be defined in the security-role elements of the
-	deployment descriptor, and the methods must be methods
-	defined in the enterprise bean's business, home, component
-        and/or web service endpoint interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="role-name"
-		     type="j2ee:role-nameType"
-		     maxOccurs="unbounded"/>
-	<xsd:element name="unchecked"
-		     type="j2ee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The unchecked element specifies that a method is
-	      not checked for authorization by the container
-	      prior to invocation of the method.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-      <xsd:element name="method"
-		   type="j2ee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	  The methodType is used to denote a method of an enterprise
-	  bean's business, home, component, and/or web service endpoint
-	  interface, or, in the case of a message-driven bean, the
-	  bean's message listener method, or a set of such
-	  methods. The ejb-name element must be the name of one of the
-	  enterprise beans declared in the deployment descriptor; the
-	  optional method-intf element allows to distinguish between a
-	  method with the same signature that is multiply defined
-	  across the business, home, component, and/or web service
-          endpoint nterfaces; the method-name element specifies the
-          method name; and the optional method-params elements identify
-          a single method among multiple methods with an overloaded
-	  method name.
-
-	  There are three possible styles of using methodType element
-	  within a method element:
-
-	  1.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	     This style is used to refer to all the methods of the
-	     specified enterprise bean's business, home, component,
-             and/or web service endpoint interfaces.
-
-	  2.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	  </method>
-
-	     This style is used to refer to the specified method of
-	     the specified enterprise bean. If there are multiple
-	     methods with the same overloaded name, the element of
-	     this style refers to all the methods with the overloaded
-	     name.
-
-	  3.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	      <method-params>
-		  <method-param>PARAM-1</method-param>
-		  <method-param>PARAM-2</method-param>
-		  ...
-		  <method-param>PARAM-n</method-param>
-	      </method-params>
-	  </method>
-
-	     This style is used to refer to a single method within a
-	     set of methods with an overloaded name. PARAM-1 through
-	     PARAM-n are the fully-qualified Java types of the
-	     method's input parameters (if the method has no input
-	     arguments, the method-params element contains no
-	     method-param elements). Arrays are specified by the
-	     array element's type, followed by one or more pair of
-	     square brackets (e.g. int[][]). If there are multiple
-	     methods with the same overloaded name, this style refers
-	     to all of the overloaded methods.
-
-	  Examples:
-
-	  Style 1: The following method element refers to all the
-	  methods of the EmployeeService bean's business, home,
-          component, and/or web service endpoint interfaces:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	  Style 2: The following method element refers to all the
-	  create methods of the EmployeeService bean's home
-	  interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	  </method>
-
-	  Style 3: The following method element refers to the
-	  create(String firstName, String LastName) method of the
-	  EmployeeService bean's home interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The following example illustrates a Style 3 element with
-	  more complex parameter types. The method
-	  foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
-	  mypackage.MyClass[][] myclaar) would be specified as:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>foobar</method-name>
-	      <method-params>
-		  <method-param>char</method-param>
-		  <method-param>int</method-param>
-		  <method-param>int[]</method-param>
-		  <method-param>mypackage.MyClass</method-param>
-		  <method-param>mypackage.MyClass[][]</method-param>
-	      </method-params>
-	  </method>
-
-	  The optional method-intf element can be used when it becomes
-	  necessary to differentiate between a method that is multiply
-	  defined across the enterprise bean's business, home, component,
-          and/or web service endpoint interfaces with the same name and
-	  signature. However, if the same method is a method of both the
-          local business interface, and the local component interface,
-          the same attribute applies to the method for both interfaces.
-          Likewise, if the same method is a method of both the remote
-          business interface and the remote component interface, the same
-          attribute applies to the method for both interfaces.
-
-	  For example, the method element
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Remote</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  can be used to differentiate the create(String, String)
-	  method defined in the remote interface from the
-	  create(String, String) method defined in the remote home
-	  interface, which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  and the create method that is defined in the local home
-	  interface which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>LocalHome</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The method-intf element can be used with all three Styles
-	  of the method element usage. For example, the following
-	  method element example could be used to refer to all the
-	  methods of the EmployeeService bean's remote home interface
-          and the remote business interface.
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>*</method-name>
-	  </method>
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-      <xsd:element name="method-intf"
-		   type="j2ee:method-intfType"
-		   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="method-name"
-		   type="j2ee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="j2ee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="multiplicityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The multiplicityType describes the multiplicity of the
-	role that participates in a relation.
-
-	The value must be one of the two following:
-
-	    One
-	    Many
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="One"/>
-	<xsd:enumeration value="Many"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="named-methodType">
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="j2ee:string"/>
-      <xsd:element name="method-params"
-		   type="j2ee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The persistence-typeType specifies an entity bean's persistence
-	management type.
-
-	The persistence-type element must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="query-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	  The query-method specifies the method for a finder or select
-	  query.
-
-	  The method-name element specifies the name of a finder or select
-	  method in the entity bean's implementation class.
-
-	  Each method-param must be defined for a query-method using the
-	  method-params element.
-
-	  It is used by the query-method element.
-
-	  Example:
-
-	  <query>
-	      <description>Method finds large orders</description>
-	      <query-method>
-		  <method-name>findLargeOrders</method-name>
-		  <method-params></method-params>
-	      </query-method>
-	      <ejb-ql>
-		SELECT OBJECT(o) FROM Order o
-		  WHERE o.amount &gt; 1000
-	      </ejb-ql>
-	  </query>
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="j2ee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="j2ee:method-paramsType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="queryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The queryType defines a finder or select
-	query. It contains
-	    - an optional description of the query
-	    - the specification of the finder or select
-	      method it is used by
-		- an optional specification of the result type
-		  mapping, if the query is for a select method
-		  and entity objects are returned.
-		- the EJB QL query string that defines the query.
-
-	Queries that are expressible in EJB QL must use the ejb-ql
-	element to specify the query. If a query is not expressible
-	in EJB QL, the description element should be used to
-	describe the semantics of the query and the ejb-ql element
-	should be empty.
-
-	The result-type-mapping is an optional element. It can only
-	be present if the query-method specifies a select method
-	that returns entity objects.  The default value for the
-	result-type-mapping element is "Local".
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType" minOccurs="0"/>
-      <xsd:element name="query-method"
-		   type="j2ee:query-methodType"/>
-      <xsd:element name="result-type-mapping"
-		   type="j2ee:result-type-mappingType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-ql"
-		   type="j2ee:xsdStringType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationship-role-sourceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationship-role-sourceType designates the source of a
-	role that participates in a relationship. A
-	relationship-role-sourceType is used by
-	relationship-role-source elements to uniquely identify an
-	entity bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationshipsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationshipsType describes the relationships in
-	which entity beans with container-managed persistence
-	participate. The relationshipsType contains an optional
-	description; and a list of ejb-relation elements, which
-	specify the container managed relationships.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation"
-		   type="j2ee:ejb-relationType"
-		   maxOccurs="unbounded">
-
-	<xsd:unique name="role-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relationship-role-name contains the name of a
-	      relationship role. The name must be unique within
-	      a relationship, but can be reused in different
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector
-	       xpath=".//j2ee:ejb-relationship-role-name"/>
-	  <xsd:field
-	       xpath="."/>
-	</xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remove-methodType">
-    <xsd:sequence>
-      <xsd:element name="bean-method"
-		   type="j2ee:named-methodType"/>
-      <xsd:element name="retain-if-exception"
-		   type="j2ee:emptyType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="result-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The result-type-mappingType is used in the query element to
-	specify whether an abstract schema type returned by a query
-	for a select method is to be mapped to an EJBLocalObject or
-	EJBObject type.
-
-	The value must be one of the following:
-
-	    Local
-	    Remote
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="Remote"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-identityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-identityType specifies whether the caller's
-	security identity is to be used for the execution of the
-	methods of the enterprise bean or whether a specific run-as
-	identity is to be used. It contains an optional description
-	and a specification of the security identity to be used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="use-caller-identity"
-		     type="j2ee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The use-caller-identity element specifies that
-	      the caller's security identity be used as the
-	      security identity for the execution of the
-	      enterprise bean's methods.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="run-as"
-		     type="j2ee:run-asType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-beanType declares an session bean. The
-	declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - an optional declaration of the enterprise bean's name
-            - the names of all the remote or local business interfaces,
-              if any
-	    - the names of the session bean's remote home and
-	      remote interfaces, if any
-	    - the names of the session bean's local home and
-	      local interfaces, if any
-	    - the name of the session bean's web service endpoint
-	      interface, if any
-	    - an optional declaration of the message-driven bean's 
-	      implementation class
-	    - the session bean's state management type
-	    - the optional session bean's transaction management type.
-              If it is not present, it is defaulted to Container.
-	    - an optional declaration of the bean's
-	      environment entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's resource
-	      manager connection factory references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-	The elements that are optional are "optional" in the sense
-	that they are omitted when if lists represented by them are
-	empty.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified for the
-	session bean.
-
-	The service-endpoint element may only be specified if the
-	bean is a stateless session bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="j2ee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="j2ee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="j2ee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="j2ee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="business-local"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="business-remote"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="service-endpoint"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint element contains the
-	    fully-qualified name of the enterprise bean's web
-	    service endpoint interface. The service-endpoint
-	    element may only be specified for a stateless
-	    session bean. The specified interface must be a
-	    valid JAX-RPC service endpoint interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-class"
-		   type="j2ee:ejb-classType"
-		   minOccurs="0"/>
-      <xsd:element name="session-type"
-		   type="j2ee:session-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="interceptor"
-                   type="j2ee:interceptorType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="around-invoke-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="callback-listener"
-                   type="j2ee:callback-listenerType"
-                   minOccurs="0"/>
-      <xsd:element name="post-construct-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="pre-destroy-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="post-activate-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="pre-passivate-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="timeout-method"
-                   type="j2ee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="init-method"
-                   type="j2ee:init-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-method element specifies the mappings for
-	    EJB 2.x style create methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="remove-method"
-                   type="j2ee:remove-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The remove-method element specifies the mappings for
-	    EJB 2.x style remove methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="transaction-type"
-		   type="j2ee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-		   type="j2ee:security-role-refType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="security-identity"
-		   type="j2ee:security-identityType"
-		   minOccurs="0">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-typeType describes whether the session bean is a
-	stateful session or stateless session. It is used by
-	session-type elements.
-
-	The value must be one of the two following:
-
-	    Stateful
-	    Stateless
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Stateful"/>
-	<xsd:enumeration value="Stateless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="trans-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The trans-attributeType specifies how the container must
-	manage the transaction boundaries when delegating a method
-	invocation to an enterprise bean's business method.
-
-	The value must be one of the following:
-
-	    NotSupported
-	    Supports
-	    Required
-	    RequiresNew
-	    Mandatory
-	    Never
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="NotSupported"/>
-	<xsd:enumeration value="Supports"/>
-	<xsd:enumeration value="Required"/>
-	<xsd:enumeration value="RequiresNew"/>
-	<xsd:enumeration value="Mandatory"/>
-	<xsd:enumeration value="Never"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transaction-typeType specifies an enterprise bean's
-	transaction management type.
-
-	The transaction-type must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
-

Copied: branches/Branch_4_2/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/schema/sun-ejb-jar_3_0.xsd	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2403 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="3.0">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)ejb-jar_3_0.xsds	1.44 06/07/05
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+	This is the XML Schema for the EJB 3.0 deployment descriptor.
+	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
+	the EJB's jar file.  All EJB deployment descriptors must indicate
+	the ejb-jar schema by using the J2EE namespace:
+
+	http://java.sun.com/xml/ns/j2ee
+
+	and by indicating the version of the schema by
+	using the version element as shown below:
+
+	    <ejb-jar 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/ejb-jar_3_0.xsd"
+	      version="3.0">
+	      ...
+	    </ejb-jar>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for the
+	J2EE namespace with the following location:
+
+	http://java.sun.com/xml/ns/j2ee/ejb-jar_3_0.xsd
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all J2EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="j2ee_5_0.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+  <xsd:element name="ejb-jar" type="j2ee:ejb-jarType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This is the root of the ejb-jar deployment descriptor.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:key name="ejb-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The ejb-name element contains the name of an enterprise
+	  bean. The name must be unique within the ejb-jar file.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:enterprise-beans/*"/>
+      <xsd:field    xpath="j2ee:ejb-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="ejb-name-references"
+		refer="j2ee:ejb-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The keyref indicates the references from
+	  relationship-role-source must be to a specific ejb-name
+	  defined within the scope of enterprise-beans element.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector
+	   xpath=".//j2ee:ejb-relationship-role/j2ee:relationship-role-source"/>
+      <xsd:field
+	   xpath="j2ee:ejb-name"/>
+    </xsd:keyref>
+
+    <xsd:key name="role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  A role-name-key is specified to allow the references
+	  from the security-role-refs.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:assembly-descriptor/j2ee:security-role"/>
+      <xsd:field    xpath="j2ee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="role-name-references"
+		refer="j2ee:role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The keyref indicates the references from
+	  security-role-ref to a specified role-name.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role-ref"/>
+      <xsd:field    xpath="j2ee:role-link"/>
+    </xsd:keyref>
+  </xsd:element>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="activation-config-propertyType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The activation-config-propertyType contains a name/value
+	configuration property pair for a message-driven bean.
+
+	The properties that are recognized for a particular
+	message-driven bean are determined by the messaging type.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="activation-config-property-name"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The activation-config-property-name element contains
+	    the name for an activation configuration property of
+	    a message-driven bean.
+
+	    For JMS message-driven beans, the following property
+	    names are recognized: acknowledgeMode,
+	    messageSelector, destinationType, subscriptionDurability
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="activation-config-property-value"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The activation-config-property-value element
+	    contains the value for an activation configuration
+	    property of a message-driven bean.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="activation-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The activation-configType defines information about the
+	expected configuration properties of the message-driven bean
+	in its operational environment. This may include information
+	about message acknowledgement, message selector, expected
+	destination type, etc.
+
+	The configuration information is expressed in terms of
+	name/value configuration properties.
+
+	The properties that are recognized for a particular
+	message-driven bean are determined by the messaging type.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="activation-config-property"
+		   type="j2ee:activation-config-propertyType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="application-exceptionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        The application-exceptionType declares an application
+        exception. The declaration consists of:
+
+            - the exception class. When the container receives
+              an exception of this type, it is required to
+              forward this exception as an applcation exception
+              to the client regardless of whether it is a checked
+              or unchecked exception.
+            - an optional rollback element. If this element is
+              present, the container must rollback the current
+              transaction before forwarding the exception to the
+              client.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="exception-class"
+		   type="j2ee:fully-qualified-classType"/>
+      <xsd:element name="rollback"
+                   type="j2ee:emptyType"
+                   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="assembly-descriptorType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The assembly-descriptorType defines
+	application-assembly information.
+
+	The application-assembly information consists of the
+	following parts: the definition of security roles, the
+	definition of method permissions, the definition of
+	transaction attributes for enterprise beans with
+	container-managed transaction demarcation and a list of
+	methods to be excluded from being invoked.
+
+	All the parts are optional in the sense that they are
+	omitted if the lists represented by them are empty.
+
+	Providing an assembly-descriptor in the deployment
+	descriptor is optional for the ejb-jar file producer.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="security-role"
+		   type="j2ee:security-roleType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method-permission"
+		   type="j2ee:method-permissionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="container-transaction"
+		   type="j2ee:container-transactionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="message-destination"
+		   type="j2ee:message-destinationType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="exclude-list"
+		   type="j2ee:exclude-listType"
+		   minOccurs="0"/>
+      <xsd:element name="application-exception"
+                   type="j2ee:application-exceptionType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="callback-listenerType">
+    <xsd:sequence>
+      <xsd:element name="callback-listener-class"
+		   type="j2ee:fully-qualified-classType"/>
+      <xsd:element name="post-construct-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="pre-destroy-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="post-activate-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="pre-passivate-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmp-fieldType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmp-fieldType describes a container-managed field. The
+	cmp-fieldType contains an optional description of the field,
+	and the name of the field.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="field-name"
+		   type="j2ee:java-identifierType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The field-name element specifies the name of a
+	    container managed field.
+
+	    The name of the cmp-field of an entity bean with
+	    cmp-version 2.x must begin with a lowercase
+	    letter. This field is accessed by methods whose
+	    names consists of the name of the field specified by
+	    field-name in which the first letter is uppercased,
+	    prefixed by "get" or "set".
+
+	    The name of the cmp-field of an entity bean with
+	    cmp-version 1.x must denote a public field of the
+	    enterprise bean class or one of its superclasses.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmp-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmp-versionType specifies the version of an entity bean
+	with container-managed persistence. It is used by
+	cmp-version elements.
+
+	The value must be one of the two following:
+
+	    1.x
+	    2.x
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="1.x"/>
+	<xsd:enumeration value="2.x"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmr-field-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmr-field-type element specifies the class of a
+	collection-valued logical relationship field in the entity
+	bean class. The value of an element using cmr-field-typeType
+	must be either: java.util.Collection or java.util.Set.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="java.util.Collection"/>
+	<xsd:enumeration value="java.util.Set"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmr-fieldType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The cmr-fieldType describes the bean provider's view of
+	a relationship. It consists of an optional description, and
+	the name and the class type of a field in the source of a
+	role of a relationship. The cmr-field-name element
+	corresponds to the name used for the get and set accessor
+	methods for the relationship. The cmr-field-type element is
+	used only for collection-valued cmr-fields. It specifies the
+	type of the collection that is used.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="cmr-field-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The cmr-field-name element specifies the name of a
+	    logical relationship field in the entity bean
+	    class. The name of the cmr-field must begin with a
+	    lowercase letter. This field is accessed by methods
+	    whose names consist of the name of the field
+	    specified by cmr-field-name in which the first
+	    letter is uppercased, prefixed by "get" or "set".
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmr-field-type"
+		   type="j2ee:cmr-field-typeType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="container-transactionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The container-transactionType specifies how the container
+	must manage transaction scopes for the enterprise bean's
+	method invocations. It defines an optional description, a
+	list of method elements, and a transaction attribute. The
+	transaction attribute is to be applied to all the specified
+	methods.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method"
+		   type="j2ee:methodType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="trans-attribute"
+		   type="j2ee:trans-attributeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-classType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	  The ejb-classType contains the fully-qualified name of the
+	  enterprise bean's class. It is used by ejb-class elements.
+
+	  Example:
+
+	      <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-jarType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The ejb-jarType defines the root element of the EJB
+	deployment descriptor. It contains
+
+	    - an optional description of the ejb-jar file
+	    - an optional display name
+	    - an optional icon that contains a small and a large
+	      icon file name
+	    - structural information about all included
+	      enterprise beans that is not specified through annotations
+	    - a descriptor for container managed relationships,
+	      if any.
+	    - an optional application-assembly descriptor
+	    - an optional name of an ejb-client-jar file for the
+	      ejb-jar.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="enterprise-beans"
+		   type="j2ee:enterprise-beansType"
+                   minOccurs="0"/>
+      <xsd:element name="relationships"
+		   type="j2ee:relationshipsType"
+		   minOccurs="0">
+	<xsd:unique name="relationship-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-relation-name contains the name of a
+	      relation. The name must be unique within
+	      relationships.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-relation"/>
+	  <xsd:field    xpath="j2ee:ejb-relation-name"/>
+	</xsd:unique>
+      </xsd:element>
+      <xsd:element name="assembly-descriptor"
+		   type="j2ee:assembly-descriptorType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Providing an assembly-descriptor in the deployment
+	    descriptor is optional for the ejb-jar file
+	    producer.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-client-jar"
+		   type="j2ee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	      The optional ejb-client-jar element specifies a JAR
+	      file that contains the class files necessary for a
+	      client program to access the
+	      enterprise beans in the ejb-jar file.
+
+	      Example:
+
+		  <ejb-client-jar>employee_service_client.jar
+		  </ejb-client-jar>
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="3.0"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The version specifies the version of the
+	  EJB specification that the instance document must
+	  comply with. This information enables deployment tools
+	  to validate a particular EJB Deployment
+	  Descriptor with respect to a specific version of the EJB
+	  schema.
+
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="full" type="xsd:boolean">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The full attribute defines whether this deployment
+	  descriptor is complete, or whether the class files
+	  of the jar file should be examined for annotations
+	  that specify deployment information.
+
+	  If full is set to "true", the deployment tool
+	  must ignore any EJB annotations present in the
+	  class files of the application.
+
+	  If full is not specified or is set to "false", the
+	  deployment tool must examine the class files of the
+	  application for annotations, as specified by the EJB
+	  specifications.
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	  The ejb-nameType specifies an enterprise bean's name. It is
+	  used by ejb-name elements. This name is assigned by the
+	  ejb-jar file producer to name the enterprise bean in the
+	  ejb-jar file's deployment descriptor. The name must be
+	  unique among the names of the enterprise beans in the same
+	  ejb-jar file.
+
+	  There is no architected relationship between the used
+	  ejb-name in the deployment descriptor and the JNDI name that
+	  the Deployer will assign to the enterprise bean's home.
+
+	  The name for an entity bean must conform to the lexical
+	  rules for an NMTOKEN.
+
+	  Example:
+
+	  <ejb-name>EmployeeService</ejb-name>
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:xsdNMTOKENType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-relationType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The ejb-relationType describes a relationship between two
+	entity beans with container-managed persistence.  It is used
+	by ejb-relation elements. It contains a description; an
+	optional ejb-relation-name element; and exactly two
+	relationship role declarations, defined by the
+	ejb-relationship-role elements. The name of the
+	relationship, if specified, is unique within the ejb-jar
+	file.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relation-name"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The ejb-relation-name element provides a unique name
+	    within the ejb-jar file for a relationship.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-relationship-role"
+		   type="j2ee:ejb-relationship-roleType"/>
+      <xsd:element name="ejb-relationship-role"
+		   type="j2ee:ejb-relationship-roleType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-relationship-roleType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	  The ejb-relationship-roleType describes a role within a
+	  relationship. There are two roles in each relationship.
+
+	  The ejb-relationship-roleType contains an optional
+	  description; an optional name for the relationship role; a
+	  specification of the multiplicity of the role; an optional
+	  specification of cascade-delete functionality for the role;
+	  the role source; and a declaration of the cmr-field, if any,
+	  by means of which the other side of the relationship is
+	  accessed from the perspective of the role source.
+
+	  The multiplicity and role-source element are mandatory.
+
+	  The relationship-role-source element designates an entity
+	  bean by means of an ejb-name element. For bidirectional
+	  relationships, both roles of a relationship must declare a
+	  relationship-role-source element that specifies a cmr-field
+	  in terms of which the relationship is accessed. The lack of
+	  a cmr-field element in an ejb-relationship-role specifies
+	  that the relationship is unidirectional in navigability and
+	  the entity bean that participates in the relationship is
+	  "not aware" of the relationship.
+
+	  Example:
+
+	  <ejb-relation>
+	      <ejb-relation-name>Product-LineItem</ejb-relation-name>
+	      <ejb-relationship-role>
+		  <ejb-relationship-role-name>product-has-lineitems
+		  </ejb-relationship-role-name>
+		  <multiplicity>One</multiplicity>
+		  <relationship-role-source>
+		  <ejb-name>ProductEJB</ejb-name>
+		  </relationship-role-source>
+	       </ejb-relationship-role>
+	  </ejb-relation>
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relationship-role-name"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The ejb-relationship-role-name element defines a
+	    name for a role that is unique within an
+	    ejb-relation. Different relationships can use the
+	    same name for a role.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="multiplicity"
+		   type="j2ee:multiplicityType"/>
+      <xsd:element name="cascade-delete"
+		   type="j2ee:emptyType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The cascade-delete element specifies that, within a
+	    particular relationship, the lifetime of one or more
+	    entity beans is dependent upon the lifetime of
+	    another entity bean. The cascade-delete element can
+	    only be specified for an ejb-relationship-role
+	    element contained in an ejb-relation element in
+	    which the other ejb-relationship-role
+	    element specifies a multiplicity of One.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="relationship-role-source"
+		   type="j2ee:relationship-role-sourceType"/>
+      <xsd:element name="cmr-field"
+		   type="j2ee:cmr-fieldType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="enterprise-beansType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The enterprise-beansType declares one or more enterprise
+	beans. Each bean can be a session, entity or message-driven
+	bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:element name="session"
+		   type="j2ee:session-beanType">
+	<xsd:unique name="session-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of
+	      an EJB reference. The EJB reference is an entry in
+	      the component's environment and is relative to the
+	      java:comp/env context.  The name must be unique within
+	      the component.
+
+	      It is recommended that name be prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of an EJB
+	      reference. The EJB reference is an entry in the
+	      component's environment and is relative to the
+	      java:comp/env context. The name must be unique
+	      within the component.
+
+	      It is recommended that name is prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The resource-env-ref-name element specifies the name
+	      of a resource environment reference; its value is
+	      the environment entry name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-env-ref"/>
+	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The message-destination-ref-name element specifies the name
+	      of a message destination reference; its value is
+	      the message destination reference name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:message-destination-ref"/>
+	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The res-ref-name element specifies the name of a
+	      resource manager connection factory reference.  The name
+	      is a JNDI name relative to the java:comp/env context.
+	      The name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-ref"/>
+	  <xsd:field    xpath="j2ee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The env-entry-name element contains the name of a
+	      component's environment entry.  The name is a JNDI
+	      name relative to the java:comp/env context.  The
+	      name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:env-entry"/>
+	  <xsd:field    xpath="j2ee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+      <xsd:element name="entity"
+		   type="j2ee:entity-beanType">
+	<xsd:unique name="entity-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of
+	      an EJB reference. The EJB reference is an entry in
+	      the component's environment and is relative to the
+	      java:comp/env context.  The name must be unique within
+	      the component.
+
+	      It is recommended that name be prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of an EJB
+	      reference. The EJB reference is an entry in the
+	      component's environment and is relative to the
+	      java:comp/env context. The name must be unique
+	      within the component.
+
+	      It is recommended that name is prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The resource-env-ref-name element specifies the name
+	      of a resource environment reference; its value is
+	      the environment entry name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-env-ref"/>
+	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The message-destination-ref-name element specifies the name
+	      of a message destination reference; its value is
+	      the message destination reference name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:message-destination-ref"/>
+	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The res-ref-name element specifies the name of a
+	      resource manager connection factory reference.  The name
+	      is a JNDI name relative to the java:comp/env context.
+	      The name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-ref"/>
+	  <xsd:field    xpath="j2ee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The env-entry-name element contains the name of a
+	      component's environment entry.  The name is a JNDI
+	      name relative to the java:comp/env context.  The
+	      name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:env-entry"/>
+	  <xsd:field    xpath="j2ee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+      <xsd:element name="message-driven"
+		   type="j2ee:message-driven-beanType">
+	<xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of
+	      an EJB reference. The EJB reference is an entry in
+	      the component's environment and is relative to the
+	      java:comp/env context.  The name must be unique within
+	      the component.
+
+	      It is recommended that name be prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-ref-name element contains the name of an EJB
+	      reference. The EJB reference is an entry in the
+	      component's environment and is relative to the
+	      java:comp/env context. The name must be unique
+	      within the component.
+
+	      It is recommended that name is prefixed with "ejb/".
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The resource-env-ref-name element specifies the name
+	      of a resource environment reference; its value is
+	      the environment entry name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-env-ref"/>
+	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The message-destination-ref-name element specifies the name
+	      of a message destination reference; its value is
+	      the message destination reference name used in the component
+	      code. The name is a JNDI name relative to the
+	      java:comp/env context and must be unique within an
+	      component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:message-destination-ref"/>
+	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The res-ref-name element specifies the name of a
+	      resource manager connection factory reference.  The name
+	      is a JNDI name relative to the java:comp/env context.
+	      The name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-ref"/>
+	  <xsd:field    xpath="j2ee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The env-entry-name element contains the name of a
+	      component's environment entry.  The name is a JNDI
+	      name relative to the java:comp/env context.  The
+	      name must be unique within an component.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:env-entry"/>
+	  <xsd:field    xpath="j2ee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+    </xsd:choice>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="entity-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The entity-beanType declares an entity bean. The declaration
+	consists of:
+
+	    - an optional description
+	    - an optional display name
+	    - an optional icon element that contains a small and a large
+	      icon file name
+	    - a unique name assigned to the enterprise bean
+	      in the deployment descriptor
+	    - the names of the entity bean's remote home
+	      and remote interfaces, if any
+	    - the names of the entity bean's local home and local
+	      interfaces, if any
+	    - the entity bean's implementation class
+	    - the optional entity bean's persistence management type. If
+              this element is not specified it is defaulted to Container.
+	    - the entity bean's primary key class name
+	    - an indication of the entity bean's reentrancy
+	    - an optional specification of the
+	      entity bean's cmp-version
+	    - an optional specification of the entity bean's
+	      abstract schema name
+	    - an optional list of container-managed fields
+	    - an optional specification of the primary key
+	      field
+	    - an optional declaration of the bean's environment
+	      entries
+	    - an optional declaration of the bean's EJB
+	      references
+	    - an optional declaration of the bean's local
+	      EJB references
+	    - an optional declaration of the bean's web
+	      service references
+	    - an optional declaration of the security role
+	      references
+	    - an optional declaration of the security identity
+	      to be used for the execution of the bean's methods
+	    - an optional declaration of the bean's
+	      resource manager connection factory references
+	    - an optional declaration of the bean's
+	      resource environment references
+	    - an optional declaration of the bean's message
+	      destination references
+	    - an optional set of query declarations
+	      for finder and select methods for an entity
+	      bean with cmp-version 2.x.
+
+	The optional abstract-schema-name element must be specified
+	for an entity bean with container-managed persistence and
+	cmp-version 2.x.
+
+	The optional primkey-field may be present in the descriptor
+	if the entity's persistence-type is Container.
+
+	The optional cmp-version element may be present in the
+	descriptor if the entity's persistence-type is Container. If
+	the persistence-type is Container and the cmp-version
+	element is not specified, its value defaults to 2.x.
+
+	The optional home and remote elements must be specified if
+	the entity bean cmp-version is 1.x.
+
+	The optional home and remote elements must be specified if
+	the entity bean has a remote home and remote interface.
+
+	The optional local-home and local elements must be specified
+	if the entity bean has a local home and local interface.
+
+	Either both the local-home and the local elements or both
+	the home and the remote elements must be specified.
+
+	The optional query elements must be present if the
+	persistence-type is Container and the cmp-version is 2.x and
+	query methods other than findByPrimaryKey have been defined
+	for the entity bean.
+
+	The other elements that are optional are "optional" in the
+	sense that they are omitted if the lists represented by them
+	are empty.
+
+	At least one cmp-field element must be present in the
+	descriptor if the entity's persistence-type is Container and
+	the cmp-version is 1.x, and none must not be present if the
+	entity's persistence-type is Bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+      <xsd:element name="home"
+		   type="j2ee:homeType"
+		   minOccurs="0"/>
+      <xsd:element name="remote"
+		   type="j2ee:remoteType"
+		   minOccurs="0"/>
+      <xsd:element name="local-home"
+		   type="j2ee:local-homeType"
+		   minOccurs="0"/>
+      <xsd:element name="local"
+		   type="j2ee:localType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-class"
+		   type="j2ee:ejb-classType"/>
+      <xsd:element name="persistence-type"
+		   type="j2ee:persistence-typeType"
+                   minOccurs="0"/>
+      <xsd:element name="prim-key-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The prim-key-class element contains the
+	    fully-qualified name of an
+	    entity bean's primary key class.
+
+	    If the definition of the primary key class is
+	    deferred to deployment time, the prim-key-class
+	    element should specify java.lang.Object.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="reentrant"
+		   type="j2ee:true-falseType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The reentrant element specifies whether an entity
+	    bean is reentrant or not.
+
+	    The reentrant element must be one of the two
+	    following: true or false
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmp-version"
+		   type="j2ee:cmp-versionType"
+		   minOccurs="0"/>
+      <xsd:element name="abstract-schema-name"
+		   type="j2ee:java-identifierType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The abstract-schema-name element specifies the name
+	    of the abstract schema type of an entity bean with
+	    cmp-version 2.x. It is used in EJB QL queries.
+
+	    For example, the abstract-schema-name for an entity
+	    bean whose local interface is
+	    com.acme.commerce.Order might be Order.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmp-field"
+		   type="j2ee:cmp-fieldType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="primkey-field"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The primkey-field element is used to specify the
+	    name of the primary key field for an entity with
+	    container-managed persistence.
+
+	    The primkey-field must be one of the fields declared
+	    in the cmp-field element, and the type of the field
+	    must be the same as the primary key type.
+
+	    The primkey-field element is not used if the primary
+	    key maps to multiple container-managed fields
+	    (i.e. the key is a compound key). In this case, the
+	    fields of the primary key class must be public, and
+	    their names must correspond to the field names of
+	    the entity bean class that comprise the key.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-role-ref"
+		   type="j2ee:security-role-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="security-identity"
+		   type="j2ee:security-identityType"
+		   minOccurs="0"/>
+      <xsd:element name="query"
+		   type="j2ee:queryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="exclude-listType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The exclude-listType specifies one or more methods which
+	the Assembler marks to be uncallable.
+
+	If the method permission relation contains methods that are
+	in the exclude list, the Deployer should consider those
+	methods to be uncallable.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method"
+		   type="j2ee:methodType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="init-methodType">
+    <xsd:sequence>
+      <xsd:element name="create-method"
+		   type="j2ee:named-methodType"/>
+      <xsd:element name="bean-method"
+		   type="j2ee:named-methodType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="interceptorType">
+    <xsd:sequence>
+      <xsd:element name="interceptor-class"
+		   type="j2ee:fully-qualified-classType"/>
+      <xsd:element name="around-invoke-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-driven-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The message-driven element declares a message-driven
+	bean. The declaration consists of:
+
+	    - an optional description
+	    - an optional display name
+	    - an optional icon element that contains a small and a large
+	      icon file name.
+	    - an optional declaration of the enterprise bean's name
+	    - an optional declaration of the message-driven bean's 
+	      implementation class
+	    - an optional declaration of the bean's messaging
+	      type
+	    - the optional message-driven bean's transaction management
+              type. If it is not defined, it is defaulted to Container.
+	    - an optional declaration of the bean's
+	      message-destination-type
+	    - an optional declaration of the bean's
+	      message-destination-link
+	    - an optional declaration of the message-driven bean's
+	      activation configuration properties
+	    - an optional declaration of the bean's environment
+	      entries
+	    - an optional declaration of the bean's EJB references
+	    - an optional declaration of the bean's local EJB
+	      references
+	    - an optional declaration of the bean's web service
+	      references
+	    - an optional declaration of the security
+	      identity to be used for the execution of the bean's
+	      methods
+	    - an optional declaration of the bean's
+	      resource manager connection factory
+	      references
+	    - an optional declaration of the bean's resource
+	      environment references.
+	    - an optional declaration of the bean's message
+	      destination references
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-class"
+		   type="j2ee:ejb-classType"
+		   minOccurs="0"/>
+      <xsd:element name="messaging-type"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The messaging-type element specifies the message
+	    listener interface of the message-driven bean. If
+	    the messaging-type element is not specified, it is
+	    assumed to be javax.jms.MessageListener.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="interceptor"
+                   type="j2ee:interceptorType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="around-invoke-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="callback-listener"
+                   type="j2ee:callback-listenerType"
+                   minOccurs="0"/>
+      <xsd:element name="post-construct-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="pre-destroy-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="post-activate-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="pre-passivate-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="timeout-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="transaction-type"
+		   type="j2ee:transaction-typeType"
+                   minOccurs="0"/>
+      <xsd:element name="message-destination-type"
+		   type="j2ee:message-destination-typeType"
+		   minOccurs="0"/>
+      <xsd:element name="message-destination-link"
+		   type="j2ee:message-destination-linkType"
+		   minOccurs="0"/>
+      <xsd:element name="activation-config"
+		   type="j2ee:activation-configType"
+		   minOccurs="0"/>
+      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-identity"
+		   type="j2ee:security-identityType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-intfType">
+
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-intf element allows a method element to
+	differentiate between the methods with the same name and
+	signature that are multiply defined across the home and
+	component interfaces (e.g, in both an enterprise bean's
+	remote and local interfaces or in both an enterprise bean's
+	home and remote interfaces, etc.); the component and web
+	service endpoint interfaces, and so on. The Local applies to
+        both local component interface and local business interface.
+        Similarly, Remote applies to both remote component interface
+        and the remote business interface.
+
+	The method-intf element must be one of the following:
+
+	    Home
+	    Remote
+	    LocalHome
+	    Local
+	    ServiceEndpoint
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Home"/>
+	<xsd:enumeration value="Remote"/>
+	<xsd:enumeration value="LocalHome"/>
+	<xsd:enumeration value="Local"/>
+	<xsd:enumeration value="ServiceEndpoint"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-nameType contains a name of an enterprise
+	bean method or the asterisk (*) character. The asterisk is
+	used when the element denotes all the methods of an
+	enterprise bean's client view interfaces.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-paramsType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-paramsType defines a list of the
+	fully-qualified Java type names of the method parameters.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="method-param"
+		   type="j2ee:java-typeType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The method-param element contains a primitive
+	    or a fully-qualified Java type name of a method
+	    parameter.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-permissionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-permissionType specifies that one or more
+	security roles are allowed to invoke one or more enterprise
+	bean methods. The method-permissionType consists of an
+	optional description, a list of security role names or an
+	indicator to state that the method is unchecked for
+	authorization, and a list of method elements.
+
+	The security roles used in the method-permissionType
+	must be defined in the security-role elements of the
+	deployment descriptor, and the methods must be methods
+	defined in the enterprise bean's business, home, component
+        and/or web service endpoint interfaces.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="role-name"
+		     type="j2ee:role-nameType"
+		     maxOccurs="unbounded"/>
+	<xsd:element name="unchecked"
+		     type="j2ee:emptyType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The unchecked element specifies that a method is
+	      not checked for authorization by the container
+	      prior to invocation of the method.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+      <xsd:element name="method"
+		   type="j2ee:methodType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	  The methodType is used to denote a method of an enterprise
+	  bean's business, home, component, and/or web service endpoint
+	  interface, or, in the case of a message-driven bean, the
+	  bean's message listener method, or a set of such
+	  methods. The ejb-name element must be the name of one of the
+	  enterprise beans declared in the deployment descriptor; the
+	  optional method-intf element allows to distinguish between a
+	  method with the same signature that is multiply defined
+	  across the business, home, component, and/or web service
+          endpoint nterfaces; the method-name element specifies the
+          method name; and the optional method-params elements identify
+          a single method among multiple methods with an overloaded
+	  method name.
+
+	  There are three possible styles of using methodType element
+	  within a method element:
+
+	  1.
+	  <method>
+	      <ejb-name>EJBNAME</ejb-name>
+	      <method-name>*</method-name>
+	  </method>
+
+	     This style is used to refer to all the methods of the
+	     specified enterprise bean's business, home, component,
+             and/or web service endpoint interfaces.
+
+	  2.
+	  <method>
+	      <ejb-name>EJBNAME</ejb-name>
+	      <method-name>METHOD</method-name>
+	  </method>
+
+	     This style is used to refer to the specified method of
+	     the specified enterprise bean. If there are multiple
+	     methods with the same overloaded name, the element of
+	     this style refers to all the methods with the overloaded
+	     name.
+
+	  3.
+	  <method>
+	      <ejb-name>EJBNAME</ejb-name>
+	      <method-name>METHOD</method-name>
+	      <method-params>
+		  <method-param>PARAM-1</method-param>
+		  <method-param>PARAM-2</method-param>
+		  ...
+		  <method-param>PARAM-n</method-param>
+	      </method-params>
+	  </method>
+
+	     This style is used to refer to a single method within a
+	     set of methods with an overloaded name. PARAM-1 through
+	     PARAM-n are the fully-qualified Java types of the
+	     method's input parameters (if the method has no input
+	     arguments, the method-params element contains no
+	     method-param elements). Arrays are specified by the
+	     array element's type, followed by one or more pair of
+	     square brackets (e.g. int[][]). If there are multiple
+	     methods with the same overloaded name, this style refers
+	     to all of the overloaded methods.
+
+	  Examples:
+
+	  Style 1: The following method element refers to all the
+	  methods of the EmployeeService bean's business, home,
+          component, and/or web service endpoint interfaces:
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>*</method-name>
+	  </method>
+
+	  Style 2: The following method element refers to all the
+	  create methods of the EmployeeService bean's home
+	  interface(s).
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>create</method-name>
+	  </method>
+
+	  Style 3: The following method element refers to the
+	  create(String firstName, String LastName) method of the
+	  EmployeeService bean's home interface(s).
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  The following example illustrates a Style 3 element with
+	  more complex parameter types. The method
+	  foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
+	  mypackage.MyClass[][] myclaar) would be specified as:
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-name>foobar</method-name>
+	      <method-params>
+		  <method-param>char</method-param>
+		  <method-param>int</method-param>
+		  <method-param>int[]</method-param>
+		  <method-param>mypackage.MyClass</method-param>
+		  <method-param>mypackage.MyClass[][]</method-param>
+	      </method-params>
+	  </method>
+
+	  The optional method-intf element can be used when it becomes
+	  necessary to differentiate between a method that is multiply
+	  defined across the enterprise bean's business, home, component,
+          and/or web service endpoint interfaces with the same name and
+	  signature. However, if the same method is a method of both the
+          local business interface, and the local component interface,
+          the same attribute applies to the method for both interfaces.
+          Likewise, if the same method is a method of both the remote
+          business interface and the remote component interface, the same
+          attribute applies to the method for both interfaces.
+
+	  For example, the method element
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>Remote</method-intf>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  can be used to differentiate the create(String, String)
+	  method defined in the remote interface from the
+	  create(String, String) method defined in the remote home
+	  interface, which would be defined as
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>Home</method-intf>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  and the create method that is defined in the local home
+	  interface which would be defined as
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>LocalHome</method-intf>
+	      <method-name>create</method-name>
+	      <method-params>
+		  <method-param>java.lang.String</method-param>
+		  <method-param>java.lang.String</method-param>
+	      </method-params>
+	  </method>
+
+	  The method-intf element can be used with all three Styles
+	  of the method element usage. For example, the following
+	  method element example could be used to refer to all the
+	  methods of the EmployeeService bean's remote home interface
+          and the remote business interface.
+
+	  <method>
+	      <ejb-name>EmployeeService</ejb-name>
+	      <method-intf>Home</method-intf>
+	      <method-name>*</method-name>
+	  </method>
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+      <xsd:element name="method-intf"
+		   type="j2ee:method-intfType"
+		   minOccurs="0">
+      </xsd:element>
+      <xsd:element name="method-name"
+		   type="j2ee:method-nameType"/>
+      <xsd:element name="method-params"
+		   type="j2ee:method-paramsType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="multiplicityType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The multiplicityType describes the multiplicity of the
+	role that participates in a relation.
+
+	The value must be one of the two following:
+
+	    One
+	    Many
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="One"/>
+	<xsd:enumeration value="Many"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="named-methodType">
+    <xsd:sequence>
+      <xsd:element name="method-name"
+		   type="j2ee:string"/>
+      <xsd:element name="method-params"
+		   type="j2ee:method-paramsType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="persistence-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The persistence-typeType specifies an entity bean's persistence
+	management type.
+
+	The persistence-type element must be one of the two following:
+
+	    Bean
+	    Container
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Bean"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="query-methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	  The query-method specifies the method for a finder or select
+	  query.
+
+	  The method-name element specifies the name of a finder or select
+	  method in the entity bean's implementation class.
+
+	  Each method-param must be defined for a query-method using the
+	  method-params element.
+
+	  It is used by the query-method element.
+
+	  Example:
+
+	  <query>
+	      <description>Method finds large orders</description>
+	      <query-method>
+		  <method-name>findLargeOrders</method-name>
+		  <method-params></method-params>
+	      </query-method>
+	      <ejb-ql>
+		SELECT OBJECT(o) FROM Order o
+		  WHERE o.amount &gt; 1000
+	      </ejb-ql>
+	  </query>
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="method-name"
+		   type="j2ee:method-nameType"/>
+      <xsd:element name="method-params"
+		   type="j2ee:method-paramsType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="queryType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The queryType defines a finder or select
+	query. It contains
+	    - an optional description of the query
+	    - the specification of the finder or select
+	      method it is used by
+		- an optional specification of the result type
+		  mapping, if the query is for a select method
+		  and entity objects are returned.
+		- the EJB QL query string that defines the query.
+
+	Queries that are expressible in EJB QL must use the ejb-ql
+	element to specify the query. If a query is not expressible
+	in EJB QL, the description element should be used to
+	describe the semantics of the query and the ejb-ql element
+	should be empty.
+
+	The result-type-mapping is an optional element. It can only
+	be present if the query-method specifies a select method
+	that returns entity objects.  The default value for the
+	result-type-mapping element is "Local".
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType" minOccurs="0"/>
+      <xsd:element name="query-method"
+		   type="j2ee:query-methodType"/>
+      <xsd:element name="result-type-mapping"
+		   type="j2ee:result-type-mappingType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-ql"
+		   type="j2ee:xsdStringType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="relationship-role-sourceType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The relationship-role-sourceType designates the source of a
+	role that participates in a relationship. A
+	relationship-role-sourceType is used by
+	relationship-role-source elements to uniquely identify an
+	entity bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="relationshipsType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The relationshipsType describes the relationships in
+	which entity beans with container-managed persistence
+	participate. The relationshipsType contains an optional
+	description; and a list of ejb-relation elements, which
+	specify the container managed relationships.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relation"
+		   type="j2ee:ejb-relationType"
+		   maxOccurs="unbounded">
+
+	<xsd:unique name="role-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb-relationship-role-name contains the name of a
+	      relationship role. The name must be unique within
+	      a relationship, but can be reused in different
+	      relationships.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector
+	       xpath=".//j2ee:ejb-relationship-role-name"/>
+	  <xsd:field
+	       xpath="."/>
+	</xsd:unique>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="remove-methodType">
+    <xsd:sequence>
+      <xsd:element name="bean-method"
+		   type="j2ee:named-methodType"/>
+      <xsd:element name="retain-if-exception"
+		   type="j2ee:emptyType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="result-type-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The result-type-mappingType is used in the query element to
+	specify whether an abstract schema type returned by a query
+	for a select method is to be mapped to an EJBLocalObject or
+	EJBObject type.
+
+	The value must be one of the following:
+
+	    Local
+	    Remote
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Local"/>
+	<xsd:enumeration value="Remote"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-identityType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The security-identityType specifies whether the caller's
+	security identity is to be used for the execution of the
+	methods of the enterprise bean or whether a specific run-as
+	identity is to be used. It contains an optional description
+	and a specification of the security identity to be used.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="use-caller-identity"
+		     type="j2ee:emptyType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The use-caller-identity element specifies that
+	      the caller's security identity be used as the
+	      security identity for the execution of the
+	      enterprise bean's methods.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="run-as"
+		     type="j2ee:run-asType"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The session-beanType declares an session bean. The
+	declaration consists of:
+
+	    - an optional description
+	    - an optional display name
+	    - an optional icon element that contains a small and a large
+	      icon file name
+	    - an optional declaration of the enterprise bean's name
+            - the names of all the remote or local business interfaces,
+              if any
+	    - the names of the session bean's remote home and
+	      remote interfaces, if any
+	    - the names of the session bean's local home and
+	      local interfaces, if any
+	    - the name of the session bean's web service endpoint
+	      interface, if any
+	    - an optional declaration of the message-driven bean's 
+	      implementation class
+	    - the session bean's state management type
+	    - the optional session bean's transaction management type.
+              If it is not present, it is defaulted to Container.
+	    - an optional declaration of the bean's
+	      environment entries
+	    - an optional declaration of the bean's EJB references
+	    - an optional declaration of the bean's local
+	      EJB references
+	    - an optional declaration of the bean's web
+	      service references
+	    - an optional declaration of the security role
+	      references
+	    - an optional declaration of the security identity
+	      to be used for the execution of the bean's methods
+	    - an optional declaration of the bean's resource
+	      manager connection factory references
+	    - an optional declaration of the bean's resource
+	      environment references.
+	    - an optional declaration of the bean's message
+	      destination references
+
+	The elements that are optional are "optional" in the sense
+	that they are omitted when if lists represented by them are
+	empty.
+
+	Either both the local-home and the local elements or both
+	the home and the remote elements must be specified for the
+	session bean.
+
+	The service-endpoint element may only be specified if the
+	bean is a stateless session bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"
+		   minOccurs="0"/>
+      <xsd:element name="home"
+		   type="j2ee:homeType"
+		   minOccurs="0"/>
+      <xsd:element name="remote"
+		   type="j2ee:remoteType"
+		   minOccurs="0"/>
+      <xsd:element name="local-home"
+		   type="j2ee:local-homeType"
+		   minOccurs="0"/>
+      <xsd:element name="local"
+		   type="j2ee:localType"
+		   minOccurs="0"/>
+      <xsd:element name="business-local"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="business-remote"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="service-endpoint"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-endpoint element contains the
+	    fully-qualified name of the enterprise bean's web
+	    service endpoint interface. The service-endpoint
+	    element may only be specified for a stateless
+	    session bean. The specified interface must be a
+	    valid JAX-RPC service endpoint interface.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-class"
+		   type="j2ee:ejb-classType"
+		   minOccurs="0"/>
+      <xsd:element name="session-type"
+		   type="j2ee:session-typeType"
+                   minOccurs="0"/>
+      <xsd:element name="interceptor"
+                   type="j2ee:interceptorType"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+      <xsd:element name="around-invoke-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="callback-listener"
+                   type="j2ee:callback-listenerType"
+                   minOccurs="0"/>
+      <xsd:element name="post-construct-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="pre-destroy-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="post-activate-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="pre-passivate-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="timeout-method"
+                   type="j2ee:named-methodType"
+                   minOccurs="0"/>
+      <xsd:element name="init-method"
+                   type="j2ee:init-methodType"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+        <xsd:annotation>
+	  <xsd:documentation>
+
+	    The init-method element specifies the mappings for
+	    EJB 2.x style create methods for an EJB 3.0 bean.
+	    This element can only be specified for stateful
+            session beans.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="remove-method"
+                   type="j2ee:remove-methodType"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+        <xsd:annotation>
+	  <xsd:documentation>
+
+	    The remove-method element specifies the mappings for
+	    EJB 2.x style remove methods for an EJB 3.0 bean.
+	    This element can only be specified for stateful
+            session beans.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="transaction-type"
+		   type="j2ee:transaction-typeType"
+                   minOccurs="0"/>
+      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-role-ref"
+		   type="j2ee:security-role-refType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+      </xsd:element>
+      <xsd:element name="security-identity"
+		   type="j2ee:security-identityType"
+		   minOccurs="0">
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The session-typeType describes whether the session bean is a
+	stateful session or stateless session. It is used by
+	session-type elements.
+
+	The value must be one of the two following:
+
+	    Stateful
+	    Stateless
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Stateful"/>
+	<xsd:enumeration value="Stateless"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="trans-attributeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The trans-attributeType specifies how the container must
+	manage the transaction boundaries when delegating a method
+	invocation to an enterprise bean's business method.
+
+	The value must be one of the following:
+
+	    NotSupported
+	    Supports
+	    Required
+	    RequiresNew
+	    Mandatory
+	    Never
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="NotSupported"/>
+	<xsd:enumeration value="Supports"/>
+	<xsd:enumeration value="Required"/>
+	<xsd:enumeration value="RequiresNew"/>
+	<xsd:enumeration value="Mandatory"/>
+	<xsd:enumeration value="Never"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="transaction-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The transaction-typeType specifies an enterprise bean's
+	transaction management type.
+
+	The transaction-type must be one of the two following:
+
+	    Bean
+	    Container
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Bean"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+</xsd:schema>
+
+

Copied: branches/Branch_4_2/ejb3/src/resources/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/security)

Deleted: branches/Branch_4_2/ejb3/src/resources/security/tst.policy
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/security/tst.policy	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/security/tst.policy	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-grant {
-        permission java.security.AllPermission;
-};

Copied: branches/Branch_4_2/ejb3/src/resources/security/tst.policy (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/security/tst.policy)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/security/tst.policy	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/security/tst.policy	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+grant {
+        permission java.security.AllPermission;
+};

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/bootstrap.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/bootstrap.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/bootstrap.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment>
-   <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
-   
-   <bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl"/>
-
-   <bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
-      <property name="xidFactory"><inject bean="XidFactory"/></property>
-   </bean>
-
-   <bean name="TransactionManager" class="java.lang.Object">
-      <constructor factoryMethod="getTransactionManager">
-         <factory value="TransactionManagerInitializer"/>
-      </constructor>
-   </bean>
-   <bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
-      <property name="transactionManager"><inject bean="TransactionManager"/></property>
-   </bean>
-
-   <bean name="DefaultDS" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
-      <property name="driverClass">org.hsqldb.jdbcDriver</property>
-      <property name="connectionURL">jdbc:hsqldb:.</property>
-      <property name="userName">sa</property>
-      <property name="jndiName">java:/DefaultDS</property>
-      <property name="transactionManager"><inject bean="TransactionManager"/></property>
-      <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
-   </bean>
-
-</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/dist (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/dist)

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/dist/log4j.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/dist/log4j.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/dist/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="WARN"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/dist/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/dist/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/dist/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/dist/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="WARN"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-   <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
-
-   <bean name="InitialContextProperties" class="java.util.Hashtable">
-      <constructor>
-      <parameter class="java.util.Map">
-            <map keyClass="java.lang.String" valueClass="java.lang.String">
-               <entry>
-                  <key>java.naming.factory.initial</key>
-                  <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
-               </entry>
-               <entry>
-                   <key>java.naming.factory.url.pkgs</key>
-                   <value>org.jboss.naming:org.jnp.interfaces</value>
-               </entry>
-            </map>
-      </parameter>
-      </constructor>
-   </bean>
-
-   <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
-      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
-   </bean>
-
-   <bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl"/>
-
-   <bean name="XidFactoryMBean" class="org.jboss.ejb3.embedded.XidFactoryMBean">
-      <constructor>
-         <parameter class="org.jboss.tm.XidFactoryBase">
-            <inject bean="XidFactory"/>
-         </parameter>
-      </constructor>
-   </bean>
-
-   <bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
-      <property name="xidFactory"><inject bean="XidFactory"/></property>
-      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-   </bean>
-
-   <bean name="UserTransaction" class="org.jboss.ejb3.embedded.UserTransactionImpl">
-      <demand>TransactionManagerInitializer</demand>
-   </bean>
-
-   <bean name="UserTransactionBinding" class="org.jboss.ejb3.embedded.JndiBinder">
-      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
-      <property name="target"><inject bean="UserTransaction"/></property>
-      <property name="bindTo">UserTransaction</property>
-      <property name="serializable">false</property>
-   </bean>
-
-
-   <bean name="TransactionManager" class="java.lang.Object">
-      <constructor factoryMethod="getTransactionManager">
-         <factory bean="TransactionManagerInitializer"/>
-      </constructor>
-   </bean>
-   <bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
-      <property name="transactionManager"><inject bean="TransactionManager"/></property>
-   </bean>
-
-   <!--
-      <bean class="org.jboss.jdbc.HypersonicDatabase"
-        name="jboss:service=Hypersonic,database=localDB">
-        <property name="database">localDB</property>
-        <property name="inProcessMode">true</property>
-        <property name="dbDataDir">.</property>
-      </bean>
-   -->
-
-   <bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
-      <property name="driverClass">org.hsqldb.jdbcDriver</property>
-      <property name="connectionURL">jdbc:hsqldb:.</property>
-      <!--      <property name="connectionURL">jdbc:hsqldb:./hypersonic/localDB</property> -->
-      <property name="userName">sa</property>
-      <property name="jndiName">java:/DefaultDS</property>
-      <property name="minSize">0</property>
-      <property name="maxSize">10</property>
-      <property name="blockingTimeout">1000</property>
-      <property name="idleTimeout">100000</property>
-      <property name="transactionManager"><inject bean="TransactionManager"/></property>
-      <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
-      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-   </bean>
-
-   <bean name="DefaultDS" class="java.lang.Object">
-      <constructor factoryMethod="getDatasource">
-         <factory bean="DefaultDSBootstrap"/>
-      </constructor>
-   </bean>
-
-   <bean name="TimerServiceFactory" class="org.jboss.ejb3.timerservice.quartz.QuartzTimerServiceFactory">
-      <property name="properties">
-        	org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
-            org.quartz.jobStore.nonManagedTXDataSource=myDS
-            org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
-            org.quartz.jobStore.tablePrefix=QRTZ_
-            org.quartz.jobStore.dataSource=myDS
-         
-	        # To get it to work with hypersonic
-	        # FIXME: this doesn't lock the row
-            org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
-         
-        	# from quartz.properties
-            org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
-            org.quartz.scheduler.rmi.export=false
-            org.quartz.scheduler.rmi.proxy=false
-            org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
-   
-            org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-            org.quartz.threadPool.threadCount=10
-            org.quartz.threadPool.threadPriority=5
-            org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
-   
-        	org.quartz.jobStore.misfireThreshold=60000
-      </property>
-      <property name="dataSource">java:/DefaultDS</property>
-      <property name="sqlProperties">
-         CREATE_DB_ON_STARTUP = TRUE
-         
-         CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
-            DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
-            IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
-            JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
-         CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
-            JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
-            REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
-         CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
-            JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
-            NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
-            TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
-            MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
-            REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
-         CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-            TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
-            TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-         CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-            TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
-            PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-         CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-            TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
-            FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-         CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-            TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
-            PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-         CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
-            PRIMARY KEY (CALENDAR_NAME))
-         CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
-            PRIMARY KEY (TRIGGER_GROUP))
-         CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
-            TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
-            FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
-            IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
-         CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
-            LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
-            PRIMARY KEY (INSTANCE_NAME))
-         CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
-         INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
-         INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
-         INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
-         INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
-         INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
-      </property>
-   </bean>
-</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/embedded-jboss-beans.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/embedded-jboss-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+   <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
+
+   <bean name="InitialContextProperties" class="java.util.Hashtable">
+      <constructor>
+      <parameter class="java.util.Map">
+            <map keyClass="java.lang.String" valueClass="java.lang.String">
+               <entry>
+                  <key>java.naming.factory.initial</key>
+                  <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
+               </entry>
+               <entry>
+                   <key>java.naming.factory.url.pkgs</key>
+                   <value>org.jboss.naming:org.jnp.interfaces</value>
+               </entry>
+            </map>
+      </parameter>
+      </constructor>
+   </bean>
+
+   <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
+      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
+   </bean>
+
+   <bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl"/>
+
+   <bean name="XidFactoryMBean" class="org.jboss.ejb3.embedded.XidFactoryMBean">
+      <constructor>
+         <parameter class="org.jboss.tm.XidFactoryBase">
+            <inject bean="XidFactory"/>
+         </parameter>
+      </constructor>
+   </bean>
+
+   <bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
+      <property name="xidFactory"><inject bean="XidFactory"/></property>
+      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+   </bean>
+
+   <bean name="UserTransaction" class="org.jboss.ejb3.embedded.UserTransactionImpl">
+      <demand>TransactionManagerInitializer</demand>
+   </bean>
+
+   <bean name="UserTransactionBinding" class="org.jboss.ejb3.embedded.JndiBinder">
+      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
+      <property name="target"><inject bean="UserTransaction"/></property>
+      <property name="bindTo">UserTransaction</property>
+      <property name="serializable">false</property>
+   </bean>
+
+
+   <bean name="TransactionManager" class="java.lang.Object">
+      <constructor factoryMethod="getTransactionManager">
+         <factory bean="TransactionManagerInitializer"/>
+      </constructor>
+   </bean>
+   <bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
+      <property name="transactionManager"><inject bean="TransactionManager"/></property>
+   </bean>
+
+   <!--
+      <bean class="org.jboss.jdbc.HypersonicDatabase"
+        name="jboss:service=Hypersonic,database=localDB">
+        <property name="database">localDB</property>
+        <property name="inProcessMode">true</property>
+        <property name="dbDataDir">.</property>
+      </bean>
+   -->
+
+   <bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
+      <property name="driverClass">org.hsqldb.jdbcDriver</property>
+      <property name="connectionURL">jdbc:hsqldb:.</property>
+      <!--      <property name="connectionURL">jdbc:hsqldb:./hypersonic/localDB</property> -->
+      <property name="userName">sa</property>
+      <property name="jndiName">java:/DefaultDS</property>
+      <property name="minSize">0</property>
+      <property name="maxSize">10</property>
+      <property name="blockingTimeout">1000</property>
+      <property name="idleTimeout">100000</property>
+      <property name="transactionManager"><inject bean="TransactionManager"/></property>
+      <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
+      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+   </bean>
+
+   <bean name="DefaultDS" class="java.lang.Object">
+      <constructor factoryMethod="getDatasource">
+         <factory bean="DefaultDSBootstrap"/>
+      </constructor>
+   </bean>
+
+   <!--
+   <bean name="TimerServiceFactory" class="org.jboss.ejb3.timerservice.quartz.QuartzTimerServiceFactory">
+      <property name="properties">
+        	org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
+            org.quartz.jobStore.nonManagedTXDataSource=myDS
+            org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
+            org.quartz.jobStore.tablePrefix=QRTZ_
+            org.quartz.jobStore.dataSource=myDS
+         
+	        # To get it to work with hypersonic
+	        # FIXME: this doesn't lock the row
+            org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
+         
+        	# from quartz.properties
+            org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
+            org.quartz.scheduler.rmi.export=false
+            org.quartz.scheduler.rmi.proxy=false
+            org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
+   
+            org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
+            org.quartz.threadPool.threadCount=10
+            org.quartz.threadPool.threadPriority=5
+            org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
+   
+        	org.quartz.jobStore.misfireThreshold=60000
+      </property>
+      <property name="dataSource">java:/DefaultDS</property>
+      <property name="sqlProperties">
+         CREATE_DB_ON_STARTUP = TRUE
+         
+         CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
+            DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
+            IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
+            JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
+         CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
+            JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
+            REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
+         CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
+            JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
+            NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
+            TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
+            MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
+            REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
+         CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
+            TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
+            PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
+            FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
+            PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
+            REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
+         CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
+            PRIMARY KEY (CALENDAR_NAME))
+         CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
+            PRIMARY KEY (TRIGGER_GROUP))
+         CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
+            TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
+            FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
+            IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
+         CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
+            LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
+            PRIMARY KEY (INSTANCE_NAME))
+         CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
+         INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
+         INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
+         INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
+         INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
+         INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
+      </property>
+   </bean>
+
+   -->
+   
+</deployment>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-   <bean name="jboss.mq:service=JMSProviderLoader,name=JMSProvider" class="org.jboss.jms.jndi.JNDIProviderAdapter">
-      <property name="factoryRef">java:/XAConnectionFactory</property>
-      <property name="queueFactoryRef">java:/XAConnectionFactory</property>
-      <property name="topicFactoryRef">java:/XAConnectionFactory</property>
-      <property name="properties" class="java.util.Properties">
-               <map keyClass="java.lang.String" valueClass="java.lang.String">
-                  <entry>
-                     <key>java.naming.factory.initial</key>
-                     <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
-                  </entry>
-                  <entry>
-                      <key>java.naming.factory.url.pkgs</key>
-                      <value>org.jboss.naming:org.jnp.interfaces</value>
-                  </entry>
-               </map>
-      </property>
-   </bean>
-
-   <bean name="b1" class="org.jboss.ejb3.embedded.JndiBinder">
-      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
-      <property name="target"><inject bean="jboss.mq:service=JMSProviderLoader,name=JMSProvider"/></property>
-      <property name="bindTo">java:/DefaultJMSProvider</property>
-      <property name="serializable">true</property>
-   </bean>
-
-   <bean name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool" class="org.jboss.jms.asf.StdServerSessionPoolFactory">
-      <property name="name">StdJMSPool</property>
-      <property name="xidFactory"><inject bean="XidFactoryMBean"/></property>
-      <property name="transactionManager"><inject bean="TransactionManager"/></property>
-   </bean>
-
-   <bean name="b2" class="org.jboss.ejb3.embedded.JndiBinder">
-      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
-      <property name="target"><inject bean="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"/></property>
-      <property name="bindTo">java:/StdJMSPool</property>
-      <property name="serializable">false</property>
-   </bean>
-
-
-   <bean name="jboss.mq:service=PersistenceManager" class="org.jboss.mq.kernel.JDBC2PersistenceManager">
-      <property name="transactionManager">
-         <inject bean="TransactionManager"/>
-      </property>
-      <property name="datasource">
-         <inject bean="DefaultDS"/>
-      </property>
-      <property name="sqlProperties">
-
-            BLOB_TYPE=OBJECT_BLOB
-            INSERT_TX = INSERT INTO JMS_TRANSACTIONS (TXID) values(?)
-            INSERT_MESSAGE = INSERT INTO JMS_MESSAGES (MESSAGEID, DESTINATION, MESSAGEBLOB, TXID, TXOP) VALUES(?,?,?,?,?)
-            SELECT_ALL_UNCOMMITED_TXS = SELECT TXID FROM JMS_TRANSACTIONS
-            SELECT_MAX_TX = SELECT MAX(TXID) FROM JMS_MESSAGES
-            SELECT_MESSAGES_IN_DEST = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE DESTINATION=?
-            SELECT_MESSAGE = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
-            MARK_MESSAGE = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE MESSAGEID=? AND DESTINATION=?
-            UPDATE_MESSAGE = UPDATE JMS_MESSAGES SET MESSAGEBLOB=? WHERE MESSAGEID=? AND DESTINATION=?
-            UPDATE_MARKED_MESSAGES = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=?
-            UPDATE_MARKED_MESSAGES_WITH_TX = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=? AND TXID=?
-            DELETE_MARKED_MESSAGES_WITH_TX = DELETE FROM JMS_MESSAGES WHERE TXOP=? AND JMS_MESSAGES.TXID IN (SELECT TXID FROM JMS_TRANSACTIONS)
-            DELETE_TX = DELETE FROM JMS_TRANSACTIONS WHERE TXID = ?
-            DELETE_MARKED_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXID=? AND TXOP=?
-            DELETE_MESSAGE = DELETE FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
-            CREATE_MESSAGE_TABLE = CREATE CACHED TABLE JMS_MESSAGES ( MESSAGEID INTEGER NOT NULL, \
-               DESTINATION VARCHAR(255) NOT NULL, TXID INTEGER, TXOP CHAR(1), \
-               MESSAGEBLOB OBJECT, PRIMARY KEY (MESSAGEID, DESTINATION) )
-            CREATE_IDX_MESSAGE_TXOP_TXID = CREATE INDEX JMS_MESSAGES_TXOP_TXID ON JMS_MESSAGES (TXOP, TXID)
-            CREATE_IDX_MESSAGE_DESTINATION = CREATE INDEX JMS_MESSAGES_DESTINATION ON JMS_MESSAGES (DESTINATION)
-            CREATE_TX_TABLE = CREATE CACHED TABLE JMS_TRANSACTIONS ( TXID INTEGER, PRIMARY KEY (TXID) )
-            CREATE_TABLES_ON_STARTUP = TRUE
-            DELETE_TEMPORARY_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXOP='T'
-
-      </property>
-   </bean>
-
-   <bean name="jboss.mq:service=MessageCache" class="org.jboss.mq.kernel.MessageCache">
-      <property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
-      <property name="highMemoryMark">50</property>
-      <property name="maxMemoryMark">60</property>
-   </bean>
-
-   <bean name="jms-rar-WorkManager" class="org.jboss.ejb3.embedded.resource.JBossWorkManager">
-   </bean>
-
-   <bean name="jms-rar-DeploymentInfo" class="org.jboss.ejb3.embedded.resource.Ejb3DeploymentInfo">
-      <constructor>
-         <parameter class="java.lang.String">jms-ra.rar</parameter>
-         <parameter class="java.lang.String">javax.jms.MessageListener</parameter>
-         <parameter class="java.lang.String">org.jboss.resource.adapter.jms.inflow.JmsActivationSpec</parameter>
-      </constructor>
-   </bean>
-
-   <bean name="jboss.jca:name='jms-ra.rar',service=RARDeployment" class="org.jboss.ejb3.embedded.resource.RARDeployment">
-   	<constructor>
-         <parameter class="org.jboss.deployment.DeploymentInfo">
-            <inject bean="jms-rar-DeploymentInfo"/>
-         </parameter>
-      </constructor>
-      <property name="workManager"><inject bean="jms-rar-WorkManager"/></property>
-   </bean>
-
-   <bean name="jboss.mq:service=StateManager" class="org.jboss.mq.kernel.JDBCStateManager">
-      <property name="transactionManager">
-         <inject bean="TransactionManager"/>
-      </property>
-      <property name="datasource">
-         <inject bean="DefaultDS"/>
-      </property>
-      <property name="sqlProperties">
-
-            CREATE_TABLES_ON_STARTUP = TRUE
-            CREATE_USER_TABLE = CREATE TABLE JMS_USERS (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, \
-                                                       CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
-            CREATE_ROLE_TABLE = CREATE TABLE JMS_ROLES (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, \
-                                                       PRIMARY KEY(USERID, ROLEID))
-            CREATE_SUBSCRIPTION_TABLE = CREATE TABLE JMS_SUBSCRIPTIONS (CLIENTID VARCHAR(128) NOT NULL, \
-                                                       SUBNAME VARCHAR(128) NOT NULL, TOPIC VARCHAR(255) NOT NULL, \
-                                                       SELECTOR VARCHAR(255), PRIMARY KEY(CLIENTID, SUBNAME))
-            GET_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
-            LOCK_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
-            GET_SUBSCRIPTIONS_FOR_TOPIC = SELECT CLIENTID, SUBNAME, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE TOPIC=?
-            INSERT_SUBSCRIPTION = INSERT INTO JMS_SUBSCRIPTIONS (CLIENTID, SUBNAME, TOPIC, SELECTOR) VALUES(?,?,?,?)
-            UPDATE_SUBSCRIPTION = UPDATE JMS_SUBSCRIPTIONS SET TOPIC=?, SELECTOR=? WHERE CLIENTID=? AND SUBNAME=?
-            REMOVE_SUBSCRIPTION = DELETE FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
-            GET_USER_BY_CLIENTID = SELECT USERID, PASSWD, CLIENTID FROM JMS_USERS WHERE CLIENTID=?
-            GET_USER = SELECT PASSWD, CLIENTID FROM JMS_USERS WHERE USERID=?
-            POPULATE.TABLES.01 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('guest', 'guest')
-            POPULATE.TABLES.02 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('j2ee', 'j2ee')
-            POPULATE.TABLES.03 = INSERT INTO JMS_USERS (USERID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
-            POPULATE.TABLES.04 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('nobody', 'nobody')
-            POPULATE.TABLES.05 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('dynsub', 'dynsub')
-            POPULATE.TABLES.06 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('guest','guest')
-            POPULATE.TABLES.07 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('j2ee','guest')
-            POPULATE.TABLES.08 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('john','guest')
-            POPULATE.TABLES.09 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('subscriber','john')
-            POPULATE.TABLES.10 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','john')
-            POPULATE.TABLES.11 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','dynsub')
-            POPULATE.TABLES.12 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','john')
-            POPULATE.TABLES.13 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','dynsub')
-            POPULATE.TABLES.14 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('noacc','nobody')
-
-      </property>
-   </bean>
-
-
-   <bean name="BasicQueueParameters" class="org.jboss.mq.server.BasicQueueParameters"/>
-
-   <bean name="jboss.mq:service=ThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
-      <property name="name">JMSThread</property>
-      <property name="threadGroupName">JBossMQ Server Threads</property>
-      <!-- The max number of threads in the pool -->
-      <property name="maximumPoolSize">10</property>
-      <!-- The max number of tasks before the queue is full -->
-      <property name="maximumQueueSize">1000</property>
-      <!-- The behavior of the pool when a task is added and the queue is full.
-      abort - a RuntimeException is thrown
-      run - the calling thread executes the task
-      wait - the calling thread blocks until the queue has room
-      discard - the task is silently discarded without being run
-      discardOldest - check to see if a task is about to complete and enque
-         the new task if possible, else run the task in the calling thread
-      -->
-      <property name="blockingModeString">run</property>
-   </bean>
-
-   <bean name="jboss.mq:service=DestinationManager" class="org.jboss.mq.server.JMSDestinationManager">
-      <constructor>
-         <parameter class="org.jboss.mq.server.BasicQueueParameters">
-            <inject bean="BasicQueueParameters"/>
-         </parameter>
-      </constructor>
-      <property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
-      <property name="messageCache"><inject bean="jboss.mq:service=MessageCache"/></property>
-      <property name="stateManager"><inject bean="jboss.mq:service=StateManager"/></property>
-      <property name="threadPool"><inject bean="jboss.mq:service=ThreadPool"/></property>
-      <property name="threadGroup"><inject bean="jboss.mq:service=ThreadPool" property="threadGroup"/></property>
-      <start method="startServer"/>
-      <stop method="stopServer"/>
-   </bean>
-
-   <bean name="jboss.mq.destination:service=Queue,name=DLQ" class="org.jboss.mq.kernel.Queue">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-      <property name="destinationName">DLQ</property>
-   </bean>
-
-   <bean name="jboss.mq:service=Invoker" class="org.jboss.mq.server.JMSServerInvoker">
-      <property name="next"><inject bean="jboss.mq:service=DestinationManager"/></property>
-   </bean>
-
-   <bean name="jboss.mq:service=invocationlayer,type=JVM" class="org.jboss.mq.kernel.JVMIL">
-      <property name="jmsInvoker"><inject bean="jboss.mq:service=Invoker"/></property>
-     <property name="connectionFactoryJNDIRef">java:/ConnectionFactory</property>
-     <property name="XAConnectionFactoryJNDIRef">java:/XAConnectionFactory</property>
-     <property name="pingPeriod">0</property>
-      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-   </bean>
-
-</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/jboss-jms-beans.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/jboss-jms-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+   <bean name="jboss.mq:service=JMSProviderLoader,name=JMSProvider" class="org.jboss.jms.jndi.JNDIProviderAdapter">
+      <property name="factoryRef">java:/XAConnectionFactory</property>
+      <property name="queueFactoryRef">java:/XAConnectionFactory</property>
+      <property name="topicFactoryRef">java:/XAConnectionFactory</property>
+      <property name="properties" class="java.util.Properties">
+               <map keyClass="java.lang.String" valueClass="java.lang.String">
+                  <entry>
+                     <key>java.naming.factory.initial</key>
+                     <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
+                  </entry>
+                  <entry>
+                      <key>java.naming.factory.url.pkgs</key>
+                      <value>org.jboss.naming:org.jnp.interfaces</value>
+                  </entry>
+               </map>
+      </property>
+   </bean>
+
+   <bean name="b1" class="org.jboss.ejb3.embedded.JndiBinder">
+      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
+      <property name="target"><inject bean="jboss.mq:service=JMSProviderLoader,name=JMSProvider"/></property>
+      <property name="bindTo">java:/DefaultJMSProvider</property>
+      <property name="serializable">true</property>
+   </bean>
+
+   <bean name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool" class="org.jboss.jms.asf.StdServerSessionPoolFactory">
+      <property name="name">StdJMSPool</property>
+      <property name="xidFactory"><inject bean="XidFactoryMBean"/></property>
+      <property name="transactionManager"><inject bean="TransactionManager"/></property>
+   </bean>
+
+   <bean name="b2" class="org.jboss.ejb3.embedded.JndiBinder">
+      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
+      <property name="target"><inject bean="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"/></property>
+      <property name="bindTo">java:/StdJMSPool</property>
+      <property name="serializable">false</property>
+   </bean>
+
+
+   <bean name="jboss.mq:service=PersistenceManager" class="org.jboss.mq.kernel.JDBC2PersistenceManager">
+      <property name="transactionManager">
+         <inject bean="TransactionManager"/>
+      </property>
+      <property name="datasource">
+         <inject bean="DefaultDS"/>
+      </property>
+      <property name="sqlProperties">
+
+            BLOB_TYPE=OBJECT_BLOB
+            INSERT_TX = INSERT INTO JMS_TRANSACTIONS (TXID) values(?)
+            INSERT_MESSAGE = INSERT INTO JMS_MESSAGES (MESSAGEID, DESTINATION, MESSAGEBLOB, TXID, TXOP) VALUES(?,?,?,?,?)
+            SELECT_ALL_UNCOMMITED_TXS = SELECT TXID FROM JMS_TRANSACTIONS
+            SELECT_MAX_TX = SELECT MAX(TXID) FROM JMS_MESSAGES
+            SELECT_MESSAGES_IN_DEST = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE DESTINATION=?
+            SELECT_MESSAGE = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
+            MARK_MESSAGE = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE MESSAGEID=? AND DESTINATION=?
+            UPDATE_MESSAGE = UPDATE JMS_MESSAGES SET MESSAGEBLOB=? WHERE MESSAGEID=? AND DESTINATION=?
+            UPDATE_MARKED_MESSAGES = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=?
+            UPDATE_MARKED_MESSAGES_WITH_TX = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=? AND TXID=?
+            DELETE_MARKED_MESSAGES_WITH_TX = DELETE FROM JMS_MESSAGES WHERE TXOP=? AND JMS_MESSAGES.TXID IN (SELECT TXID FROM JMS_TRANSACTIONS)
+            DELETE_TX = DELETE FROM JMS_TRANSACTIONS WHERE TXID = ?
+            DELETE_MARKED_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXID=? AND TXOP=?
+            DELETE_MESSAGE = DELETE FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
+            CREATE_MESSAGE_TABLE = CREATE CACHED TABLE JMS_MESSAGES ( MESSAGEID INTEGER NOT NULL, \
+               DESTINATION VARCHAR(255) NOT NULL, TXID INTEGER, TXOP CHAR(1), \
+               MESSAGEBLOB OBJECT, PRIMARY KEY (MESSAGEID, DESTINATION) )
+            CREATE_IDX_MESSAGE_TXOP_TXID = CREATE INDEX JMS_MESSAGES_TXOP_TXID ON JMS_MESSAGES (TXOP, TXID)
+            CREATE_IDX_MESSAGE_DESTINATION = CREATE INDEX JMS_MESSAGES_DESTINATION ON JMS_MESSAGES (DESTINATION)
+            CREATE_TX_TABLE = CREATE CACHED TABLE JMS_TRANSACTIONS ( TXID INTEGER, PRIMARY KEY (TXID) )
+            CREATE_TABLES_ON_STARTUP = TRUE
+            DELETE_TEMPORARY_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXOP='T'
+
+      </property>
+   </bean>
+
+   <bean name="jboss.mq:service=MessageCache" class="org.jboss.mq.kernel.MessageCache">
+      <property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
+      <property name="highMemoryMark">50</property>
+      <property name="maxMemoryMark">60</property>
+   </bean>
+
+   <bean name="jms-rar-WorkManager" class="org.jboss.ejb3.embedded.resource.JBossWorkManager">
+   </bean>
+
+   <bean name="jms-rar-DeploymentInfo" class="org.jboss.ejb3.embedded.resource.Ejb3DeploymentInfo">
+      <constructor>
+         <parameter class="java.lang.String">jms-ra.rar</parameter>
+         <parameter class="java.lang.String">javax.jms.MessageListener</parameter>
+         <parameter class="java.lang.String">org.jboss.resource.adapter.jms.inflow.JmsActivationSpec</parameter>
+      </constructor>
+   </bean>
+
+   <bean name="jboss.jca:name='jms-ra.rar',service=RARDeployment" class="org.jboss.ejb3.embedded.resource.RARDeployment">
+   	<constructor>
+         <parameter class="org.jboss.deployment.DeploymentInfo">
+            <inject bean="jms-rar-DeploymentInfo"/>
+         </parameter>
+      </constructor>
+      <property name="workManager"><inject bean="jms-rar-WorkManager"/></property>
+   </bean>
+
+   <bean name="jboss.mq:service=StateManager" class="org.jboss.mq.kernel.JDBCStateManager">
+      <property name="transactionManager">
+         <inject bean="TransactionManager"/>
+      </property>
+      <property name="datasource">
+         <inject bean="DefaultDS"/>
+      </property>
+      <property name="sqlProperties">
+
+            CREATE_TABLES_ON_STARTUP = TRUE
+            CREATE_USER_TABLE = CREATE TABLE JMS_USERS (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, \
+                                                       CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
+            CREATE_ROLE_TABLE = CREATE TABLE JMS_ROLES (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, \
+                                                       PRIMARY KEY(USERID, ROLEID))
+            CREATE_SUBSCRIPTION_TABLE = CREATE TABLE JMS_SUBSCRIPTIONS (CLIENTID VARCHAR(128) NOT NULL, \
+                                                       SUBNAME VARCHAR(128) NOT NULL, TOPIC VARCHAR(255) NOT NULL, \
+                                                       SELECTOR VARCHAR(255), PRIMARY KEY(CLIENTID, SUBNAME))
+            GET_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
+            LOCK_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
+            GET_SUBSCRIPTIONS_FOR_TOPIC = SELECT CLIENTID, SUBNAME, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE TOPIC=?
+            INSERT_SUBSCRIPTION = INSERT INTO JMS_SUBSCRIPTIONS (CLIENTID, SUBNAME, TOPIC, SELECTOR) VALUES(?,?,?,?)
+            UPDATE_SUBSCRIPTION = UPDATE JMS_SUBSCRIPTIONS SET TOPIC=?, SELECTOR=? WHERE CLIENTID=? AND SUBNAME=?
+            REMOVE_SUBSCRIPTION = DELETE FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
+            GET_USER_BY_CLIENTID = SELECT USERID, PASSWD, CLIENTID FROM JMS_USERS WHERE CLIENTID=?
+            GET_USER = SELECT PASSWD, CLIENTID FROM JMS_USERS WHERE USERID=?
+            POPULATE.TABLES.01 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('guest', 'guest')
+            POPULATE.TABLES.02 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('j2ee', 'j2ee')
+            POPULATE.TABLES.03 = INSERT INTO JMS_USERS (USERID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
+            POPULATE.TABLES.04 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('nobody', 'nobody')
+            POPULATE.TABLES.05 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('dynsub', 'dynsub')
+            POPULATE.TABLES.06 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('guest','guest')
+            POPULATE.TABLES.07 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('j2ee','guest')
+            POPULATE.TABLES.08 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('john','guest')
+            POPULATE.TABLES.09 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('subscriber','john')
+            POPULATE.TABLES.10 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','john')
+            POPULATE.TABLES.11 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','dynsub')
+            POPULATE.TABLES.12 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','john')
+            POPULATE.TABLES.13 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','dynsub')
+            POPULATE.TABLES.14 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('noacc','nobody')
+
+      </property>
+   </bean>
+
+
+   <bean name="BasicQueueParameters" class="org.jboss.mq.server.BasicQueueParameters"/>
+
+   <bean name="jboss.mq:service=ThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
+      <property name="name">JMSThread</property>
+      <property name="threadGroupName">JBossMQ Server Threads</property>
+      <!-- The max number of threads in the pool -->
+      <property name="maximumPoolSize">10</property>
+      <!-- The max number of tasks before the queue is full -->
+      <property name="maximumQueueSize">1000</property>
+      <!-- The behavior of the pool when a task is added and the queue is full.
+      abort - a RuntimeException is thrown
+      run - the calling thread executes the task
+      wait - the calling thread blocks until the queue has room
+      discard - the task is silently discarded without being run
+      discardOldest - check to see if a task is about to complete and enque
+         the new task if possible, else run the task in the calling thread
+      -->
+      <property name="blockingModeString">run</property>
+   </bean>
+
+   <bean name="jboss.mq:service=DestinationManager" class="org.jboss.mq.server.JMSDestinationManager">
+      <constructor>
+         <parameter class="org.jboss.mq.server.BasicQueueParameters">
+            <inject bean="BasicQueueParameters"/>
+         </parameter>
+      </constructor>
+      <property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
+      <property name="messageCache"><inject bean="jboss.mq:service=MessageCache"/></property>
+      <property name="stateManager"><inject bean="jboss.mq:service=StateManager"/></property>
+      <property name="threadPool"><inject bean="jboss.mq:service=ThreadPool"/></property>
+      <property name="threadGroup"><inject bean="jboss.mq:service=ThreadPool" property="threadGroup"/></property>
+      <start method="startServer"/>
+      <stop method="stopServer"/>
+   </bean>
+
+   <bean name="jboss.mq.destination:name=DLQ,service=Queue" class="org.jboss.mq.kernel.Queue">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+      <property name="destinationName">DLQ</property>
+   </bean>
+
+   <bean name="jboss.mq:service=Invoker" class="org.jboss.mq.server.JMSServerInvoker">
+      <property name="next"><inject bean="jboss.mq:service=DestinationManager"/></property>
+   </bean>
+
+   <bean name="jboss.mq:service=invocationlayer,type=JVM" class="org.jboss.mq.kernel.JVMIL">
+      <property name="jmsInvoker"><inject bean="jboss.mq:service=Invoker"/></property>
+     <property name="connectionFactoryJNDIRef">java:/ConnectionFactory</property>
+     <property name="XAConnectionFactoryJNDIRef">java:/XAConnectionFactory</property>
+     <property name="pingPeriod">0</property>
+      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+   </bean>
+
+</deployment>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.LocalOnlyContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.LocalOnlyContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-   
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Messagen -->
-         <!--
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-         -->
-         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
-      </layout>
-</appender>
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/log4j.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/log4j.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+   
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Messagen -->
+         <!--
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+         -->
+         <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L)  -%m%n"/>
+      </layout>
+</appender>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
-  <authentication>
-    <login-module code="login.module1.class.name" flag="control_flag">
-      <module-option name = "option1-name">option1-value</module-option>
-      <module-option name = "option2-name">option2-value</module-option>
-      ...
-    </login-module>
-
-    <login-module code="login.module2.class.name" flag="control_flag">
-      ...
-    </login-module>
-    ...
-  </authentication>
-</application-policy>
-
-$Revision$
--->
-
-<policy>
-  <!-- Used by clients within the application server VM such as
-  mbeans and servlets that access EJBs.
-  -->
-  <application-policy name="client-login">
-    <authentication>
-      <login-module code="org.jboss.security.ClientLoginModule"
-        flag="required">
-         <!-- Any existing security context will be restored on logout -->
-         <module-option name="restore-login-identity">true</module-option>
-      </login-module>
-    </authentication>
-  </application-policy>
-
-  <application-policy name="other">
-    <!-- A simple server login module, which can be used when the number
-    of users is relatively small. It uses two properties files:
-    users.properties, which holds users (key) and their password (value).
-    roles.properties, which holds users (key) and a comma-separated list of
-    their roles (value).
-    The unauthenticatedIdentity property defines the name of the principal
-    that will be used when a null username and password are presented as is
-    the case for an unuathenticated web client or MDB. If you want to
-    allow such users to be authenticated add the property, e.g.,
-    unauthenticatedIdentity="nobody"
-    -->
-    <authentication>
-      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-        flag="required"/>
-    </authentication>
-  </application-policy>
-
-</policy>
-

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/login-config.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/login-config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+  <authentication>
+    <login-module code="login.module1.class.name" flag="control_flag">
+      <module-option name = "option1-name">option1-value</module-option>
+      <module-option name = "option2-name">option2-value</module-option>
+      ...
+    </login-module>
+
+    <login-module code="login.module2.class.name" flag="control_flag">
+      ...
+    </login-module>
+    ...
+  </authentication>
+</application-policy>
+
+$Revision$
+-->
+
+<policy>
+  <!-- Used by clients within the application server VM such as
+  mbeans and servlets that access EJBs.
+  -->
+  <application-policy name="client-login">
+    <authentication>
+      <login-module code="org.jboss.security.ClientLoginModule"
+        flag="required">
+         <!-- Any existing security context will be restored on logout -->
+         <module-option name="restore-login-identity">true</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+
+  <application-policy name="other">
+    <!-- A simple server login module, which can be used when the number
+    of users is relatively small. It uses two properties files:
+    users.properties, which holds users (key) and their password (value).
+    roles.properties, which holds users (key) and a comma-separated list of
+    their roles (value).
+    The unauthenticatedIdentity property defines the name of the principal
+    that will be used when a null username and password are presented as is
+    the case for an unuathenticated web client or MDB. If you want to
+    allow such users to be authenticated add the property, e.g.,
+    unauthenticatedIdentity="nobody"
+    -->
+    <authentication>
+      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+        flag="required"/>
+    </authentication>
+  </application-policy>
+
+</policy>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-
-   <bean class="org.jboss.ejb3.embedded.JaasSecurityManagerService"
-         name="jboss.security:service=JaasSecurityManager">
-      <property name="initialContextProperties">
-         <inject bean="InitialContextProperties"/>
-      </property>
-   </bean>
-</deployment>

Copied: branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/standalone/security-beans.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/standalone/security-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+
+   <bean class="org.jboss.ejb3.embedded.JaasSecurityManagerService"
+         name="jboss.security:service=JaasSecurityManager">
+      <property name="initialContextProperties">
+         <inject bean="InitialContextProperties"/>
+      </property>
+   </bean>
+</deployment>

Copied: branches/Branch_4_2/ejb3/src/resources/test/appclient (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/appclient/Manifest
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/Manifest	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/Manifest	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-Main-Class: org.jboss.ejb3.test.appclient.client.HelloWorldClient
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/appclient/Manifest (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/Manifest)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/appclient/Manifest	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/Manifest	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+Main-Class: org.jboss.ejb3.test.appclient.client.HelloWorldClient
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/appclient/application-client.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/application-client.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/application-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client 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/j2ee
-                    http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
-                    version="5" id="appclient-test">
-	<display-name>appclient-test-client</display-name>
-	<description>application client unit test</description>
-
-	<env-entry>
-		<env-entry-name>msg</env-entry-name>
-		<env-entry-type>java.lang.String</env-entry-type>
-		<env-entry-value>how are you?</env-entry-value>
-	</env-entry>
-	
-	<resource-env-ref>
-		<resource-env-ref-name>messageReplier</resource-env-ref-name>
-		<resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-	</resource-env-ref>
-	
-	<post-construct>
-		<lifecycle-callback-method>postConstruct</lifecycle-callback-method>
-	</post-construct>
-	
-	<pre-destroy>
-		<lifecycle-callback-method>preDestroy</lifecycle-callback-method>
-	</pre-destroy>
-	
-	<callback-handler>org.jboss.ejb3.test.applicationclient.client.TestCallbackHandler</callback-handler>
-</application-client>

Copied: branches/Branch_4_2/ejb3/src/resources/test/appclient/application-client.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/application-client.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/appclient/application-client.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/application-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client 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/j2ee
+                    http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
+                    version="5" id="appclient-test">
+	<display-name>appclient-test-client</display-name>
+	<description>application client unit test</description>
+
+	<env-entry>
+		<env-entry-name>msg</env-entry-name>
+		<env-entry-type>java.lang.String</env-entry-type>
+		<env-entry-value>how are you?</env-entry-value>
+	</env-entry>
+	
+	<resource-env-ref>
+		<resource-env-ref-name>messageReplier</resource-env-ref-name>
+		<resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+	</resource-env-ref>
+	
+	<post-construct>
+		<lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+	</post-construct>
+	
+	<pre-destroy>
+		<lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+	</pre-destroy>
+	
+	<callback-handler>org.jboss.ejb3.test.applicationclient.client.TestCallbackHandler</callback-handler>
+</application-client>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/appclient/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>EJB3 appclient test</display-name>
-
-   <module>
-      <ejb>appclient-test.jar</ejb>
-   </module>
-   <module>
-      <java>appclient-test-client.jar</java>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/appclient/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/appclient/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>EJB3 appclient test</display-name>
+
+   <module>
+      <ejb>appclient-test.jar</ejb>
+   </module>
+   <module>
+      <java>appclient-test-client.jar</java>
+   </module>
+</application>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/appclient/jboss-client.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/jboss-client.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/jboss-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
-
-<jboss-client>
-   <jndi-name>applicationclient_test</jndi-name>
-   
-   <resource-env-ref>
-      <resource-env-ref-name>messageReplier</resource-env-ref-name>
-      <jndi-name>queue/messageReplier</jndi-name>
-   </resource-env-ref>
-</jboss-client>

Copied: branches/Branch_4_2/ejb3/src/resources/test/appclient/jboss-client.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/jboss-client.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/appclient/jboss-client.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/jboss-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
+
+<jboss-client>
+   <jndi-name>applicationclient_test</jndi-name>
+   
+   <resource-env-ref>
+      <resource-env-ref-name>messageReplier</resource-env-ref-name>
+      <jndi-name>queue/messageReplier</jndi-name>
+   </resource-env-ref>
+</jboss-client>

Copied: branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/simpleresource)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/application-client.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/simpleresource/application-client.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/application-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client 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/j2ee
-                    http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
-                    version="5">
-	<display-name>appclient-simpleresource-client</display-name>
-	<description>application client unit test</description>
-
-	<env-entry>
-		<env-entry-name>msg</env-entry-name>
-		<env-entry-type>java.lang.String</env-entry-type>
-		<env-entry-value>Hello world</env-entry-value>
-	</env-entry>
-</application-client>

Copied: branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/application-client.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/appclient/simpleresource/application-client.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/application-client.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/appclient/simpleresource/application-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client 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/j2ee
+                    http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
+                    version="5">
+	<display-name>appclient-simpleresource-client</display-name>
+	<description>application client unit test</description>
+
+	<env-entry>
+		<env-entry-name>msg</env-entry-name>
+		<env-entry-type>java.lang.String</env-entry-type>
+		<env-entry-value>Hello world</env-entry-value>
+	</env-entry>
+</application-client>

Copied: branches/Branch_4_2/ejb3/src/resources/test/arjuna (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/arjuna)

Copied: branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/arjuna/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/arjuna/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/arjuna/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/arjuna/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/aspectdomain (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/aspectdomain)

Copied: branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/aspectdomain/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>DeploymentDescriptorStateful</ejb-name>
-         <aop-domain-name>Test Aspect Domain</aop-domain-name>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>DeploymentDescriptorStateful</ejb-name>
+         <aop-domain-name>Test Aspect Domain</aop-domain-name>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
-   "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
-   <interceptor class="org.jboss.ejb3.test.aspectdomain.TestInterceptor" scope="PER_VM"/>
-
-   <domain name="Test Aspect Domain">
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.test.aspectdomain.TestInterceptor"/>
-      </bind>
-   </domain>
-</aop>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+   "-//JBoss//DTD JBOSS AOP 1.0//EN"
+   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+   <interceptor class="org.jboss.ejb3.test.aspectdomain.TestInterceptor" scope="PER_VM"/>
+
+   <domain name="Test Aspect Domain">
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.test.aspectdomain.TestInterceptor"/>
+      </bind>
+   </domain>
+</aop>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/asynchronous/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Modified: branches/Branch_4_2/ejb3/src/resources/test/bank/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/bank/META-INF/ejb-jar.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/bank/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -255,13 +255,9 @@
       <container-transaction>
          <method>
             <ejb-name>Bank</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>Bank</ejb-name>
             <method-name>testTransactionTimeout</method-name>
          </method>
-         <trans-attribute>Required</trans-attribute>
+         <trans-attribute>RequiresNew</trans-attribute>
       </container-transaction>
 
       <interceptor-binding>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aop>
-   <interceptor class="org.jboss.ejb3.test.bank.TellerInterceptor" scope="PER_VM"/>
-   
-   <stack name="TellerClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.test.bank.TellerInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-</aop>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/bank/bank-ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop>
+   <interceptor class="org.jboss.ejb3.test.bank.TellerInterceptor" scope="PER_VM"/>
+   
+   <stack name="TellerClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.ejb3.test.bank.TellerInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+</aop>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/bmt (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/bmt)

Copied: branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/bmt/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-<?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">
-   <description>jBoss test application</description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>DeploymentDescriptorTester</ejb-name>
-         <remote>org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterRemote</remote>
-         <ejb-class>org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-      <session>
-         <ejb-name>DeploymentDescriptorStateless</ejb-name>
-		 <local>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatelessLocal</local>
-         <ejb-class>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatelessBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Bean</transaction-type>
-      </session>
-      <session>
-         <ejb-name>DeploymentDescriptorStateful</ejb-name>
-         <local>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatefulLocal</local>
-         <ejb-class>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatefulBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Bean</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/bmt/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+<?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">
+   <description>jBoss test application</description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>DeploymentDescriptorTester</ejb-name>
+         <remote>org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterRemote</remote>
+         <ejb-class>org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+      <session>
+         <ejb-name>DeploymentDescriptorStateless</ejb-name>
+		 <local>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatelessLocal</local>
+         <ejb-class>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatelessBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+      <session>
+         <ejb-name>DeploymentDescriptorStateful</ejb-name>
+         <local>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatefulLocal</local>
+         <ejb-class>org.jboss.ejb3.test.bmt.DeploymentDescriptorStatefulBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Modified: branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-cache-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-cache-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-cache-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
-   <mbean code="org.jboss.ejb3.cache.tree.PassivationTreeCache" name="jboss.cache:service=EJB3TreeCache">
+   <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=EJB3TreeCache">
       <!--
               Node locking level : SERIALIZABLE
                                    REPEATABLE_READ (default)
@@ -8,7 +8,7 @@
                                    READ_UNCOMMITTED
                                    NONE
       -->
-      <attribute name="IsolationLevel">READ_UNCOMMITTED</attribute>
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
 
       <!--     Valid modes are LOCAL
                                REPL_ASYNC
@@ -19,13 +19,13 @@
       <!--    Number of milliseconds to wait until all responses for a
               synchronous call have been received.
       -->
-      <attribute name="SyncReplTimeout">10000</attribute>
+      <attribute name="SyncReplTimeout">16000</attribute>
 
       <!--  Max number of milliseconds to wait for a lock acquisition -->
       <attribute name="LockAcquisitionTimeout">15000</attribute>
 
       <!--  Name of the eviction policy class. -->
-      <attribute name="EvictionPolicyClass">org.jboss.ejb3.cache.tree.PassivationEvictionPolicy</attribute>
+      <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
 
       <!--  Specific eviction policy configurations. This is LRU -->
       <attribute name="EvictionPolicyConfig">
@@ -48,11 +48,13 @@
 
                 <!-- we can now have multiple cache loaders, which get chained -->
                 <cacheloader>
-                    <class>org.jboss.ejb3.cache.tree.PassivationCacheLoader</class>
-                    <!-- same as the old CacheLoaderConfig attribute -->
-                    <properties>
-                        location=server/all/tmp/stateful
-                    </properties>
+                    
+                  <class>org.jboss.cache.loader.FileCacheLoader</class>
+                      <!-- 
+                      -->
+                  <properties>
+                       location=${jboss.server.data.dir}${/}sfsb-test 
+                  </properties>
                     <!-- whether the cache loader writes are asynchronous -->
                     <async>false</async>
                     <!-- only one cache loader in the chain may set fetchPersistentState to true.

Modified: branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
-   <mbean code="org.jboss.ejb3.cache.tree.PassivationTreeCache" name="jboss.cache:service=EJB3TreeCache">
+   <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=EJB3TreeCache">
       <!--
               Node locking level : SERIALIZABLE
                                    REPEATABLE_READ (default)
@@ -8,7 +8,7 @@
                                    READ_UNCOMMITTED
                                    NONE
       -->
-      <attribute name="IsolationLevel">READ_UNCOMMITTED</attribute>
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
 
       <!--     Valid modes are LOCAL
                                REPL_ASYNC
@@ -19,13 +19,13 @@
       <!--    Number of milliseconds to wait until all responses for a
               synchronous call have been received.
       -->
-      <attribute name="SyncReplTimeout">10000</attribute>
+      <attribute name="SyncReplTimeout">16000</attribute>
 
       <!--  Max number of milliseconds to wait for a lock acquisition -->
       <attribute name="LockAcquisitionTimeout">15000</attribute>
 
       <!--  Name of the eviction policy class. -->
-      <attribute name="EvictionPolicyClass">org.jboss.ejb3.cache.tree.StatefulEvictionPolicy</attribute>
+      <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
 
       <!--  Specific eviction policy configurations. This is LRU -->
       <attribute name="EvictionPolicyConfig">
@@ -49,11 +49,10 @@
 
                 <!-- we can now have multiple cache loaders, which get chained -->
                 <cacheloader>
-                    <class>org.jboss.ejb3.cache.tree.StatefulCacheLoader</class>
-                    <!-- same as the old CacheLoaderConfig attribute -->
-                    <properties>
-                        location=server/all/tmp/stateful
-                    </properties>
+                   <class>org.jboss.cache.loader.FileCacheLoader</class>
+                  <properties>
+                       location=${jboss.server.data.dir}${/}sfsb-test
+                  </properties>
                     <!-- whether the cache loader writes are asynchronous -->
                     <async>false</async>
                     <!-- only one cache loader in the chain may set fetchPersistentState to true.

Copied: branches/Branch_4_2/ejb3/src/resources/test/classloader (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/classloader)

Copied: branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/classloader/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/classloader/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <loader-repository>
-      jboss.test:war=servlet.war
-      <loader-repository-config>
-         java2ParentDelegaton=false
-      </loader-repository-config>
-   </loader-repository>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/classloader/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <loader-repository>
+      jboss.test:war=servlet.war
+      <loader-repository-config>
+         java2ParentDelegaton=false
+      </loader-repository-config>
+   </loader-repository>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/classloader/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j-113.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j-113.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/classloader/log4j-113.jar)
===================================================================
(Binary files differ)


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j-113.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/classloader/log4j.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=INFO
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=(%d{ABSOLUTE},%-5p,[%c{1}]) %m%n

Copied: branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/classloader/log4j.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=(%d{ABSOLUTE},%-5p,[%c{1}]) %m%n


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/classloader/log4j.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clientinterceptor)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aop>
-	
-   <interceptor class="org.jboss.ejb3.test.clientinterceptor.CustomInterceptor" scope="PER_VM"/>
-	
-   <stack name="CustomStatelessSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.test.clientinterceptor.CustomInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-	
-</aop>

Copied: branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop>
+	
+   <interceptor class="org.jboss.ejb3.test.clientinterceptor.CustomInterceptor" scope="PER_VM"/>
+	
+   <stack name="CustomStatelessSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.ejb3.test.clientinterceptor.CustomInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+	
+</aop>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/clientinterceptor/clientinterceptor-aop.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
-         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb" transaction-type="JTA">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
+         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader)

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application>
-   <display-name>Clustered entity with scoped classloader test ear</display-name>
-   <module>
-      <ejb>clusteredentity-classloader-test.jar</ejb>
-   </module>
-</application>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+   <display-name>Clustered entity with scoped classloader test ear</display-name>
+   <module>
+      <ejb>clusteredentity-classloader-test.jar</ejb>
+   </module>
+</application>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-app>
-   <loader-repository>
-      jboss.test:ear=clusteredentity-classloader-test.ear
-      <!--
-      <loader-repository-config>
-         java2ParentDelegation=false
-      </loader-repository-config>
-      -->
-   </loader-repository>
-   <module>
-      <service>clusteredentity-ds.xml</service>
-   </module>
-</jboss-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-app>
+   <loader-repository>
+      jboss.test:ear=clusteredentity-classloader-test.ear
+      <!--
+      <loader-repository-config>
+         java2ParentDelegation=false
+      </loader-repository-config>
+      -->
+   </loader-repository>
+   <module>
+      <service>clusteredentity-ds.xml</service>
+   </module>
+</jboss-app>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb" transaction-type="JTA">
-      <jta-data-source>java:/ClusteredEntityTestDS</jta-data-source>
-      <properties>
-         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
-         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
-         <!-- Must use "update" here as we do a test of redeployment and don't want to drop the db -->
-         <property name="hibernate.hbm2ddl.auto" value="update"/>
-         <property name="hibernate.cache.use_query_cache" value="true"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb" transaction-type="JTA">
+      <jta-data-source>java:/ClusteredEntityTestDS</jta-data-source>
+      <properties>
+         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
+         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
+         <!-- Must use "update" here as we do a test of redeployment and don't want to drop the db -->
+         <property name="hibernate.hbm2ddl.auto" value="update"/>
+         <property name="hibernate.cache.use_query_cache" value="true"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
-   <local-tx-datasource>
-      <jndi-name>ClusteredEntityTestDS</jndi-name>
-
-      <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url>
-      <driver-class>org.hsqldb.jdbcDriver</driver-class>
-      <user-name>sa</user-name>
-      <password></password>
-      <min-pool-size>1</min-pool-size>
-      <max-pool-size>20</max-pool-size>
-      <idle-timeout-minutes>0</idle-timeout-minutes>
-      <track-statements/>
-   </local-tx-datasource>
-</datasources>

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/classloader/clusteredentity-ds.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+   <local-tx-datasource>
+      <jndi-name>ClusteredEntityTestDS</jndi-name>
+
+      <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url>
+      <driver-class>org.hsqldb.jdbcDriver</driver-class>
+      <user-name>sa</user-name>
+      <password></password>
+      <min-pool-size>1</min-pool-size>
+      <max-pool-size>20</max-pool-size>
+      <idle-timeout-minutes>0</idle-timeout-minutes>
+      <track-statements/>
+   </local-tx-datasource>
+</datasources>

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/embeddedid)

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application>
-   <display-name>Second clustered entity with scoped classloader test ear</display-name>
-   <module>
-      <ejb>clusteredentity-embeddedid-test.jar</ejb>
-   </module>
-</application>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredentity/embeddedid/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+   <display-name>Second clustered entity with scoped classloader test ear</display-name>
+   <module>
+      <ejb>clusteredentity-embeddedid-test.jar</ejb>
+   </module>
+</application>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredservice (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredservice)

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredservice/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4"
-   xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-   <description>EJB3 Servlet Access Test</description>
-
-   <servlet>
-      <servlet-name>EJBServlet</servlet-name>
-      <servlet-class>org.jboss.ejb3.test.clusteredservice.servlets.EJBServlet</servlet-class>
-   </servlet>
-
-   <!-- The servlet and jsp page mappings -->
-   <servlet-mapping>
-      <servlet-name>EJBServlet</servlet-name>
-      <url-pattern>/EJBServlet</url-pattern>
-   </servlet-mapping>
-</web-app>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4"
+   xmlns="http://java.sun.com/xml/ns/j2ee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+   <description>EJB3 Servlet Access Test</description>
+
+   <servlet>
+      <servlet-name>EJBServlet</servlet-name>
+      <servlet-class>org.jboss.ejb3.test.clusteredservice.servlets.EJBServlet</servlet-class>
+   </servlet>
+
+   <!-- The servlet and jsp page mappings -->
+   <servlet-mapping>
+      <servlet-name>EJBServlet</servlet-name>
+      <url-pattern>/EJBServlet</url-pattern>
+   </servlet-mapping>
+</web-app>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/clusteredservice/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession)

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-<?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">
-   <enterprise-beans>
-      <session>
-         <ejb-name>NonAnnotationStateful</ejb-name>
-         <remote>org.jboss.ejb3.test.clusteredsession.StatefulRemote</remote>
-         <ejb-class>org.jboss.ejb3.test.clusteredsession.NonAnnotationStatefulBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-      <session>
-         <ejb-name>EjbJarOverrideAnnotationStateful</ejb-name>
-         <remote>org.jboss.ejb3.test.clusteredsession.StatefulRemote</remote>
-         <ejb-class>org.jboss.ejb3.test.clusteredsession.OverrideAnnotationStatefulBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-      <session>
-         <ejb-name>NonClusteredStateful</ejb-name>
-         <remote>org.jboss.ejb3.test.clusteredsession.OverrideStatefulRemote</remote>
-         <ejb-class>org.jboss.ejb3.test.clusteredsession.OverrideStatefulBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+<?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">
+   <enterprise-beans>
+      <session>
+         <ejb-name>NonAnnotationStateful</ejb-name>
+         <remote>org.jboss.ejb3.test.clusteredsession.StatefulRemote</remote>
+         <ejb-class>org.jboss.ejb3.test.clusteredsession.NonAnnotationStatefulBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+      <session>
+         <ejb-name>EjbJarOverrideAnnotationStateful</ejb-name>
+         <remote>org.jboss.ejb3.test.clusteredsession.StatefulRemote</remote>
+         <ejb-class>org.jboss.ejb3.test.clusteredsession.OverrideAnnotationStatefulBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+      <session>
+         <ejb-name>NonClusteredStateful</ejb-name>
+         <remote>org.jboss.ejb3.test.clusteredsession.OverrideStatefulRemote</remote>
+         <ejb-class>org.jboss.ejb3.test.clusteredsession.OverrideStatefulBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-      <enterprise-beans>
-         <session>
-            <ejb-name>OverrideStateful</ejb-name>
-            <jndi-name>OverrideStatefulRemote</jndi-name>
-            <clustered>true</clustered>
-            <cluster-config>
-               <partition-name>DefaultPartition</partition-name>
-               <load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</load-balance-policy>
-            </cluster-config>
-         </session>
-         <session>
-            <ejb-name>NonAnnotationStateful</ejb-name>
-            <clustered>true</clustered>
-            <cluster-config>
-               <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
-               <load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
-            </cluster-config>
-         </session>         
-         <session>
-            <ejb-name>OverrideAnnotationStateful</ejb-name>
-            <clustered>true</clustered>
-            <cluster-config>
-               <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
-               <load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
-            </cluster-config>
-         </session>
-         <session>
-            <ejb-name>EjbJarOverrideAnnotationStateful</ejb-name>
-            <clustered>true</clustered>
-            <cluster-config>
-               <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
-               <load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
-            </cluster-config>
-         </session>
-         <session>
-            <ejb-name>NonClusteredStateful</ejb-name>
-            <jndi-name>NonClusteredStatefulRemote</jndi-name>
-            <clustered>false</clustered>
-            <cache-config>
-               <cache-class>org.jboss.ejb3.cache.simple.SimpleStatefulCache</cache-class>
-               <cache-max-size>1000</cache-max-size>
-               <idle-timeout-seconds>100</idle-timeout-seconds>
-            </cache-config>
-         </session>
-      </enterprise-beans>
-   </jboss>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+      <enterprise-beans>
+         <session>
+            <ejb-name>OverrideStateful</ejb-name>
+            <jndi-name>OverrideStatefulRemote</jndi-name>
+            <clustered>true</clustered>
+            <cluster-config>
+               <partition-name>DefaultPartition</partition-name>
+               <load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</load-balance-policy>
+            </cluster-config>
+         </session>
+         <session>
+            <ejb-name>NonAnnotationStateful</ejb-name>
+            <clustered>true</clustered>
+            <cluster-config>
+               <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+               <load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
+            </cluster-config>
+         </session>         
+         <session>
+            <ejb-name>OverrideAnnotationStateful</ejb-name>
+            <clustered>true</clustered>
+            <cluster-config>
+               <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+               <load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
+            </cluster-config>
+         </session>
+         <session>
+            <ejb-name>EjbJarOverrideAnnotationStateful</ejb-name>
+            <clustered>true</clustered>
+            <cluster-config>
+               <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+               <load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
+            </cluster-config>
+         </session>
+         <session>
+            <ejb-name>NonClusteredStateful</ejb-name>
+            <jndi-name>NonClusteredStatefulRemote</jndi-name>
+            <clustered>false</clustered>
+            <cache-config>
+               <cache-class>org.jboss.ejb3.cache.simple.SimpleStatefulCache</cache-class>
+               <cache-max-size>1000</cache-max-size>
+               <idle-timeout-seconds>100</idle-timeout-seconds>
+            </cache-config>
+         </session>
+      </enterprise-beans>
+   </jboss>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/composite (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite)

Copied: branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/composite/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/composite2 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite2)

Copied: branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite2/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite2/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/composite2/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/composite2/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/consumer (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/consumer)

Copied: branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/consumer/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/consumer/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-	<enterprise-beans>
-    	<consumer>
-         	<ejb-name>DeploymentDescriptorQueueTestConsumer</ejb-name>
-         	<ejb-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</ejb-class>
-         	<message-destination>queue/consumertest</message-destination>
-	     	<message-destination-type>javax.jms.Queue</message-destination-type>
-         	<producer>
-            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestRemote</class>
-         	</producer>
-         	<producer>
-            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestXA</class>
-            	<connection-factory>java:/JmsXA</connection-factory>
-         	</producer>
-         	<local-producer>
-            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestLocal</class>
-         	</local-producer>
-         	<current-message>
-				<method>
-               		<method-name>currentMessage</method-name>
-            	</method>
-            	<method>
-               		<method-name>setMessage</method-name>
-            	</method>
-         	</current-message>
-         	<message-properties>
-            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTest</class>
-				<method>
-		   			<method-name>method2</method-name>
-	      		</method>
-				<delivery>NonPersistent</delivery>
-         	</message-properties>
-         	<message-properties>
-            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestXA</class>
-				<method>
-		   			<method-name>method2</method-name>
-	      		</method>
-				<delivery>Persistent</delivery>
-            	<priority>4</priority>
-         	</message-properties>
-            <ejb-ref>
-            	<ejb-ref-name>ejb/StatelessRemote</ejb-ref-name>
-            	<ejb-ref-type>Session</ejb-ref-type>
-            	<remote>org.jboss.ejb3.test.consumer.StatelessRemote</remote>
-            	<ejb-link>StatelessBean</ejb-link>
-            	<injection-target>
-               		<injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
-               		<injection-target-name>stateless</injection-target-name>
-            	</injection-target>
-            	<jndi-name>StatelessBean/remote</jndi-name>
-         	</ejb-ref>
-			<ejb-local-ref>
-            	<ejb-ref-name>ejb/StatelessLocal</ejb-ref-name>
-            	<ejb-ref-type>Session</ejb-ref-type>
-            	<local>org.jboss.ejb3.test.consumer.StatelessLocal</local>
-            	<ejb-link>StatelessBean</ejb-link>
-            	<injection-target>
-               		<injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
-               		<injection-target-name>setStatelessLocal</injection-target-name>
-            	</injection-target>
-                <local-jndi-name>StatelessBean/local</local-jndi-name>
-         	</ejb-local-ref>
-            <resource-ref>
-            	<res-ref-name>testDatasource</res-ref-name>
-            	<res-type>javax.sql.DataSource</res-type>
-            	<res-auth>Container</res-auth>
-            	<res-sharing-scope>Shareable</res-sharing-scope>
-            	<mapped-name>java:/DefaultDS</mapped-name>
-            	<injection-target>
-               		<injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
-               		<injection-target-name>testDatasource</injection-target-name>
-            	</injection-target>
-         	</resource-ref>
-            <resource-env-ref>
-            	<description>A test of the resource-env-ref tag</description>
-            	<resource-env-ref-name>res/aQueue</resource-env-ref-name>
-            	<resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-                <jndi-name>queue/mdbtest</jndi-name>
-         	</resource-env-ref>
-      	</consumer>
-   	</enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/consumer/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/consumer/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+	<enterprise-beans>
+    	<consumer>
+         	<ejb-name>DeploymentDescriptorQueueTestConsumer</ejb-name>
+         	<ejb-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</ejb-class>
+         	<message-destination>queue/consumertest</message-destination>
+	     	<message-destination-type>javax.jms.Queue</message-destination-type>
+         	<producer>
+            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestRemote</class>
+         	</producer>
+         	<producer>
+            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestXA</class>
+            	<connection-factory>java:/JmsXA</connection-factory>
+         	</producer>
+         	<local-producer>
+            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestLocal</class>
+         	</local-producer>
+         	<current-message>
+				<method>
+               		<method-name>currentMessage</method-name>
+            	</method>
+            	<method>
+               		<method-name>setMessage</method-name>
+            	</method>
+         	</current-message>
+         	<message-properties>
+            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTest</class>
+				<method>
+		   			<method-name>method2</method-name>
+	      		</method>
+				<delivery>NonPersistent</delivery>
+         	</message-properties>
+         	<message-properties>
+            	<class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestXA</class>
+				<method>
+		   			<method-name>method2</method-name>
+	      		</method>
+				<delivery>Persistent</delivery>
+            	<priority>4</priority>
+         	</message-properties>
+            <ejb-ref>
+            	<ejb-ref-name>ejb/StatelessRemote</ejb-ref-name>
+            	<ejb-ref-type>Session</ejb-ref-type>
+            	<remote>org.jboss.ejb3.test.consumer.StatelessRemote</remote>
+            	<ejb-link>StatelessBean</ejb-link>
+            	<injection-target>
+               		<injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
+               		<injection-target-name>stateless</injection-target-name>
+            	</injection-target>
+            	<jndi-name>StatelessBean/remote</jndi-name>
+         	</ejb-ref>
+			<ejb-local-ref>
+            	<ejb-ref-name>ejb/StatelessLocal</ejb-ref-name>
+            	<ejb-ref-type>Session</ejb-ref-type>
+            	<local>org.jboss.ejb3.test.consumer.StatelessLocal</local>
+            	<ejb-link>StatelessBean</ejb-link>
+            	<injection-target>
+               		<injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
+               		<injection-target-name>setStatelessLocal</injection-target-name>
+            	</injection-target>
+                <local-jndi-name>StatelessBean/local</local-jndi-name>
+         	</ejb-local-ref>
+            <resource-ref>
+            	<res-ref-name>testDatasource</res-ref-name>
+            	<res-type>javax.sql.DataSource</res-type>
+            	<res-auth>Container</res-auth>
+            	<res-sharing-scope>Shareable</res-sharing-scope>
+            	<mapped-name>java:/DefaultDS</mapped-name>
+            	<injection-target>
+               		<injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
+               		<injection-target-name>testDatasource</injection-target-name>
+            	</injection-target>
+         	</resource-ref>
+            <resource-env-ref>
+            	<description>A test of the resource-env-ref tag</description>
+            	<resource-env-ref-name>res/aQueue</resource-env-ref-name>
+            	<resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+                <jndi-name>queue/mdbtest</jndi-name>
+         	</resource-env-ref>
+      	</consumer>
+   	</enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/consumer/consumertest-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=consumerqueuetest">
-      <attribute name="JNDIName">queue/consumertest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Topic"
-      name="jboss.mq.destination:service=Topic,name=topictest">
-      <attribute name="JNDIName">topic/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/consumer/consumertest-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queuetest">
+      <attribute name="JNDIName">queue/mdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=consumerqueuetest">
+      <attribute name="JNDIName">queue/consumertest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Topic"
+      name="jboss.mq.destination:service=Topic,name=topictest">
+      <attribute name="JNDIName">topic/mdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dd/application-client-test1.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dd/application-client-test1.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/application-client-test1.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/application-client-test1.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client 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/j2ee
+                    http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
+                    version="5">
+	<display-name>Test1</display-name>
+	<description>application client dd test</description>
+
+	<env-entry>
+		<env-entry-name>envTest</env-entry-name>
+		<env-entry-type>java.lang.String</env-entry-type>
+		<env-entry-value>Hello world</env-entry-value>
+	</env-entry>
+	
+	<post-construct>
+		<lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+	</post-construct>
+	
+	<pre-destroy>
+		<lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+	</pre-destroy>
+	
+	<callback-handler>org.jboss.ejb3.test.applicationclient.client.TestCallbackHandler</callback-handler>
+</application-client>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<!-- 
-   | This file defines the default Queues and Topics that JBossMQ
-   | ships with.  The default Queues and Topics are used by the 
-   | JBoss test suite and by the sample jms programs.
-   |
-   | You can add other destinations to this file, or you can create other
-   | *-service.xml files to contain your application's destinations.
- -->
-
-<server>
-  <!-- Destination without a configured SecurityManager or without a 
-       a SecurityConf will default to role guest with read=true, write=true,
-       create=false.
-  -->
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=testTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="durpublisher" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=securedTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="publisher" read="true" write="true" create="false"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=testDurableTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-       <security>
-         <role name="guest" read="true" write="true"/>
-         <role name="publisher" read="true" write="true" create="false"/>
-         <role name="durpublisher" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=testQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="MessageCounterHistoryDayLimit">-1</attribute>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="noacc" read="false" write="false" create="false"/>
-      </security>
-    </attribute>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=A">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=B">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=C">
-	 <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=D">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=ex">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<!-- 
+   | This file defines the default Queues and Topics that JBossMQ
+   | ships with.  The default Queues and Topics are used by the 
+   | JBoss test suite and by the sample jms programs.
+   |
+   | You can add other destinations to this file, or you can create other
+   | *-service.xml files to contain your application's destinations.
+ -->
+
+<server>
+  <!-- Destination without a configured SecurityManager or without a 
+       a SecurityConf will default to role guest with read=true, write=true,
+       create=false.
+  -->
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=testTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="guest" read="true" write="true"/>
+        <role name="publisher" read="true" write="true" create="false"/>
+        <role name="durpublisher" read="true" write="true" create="true"/>
+      </security>
+    </attribute>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=securedTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="publisher" read="true" write="true" create="false"/>
+      </security>
+    </attribute>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=testDurableTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+       <security>
+         <role name="guest" read="true" write="true"/>
+         <role name="publisher" read="true" write="true" create="false"/>
+         <role name="durpublisher" read="true" write="true" create="true"/>
+      </security>
+    </attribute>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=testQueue">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="MessageCounterHistoryDayLimit">-1</attribute>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="guest" read="true" write="true"/>
+        <role name="publisher" read="true" write="true" create="false"/>
+        <role name="noacc" read="false" write="false" create="false"/>
+      </security>
+    </attribute>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=A">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=B">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=C">
+	 <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=D">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=ex">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+</server>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-jbossmq-destinations-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE server>
-
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=myMDBQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="noacc" read="false" write="false" create="false"/>
-      </security>
-    </attribute>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=myMDBTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="durpublisher" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-  <mbean code="org.jboss.naming.NamingAlias" 
-         name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
-     <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>
-     <attribute name="ToName">queue/myMDBQueue</attribute>
-  </mbean>
-  <mbean code="org.jboss.naming.NamingAlias" 
-         name="jboss.test:test=mdb,alias=anotherContext/TopicInADifferentContext">
-     <attribute name="FromName">anotherContext/TopicInADifferentContext</attribute>
-     <attribute name="ToName">topic/myMDBTopic</attribute>
-  </mbean>
-</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server>
+
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=myMDBQueue">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="guest" read="true" write="true"/>
+        <role name="publisher" read="true" write="true" create="false"/>
+        <role name="noacc" read="false" write="false" create="false"/>
+      </security>
+    </attribute>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=myMDBTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+    <attribute name="SecurityConf">
+      <security>
+        <role name="guest" read="true" write="true"/>
+        <role name="publisher" read="true" write="true" create="false"/>
+        <role name="durpublisher" read="true" write="true" create="true"/>
+      </security>
+    </attribute>
+  </mbean>
+  <mbean code="org.jboss.naming.NamingAlias" 
+         name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
+     <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>
+     <attribute name="ToName">queue/myMDBQueue</attribute>
+  </mbean>
+  <mbean code="org.jboss.naming.NamingAlias" 
+         name="jboss.test:test=mdb,alias=anotherContext/TopicInADifferentContext">
+     <attribute name="FromName">anotherContext/TopicInADifferentContext</attribute>
+     <attribute name="ToName">topic/myMDBTopic</attribute>
+  </mbean>
+</server>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/jboss-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/jboss-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/mdb/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE server>
-
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=myMDBQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="noacc" read="false" write="false" create="false"/>
-      </security>
-    </attribute>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=myMDBTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="durpublisher" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-  <mbean code="org.jboss.naming.NamingAlias" 
-         name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
-     <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>
-     <attribute name="ToName">queue/myMDBQueue</attribute>
-  </mbean>
-  <mbean code="org.jboss.naming.NamingAlias" 
-         name="jboss.test:test=mdb,alias=anotherContext/TopicInADifferentContext">
-     <attribute name="FromName">anotherContext/TopicInADifferentContext</attribute>
-     <attribute name="ToName">topic/myMDBTopic</attribute>
-  </mbean>
-</server>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
-         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/WebDDEntityManager"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dd/web/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
+         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/WebDDEntityManager"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/dd/web/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency)

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>EJB3 Ear test</display-name>
-
-   <module>
-      <ejb>ejbjar.jar</ejb>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>EJB3 Ear test</display-name>
+
+   <module>
+      <ejb>ejbjar.jar</ejb>
+   </module>
+</application>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app>
-   <module>
-      <service>mydatasource-ds.xml</service>
-   </module>
-</jboss-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+   <module>
+      <service>mydatasource-ds.xml</service>
+   </module>
+</jboss-app>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>HasXmlMBeanDependencyBean</ejb-name>
-         <depends>jboss.test:service=DependedOn</depends>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>HasXmlMBeanDependencyBean</ejb-name>
+         <depends>jboss.test:service=DependedOn</depends>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/MyDatasource</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/MyDatasource</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/another (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/another)

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/another/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.ejb3.test.dependency.AnotherDependedOn" name="jboss.test:service=AnotherDependedOn"/>
-</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/another/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.ejb3.test.dependency.AnotherDependedOn" name="jboss.test:service=AnotherDependedOn"/>
+</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/dependedon)

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/dependedon/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.ejb3.test.dependency.DependedOn" name="jboss.test:service=DependedOn"/>
-</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/dependedon/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.ejb3.test.dependency.DependedOn" name="jboss.test:service=DependedOn"/>
+</server>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/mydatasource-ds.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/mydatasource-ds.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/mydatasource-ds.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- The Hypersonic embedded database JCA connection factory config
-$Id$ -->
-
-
-<datasources>
-   <local-tx-datasource>
-      <jndi-name>MyDatasource</jndi-name>
-
-      <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}MyDatasourceDB</connection-url>
-
-      <!-- The driver class -->
-      <driver-class>org.hsqldb.jdbcDriver</driver-class>
-
-      <!-- The login and password -->
-      <user-name>sa</user-name>
-      <password></password>
-
-      <min-pool-size>5</min-pool-size>
-
-      <max-pool-size>20</max-pool-size>
-
-      <idle-timeout-minutes>0</idle-timeout-minutes>
-
-      <metadata>
-         <type-mapping>Hypersonic SQL</type-mapping>
-      </metadata>
-
-      <!-- This mbean can be used when using in process persistent hypersonic -->
-      <depends>jboss:service=Hypersonic,database=MyDatasourceDB</depends>
-   </local-tx-datasource>
-
-   <!-- This mbean can be used when using in process persistent db -->
-   <mbean code="org.jboss.jdbc.HypersonicDatabase" 
-     name="jboss:service=Hypersonic,database=MyDatasourceDB">
-     <attribute name="Database">MyDatasourceDB</attribute>
-     <attribute name="InProcessMode">true</attribute>
-   </mbean>
-</datasources>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/mydatasource-ds.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/mydatasource-ds.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/mydatasource-ds.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/mydatasource-ds.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- The Hypersonic embedded database JCA connection factory config
+$Id$ -->
+
+
+<datasources>
+   <local-tx-datasource>
+      <jndi-name>MyDatasource</jndi-name>
+
+      <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}MyDatasourceDB</connection-url>
+
+      <!-- The driver class -->
+      <driver-class>org.hsqldb.jdbcDriver</driver-class>
+
+      <!-- The login and password -->
+      <user-name>sa</user-name>
+      <password></password>
+
+      <min-pool-size>5</min-pool-size>
+
+      <max-pool-size>20</max-pool-size>
+
+      <idle-timeout-minutes>0</idle-timeout-minutes>
+
+      <metadata>
+         <type-mapping>Hypersonic SQL</type-mapping>
+      </metadata>
+
+      <!-- This mbean can be used when using in process persistent hypersonic -->
+      <depends>jboss:service=Hypersonic,database=MyDatasourceDB</depends>
+   </local-tx-datasource>
+
+   <!-- This mbean can be used when using in process persistent db -->
+   <mbean code="org.jboss.jdbc.HypersonicDatabase" 
+     name="jboss:service=Hypersonic,database=MyDatasourceDB">
+     <attribute name="Database">MyDatasourceDB</attribute>
+     <attribute name="InProcessMode">true</attribute>
+   </mbean>
+</datasources>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/session2 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/session2)

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/session2/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.ejb3.test.dependency.AnotherDependedOn" name="jboss.test:service=YetAnotherDependedOn"/>
-</server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.ejb3.test.dependency.AnotherDependedOn" name="jboss.test:service=YetAnotherDependedOn"/>
+</server>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-          <property name="jboss.depends.1" value="jboss.test:service=YetAnotherDependedOn"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependency/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+          <property name="jboss.depends.1" value="jboss.test:service=YetAnotherDependedOn"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependent (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependent)

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependent/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependent/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/dependent/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/dependent/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/ear (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear)

Copied: branches/Branch_4_2/ejb3/src/resources/test/ear/earlib (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/earlib)

Copied: branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/earlib/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="earlib">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/ear/earlib/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="earlib">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/ejbref)

Copied: branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/ejbref/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="ejbref">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <class>org.jboss.ejb3.test.ear.ReferencedEntity</class>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/ear/ejbref/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="ejbref">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <class>org.jboss.ejb3.test.ear.ReferencedEntity</class>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/ejbthree712 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ejbthree712)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ejbthree712/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,26 +0,0 @@
-<?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" 
-	metadata-complete="false" 
-	version="3.0" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
-	
-	<enterprise-beans>
-		<session>
-			<ejb-name>InjectionTesterBean</ejb-name>
-			<business-remote>org.jboss.ejb3.test.ejbthree712.InjectionTester</business-remote>
-			<ejb-class>org.jboss.ejb3.test.ejbthree712.InjectionTesterBean</ejb-class>
-			<session-type>Stateless</session-type>
-			<transaction-type>Container</transaction-type>
-			<resource-env-ref>
-				<resource-env-ref-name>ctx</resource-env-ref-name>
-				<resource-env-ref-type>javax.ejb.SessionContext</resource-env-ref-type>
-				<!--mapped-name>java:comp/EJBContext</mapped-name-->
-				<injection-target>
-					<injection-target-class>org.jboss.ejb3.test.ejbthree712.InjectionTesterBean</injection-target-class>
-					<injection-target-name>ctx</injection-target-name>
-				</injection-target>
-			</resource-env-ref>
-		</session>
-	</enterprise-beans>
-</ejb-jar>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ejbthree712/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/ejbthree712/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,26 @@
+<?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" 
+	metadata-complete="false" 
+	version="3.0" 
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+	
+	<enterprise-beans>
+		<session>
+			<ejb-name>InjectionTesterBean</ejb-name>
+			<business-remote>org.jboss.ejb3.test.ejbthree712.InjectionTester</business-remote>
+			<ejb-class>org.jboss.ejb3.test.ejbthree712.InjectionTesterBean</ejb-class>
+			<session-type>Stateless</session-type>
+			<transaction-type>Container</transaction-type>
+			<resource-env-ref>
+				<resource-env-ref-name>ctx</resource-env-ref-name>
+				<resource-env-ref-type>javax.ejb.SessionContext</resource-env-ref-type>
+				<!--mapped-name>java:comp/EJBContext</mapped-name-->
+				<injection-target>
+					<injection-target-class>org.jboss.ejb3.test.ejbthree712.InjectionTesterBean</injection-target-class>
+					<injection-target-name>ctx</injection-target-name>
+				</injection-target>
+			</resource-env-ref>
+		</session>
+	</enterprise-beans>
+</ejb-jar>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/ejbthree832 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ejbthree832)

Copied: branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ejbthree832/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb" transaction-type="JTA">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-          <property name="hibernate.cache.provider_class" value="org.hibernate.cache.OptimisticTreeCacheProvider"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/ejbthree832/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb" transaction-type="JTA">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+          <property name="hibernate.cache.provider_class" value="org.hibernate.cache.OptimisticTreeCacheProvider"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/entity (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entity)

Copied: branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entity/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entity/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entity/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/entity/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/entitycallback (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entitycallback)

Copied: branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entitycallback/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/entitycallback/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/entityexception (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entityexception)

Copied: branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entityexception/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entityexception/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/entityexception/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/entityexception/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/enventry (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/enventry)

Copied: branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/enventry/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-   <display-name>EnvEntry Tests</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>TestEnvEntry</ejb-name>
-         <env-entry>
-            <env-entry-name>maxExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>15</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <env-entry-name>minExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>5</env-entry-value>
-		    <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.enventry.TestEnvEntryBean</injection-target-class>
-               <injection-target-name>minExceptions</injection-target-name>
-            </injection-target>
-         </env-entry>
-         <env-entry>
-            <env-entry-name>org.jboss.ejb3.test.enventry.TestEnvEntryBean/numExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>10</env-entry-value>
-         </env-entry>
-      </session>
-      <session>
-         <ejb-name>ExtendedTestEnvEntry</ejb-name>
-         <env-entry>
-            <env-entry-name>maxExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>14</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <env-entry-name>minExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>6</env-entry-value>
-		    <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.enventry.ExtendedTestEnvEntryBean</injection-target-class>
-               <injection-target-name>minExceptions</injection-target-name>
-            </injection-target>
-         </env-entry>
-         <env-entry>
-            <env-entry-name>org.jboss.ejb3.test.enventry.ExtendedTestEnvEntryBean/numExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>11</env-entry-value>
-         </env-entry>
-      </session>
-      <message-driven>
-         <ejb-name>TestEnvEntryMD</ejb-name>
-         <env-entry>
-            <env-entry-name>maxExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>16</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <env-entry-name>minExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>7</env-entry-value>
-		    <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.enventry.TestEnvEntryMDBean</injection-target-class>
-               <injection-target-name>minExceptions</injection-target-name>
-            </injection-target>
-         </env-entry>
-         <env-entry>
-            <env-entry-name>org.jboss.ejb3.test.enventry.TestEnvEntryMDBean/numExceptions</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>12</env-entry-value>
-         </env-entry>
-      </message-driven>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
+<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">
+   <display-name>EnvEntry Tests</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>TestEnvEntry</ejb-name>
+         <env-entry>
+            <env-entry-name>maxExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>15</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <env-entry-name>minExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>5</env-entry-value>
+		    <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.enventry.TestEnvEntryBean</injection-target-class>
+               <injection-target-name>minExceptions</injection-target-name>
+            </injection-target>
+         </env-entry>
+         <env-entry>
+            <env-entry-name>org.jboss.ejb3.test.enventry.TestEnvEntryBean/numExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>10</env-entry-value>
+         </env-entry>
+      </session>
+      <session>
+         <ejb-name>ExtendedTestEnvEntry</ejb-name>
+         <env-entry>
+            <env-entry-name>maxExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>14</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <env-entry-name>minExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>6</env-entry-value>
+		    <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.enventry.ExtendedTestEnvEntryBean</injection-target-class>
+               <injection-target-name>minExceptions</injection-target-name>
+            </injection-target>
+         </env-entry>
+         <env-entry>
+            <env-entry-name>org.jboss.ejb3.test.enventry.ExtendedTestEnvEntryBean/numExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>11</env-entry-value>
+         </env-entry>
+      </session>
+      <message-driven>
+         <ejb-name>TestEnvEntryMD</ejb-name>
+         <env-entry>
+            <env-entry-name>maxExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>16</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <env-entry-name>minExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>7</env-entry-value>
+		    <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.enventry.TestEnvEntryMDBean</injection-target-class>
+               <injection-target-name>minExceptions</injection-target-name>
+            </injection-target>
+         </env-entry>
+         <env-entry>
+            <env-entry-name>org.jboss.ejb3.test.enventry.TestEnvEntryMDBean/numExceptions</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>12</env-entry-value>
+         </env-entry>
+      </message-driven>
+   </enterprise-beans>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/enventry/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app>
-   <loader-repository>
-      jboss.test:test=ejb3factory
-   </loader-repository>
-   <module>
-      <service>util.jar</service>
-   </module>
-</jboss-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factory/META-INF/jboss-app.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+   <loader-repository>
+      jboss.test:test=ejb3factory
+   </loader-repository>
+   <module>
+      <service>util.jar</service>
+   </module>
+</jboss-app>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factory/META-INF/jboss-app.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
-   <local-tx-datasource>
-
-      <jndi-name>MyDS</jndi-name>
-
-      <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}myDB</connection-url>
-
-      <!-- The driver class -->
-      <driver-class>org.hsqldb.jdbcDriver</driver-class>
-
-      <!-- The login and password -->
-      <user-name>sa</user-name>
-      <password></password>
-
-      <min-pool-size>5</min-pool-size>
-
-      <max-pool-size>20</max-pool-size>
-
-      <idle-timeout-minutes>0</idle-timeout-minutes>
-
-      <track-statements/>
-
-      <!--
-      <security-domain>HsqlDbRealm</security-domain>
-      -->
-      
-      <!-- This mbean can be used when using in process persistent hypersonic -->
-      <depends>jboss:service=Hypersonic,database=myDB</depends>
-   </local-tx-datasource>
-
-   <!-- This mbean can be used when using in process persistent db -->
-   <mbean code="org.jboss.jdbc.HypersonicDatabase"
-     name="jboss:service=Hypersonic,database=myDB">
-     <attribute name="Database">myDB</attribute>
-     <attribute name="InProcessMode">true</attribute>
-   </mbean>
-</datasources>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factory/myds-ds.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+   <local-tx-datasource>
+
+      <jndi-name>MyDS</jndi-name>
+
+      <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}myDB</connection-url>
+
+      <!-- The driver class -->
+      <driver-class>org.hsqldb.jdbcDriver</driver-class>
+
+      <!-- The login and password -->
+      <user-name>sa</user-name>
+      <password></password>
+
+      <min-pool-size>5</min-pool-size>
+
+      <max-pool-size>20</max-pool-size>
+
+      <idle-timeout-minutes>0</idle-timeout-minutes>
+
+      <track-statements/>
+
+      <!--
+      <security-domain>HsqlDbRealm</security-domain>
+      -->
+      
+      <!-- This mbean can be used when using in process persistent hypersonic -->
+      <depends>jboss:service=Hypersonic,database=myDB</depends>
+   </local-tx-datasource>
+
+   <!-- This mbean can be used when using in process persistent db -->
+   <mbean code="org.jboss.jdbc.HypersonicDatabase"
+     name="jboss:service=Hypersonic,database=myDB">
+     <attribute name="Database">myDB</attribute>
+     <attribute name="InProcessMode">true</attribute>
+   </mbean>
+</datasources>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factory/myds-ds.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager1">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <jar-file>../util.jar</jar-file>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager1Factory"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/Manager1"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager1">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jar-file>../util.jar</jar-file>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager1Factory"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/Manager1"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factory/session1/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager2">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <jar-file>../util.jar</jar-file>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager2Factory"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/Manager2"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager2">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jar-file>../util.jar</jar-file>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager2Factory"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/Manager2"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factory/session2/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml)

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>EJB3 Ear test</display-name>
-
-   <module>
-      <ejb>session1xml.jar</ejb>
-   </module>
-   <module>
-      <ejb>session2xml.jar</ejb>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>EJB3 Ear test</display-name>
+
+   <module>
+      <ejb>session1xml.jar</ejb>
+   </module>
+   <module>
+      <ejb>session2xml.jar</ejb>
+   </module>
+</application>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app>
-   <loader-repository>
-      jboss.test:test=ejb3factory
-   </loader-repository>
-   <module>
-      <service>utilxml.jar</service>
-   </module>
-</jboss-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+   <loader-repository>
+      jboss.test:test=ejb3factory
+   </loader-repository>
+   <module>
+      <service>utilxml.jar</service>
+   </module>
+</jboss-app>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/META-INF/jboss-app.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1)

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-<?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">
-   <enterprise-beans>
-      <session>
-         <ejb-name>Session1Bean</ejb-name>
-         <remote>org.jboss.ejb3.test.factoryxml.Session1</remote>
-         <ejb-class>org.jboss.ejb3.test.factoryxml.Session1Bean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <ejb-ref-name>session2</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.ejb3.test.factoryxml.Session2</remote>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session1Bean</injection-target-class>
-               <injection-target-name>session2</injection-target-name>
-            </injection-target>
-         </ejb-ref>
-         <persistence-context-ref>
-            <persistence-context-ref-name>manager1</persistence-context-ref-name>
-            <persistence-unit-name>manager1</persistence-unit-name>
-            <persistence-context-type>Transaction</persistence-context-type>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session1Bean</injection-target-class>
-               <injection-target-name>manager1</injection-target-name>
-            </injection-target>
-         </persistence-context-ref>
-         <persistence-context-ref>
-            <persistence-context-ref-name>manager2</persistence-context-ref-name>
-            <persistence-unit-name>../session2xml.jar#manager2</persistence-unit-name>
-            <persistence-context-type>Transaction</persistence-context-type>
-         </persistence-context-ref>
-         <persistence-unit-ref>
-            <persistence-unit-ref-name>factory1</persistence-unit-ref-name>
-            <persistence-unit-name>manager1</persistence-unit-name>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session1Bean</injection-target-class>
-               <injection-target-name>factory1</injection-target-name>
-            </injection-target>
-         </persistence-unit-ref>
-         <persistence-unit-ref>
-            <persistence-unit-ref-name>factory2</persistence-unit-ref-name>
-            <persistence-unit-name>../session2xml.jar#manager2</persistence-unit-name>
-         </persistence-unit-ref>
-      </session>
-      <session>
-         <ejb-name>Stateful1Bean</ejb-name>
-         <remote>org.jboss.ejb3.test.factoryxml.Stateful1</remote>
-         <ejb-class>org.jboss.ejb3.test.factoryxml.Stateful1Bean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-         <persistence-context-ref>
-            <persistence-context-ref-name>manager1</persistence-context-ref-name>
-            <persistence-unit-name>manager1</persistence-unit-name>
-            <persistence-context-type>Extended</persistence-context-type>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.factoryxml.Stateful1Bean</injection-target-class>
-               <injection-target-name>manager1</injection-target-name>
-            </injection-target>
-         </persistence-context-ref>
-         <persistence-context-ref>
-            <persistence-context-ref-name>manager2</persistence-context-ref-name>
-            <persistence-unit-name>../session2xml.jar#manager2</persistence-unit-name>
-            <persistence-context-type>Extended</persistence-context-type>
-         </persistence-context-ref>
-      </session>
-   </enterprise-beans>
-
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+<?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">
+   <enterprise-beans>
+      <session>
+         <ejb-name>Session1Bean</ejb-name>
+         <remote>org.jboss.ejb3.test.factoryxml.Session1</remote>
+         <ejb-class>org.jboss.ejb3.test.factoryxml.Session1Bean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <ejb-ref>
+            <ejb-ref-name>session2</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <remote>org.jboss.ejb3.test.factoryxml.Session2</remote>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session1Bean</injection-target-class>
+               <injection-target-name>session2</injection-target-name>
+            </injection-target>
+         </ejb-ref>
+         <persistence-context-ref>
+            <persistence-context-ref-name>manager1</persistence-context-ref-name>
+            <persistence-unit-name>manager1</persistence-unit-name>
+            <persistence-context-type>Transaction</persistence-context-type>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session1Bean</injection-target-class>
+               <injection-target-name>manager1</injection-target-name>
+            </injection-target>
+         </persistence-context-ref>
+         <persistence-context-ref>
+            <persistence-context-ref-name>manager2</persistence-context-ref-name>
+            <persistence-unit-name>../session2xml.jar#manager2</persistence-unit-name>
+            <persistence-context-type>Transaction</persistence-context-type>
+         </persistence-context-ref>
+         <persistence-unit-ref>
+            <persistence-unit-ref-name>factory1</persistence-unit-ref-name>
+            <persistence-unit-name>manager1</persistence-unit-name>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session1Bean</injection-target-class>
+               <injection-target-name>factory1</injection-target-name>
+            </injection-target>
+         </persistence-unit-ref>
+         <persistence-unit-ref>
+            <persistence-unit-ref-name>factory2</persistence-unit-ref-name>
+            <persistence-unit-name>../session2xml.jar#manager2</persistence-unit-name>
+         </persistence-unit-ref>
+      </session>
+      <session>
+         <ejb-name>Stateful1Bean</ejb-name>
+         <remote>org.jboss.ejb3.test.factoryxml.Stateful1</remote>
+         <ejb-class>org.jboss.ejb3.test.factoryxml.Stateful1Bean</ejb-class>
+         <session-type>Stateful</session-type>
+         <transaction-type>Container</transaction-type>
+         <persistence-context-ref>
+            <persistence-context-ref-name>manager1</persistence-context-ref-name>
+            <persistence-unit-name>manager1</persistence-unit-name>
+            <persistence-context-type>Extended</persistence-context-type>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.factoryxml.Stateful1Bean</injection-target-class>
+               <injection-target-name>manager1</injection-target-name>
+            </injection-target>
+         </persistence-context-ref>
+         <persistence-context-ref>
+            <persistence-context-ref-name>manager2</persistence-context-ref-name>
+            <persistence-unit-name>../session2xml.jar#manager2</persistence-unit-name>
+            <persistence-context-type>Extended</persistence-context-type>
+         </persistence-context-ref>
+      </session>
+   </enterprise-beans>
+
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss>
-   <enterprise-beans>
-   <session>
-      <ejb-name>Session1Bean</ejb-name>
-      <ejb-ref>
-         <ejb-ref-name>session2</ejb-ref-name>
-         <ignore-dependency/>
-      </ejb-ref>
-   </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss>
+   <enterprise-beans>
+   <session>
+      <ejb-name>Session1Bean</ejb-name>
+      <ejb-ref>
+         <ejb-ref-name>session2</ejb-ref-name>
+         <ignore-dependency/>
+      </ejb-ref>
+   </session>
+   </enterprise-beans>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager1">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <jar-file>../utilxml.jar</jar-file>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager1Factory"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/Manager1"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager1">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jar-file>../utilxml.jar</jar-file>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager1Factory"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/Manager1"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session1/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2)

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-<?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">
-   <enterprise-beans>
-      <session>
-         <ejb-name>Session2Bean</ejb-name>
-         <remote>org.jboss.ejb3.test.factoryxml.Session2</remote>
-         <ejb-class>org.jboss.ejb3.test.factoryxml.Session2Bean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-          <ejb-ref>
-            <ejb-ref-name>session1</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.ejb3.test.factoryxml.Session1</remote>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session2Bean</injection-target-class>
-               <injection-target-name>session1</injection-target-name>
-            </injection-target>
-         </ejb-ref>
-         <persistence-context-ref>
-            <persistence-context-ref-name>manager1</persistence-context-ref-name>
-            <persistence-unit-name>../session1xml.jar#manager1</persistence-unit-name>
-            <persistence-context-type>Transaction</persistence-context-type>
-         </persistence-context-ref>
-         <persistence-context-ref>
-            <persistence-context-ref-name>manager2</persistence-context-ref-name>
-            <persistence-unit-name>manager2</persistence-unit-name>
-            <persistence-context-type>Transaction</persistence-context-type>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session2Bean</injection-target-class>
-               <injection-target-name>manager2</injection-target-name>
-            </injection-target>
-         </persistence-context-ref>
-         <persistence-unit-ref>
-            <persistence-unit-ref-name>factory1</persistence-unit-ref-name>
-            <persistence-unit-name>../session1xml.jar#manager1</persistence-unit-name>
-         </persistence-unit-ref>
-         <persistence-unit-ref>
-            <persistence-unit-ref-name>factory2</persistence-unit-ref-name>
-            <persistence-unit-name>manager2</persistence-unit-name>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session2Bean</injection-target-class>
-               <injection-target-name>factory2</injection-target-name>
-            </injection-target>
-         </persistence-unit-ref>
-      </session>
-   </enterprise-beans>
-
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+<?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">
+   <enterprise-beans>
+      <session>
+         <ejb-name>Session2Bean</ejb-name>
+         <remote>org.jboss.ejb3.test.factoryxml.Session2</remote>
+         <ejb-class>org.jboss.ejb3.test.factoryxml.Session2Bean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+          <ejb-ref>
+            <ejb-ref-name>session1</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <remote>org.jboss.ejb3.test.factoryxml.Session1</remote>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session2Bean</injection-target-class>
+               <injection-target-name>session1</injection-target-name>
+            </injection-target>
+         </ejb-ref>
+         <persistence-context-ref>
+            <persistence-context-ref-name>manager1</persistence-context-ref-name>
+            <persistence-unit-name>../session1xml.jar#manager1</persistence-unit-name>
+            <persistence-context-type>Transaction</persistence-context-type>
+         </persistence-context-ref>
+         <persistence-context-ref>
+            <persistence-context-ref-name>manager2</persistence-context-ref-name>
+            <persistence-unit-name>manager2</persistence-unit-name>
+            <persistence-context-type>Transaction</persistence-context-type>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session2Bean</injection-target-class>
+               <injection-target-name>manager2</injection-target-name>
+            </injection-target>
+         </persistence-context-ref>
+         <persistence-unit-ref>
+            <persistence-unit-ref-name>factory1</persistence-unit-ref-name>
+            <persistence-unit-name>../session1xml.jar#manager1</persistence-unit-name>
+         </persistence-unit-ref>
+         <persistence-unit-ref>
+            <persistence-unit-ref-name>factory2</persistence-unit-ref-name>
+            <persistence-unit-name>manager2</persistence-unit-name>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.factoryxml.Session2Bean</injection-target-class>
+               <injection-target-name>factory2</injection-target-name>
+            </injection-target>
+         </persistence-unit-ref>
+      </session>
+   </enterprise-beans>
+
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss>
-   <enterprise-beans>
-   <session>
-      <ejb-name>Session2Bean</ejb-name>
-      <ejb-ref>
-         <ejb-ref-name>session1</ejb-ref-name>
-         <ignore-dependency/>
-      </ejb-ref>
-   </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss>
+   <enterprise-beans>
+   <session>
+      <ejb-name>Session2Bean</ejb-name>
+      <ejb-ref>
+         <ejb-ref-name>session1</ejb-ref-name>
+         <ignore-dependency/>
+      </ejb-ref>
+   </session>
+   </enterprise-beans>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager2">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <jar-file>../utilxml.jar</jar-file>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager2Factory"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/Manager2"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager2">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jar-file>../utilxml.jar</jar-file>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager2Factory"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/Manager2"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/factoryxml/session2/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/hbm/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/hbm/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/hbm/hbm2)

Copied: branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/hbm/hbm2/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="hbm2-test">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/hbm/hbm2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="hbm2-test">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/iiop (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/iiop)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/iiop/custom.jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/iiop/custom.jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/iiop/custom.jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/iiop/custom.jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/iiop/custom.jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/iiop/custom.jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/iiop/custom.jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/iiop/jndi.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/iiop/jndi.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/iiop/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,8 +0,0 @@
-java.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory
-java.naming.provider.url=corbaloc::localhost:3528/NameService
-#java.naming.provider.url=corbaloc::localhost:3528/JBoss/Naming/root
-java.naming.factory.object=org.jboss.tm.iiop.client.IIOPClientUserTransactionObjectFactory
-# use java: client namespace
-java.naming.factory.url.pkgs=org.jboss.ejb3.naming.client:org.jnp.interfaces
-# hack to get java: client namespace up
-j2ee.clientName=iiop-unit-test

Copied: branches/Branch_4_2/ejb3/src/resources/test/iiop/jndi.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/iiop/jndi.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/iiop/jndi.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/iiop/jndi.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,8 @@
+java.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory
+java.naming.provider.url=corbaloc::localhost:3528/NameService
+#java.naming.provider.url=corbaloc::localhost:3528/JBoss/Naming/root
+java.naming.factory.object=org.jboss.tm.iiop.client.IIOPClientUserTransactionObjectFactory
+# use java: client namespace
+java.naming.factory.url.pkgs=org.jboss.ejb3.naming.client:org.jnp.interfaces
+# hack to get java: client namespace up
+j2ee.clientName=iiop-unit-test

Copied: branches/Branch_4_2/ejb3/src/resources/test/initial (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/initial)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/initial/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/initial/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/initial/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-rolefail=willfail
-somebody=allowed

Copied: branches/Branch_4_2/ejb3/src/resources/test/initial/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/initial/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/initial/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/initial/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+rolefail=willfail
+somebody=allowed

Deleted: branches/Branch_4_2/ejb3/src/resources/test/initial/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/initial/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/initial/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-somebody=password
-rolefail=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/initial/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/initial/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/initial/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/initial/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+somebody=password
+rolefail=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors)

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-<?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">
-   <display-name>InterceptorsTest</display-name>
-   <interceptors>
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</interceptor-class>
-         <around-invoke>
-            <method-name>intercept</method-name>
-         </around-invoke>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Session2</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.ejb3.test.interceptors.MySession2</remote>
-            <ejb-link>MySession2Bean</ejb-link>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
-               <injection-target-name>session2</injection-target-name>
-            </injection-target>
-         </ejb-ref>
-         <ejb-local-ref>
-            <ejb-ref-name>ejb/Session2Method</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local>org.jboss.ejb3.test.interceptors.MySession2Local</local>
-            <ejb-link>MySession2Bean</ejb-link>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
-               <injection-target-name>setSession2Method</injection-target-name>
-            </injection-target>
-         </ejb-local-ref>
-         <resource-ref>
-            <res-ref-name>ds</res-ref-name>
-            <res-type>javax.sql.DataSource</res-type>
-            <res-auth>Container</res-auth>
-            <res-sharing-scope>Shareable</res-sharing-scope>
-            <mapped-name>java:/DefaultDS</mapped-name>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
-               <injection-target-name>ds</injection-target-name>
-            </injection-target>
-         </resource-ref>
-         <resource-ref>
-            <res-ref-name>dsMethod</res-ref-name>
-            <res-type>javax.sql.DataSource</res-type>
-            <res-auth>Container</res-auth>
-            <res-sharing-scope>Shareable</res-sharing-scope>
-            <mapped-name>java:/DefaultDS</mapped-name>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
-               <injection-target-name>setDsMethod</injection-target-name>
-            </injection-target>
-         </resource-ref>
-      </interceptor>   
-   </interceptors>
-   <assembly-descriptor>
-      <interceptor-binding>
-         <ejb-name>MySessionBean</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</interceptor-class>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>org.jboss.ejb3.test.interceptors.MySessionBean</ejb-name>
-            <interceptor-order>
-		         <interceptor-class>org.jboss.ejb3.test.interceptors.MyInterceptor</interceptor-class>
-		         <interceptor-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</interceptor-class>
-            </interceptor-order>
-      </interceptor-binding>
-   </assembly-descriptor>
-</ejb-jar>      

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+<?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">
+   <display-name>InterceptorsTest</display-name>
+   <interceptors>
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</interceptor-class>
+         <around-invoke>
+            <method-name>intercept</method-name>
+         </around-invoke>
+         <ejb-ref>
+            <ejb-ref-name>ejb/Session2</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <remote>org.jboss.ejb3.test.interceptors.MySession2</remote>
+            <ejb-link>MySession2Bean</ejb-link>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
+               <injection-target-name>session2</injection-target-name>
+            </injection-target>
+         </ejb-ref>
+         <ejb-local-ref>
+            <ejb-ref-name>ejb/Session2Method</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <local>org.jboss.ejb3.test.interceptors.MySession2Local</local>
+            <ejb-link>MySession2Bean</ejb-link>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
+               <injection-target-name>setSession2Method</injection-target-name>
+            </injection-target>
+         </ejb-local-ref>
+         <resource-ref>
+            <res-ref-name>ds</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+            <res-sharing-scope>Shareable</res-sharing-scope>
+            <mapped-name>java:/DefaultDS</mapped-name>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
+               <injection-target-name>ds</injection-target-name>
+            </injection-target>
+         </resource-ref>
+         <resource-ref>
+            <res-ref-name>dsMethod</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+            <res-sharing-scope>Shareable</res-sharing-scope>
+            <mapped-name>java:/DefaultDS</mapped-name>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</injection-target-class>
+               <injection-target-name>setDsMethod</injection-target-name>
+            </injection-target>
+         </resource-ref>
+      </interceptor>   
+   </interceptors>
+   <assembly-descriptor>
+      <interceptor-binding>
+         <ejb-name>MySessionBean</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</interceptor-class>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>org.jboss.ejb3.test.interceptors.MySessionBean</ejb-name>
+            <interceptor-order>
+		         <interceptor-class>org.jboss.ejb3.test.interceptors.MyInterceptor</interceptor-class>
+		         <interceptor-class>org.jboss.ejb3.test.interceptors.XMLInterceptor</interceptor-class>
+            </interceptor-order>
+      </interceptor-binding>
+   </assembly-descriptor>
+</ejb-jar>      


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="interceptors-test">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="interceptors-test">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/interceptors/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors2 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2)

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,304 +0,0 @@
-<?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">
-   <display-name>InterceptorsTest</display-name>
-   <enterprise-beans>
-       <session>
-          <ejb-name>XMLOnlySLSB</ejb-name>
-          <remote>org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote</remote>
-          <ejb-class>org.jboss.ejb3.test.interceptors2.XMLOnlySLSB</ejb-class>
-           <session-type>Stateless</session-type>
-           <transaction-type>Container</transaction-type>
-           <around-invoke>
-	           <method-name>intercept</method-name>
-           </around-invoke>
-	       <post-construct>
-	           <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
-	       </post-construct>
-	       <pre-destroy>
-	           <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
-	       </pre-destroy>
-       </session>
-   </enterprise-beans>
-   <interceptors>
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
-         <around-invoke>
-            <method-name>intercept</method-name>
-         </around-invoke>
-         <post-construct>
-            <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
-         </post-construct>
-         <pre-destroy>
-            <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
-         </pre-destroy>
-         <post-activate>
-            <lifecycle-callback-method>postActivate</lifecycle-callback-method>
-         </post-activate>
-         <pre-passivate>
-            <lifecycle-callback-method>prePassivate</lifecycle-callback-method>
-         </pre-passivate>
-      </interceptor>   
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor</interceptor-class>
-         <around-invoke>
-            <method-name>intercept</method-name>
-         </around-invoke>
-         <post-construct>
-            <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
-         </post-construct>
-         <pre-destroy>
-            <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
-         </pre-destroy>
-         <post-activate>
-            <lifecycle-callback-method>postActivate</lifecycle-callback-method>
-         </post-activate>
-         <pre-passivate>
-            <lifecycle-callback-method>prePassivate</lifecycle-callback-method>
-         </pre-passivate>
-      </interceptor>   
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor2</interceptor-class>
-         <around-invoke>
-            <method-name>intercept2</method-name>
-         </around-invoke>
-         <post-construct>
-            <lifecycle-callback-method>postConstruct2</lifecycle-callback-method>
-         </post-construct>
-         <pre-destroy>
-            <lifecycle-callback-method>preDestroy2</lifecycle-callback-method>
-         </pre-destroy>
-         <post-activate>
-            <lifecycle-callback-method>postActivate2</lifecycle-callback-method>
-         </post-activate>
-         <pre-passivate>
-            <lifecycle-callback-method>prePassivate2</lifecycle-callback-method>
-         </pre-passivate> 
-      </interceptor>   
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
-         <around-invoke>
-            <method-name>intercept3</method-name>
-         </around-invoke>
-         <post-construct>
-            <lifecycle-callback-method>postConstruct3</lifecycle-callback-method>
-         </post-construct>
-         <pre-destroy>
-            <lifecycle-callback-method>preDestroy3</lifecycle-callback-method>
-         </pre-destroy>
-         <post-activate>
-            <lifecycle-callback-method>postActivate3</lifecycle-callback-method>
-         </post-activate>
-         <pre-passivate>
-            <lifecycle-callback-method>prePassivate3</lifecycle-callback-method>
-         </pre-passivate>
-      </interceptor>   
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         <around-invoke>
-            <method-name>intercept</method-name>
-         </around-invoke>
-         <post-construct>
-            <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
-         </post-construct>
-         <pre-destroy>
-            <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
-         </pre-destroy>
-         <post-activate>
-            <lifecycle-callback-method>postActivate</lifecycle-callback-method>
-         </post-activate>
-         <pre-passivate>
-            <lifecycle-callback-method>prePassivate</lifecycle-callback-method>
-         </pre-passivate>
-      </interceptor>   
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedClassInterceptor</interceptor-class>
-         <around-invoke>
-            <method-name>intercept</method-name>
-         </around-invoke>
-      </interceptor>   
-      <interceptor>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
-         <around-invoke>
-            <method-name>intercept</method-name>
-         </around-invoke>
-      </interceptor>   
-   </interceptors>
-   <assembly-descriptor>
-      <container-transaction>
-         <method>
-            <ejb-name>XMLOnlySLSB</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <trans-attribute>Required</trans-attribute>
-      </container-transaction>
-      <interceptor-binding>
-         <ejb-name>*</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>XMLOnlySLSB</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor2</interceptor-class>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>XMLOnlySLSB</ejb-name>
-         <exclude-default-interceptors>true</exclude-default-interceptors>
-         <method>
-			<method-name>overloadedMethod</method-name>
-         	<method-params>
-	          <method-param>long</method-param>
-            </method-params>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>XMLOnlySLSB</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         <method>
-           <method-name>overloadedMethod</method-name>
-           <method-params>
-	         <method-param>long</method-param>
-	         <method-param>java.lang.String[][]</method-param>
-           </method-params>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>XMLOnlySLSB</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         <exclude-class-interceptors>true</exclude-class-interceptors>
-         <method>
-           <method-name>overloadedMethod</method-name>
-           <method-params>
-	         <method-param>int</method-param>
-           </method-params>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>XMLOnlySLSB</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         <exclude-default-interceptors>true</exclude-default-interceptors>
-         <exclude-class-interceptors>true</exclude-class-interceptors>
-         <method>
-           <method-name>overloadedMethod</method-name>
-           <method-params>
-           </method-params>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>MixedConfigSFSB</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor</interceptor-class>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor</interceptor-class>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>MixedConfigSFSB</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
-         <method>
-           <method-name>testWithMethodLevel</method-name>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>MixedConfigSFSB</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
-         <method>
-           <method-name>testWithMethodLevelB</method-name>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>OrderedSLSB</ejb-name>
-         <interceptor-order>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
-         </interceptor-order>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>OrderedSLSB</ejb-name>
-         <interceptor-order>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
-         </interceptor-order>
-         <method>
-           <method-name>methodWithOwn</method-name>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>OrderedSLSB</ejb-name>
-         <interceptor-order>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         </interceptor-order>
-         <method>
-           <method-name>overLoadedMethod</method-name>
-           <method-params>
-	         <method-param>java.lang.String</method-param>
-           </method-params>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>OrderedSLSB</ejb-name>
-         <interceptor-order>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
-         </interceptor-order>
-         <method>
-           <method-name>overLoadedMethod</method-name>
-           <method-params>
-           </method-params>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>OrderedSLSB</ejb-name>
-         <interceptor-order>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
-         </interceptor-order>
-         <method>
-           <method-name>overLoadedMethod</method-name>
-           <method-params>
-	         <method-param>long</method-param>
-           </method-params>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>OrderedSLSB</ejb-name>
-         <interceptor-order>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
-	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
-         </interceptor-order>
-         <method>
-           <method-name>methodNotSpecifyingAll</method-name>
-         </method>
-      </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>MixedService</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
-         <exclude-class-interceptors>true</exclude-class-interceptors>
-         <method>
-           <method-name>remoteMethod</method-name>
-         </method>
-     </interceptor-binding>
-      <interceptor-binding>
-         <ejb-name>MixedConsumer</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
-         <exclude-default-interceptors>true</exclude-default-interceptors>
-         <exclude-class-interceptors>true</exclude-class-interceptors>
-         <method>
-           <method-name>methodWithOwnOnly</method-name>
-         </method>
-     </interceptor-binding>
-   </assembly-descriptor>
-</ejb-jar>      

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,304 @@
+<?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">
+   <display-name>InterceptorsTest</display-name>
+   <enterprise-beans>
+       <session>
+          <ejb-name>XMLOnlySLSB</ejb-name>
+          <remote>org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote</remote>
+          <ejb-class>org.jboss.ejb3.test.interceptors2.XMLOnlySLSB</ejb-class>
+           <session-type>Stateless</session-type>
+           <transaction-type>Container</transaction-type>
+           <around-invoke>
+	           <method-name>intercept</method-name>
+           </around-invoke>
+	       <post-construct>
+	           <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+	       </post-construct>
+	       <pre-destroy>
+	           <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+	       </pre-destroy>
+       </session>
+   </enterprise-beans>
+   <interceptors>
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
+         <around-invoke>
+            <method-name>intercept</method-name>
+         </around-invoke>
+         <post-construct>
+            <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+         </post-construct>
+         <pre-destroy>
+            <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+         </pre-destroy>
+         <post-activate>
+            <lifecycle-callback-method>postActivate</lifecycle-callback-method>
+         </post-activate>
+         <pre-passivate>
+            <lifecycle-callback-method>prePassivate</lifecycle-callback-method>
+         </pre-passivate>
+      </interceptor>   
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor</interceptor-class>
+         <around-invoke>
+            <method-name>intercept</method-name>
+         </around-invoke>
+         <post-construct>
+            <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+         </post-construct>
+         <pre-destroy>
+            <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+         </pre-destroy>
+         <post-activate>
+            <lifecycle-callback-method>postActivate</lifecycle-callback-method>
+         </post-activate>
+         <pre-passivate>
+            <lifecycle-callback-method>prePassivate</lifecycle-callback-method>
+         </pre-passivate>
+      </interceptor>   
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor2</interceptor-class>
+         <around-invoke>
+            <method-name>intercept2</method-name>
+         </around-invoke>
+         <post-construct>
+            <lifecycle-callback-method>postConstruct2</lifecycle-callback-method>
+         </post-construct>
+         <pre-destroy>
+            <lifecycle-callback-method>preDestroy2</lifecycle-callback-method>
+         </pre-destroy>
+         <post-activate>
+            <lifecycle-callback-method>postActivate2</lifecycle-callback-method>
+         </post-activate>
+         <pre-passivate>
+            <lifecycle-callback-method>prePassivate2</lifecycle-callback-method>
+         </pre-passivate> 
+      </interceptor>   
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
+         <around-invoke>
+            <method-name>intercept3</method-name>
+         </around-invoke>
+         <post-construct>
+            <lifecycle-callback-method>postConstruct3</lifecycle-callback-method>
+         </post-construct>
+         <pre-destroy>
+            <lifecycle-callback-method>preDestroy3</lifecycle-callback-method>
+         </pre-destroy>
+         <post-activate>
+            <lifecycle-callback-method>postActivate3</lifecycle-callback-method>
+         </post-activate>
+         <pre-passivate>
+            <lifecycle-callback-method>prePassivate3</lifecycle-callback-method>
+         </pre-passivate>
+      </interceptor>   
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         <around-invoke>
+            <method-name>intercept</method-name>
+         </around-invoke>
+         <post-construct>
+            <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+         </post-construct>
+         <pre-destroy>
+            <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+         </pre-destroy>
+         <post-activate>
+            <lifecycle-callback-method>postActivate</lifecycle-callback-method>
+         </post-activate>
+         <pre-passivate>
+            <lifecycle-callback-method>prePassivate</lifecycle-callback-method>
+         </pre-passivate>
+      </interceptor>   
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedClassInterceptor</interceptor-class>
+         <around-invoke>
+            <method-name>intercept</method-name>
+         </around-invoke>
+      </interceptor>   
+      <interceptor>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
+         <around-invoke>
+            <method-name>intercept</method-name>
+         </around-invoke>
+      </interceptor>   
+   </interceptors>
+   <assembly-descriptor>
+      <container-transaction>
+         <method>
+            <ejb-name>XMLOnlySLSB</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+      <interceptor-binding>
+         <ejb-name>*</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>XMLOnlySLSB</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor2</interceptor-class>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>XMLOnlySLSB</ejb-name>
+         <exclude-default-interceptors>true</exclude-default-interceptors>
+         <method>
+			<method-name>overloadedMethod</method-name>
+         	<method-params>
+	          <method-param>long</method-param>
+            </method-params>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>XMLOnlySLSB</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         <method>
+           <method-name>overloadedMethod</method-name>
+           <method-params>
+	         <method-param>long</method-param>
+	         <method-param>java.lang.String[][]</method-param>
+           </method-params>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>XMLOnlySLSB</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         <exclude-class-interceptors>true</exclude-class-interceptors>
+         <method>
+           <method-name>overloadedMethod</method-name>
+           <method-params>
+	         <method-param>int</method-param>
+           </method-params>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>XMLOnlySLSB</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         <exclude-default-interceptors>true</exclude-default-interceptors>
+         <exclude-class-interceptors>true</exclude-class-interceptors>
+         <method>
+           <method-name>overloadedMethod</method-name>
+           <method-params>
+           </method-params>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>MixedConfigSFSB</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor</interceptor-class>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor</interceptor-class>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>MixedConfigSFSB</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
+         <method>
+           <method-name>testWithMethodLevel</method-name>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>MixedConfigSFSB</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
+         <method>
+           <method-name>testWithMethodLevelB</method-name>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>OrderedSLSB</ejb-name>
+         <interceptor-order>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
+         </interceptor-order>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>OrderedSLSB</ejb-name>
+         <interceptor-order>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
+         </interceptor-order>
+         <method>
+           <method-name>methodWithOwn</method-name>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>OrderedSLSB</ejb-name>
+         <interceptor-order>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         </interceptor-order>
+         <method>
+           <method-name>overLoadedMethod</method-name>
+           <method-params>
+	         <method-param>java.lang.String</method-param>
+           </method-params>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>OrderedSLSB</ejb-name>
+         <interceptor-order>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
+         </interceptor-order>
+         <method>
+           <method-name>overLoadedMethod</method-name>
+           <method-params>
+           </method-params>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>OrderedSLSB</ejb-name>
+         <interceptor-order>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.DefaultInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor</interceptor-class>
+         </interceptor-order>
+         <method>
+           <method-name>overLoadedMethod</method-name>
+           <method-params>
+	         <method-param>long</method-param>
+           </method-params>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>OrderedSLSB</ejb-name>
+         <interceptor-order>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3</interceptor-class>
+	         <interceptor-class>org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor</interceptor-class>
+         </interceptor-order>
+         <method>
+           <method-name>methodNotSpecifyingAll</method-name>
+         </method>
+      </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>MixedService</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
+         <exclude-class-interceptors>true</exclude-class-interceptors>
+         <method>
+           <method-name>remoteMethod</method-name>
+         </method>
+     </interceptor-binding>
+      <interceptor-binding>
+         <ejb-name>MixedConsumer</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor</interceptor-class>
+         <exclude-default-interceptors>true</exclude-default-interceptors>
+         <exclude-class-interceptors>true</exclude-class-interceptors>
+         <method>
+           <method-name>methodWithOwnOnly</method-name>
+         </method>
+     </interceptor-binding>
+   </assembly-descriptor>
+</ejb-jar>      


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-        <session>
-            <ejb-name>XMLOnlySLSB</ejb-name>
-            <jndi-name>org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote</jndi-name>
-        </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+        <session>
+            <ejb-name>XMLOnlySLSB</ejb-name>
+            <jndi-name>org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote</jndi-name>
+        </session>
+   </enterprise-beans>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=mixedqueue">
-      <attribute name="JNDIName">queue/mixedqueue</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=defaultonlyqueue">
-      <attribute name="JNDIName">queue/defaultonlyqueue</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=mixedqueue">
+      <attribute name="JNDIName">queue/mixedqueue</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=defaultonlyqueue">
+      <attribute name="JNDIName">queue/defaultonlyqueue</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+</server>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors3 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors3)

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors3/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-<?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" metadata-complete="false" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
-    <enterprise-beans>
-        <session>
-            <ejb-name>AssemblyBean</ejb-name>
-            <!--business-local>com.sun.ts.tests.ejb30.assembly.common.AssemblyLocalIF</business-local-->
-            <business-remote>org.jboss.ejb3.test.interceptors3.AssemblyRemoteIF</business-remote>
-            <ejb-class>org.jboss.ejb3.test.interceptors3.AssemblyBean</ejb-class>
-            <session-type>Stateless</session-type>
-            <transaction-type>Container</transaction-type>
-            <security-identity>
-                <use-caller-identity/>
-            </security-identity>
-        </session>
-    </enterprise-beans>
-    <interceptors>
-        <interceptor>
-            <interceptor-class>org.jboss.ejb3.test.interceptors3.AssemblyInterceptor</interceptor-class>
-            <!-- already annotated in class
-            <around-invoke>
-                <method-name>intercept</method-name>
-            </around-invoke>
-            <post-construct>
-                <lifecycle-callback-method>myCreate</lifecycle-callback-method>
-            </post-construct>
-            <pre-destroy>
-                <lifecycle-callback-method>myRemove</lifecycle-callback-method>
-            </pre-destroy>
-            -->
-        </interceptor>
-    </interceptors>
-
-    <assembly-descriptor>
-        <interceptor-binding>
-            <ejb-name>AssemblyBean</ejb-name>
-            <interceptor-order>
-                <interceptor-class>org.jboss.ejb3.test.interceptors3.AssemblyInterceptor</interceptor-class>
-            </interceptor-order>
-        </interceptor-binding>
-    </assembly-descriptor>
-
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/interceptors3/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+<?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" metadata-complete="false" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+    <enterprise-beans>
+        <session>
+            <ejb-name>AssemblyBean</ejb-name>
+            <!--business-local>com.sun.ts.tests.ejb30.assembly.common.AssemblyLocalIF</business-local-->
+            <business-remote>org.jboss.ejb3.test.interceptors3.AssemblyRemoteIF</business-remote>
+            <ejb-class>org.jboss.ejb3.test.interceptors3.AssemblyBean</ejb-class>
+            <session-type>Stateless</session-type>
+            <transaction-type>Container</transaction-type>
+            <security-identity>
+                <use-caller-identity/>
+            </security-identity>
+        </session>
+    </enterprise-beans>
+    <interceptors>
+        <interceptor>
+            <interceptor-class>org.jboss.ejb3.test.interceptors3.AssemblyInterceptor</interceptor-class>
+            <!-- already annotated in class
+            <around-invoke>
+                <method-name>intercept</method-name>
+            </around-invoke>
+            <post-construct>
+                <lifecycle-callback-method>myCreate</lifecycle-callback-method>
+            </post-construct>
+            <pre-destroy>
+                <lifecycle-callback-method>myRemove</lifecycle-callback-method>
+            </pre-destroy>
+            -->
+        </interceptor>
+    </interceptors>
+
+    <assembly-descriptor>
+        <interceptor-binding>
+            <ejb-name>AssemblyBean</ejb-name>
+            <interceptor-order>
+                <interceptor-class>org.jboss.ejb3.test.interceptors3.AssemblyInterceptor</interceptor-class>
+            </interceptor-order>
+        </interceptor-binding>
+    </assembly-descriptor>
+
+</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jacc (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jacc)

Copied: branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jacc/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jacc/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.AllEntity" value="insert,update,delete,read"/>
-         <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.StarEntity" value="*"/>
-         <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.SomeEntity" value="insert,delete"/>
-
-         <property name="hibernate.jacc.enabled" value="true"/>
-      </properties>
-   </persistence-unit>
-</persistence>
-
-
-
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jacc/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jacc/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.AllEntity" value="insert,update,delete,read"/>
+         <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.StarEntity" value="*"/>
+         <property name="hibernate.jacc.allowed.org.jboss.ejb3.test.jacc.SomeEntity" value="insert,delete"/>
+
+         <property name="hibernate.jacc.enabled" value="true"/>
+      </properties>
+   </persistence-unit>
+</persistence>
+
+
+
+

Copied: branches/Branch_4_2/ejb3/src/resources/test/jaxws (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jaxws)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jaxws/TestService.wsdl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jaxws/TestService.wsdl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jaxws/TestService.wsdl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxws/context" xmlns:tns="http://org.jboss.ws/jaxws/context" 
-  xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <types/>
-  <message name="EndpointInterface_echo">
-    <part name="String_1" type="xsd:string"/>
-  </message>
-  <message name="EndpointInterface_echoResponse">
-    <part name="result" type="xsd:string"/>
-  </message>
-  <portType name="EndpointInterface">
-    <operation name="echo" parameterOrder="String_1">
-      <input message="tns:EndpointInterface_echo"/>
-      <output message="tns:EndpointInterface_echoResponse"/>
-    </operation>
-  </portType>
-  <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-    <operation name="echo">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal" namespace="http://org.jboss.ws/jaxws/context"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="http://org.jboss.ws/jaxws/context"/>
-      </output>
-    </operation>
-  </binding>
-  <service name="TestService">
-    <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
-    <!--
-      <soap:address location="http://@jbosstest.host.name@:8080/jaxws-context"/>
-    -->
-      <soap:address location="http://localhost:8080/jaxws-context"/>
-    </port>
-  </service>
-</definitions>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jaxws/TestService.wsdl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jaxws/TestService.wsdl)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jaxws/TestService.wsdl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jaxws/TestService.wsdl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxws/context" xmlns:tns="http://org.jboss.ws/jaxws/context" 
+  xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <types/>
+  <message name="EndpointInterface_echo">
+    <part name="String_1" type="xsd:string"/>
+  </message>
+  <message name="EndpointInterface_echoResponse">
+    <part name="result" type="xsd:string"/>
+  </message>
+  <portType name="EndpointInterface">
+    <operation name="echo" parameterOrder="String_1">
+      <input message="tns:EndpointInterface_echo"/>
+      <output message="tns:EndpointInterface_echoResponse"/>
+    </operation>
+  </portType>
+  <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="echo">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal" namespace="http://org.jboss.ws/jaxws/context"/>
+      </input>
+      <output>
+        <soap:body use="literal" namespace="http://org.jboss.ws/jaxws/context"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="TestService">
+    <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
+    <!--
+      <soap:address location="http://@jbosstest.host.name@:8080/jaxws-context"/>
+    -->
+      <soap:address location="http://localhost:8080/jaxws-context"/>
+    </port>
+  </service>
+</definitions>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jca (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca)

Copied: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow)

Copied: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-<?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">
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>TestMDB</ejb-name>
-         <ejb-class>org.jboss.ejb3.test.jca.inflowmdb.DeploymentDescriptorTestMDBMessageListener</ejb-class>
-         <messaging-type>org.jboss.ejb3.test.jca.inflow.TestMessageListener</messaging-type>
-         <transaction-type>Container</transaction-type>
-         <activation-config>
-            <activation-config-property>
-               <activation-config-property-name>name</activation-config-property-name>
-               <activation-config-property-value>testInflow</activation-config-property-value>
-            </activation-config-property>
-            <!-- Other non-String properties to test the ActivationSpec java bean -->
-            <activation-config-property>
-               <activation-config-property-name>anInt</activation-config-property-name>
-               <activation-config-property-value>5</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property>
-               <activation-config-property-name>anInteger</activation-config-property-name>
-               <activation-config-property-value>55</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property>
-               <activation-config-property-name>localhost</activation-config-property-name>
-               <activation-config-property-value>127.0.0.1</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property>
-               <activation-config-property-name>props</activation-config-property-name>
-               <activation-config-property-value>
-                  key1=value1
-                  key2=value2
-                  key3=value3
-               </activation-config-property-value>
-            </activation-config-property>
-        </activation-config>
-      </message-driven>
-   </enterprise-beans>
-   <assembly-descriptor>
-      <container-transaction>
-         <method>
-            <ejb-name>TestMDB</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <trans-attribute>Required</trans-attribute>
-      </container-transaction>
-   </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+<?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">
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>TestMDB</ejb-name>
+         <ejb-class>org.jboss.ejb3.test.jca.inflowmdb.DeploymentDescriptorTestMDBMessageListener</ejb-class>
+         <messaging-type>org.jboss.ejb3.test.jca.inflow.TestMessageListener</messaging-type>
+         <transaction-type>Container</transaction-type>
+         <activation-config>
+            <activation-config-property>
+               <activation-config-property-name>name</activation-config-property-name>
+               <activation-config-property-value>testInflow</activation-config-property-value>
+            </activation-config-property>
+            <!-- Other non-String properties to test the ActivationSpec java bean -->
+            <activation-config-property>
+               <activation-config-property-name>anInt</activation-config-property-name>
+               <activation-config-property-value>5</activation-config-property-value>
+            </activation-config-property>
+            <activation-config-property>
+               <activation-config-property-name>anInteger</activation-config-property-name>
+               <activation-config-property-value>55</activation-config-property-value>
+            </activation-config-property>
+            <activation-config-property>
+               <activation-config-property-name>localhost</activation-config-property-name>
+               <activation-config-property-value>127.0.0.1</activation-config-property-value>
+            </activation-config-property>
+            <activation-config-property>
+               <activation-config-property-name>props</activation-config-property-name>
+               <activation-config-property-value>
+                  key1=value1
+                  key2=value2
+                  key3=value3
+               </activation-config-property-value>
+            </activation-config-property>
+        </activation-config>
+      </message-driven>
+   </enterprise-beans>
+   <assembly-descriptor>
+      <container-transaction>
+         <method>
+            <ejb-name>TestMDB</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+   </assembly-descriptor>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>TestMDB</ejb-name>
-         <resource-adapter-name>jcainflow.rar</resource-adapter-name>
-      </message-driven>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>TestMDB</ejb-name>
+         <resource-adapter-name>jcainflow.rar</resource-adapter-name>
+      </message-driven>
+   </enterprise-beans>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector 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/connector_1_5.xsd"
-           version="1.5">
-
-   <description>Test Resource Adapter for new jca 1.5 features</description>
-   <display-name>Inflow Test Resource Adapter</display-name>
-   <vendor-name>JBoss, Inc</vendor-name>
-   <eis-type>JBoss Testsuite</eis-type>
-   <resourceadapter-version>4.0</resourceadapter-version>
-
-   <license>
-      <description>
-      COPYRIGHT AND PERMISSION NOTICE
-      Copyright (c) 2004 JBoss, Inc
-      This is released under the terms of the LGPL.
-      See gnu.org for details.
-      </description>
-      <license-required>true</license-required>
-   </license>
-
-   <resourceadapter>
-      <resourceadapter-class>org.jboss.ejb3.test.jca.inflow.TestResourceAdapter</resourceadapter-class>
-
-      <inbound-resourceadapter>
-         <messageadapter>        
-            <messagelistener>
-               <messagelistener-type>org.jboss.ejb3.test.jca.inflow.TestMessageListener</messagelistener-type>
-               <activationspec>
-                  <activationspec-class>org.jboss.ejb3.test.jca.inflow.TestActivationSpec</activationspec-class>
-                  <required-config-property>
-                     <config-property-name>name</config-property-name>
-                  </required-config-property>
-                  <required-config-property>
-                     <description>An int between 1-10</description>
-                     <config-property-name>anInt</config-property-name>
-                  </required-config-property>
-                  <required-config-property>
-                     <description>An Integer between 50-100</description>
-                     <config-property-name>anInteger</config-property-name>
-                  </required-config-property>
-                  <required-config-property>
-                     <description>The 127.0.0.1 address</description>
-                     <config-property-name>localhost</config-property-name>
-                  </required-config-property>
-                  <required-config-property>
-                     <description>java.util.Properties of the form key1=*;key2=*;...</description>
-                     <config-property-name>props</config-property-name>
-                  </required-config-property>
-               </activationspec>
-            </messagelistener>
-         </messageadapter>
-      </inbound-resourceadapter>
-
-   </resourceadapter>
-</connector>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<connector 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/connector_1_5.xsd"
+           version="1.5">
+
+   <description>Test Resource Adapter for new jca 1.5 features</description>
+   <display-name>Inflow Test Resource Adapter</display-name>
+   <vendor-name>JBoss, Inc</vendor-name>
+   <eis-type>JBoss Testsuite</eis-type>
+   <resourceadapter-version>4.0</resourceadapter-version>
+
+   <license>
+      <description>
+      COPYRIGHT AND PERMISSION NOTICE
+      Copyright (c) 2004 JBoss, Inc
+      This is released under the terms of the LGPL.
+      See gnu.org for details.
+      </description>
+      <license-required>true</license-required>
+   </license>
+
+   <resourceadapter>
+      <resourceadapter-class>org.jboss.ejb3.test.jca.inflow.TestResourceAdapter</resourceadapter-class>
+
+      <inbound-resourceadapter>
+         <messageadapter>        
+            <messagelistener>
+               <messagelistener-type>org.jboss.ejb3.test.jca.inflow.TestMessageListener</messagelistener-type>
+               <activationspec>
+                  <activationspec-class>org.jboss.ejb3.test.jca.inflow.TestActivationSpec</activationspec-class>
+                  <required-config-property>
+                     <config-property-name>name</config-property-name>
+                  </required-config-property>
+                  <required-config-property>
+                     <description>An int between 1-10</description>
+                     <config-property-name>anInt</config-property-name>
+                  </required-config-property>
+                  <required-config-property>
+                     <description>An Integer between 50-100</description>
+                     <config-property-name>anInteger</config-property-name>
+                  </required-config-property>
+                  <required-config-property>
+                     <description>The 127.0.0.1 address</description>
+                     <config-property-name>localhost</config-property-name>
+                  </required-config-property>
+                  <required-config-property>
+                     <description>java.util.Properties of the form key1=*;key2=*;...</description>
+                     <config-property-name>props</config-property-name>
+                  </required-config-property>
+               </activationspec>
+            </messagelistener>
+         </messageadapter>
+      </inbound-resourceadapter>
+
+   </resourceadapter>
+</connector>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/META-INF/ra.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=queuetest">
-      <attribute name="JNDIName">queue/inflowmdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queuetest">
+      <attribute name="JNDIName">queue/inflowmdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+</server>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/jca/inflow/jmsmdbtest-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/jms (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=testQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jms/jms-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=testQueue">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jms/managed (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/managed)

Copied: branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/managed/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-<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">
-
-  <enterprise-beans>
-    <session>
-      <ejb-name>JMSTest</ejb-name>
-      <remote>org.jboss.ejb3.test.jms.managed.JMSTest</remote>
-      <ejb-class>org.jboss.ejb3.test.jms.managed.JMSTestBean</ejb-class>
-      <session-type>Stateful</session-type>
-      <transaction-type>Container</transaction-type>
-      
-      <resource-ref>
-         <res-ref-name>jms/MyConnectionFactory</res-ref-name>
-         <res-type>javax.jms.ConnectionFactory</res-type>
-         <res-auth>Container</res-auth>
-      </resource-ref>
-       
-      <resource-ref>
-         <res-ref-name>jms/MyQueue</res-ref-name>
-         <res-type>javax.jms.Queue</res-type>
-         <res-auth>Container</res-auth>
-      </resource-ref> 
-       
-    </session>
-     
-    <message-driven>
-       <ejb-name>MessageBean</ejb-name>
-       <ejb-class>org.jboss.ejb3.test.jms.managed.MessageBean</ejb-class>
-       <transaction-type>Container</transaction-type>
-       <message-destination-type>javax.jms.Queue</message-destination-type>
-       <activation-config>   
-          <activation-config-property>
-          	<activation-config-property-name>acknowledgeMode</activation-config-property-name>
-          	<activation-config-property-value>AUTO_ACKNOWLEDGE</activation-config-property-value>
-          </activation-config-property>
-        </activation-config>
-    </message-driven>
-     
-  </enterprise-beans>
-   
-  <assembly-descriptor>
-     
-     <container-transaction>
-      <method>
-        <ejb-name>MessageBean</ejb-name>
-        <method-name>*</method-name>
-      </method>
-      <trans-attribute>Required</trans-attribute>
-    </container-transaction>
-
-    <container-transaction>
-      <method>
-        <ejb-name>JMSTest</ejb-name>
-        <method-name>*</method-name>
-      </method>
-     
-      <trans-attribute>Required</trans-attribute>
-    </container-transaction>
-
-  </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+<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">
+
+  <enterprise-beans>
+    <session>
+      <ejb-name>JMSTest</ejb-name>
+      <remote>org.jboss.ejb3.test.jms.managed.JMSTest</remote>
+      <ejb-class>org.jboss.ejb3.test.jms.managed.JMSTestBean</ejb-class>
+      <session-type>Stateful</session-type>
+      <transaction-type>Container</transaction-type>
+      
+      <resource-ref>
+         <res-ref-name>jms/MyConnectionFactory</res-ref-name>
+         <res-type>javax.jms.ConnectionFactory</res-type>
+         <res-auth>Container</res-auth>
+      </resource-ref>
+       
+      <resource-ref>
+         <res-ref-name>jms/MyQueue</res-ref-name>
+         <res-type>javax.jms.Queue</res-type>
+         <res-auth>Container</res-auth>
+      </resource-ref> 
+       
+    </session>
+     
+    <message-driven>
+       <ejb-name>MessageBean</ejb-name>
+       <ejb-class>org.jboss.ejb3.test.jms.managed.MessageBean</ejb-class>
+       <transaction-type>Container</transaction-type>
+       <message-destination-type>javax.jms.Queue</message-destination-type>
+       <activation-config>   
+          <activation-config-property>
+          	<activation-config-property-name>acknowledgeMode</activation-config-property-name>
+          	<activation-config-property-value>AUTO_ACKNOWLEDGE</activation-config-property-value>
+          </activation-config-property>
+        </activation-config>
+    </message-driven>
+     
+  </enterprise-beans>
+   
+  <assembly-descriptor>
+     
+     <container-transaction>
+      <method>
+        <ejb-name>MessageBean</ejb-name>
+        <method-name>*</method-name>
+      </method>
+      <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+
+    <container-transaction>
+      <method>
+        <ejb-name>JMSTest</ejb-name>
+        <method-name>*</method-name>
+      </method>
+     
+      <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+
+  </assembly-descriptor>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss>
-   <enterprise-beans>
-      
-      <session>
-         <ejb-name>JMSTest</ejb-name>
-         <jndi-name>/jms-test-ejbs/JMSTest</jndi-name>
-         <resource-ref>
-             <res-ref-name>jms/MyConnectionFactory</res-ref-name>
-             <resource-name>connectionfactoryref</resource-name>
-         </resource-ref>
-         <resource-ref>
-             <res-ref-name>jms/MyQueue</res-ref-name>
-             <resource-name>queueref</resource-name>
-         </resource-ref>
-      </session>
-      
-      <message-driven>
-         <ejb-name>MessageBean</ejb-name>
-         <destination-jndi-name>queue/testQueue</destination-jndi-name>
-      </message-driven>
-      
-   </enterprise-beans>
-   
-   <resource-managers>
-      <resource-manager>
-         <res-name>connectionfactoryref</res-name>
-         <res-jndi-name>java:/JmsXA</res-jndi-name>
-      </resource-manager>
-      <resource-manager>
-         <res-name>queueref</res-name>
-         <res-jndi-name>queue/testQueue</res-jndi-name>
-      </resource-manager>
-   </resource-managers>
-
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jms/managed/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss>
+   <enterprise-beans>
+      
+      <session>
+         <ejb-name>JMSTest</ejb-name>
+         <jndi-name>/jms-test-ejbs/JMSTest</jndi-name>
+         <resource-ref>
+             <res-ref-name>jms/MyConnectionFactory</res-ref-name>
+             <resource-name>connectionfactoryref</resource-name>
+         </resource-ref>
+         <resource-ref>
+             <res-ref-name>jms/MyQueue</res-ref-name>
+             <resource-name>queueref</resource-name>
+         </resource-ref>
+      </session>
+      
+      <message-driven>
+         <ejb-name>MessageBean</ejb-name>
+         <destination-jndi-name>queue/testQueue</destination-jndi-name>
+      </message-driven>
+      
+   </enterprise-beans>
+   
+   <resource-managers>
+      <resource-manager>
+         <res-name>connectionfactoryref</res-name>
+         <res-jndi-name>java:/JmsXA</res-jndi-name>
+      </resource-manager>
+      <resource-manager>
+         <res-name>queueref</res-name>
+         <res-jndi-name>queue/testQueue</res-jndi-name>
+      </resource-manager>
+   </resource-managers>
+
+</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/joininheritance (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/joininheritance)

Copied: branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/joininheritance/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/joininheritance/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp)

Copied: branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application>
-    <display-name>EJB3 Web Container Testsuite</display-name>
-
-    <module>
-    <web>
-        <description>The testsuite war</description>
-        <web-uri>jsp-test.war</web-uri>
-        <context-root>/jsp-test</context-root>
-    </web>
-    </module>
- 
-    <module>
-        <ejb>jsp-test.jar</ejb>
-    </module>
-</application>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+    <display-name>EJB3 Web Container Testsuite</display-name>
+
+    <module>
+    <web>
+        <description>The testsuite war</description>
+        <web-uri>jsp-test.war</web-uri>
+        <context-root>/jsp-test</context-root>
+    </web>
+    </module>
+ 
+    <module>
+        <ejb>jsp-test.jar</ejb>
+    </module>
+</application>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/jsp/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4"
-   xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-   <description>The EJB3 JSP Test Descriptor</description>
-
-   <servlet>
-      <servlet-name>TestJSP</servlet-name>
-      <jsp-file>/test.jsp</jsp-file>
-   </servlet>
-
-   <!-- The servlet and jsp page mappings -->
-   <servlet-mapping>
-      <servlet-name>TestJSP</servlet-name>
-      <url-pattern>/TestJSP</url-pattern>
-   </servlet-mapping>
-</web-app>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4"
+   xmlns="http://java.sun.com/xml/ns/j2ee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+   <description>The EJB3 JSP Test Descriptor</description>
+
+   <servlet>
+      <servlet-name>TestJSP</servlet-name>
+      <jsp-file>/test.jsp</jsp-file>
+   </servlet>
+
+   <!-- The servlet and jsp page mappings -->
+   <servlet-mapping>
+      <servlet-name>TestJSP</servlet-name>
+      <url-pattern>/TestJSP</url-pattern>
+   </servlet-mapping>
+</web-app>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/jsp/WEB-INF/jbosstest-jsp.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/test.jsp	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-<%@ page import="javax.naming.*,
-                  java.text.*,
-                  java.lang.*,
-                  java.util.*,
-                  org.jboss.ejb3.test.jsp.StatelessRemote"%>
-<%!
-   private StatelessRemote stateless = null;
-   public void jspInit () 
-   {
-     try 
-     {
-       InitialContext ctx = new InitialContext();
-       stateless = (StatelessRemote) ctx.lookup("jsp-test/StatelessBean/remote");
-       System.out.println("Found StatelessRemote " + stateless);
-       int i = stateless.method(10);
-       System.out.println("Executed method " + i);
-     } 
-     catch( Exception e ) { e.printStackTrace(); }
-    }
-%>
-
-<html>
-  <head>
-	<title>EJB3 JSP Test</title>
-  </head>
-  
-  <body bgcolor=#ffffff text=#000000>
-    <h1>EJB3 JSP Test</h1>
-  </body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/jsp/test.jsp)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+<%@ page import="javax.naming.*,
+                  java.text.*,
+                  java.lang.*,
+                  java.util.*,
+                  org.jboss.ejb3.test.jsp.StatelessRemote"%>
+<%!
+   private StatelessRemote stateless = null;
+   public void jspInit () 
+   {
+     try 
+     {
+       InitialContext ctx = new InitialContext();
+       stateless = (StatelessRemote) ctx.lookup("jsp-test/StatelessBean/remote");
+       System.out.println("Found StatelessRemote " + stateless);
+       int i = stateless.method(10);
+       System.out.println("Executed method " + i);
+     } 
+     catch( Exception e ) { e.printStackTrace(); }
+    }
+%>
+
+<html>
+  <head>
+	<title>EJB3 JSP Test</title>
+  </head>
+  
+  <body bgcolor=#ffffff text=#000000>
+    <h1>EJB3 JSP Test</h1>
+  </body>
+</html>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/jsp/test.jsp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/lob (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/lob)

Copied: branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/lob/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/lob/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/lob/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/lob/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/longlived (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/longlived)

Copied: branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/longlived/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/longlived/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/longlived/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/longlived/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/mail (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mail)

Copied: branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mail/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-
-   <display-name>ENC Tests</display-name>
-   <enterprise-beans>
-      <session>
-         <description>A session bean on looks up stuff in the ENC</description>
-         <ejb-name>StatelessMail</ejb-name>
-         <!-- JavaMail Connection Factories (java:comp/env/mail) -->
-         <resource-ref>
-            <description>Default Mail</description>
-            <res-ref-name>mail/DefaultMail</res-ref-name>
-            <res-type>javax.mail.Session</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-	</session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<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">
+
+   <display-name>ENC Tests</display-name>
+   <enterprise-beans>
+      <session>
+         <description>A session bean on looks up stuff in the ENC</description>
+         <ejb-name>StatelessMail</ejb-name>
+         <!-- JavaMail Connection Factories (java:comp/env/mail) -->
+         <resource-ref>
+            <description>Default Mail</description>
+            <res-ref-name>mail/DefaultMail</res-ref-name>
+            <res-type>javax.mail.Session</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+	</session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mail/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-    <enterprise-beans>
-        <session>
-            <ejb-name>StatelessMail</ejb-name>
-            <resource-ref>
-                <res-ref-name>mail/DefaultMail</res-ref-name>
-                <resource-name>DefaultMail</resource-name>
-            </resource-ref>
-        </session>
-    </enterprise-beans>
-
-    <resource-managers>
-        <resource-manager res-class="">
-            <res-name>DefaultMail</res-name>
-            <res-jndi-name>java:/Mail</res-jndi-name>
-        </resource-manager>
-    </resource-managers>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mail/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mail/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+    <enterprise-beans>
+        <session>
+            <ejb-name>StatelessMail</ejb-name>
+            <resource-ref>
+                <res-ref-name>mail/DefaultMail</res-ref-name>
+                <resource-name>DefaultMail</resource-name>
+            </resource-ref>
+        </session>
+    </enterprise-beans>
+
+    <resource-managers>
+        <resource-manager res-class="">
+            <res-name>DefaultMail</res-name>
+            <res-jndi-name>java:/Mail</res-jndi-name>
+        </resource-manager>
+    </resource-managers>
+</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/manytomany (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/manytomany)

Copied: branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/manytomany/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/manytomany/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/manytomany/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/manytomany/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdb/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<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">
-
-    <enterprise-beans>
-      <message-driven>
-        <ejb-name>QueueTestMDB</ejb-name>
-        <activation-config>
-          <activation-config-property>
-            <activation-config-property-name>maxSession</activation-config-property-name>
-              <activation-config-property-value>1</activation-config-property-value>
-          </activation-config-property>
-        </activation-config>
-      </message-driven>
-      <message-driven>
-        <ejb-name>OverrideTestMDB</ejb-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
-          <activation-config>
-            <activation-config-property>
-              <activation-config-property-name>maxSession</activation-config-property-name>
-              <activation-config-property-value>100</activation-config-property-value>
-            </activation-config-property>
-          </activation-config>
-      </message-driven>
-    </enterprise-beans>
-  </ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<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">
+
+    <enterprise-beans>
+      <message-driven>
+        <ejb-name>QueueTestMDB</ejb-name>
+        <activation-config>
+          <activation-config-property>
+            <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+          </activation-config-property>
+        </activation-config>
+      </message-driven>
+      <message-driven>
+        <ejb-name>OverrideTestMDB</ejb-name>
+        <message-destination-type>javax.jms.Queue</message-destination-type>
+          <activation-config>
+            <activation-config-property>
+              <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>100</activation-config-property-value>
+            </activation-config-property>
+          </activation-config>
+      </message-driven>
+    </enterprise-beans>
+  </ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdb/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>OverrideTestMDB</ejb-name>
-         <destination-jndi-name>queue/overridequeuetest</destination-jndi-name>
-      </message-driven>
-      <message-driven>
-         <ejb-name>OverrideDefaultedQueueTestMDB</ejb-name>
-         <default-activation-config>
-            <default-activation-config-property>
-               <activation-config-property-name>destinationType</activation-config-property-name>
-               <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
-            </default-activation-config-property>
-         </default-activation-config>
-      </message-driven>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdb/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdb/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>OverrideTestMDB</ejb-name>
+         <destination-jndi-name>queue/overridequeuetest</destination-jndi-name>
+      </message-driven>
+      <message-driven>
+         <ejb-name>OverrideDefaultedQueueTestMDB</ejb-name>
+         <default-activation-config>
+            <default-activation-config-property>
+               <activation-config-property-name>destinationType</activation-config-property-name>
+               <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
+            </default-activation-config-property>
+         </default-activation-config>
+      </message-driven>
+   </enterprise-beans>
+</jboss>

Modified: branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
+<!--
    <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=cmtmdbtest">
+      <attribute name="JNDIName">queue/cmtmdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+-->
+
+   <mbean code="org.jboss.mq.server.jmx.Queue"
       name="jboss.mq.destination:service=Queue,name=queuetest">
       <attribute name="JNDIName">queue/mdbtest</attribute>
       <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
@@ -43,16 +51,22 @@
    </mbean>
 
    <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=transactionmdbtest">
+      <attribute name="JNDIName">queue/transactionmdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Queue"
       name="jboss.mq.destination:service=Queue,name=expirytest">
       <attribute name="JNDIName">queue/expirytest</attribute>
-      <attribute name="ExpiryDestination">jboss.mq.destination:service=Queue,name=DLQ</attribute>
+<!--       <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</attribute>  -->
       <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
    </mbean>
    
    <mbean code="org.jboss.mq.server.jmx.Queue"
       name="jboss.mq.destination:service=Queue,name=dlqtest">
       <attribute name="JNDIName">queue/dlqtest</attribute>
-      <attribute name="ExpiryDestination">jboss.mq.destination:service=Queue,name=DLQ</attribute>
+<!--       <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</attribute>  -->
       <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
    </mbean>
 

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions)

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE ejb-jar PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
-  "http://java.sun.com/j2ee/dtds/ejb-jar_2_0.dtd">
-
-<ejb-jar>
-  <enterprise-beans>
-    <message-driven>
-	  <ejb-name>QueueBean21</ejb-name>
-	  <ejb-class>org.jboss.ejb3.test.mdbtransactions.QueueBean21</ejb-class>
-      <transaction-type>Container</transaction-type>
-      <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
-      <message-driven-destination>
-        <destination-type>javax.jms.Queue</destination-type>
-      </message-driven-destination>
-    </message-driven>
-  </enterprise-beans>
-  <assembly-descriptor>
-    <container-transaction>
-      <method>
-        <ejb-name>QueueBean21</ejb-name>
-          <method-name>onMessage</method-name>
-          <method-params>
-            <method-param>javax.jms.Message</method-param>
-          </method-params>
-        </method>
-      <trans-attribute>Required</trans-attribute>
-    </container-transaction>  
-  </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE ejb-jar PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+  "http://java.sun.com/j2ee/dtds/ejb-jar_2_0.dtd">
+
+<ejb-jar>
+  <enterprise-beans>
+    <message-driven>
+	  <ejb-name>QueueBean21</ejb-name>
+	  <ejb-class>org.jboss.ejb3.test.mdbtransactions.QueueBean21</ejb-class>
+      <transaction-type>Container</transaction-type>
+      <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+      <message-driven-destination>
+        <destination-type>javax.jms.Queue</destination-type>
+      </message-driven-destination>
+    </message-driven>
+  </enterprise-beans>
+  <assembly-descriptor>
+    <container-transaction>
+      <method>
+        <ejb-name>QueueBean21</ejb-name>
+          <method-name>onMessage</method-name>
+          <method-params>
+            <method-param>javax.jms.Message</method-param>
+          </method-params>
+        </method>
+      <trans-attribute>Required</trans-attribute>
+    </container-transaction>  
+  </assembly-descriptor>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE jboss PUBLIC
-      "-//JBoss//DTD JBOSS 3.2//EN"
-      "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
-<jboss>
-   <!--invoker-proxy-bindings>
-      <invoker-proxy-binding>
-         <name>my-message-driven-bean</name>
-         <invoker-mbean>default</invoker-mbean>
-         <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
-         <proxy-factory-config>
-            <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
-            <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
-            <MaximumSize>15</MaximumSize>
-            <MaxMessages>1</MaxMessages>
-            <MDBConfig>
-               <ReconnectIntervalSec>10</ReconnectIntervalSec>
-               <DLQConfig>
-                  <DestinationQueue>queue/DLQ</DestinationQueue>
-                  <MaxTimesRedelivered>10</MaxTimesRedelivered>
-                  <TimeToLive>0</TimeToLive>
-               </DLQConfig>
-            </MDBConfig>
-         </proxy-factory-config>
-      </invoker-proxy-binding>
-   </invoker-proxy-bindings-->
-
-   <enterprise-beans>
-      <message-driven>
-         <ejb-name>QueueBean21</ejb-name>
-         <destination-jndi-name>queue/mdb21test</destination-jndi-name>
-      </message-driven>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 3.2//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<jboss>
+   <!--invoker-proxy-bindings>
+      <invoker-proxy-binding>
+         <name>my-message-driven-bean</name>
+         <invoker-mbean>default</invoker-mbean>
+         <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+         <proxy-factory-config>
+            <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+            <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+            <MaximumSize>15</MaximumSize>
+            <MaxMessages>1</MaxMessages>
+            <MDBConfig>
+               <ReconnectIntervalSec>10</ReconnectIntervalSec>
+               <DLQConfig>
+                  <DestinationQueue>queue/DLQ</DestinationQueue>
+                  <MaxTimesRedelivered>10</MaxTimesRedelivered>
+                  <TimeToLive>0</TimeToLive>
+               </DLQConfig>
+            </MDBConfig>
+         </proxy-factory-config>
+      </invoker-proxy-binding>
+   </invoker-proxy-bindings-->
+
+   <enterprise-beans>
+      <message-driven>
+         <ejb-name>QueueBean21</ejb-name>
+         <destination-jndi-name>queue/mdb21test</destination-jndi-name>
+      </message-driven>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=rollbackqueuetest">
-      <attribute name="JNDIName">queue/rollbackmdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=queue21test">
-      <attribute name="JNDIName">queue/mdb21test</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queuetest">
+      <attribute name="JNDIName">queue/mdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=rollbackqueuetest">
+      <attribute name="JNDIName">queue/rollbackmdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queue21test">
+      <attribute name="JNDIName">queue/mdb21test</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming)

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,245 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-
-   <display-name>ENC Tests</display-name>
-   <enterprise-beans>
-
-      <session>
-         <description>A session bean on looks up stuff in the ENC</description>
-         <ejb-name>ENCBean</ejb-name>
-         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-
-         <!-- Basic environment entries -->
-         <env-entry>
-            <description>A flag indicating if the bean should perform the full ENC testsuite</description>
-            <env-entry-name>hasFullENC</env-entry-name>
-            <env-entry-type>java.lang.Boolean</env-entry-type>
-            <env-entry-value>true</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Integer0</description>
-            <env-entry-name>Ints/i0</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>0</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Integer1</description>
-            <env-entry-name>Ints/i1</env-entry-name>
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            <env-entry-value>1</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Float0</description>
-            <env-entry-name>Floats/f0</env-entry-name>
-            <env-entry-type>java.lang.Float</env-entry-type>
-            <env-entry-value>0.0</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Float1</description>
-            <env-entry-name>Floats/f1</env-entry-name>
-            <env-entry-type>java.lang.Float</env-entry-type>
-            <env-entry-value>1.1</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>String0</description>
-            <env-entry-name>Strings/s0</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value>String0</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>String1</description>
-            <env-entry-name>Strings/s1</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value>String1</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Short0</description>
-            <env-entry-name>Short/s0</env-entry-name>
-            <env-entry-type>java.lang.Short</env-entry-type>
-            <env-entry-value>32767</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Long0</description>
-            <env-entry-name>Long/l0</env-entry-name>
-            <env-entry-type>java.lang.Long</env-entry-type>
-            <env-entry-value>123456789987654321</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Double0</description>
-            <env-entry-name>Double/d0</env-entry-name>
-            <env-entry-type>java.lang.Double</env-entry-type>
-            <env-entry-value>123456789.987654321</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Byte0</description>
-            <env-entry-name>Byte/b0</env-entry-name>
-            <env-entry-type>java.lang.Byte</env-entry-type>
-            <env-entry-value>1</env-entry-value>
-         </env-entry>
-         <env-entry>
-            <description>Char0</description>
-            <env-entry-name>Character/c0</env-entry-name>
-            <env-entry-type>java.lang.Character</env-entry-type>
-            <env-entry-value>c</env-entry-value>
-         </env-entry>
-
-         <!-- EJB References (java:comp/env/ejb) -->
-         <ejb-ref>
-            <ejb-ref-name>ejb/bean0</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-            <ejb-link>ENCBean0</ejb-link>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/bean1</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-             <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-            <ejb-link>ENCBean1</ejb-link>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/bean2</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-            <ejb-link>ENCBean2</ejb-link>
-         </ejb-ref>
-
-         <!-- JDBC DataSources (java:comp/env/jdbc) -->
-         <resource-ref>
-            <description>The default DS</description>
-            <res-ref-name>jdbc/DefaultDS</res-ref-name>
-            <res-type>javax.sql.DataSource</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-         <!-- JavaMail Connection Factories (java:comp/env/mail) -->
-         <resource-ref>
-            <description>Default Mail</description>
-            <res-ref-name>mail/DefaultMail</res-ref-name>
-            <res-type>javax.mail.Session</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-         <!-- JMS Connection Factories (java:comp/env/jms) -->
-         <resource-ref>
-            <description>Default QueueFactory</description>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <res-type>javax.jms.QueueConnectionFactory</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-
-         <resource-env-ref>
-            <description>A test of the resource-env-ref tag</description>
-            <resource-env-ref-name>res/aQueue</resource-env-ref-name>
-            <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-         </resource-env-ref>
-         
-         <message-destination-ref>
-            <description>consumes using a link</description>
-            <message-destination-ref-name>mdr/ConsumesLink</message-destination-ref-name>
-            <message-destination-type>javax.jms.Queue</message-destination-type>
-            <message-destination-usage>Consumes</message-destination-usage>
-            <message-destination-link>TestQueue</message-destination-link>
-         </message-destination-ref>
-         <message-destination-ref>
-            <description>produces using a link</description>
-            <message-destination-ref-name>mdr/ProducesLink</message-destination-ref-name>
-            <message-destination-type>javax.jms.Topic</message-destination-type>
-            <message-destination-usage>Produces</message-destination-usage>
-            <message-destination-link>TestTopic</message-destination-link>
-         </message-destination-ref>
-         <message-destination-ref>
-            <description>consumesproduces using a jndi name</description>
-            <message-destination-ref-name>mdr/ConsumesProducesJNDIName</message-destination-ref-name>
-            <message-destination-type>javax.jms.Queue</message-destination-type>
-            <message-destination-usage>ConsumesProduces</message-destination-usage>
-         </message-destination-ref>
-      </session>
-
-      <session>
-         <description>Referenced Bean0 Create by TestENCHome2</description>
-         <ejb-name>ENCBean0</ejb-name>
-         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <env-entry>
-            <description>This bean should NOT have the same ENC as ENCBean</description>
-            <env-entry-name>hasFullENC</env-entry-name>
-            <env-entry-type>java.lang.Boolean</env-entry-type>
-            <env-entry-value>false</env-entry-value>
-         </env-entry>
-      </session>
-      <session>
-         <description>Referenced Bean1</description>
-         <ejb-name>ENCBean1</ejb-name>
-         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <env-entry>
-            <description>This bean should NOT have the same ENC as ENCBean</description>
-            <env-entry-name>hasFullENC</env-entry-name>
-            <env-entry-type>java.lang.Boolean</env-entry-type>
-            <env-entry-value>false</env-entry-value>
-         </env-entry>
-      </session>
-      <session>
-         <description>A bean with a JNDI name that cannot be used in a JMX
-            ObjectName</description>
-         <ejb-name>ENCBean2</ejb-name>
-         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <env-entry>
-            <description>This bean should NOT have the same ENC as ENCBean</description>
-            <env-entry-name>hasFullENC</env-entry-name>
-            <env-entry-type>java.lang.Boolean</env-entry-type>
-            <env-entry-value>false</env-entry-value>
-         </env-entry>
-      </session>
-      <session>
-         <description>A deployment that is secured</description>
-         <ejb-name>SecuredENCBean</ejb-name>
-         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
-         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <env-entry>
-            <description>This bean should NOT have the same ENC as ENCBean</description>
-            <env-entry-name>hasFullENC</env-entry-name>
-            <env-entry-type>java.lang.Boolean</env-entry-type>
-            <env-entry-value>false</env-entry-value>
-         </env-entry>
-      </session>
-   </enterprise-beans>
-
-   <assembly-descriptor>
-      <security-role>
-         <description>Users allowed to access SecuredENCBean</description>
-         <role-name>ENCUser</role-name>
-      </security-role>
-
-      <method-permission>
-         <role-name>ENCUser</role-name>
-         <method>
-            <ejb-name>SecuredENCBean</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-
-      <message-destination>
-         <message-destination-name>TestQueue</message-destination-name>
-      </message-destination>
-      <message-destination>
-         <message-destination-name>TestTopic</message-destination-name>
-      </message-destination>
-   </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+
+<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">
+
+   <display-name>ENC Tests</display-name>
+   <enterprise-beans>
+
+      <session>
+         <description>A session bean on looks up stuff in the ENC</description>
+         <ejb-name>ENCBean</ejb-name>
+         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+         <!-- Basic environment entries -->
+         <env-entry>
+            <description>A flag indicating if the bean should perform the full ENC testsuite</description>
+            <env-entry-name>hasFullENC</env-entry-name>
+            <env-entry-type>java.lang.Boolean</env-entry-type>
+            <env-entry-value>true</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Integer0</description>
+            <env-entry-name>Ints/i0</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>0</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Integer1</description>
+            <env-entry-name>Ints/i1</env-entry-name>
+            <env-entry-type>java.lang.Integer</env-entry-type>
+            <env-entry-value>1</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Float0</description>
+            <env-entry-name>Floats/f0</env-entry-name>
+            <env-entry-type>java.lang.Float</env-entry-type>
+            <env-entry-value>0.0</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Float1</description>
+            <env-entry-name>Floats/f1</env-entry-name>
+            <env-entry-type>java.lang.Float</env-entry-type>
+            <env-entry-value>1.1</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>String0</description>
+            <env-entry-name>Strings/s0</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>String0</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>String1</description>
+            <env-entry-name>Strings/s1</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>String1</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Short0</description>
+            <env-entry-name>Short/s0</env-entry-name>
+            <env-entry-type>java.lang.Short</env-entry-type>
+            <env-entry-value>32767</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Long0</description>
+            <env-entry-name>Long/l0</env-entry-name>
+            <env-entry-type>java.lang.Long</env-entry-type>
+            <env-entry-value>123456789987654321</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Double0</description>
+            <env-entry-name>Double/d0</env-entry-name>
+            <env-entry-type>java.lang.Double</env-entry-type>
+            <env-entry-value>123456789.987654321</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Byte0</description>
+            <env-entry-name>Byte/b0</env-entry-name>
+            <env-entry-type>java.lang.Byte</env-entry-type>
+            <env-entry-value>1</env-entry-value>
+         </env-entry>
+         <env-entry>
+            <description>Char0</description>
+            <env-entry-name>Character/c0</env-entry-name>
+            <env-entry-type>java.lang.Character</env-entry-type>
+            <env-entry-value>c</env-entry-value>
+         </env-entry>
+
+         <!-- EJB References (java:comp/env/ejb) -->
+         <ejb-ref>
+            <ejb-ref-name>ejb/bean0</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+            <ejb-link>ENCBean0</ejb-link>
+         </ejb-ref>
+         <ejb-ref>
+            <ejb-ref-name>ejb/bean1</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+             <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+            <ejb-link>ENCBean1</ejb-link>
+         </ejb-ref>
+         <ejb-ref>
+            <ejb-ref-name>ejb/bean2</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+            <ejb-link>ENCBean2</ejb-link>
+         </ejb-ref>
+
+         <!-- JDBC DataSources (java:comp/env/jdbc) -->
+         <resource-ref>
+            <description>The default DS</description>
+            <res-ref-name>jdbc/DefaultDS</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+         <!-- JavaMail Connection Factories (java:comp/env/mail) -->
+         <resource-ref>
+            <description>Default Mail</description>
+            <res-ref-name>mail/DefaultMail</res-ref-name>
+            <res-type>javax.mail.Session</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+         <!-- JMS Connection Factories (java:comp/env/jms) -->
+         <resource-ref>
+            <description>Default QueueFactory</description>
+            <res-ref-name>jms/QueFactory</res-ref-name>
+            <res-type>javax.jms.QueueConnectionFactory</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+
+         <resource-env-ref>
+            <description>A test of the resource-env-ref tag</description>
+            <resource-env-ref-name>res/aQueue</resource-env-ref-name>
+            <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+         </resource-env-ref>
+         
+         <message-destination-ref>
+            <description>consumes using a link</description>
+            <message-destination-ref-name>mdr/ConsumesLink</message-destination-ref-name>
+            <message-destination-type>javax.jms.Queue</message-destination-type>
+            <message-destination-usage>Consumes</message-destination-usage>
+            <message-destination-link>TestQueue</message-destination-link>
+         </message-destination-ref>
+         <message-destination-ref>
+            <description>produces using a link</description>
+            <message-destination-ref-name>mdr/ProducesLink</message-destination-ref-name>
+            <message-destination-type>javax.jms.Topic</message-destination-type>
+            <message-destination-usage>Produces</message-destination-usage>
+            <message-destination-link>TestTopic</message-destination-link>
+         </message-destination-ref>
+         <message-destination-ref>
+            <description>consumesproduces using a jndi name</description>
+            <message-destination-ref-name>mdr/ConsumesProducesJNDIName</message-destination-ref-name>
+            <message-destination-type>javax.jms.Queue</message-destination-type>
+            <message-destination-usage>ConsumesProduces</message-destination-usage>
+         </message-destination-ref>
+      </session>
+
+      <session>
+         <description>Referenced Bean0 Create by TestENCHome2</description>
+         <ejb-name>ENCBean0</ejb-name>
+         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <description>This bean should NOT have the same ENC as ENCBean</description>
+            <env-entry-name>hasFullENC</env-entry-name>
+            <env-entry-type>java.lang.Boolean</env-entry-type>
+            <env-entry-value>false</env-entry-value>
+         </env-entry>
+      </session>
+      <session>
+         <description>Referenced Bean1</description>
+         <ejb-name>ENCBean1</ejb-name>
+         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <description>This bean should NOT have the same ENC as ENCBean</description>
+            <env-entry-name>hasFullENC</env-entry-name>
+            <env-entry-type>java.lang.Boolean</env-entry-type>
+            <env-entry-value>false</env-entry-value>
+         </env-entry>
+      </session>
+      <session>
+         <description>A bean with a JNDI name that cannot be used in a JMX
+            ObjectName</description>
+         <ejb-name>ENCBean2</ejb-name>
+         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <description>This bean should NOT have the same ENC as ENCBean</description>
+            <env-entry-name>hasFullENC</env-entry-name>
+            <env-entry-type>java.lang.Boolean</env-entry-type>
+            <env-entry-value>false</env-entry-value>
+         </env-entry>
+      </session>
+      <session>
+         <description>A deployment that is secured</description>
+         <ejb-name>SecuredENCBean</ejb-name>
+         <remote>org.jboss.ejb3.test.naming.TestENC</remote>
+         <ejb-class>org.jboss.ejb3.test.naming.TestENCBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <description>This bean should NOT have the same ENC as ENCBean</description>
+            <env-entry-name>hasFullENC</env-entry-name>
+            <env-entry-type>java.lang.Boolean</env-entry-type>
+            <env-entry-value>false</env-entry-value>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+
+   <assembly-descriptor>
+      <security-role>
+         <description>Users allowed to access SecuredENCBean</description>
+         <role-name>ENCUser</role-name>
+      </security-role>
+
+      <method-permission>
+         <role-name>ENCUser</role-name>
+         <method>
+            <ejb-name>SecuredENCBean</ejb-name>
+            <method-name>*</method-name>
+         </method>
+      </method-permission>
+
+      <message-destination>
+         <message-destination-name>TestQueue</message-destination-name>
+      </message-destination>
+      <message-destination>
+         <message-destination-name>TestTopic</message-destination-name>
+      </message-destination>
+   </assembly-descriptor>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/META-INF/jboss1.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-    <enterprise-beans>
-        <session>
-            <ejb-name>ENCBean</ejb-name>
-            <jndi-name>ENCBean</jndi-name>
-
-            <resource-ref>
-                <res-ref-name>jdbc/DefaultDS</res-ref-name>
-                <resource-name>DefaultDS</resource-name>
-            </resource-ref>
-            <resource-ref>
-                <res-ref-name>mail/DefaultMail</res-ref-name>
-                <resource-name>DefaultMail</resource-name>
-            </resource-ref>   
-            <resource-ref>
-                <res-ref-name>jms/QueFactory</res-ref-name>
-                <jndi-name>ConnectionFactory</jndi-name>
-            </resource-ref>
-
-            <resource-env-ref>
-                <resource-env-ref-name>res/aQueue</resource-env-ref-name>
-                <jndi-name>queue/testQueue</jndi-name>
-            </resource-env-ref>
-
-            <message-destination-ref>
-               <message-destination-ref-name>mdr/ConsumesProducesJNDIName</message-destination-ref-name>
-               <jndi-name>queue/A</jndi-name>
-            </message-destination-ref>
-
-        </session>
-         <session>
-            <ejb-name>ENCBean0</ejb-name>
-            <jndi-name>ENCBean0</jndi-name>
-        </session>
-        <session>
-            <ejb-name>ENCBean1</ejb-name>
-            <jndi-name>ENCTests/ejbs/ENCBean1</jndi-name>
-        </session>
-        <session>
-            <ejb-name>ENCBean2</ejb-name>
-            <jndi-name>psuedo-url:/ejb/ENCBean2</jndi-name>
-        </session>
-        <session>
-           <ejb-name>SecuredENCBean</ejb-name>
-           <jndi-name>ENCTests/ejbs/SecuredENCBean</jndi-name>
-        </session>
-    </enterprise-beans>
-
-   <assembly-descriptor>
-      <message-destination>
-         <message-destination-name>TestQueue</message-destination-name>
-         <jndi-name>queue/testQueue</jndi-name>
-      </message-destination>
-      <message-destination>
-         <message-destination-name>TestTopic</message-destination-name>
-         <jndi-name>topic/testTopic</jndi-name>
-      </message-destination>
-   </assembly-descriptor>
-
-    <resource-managers>
-        <resource-manager res-class="">
-            <res-name>DefaultDS</res-name>
-            <res-jndi-name>java:/DefaultDS</res-jndi-name>
-        </resource-manager>
-        <resource-manager res-class="">
-            <res-name>DefaultMail</res-name>
-            <res-jndi-name>java:/Mail</res-jndi-name>
-        </resource-manager>
-        <resource-manager res-class="java.net.URL">
-            <res-name>SourceforgeHomePage</res-name>
-            <res-url>http://sourceforge.net/</res-url>
-        </resource-manager>
-    </resource-managers>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/META-INF/jboss1.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+    <enterprise-beans>
+        <session>
+            <ejb-name>ENCBean</ejb-name>
+            <jndi-name>ENCBean</jndi-name>
+
+            <resource-ref>
+                <res-ref-name>jdbc/DefaultDS</res-ref-name>
+                <resource-name>DefaultDS</resource-name>
+            </resource-ref>
+            <resource-ref>
+                <res-ref-name>mail/DefaultMail</res-ref-name>
+                <resource-name>DefaultMail</resource-name>
+            </resource-ref>   
+            <resource-ref>
+                <res-ref-name>jms/QueFactory</res-ref-name>
+                <jndi-name>ConnectionFactory</jndi-name>
+            </resource-ref>
+
+            <resource-env-ref>
+                <resource-env-ref-name>res/aQueue</resource-env-ref-name>
+                <jndi-name>queue/testQueue</jndi-name>
+            </resource-env-ref>
+
+            <message-destination-ref>
+               <message-destination-ref-name>mdr/ConsumesProducesJNDIName</message-destination-ref-name>
+               <jndi-name>queue/A</jndi-name>
+            </message-destination-ref>
+
+        </session>
+         <session>
+            <ejb-name>ENCBean0</ejb-name>
+            <jndi-name>ENCBean0</jndi-name>
+        </session>
+        <session>
+            <ejb-name>ENCBean1</ejb-name>
+            <jndi-name>ENCTests/ejbs/ENCBean1</jndi-name>
+        </session>
+        <session>
+            <ejb-name>ENCBean2</ejb-name>
+            <jndi-name>psuedo-url:/ejb/ENCBean2</jndi-name>
+        </session>
+        <session>
+           <ejb-name>SecuredENCBean</ejb-name>
+           <jndi-name>ENCTests/ejbs/SecuredENCBean</jndi-name>
+        </session>
+    </enterprise-beans>
+
+   <assembly-descriptor>
+      <message-destination>
+         <message-destination-name>TestQueue</message-destination-name>
+         <jndi-name>queue/testQueue</jndi-name>
+      </message-destination>
+      <message-destination>
+         <message-destination-name>TestTopic</message-destination-name>
+         <jndi-name>topic/testTopic</jndi-name>
+      </message-destination>
+   </assembly-descriptor>
+
+    <resource-managers>
+        <resource-manager res-class="">
+            <res-name>DefaultDS</res-name>
+            <res-jndi-name>java:/DefaultDS</res-jndi-name>
+        </resource-manager>
+        <resource-manager res-class="">
+            <res-name>DefaultMail</res-name>
+            <res-jndi-name>java:/Mail</res-jndi-name>
+        </resource-manager>
+        <resource-manager res-class="java.net.URL">
+            <res-name>SourceforgeHomePage</res-name>
+            <res-url>http://sourceforge.net/</res-url>
+        </resource-manager>
+    </resource-managers>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss1.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/META-INF/jboss2.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-    <enterprise-beans>
-        <session>
-            <ejb-name>StatefulOverrideBean</ejb-name>
-            <jndi-name>StatefulOverride</jndi-name>
-        </session>
-    </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/META-INF/jboss2.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+    <enterprise-beans>
+        <session>
+            <ejb-name>StatefulOverrideBean</ejb-name>
+            <jndi-name>StatefulOverride</jndi-name>
+        </session>
+    </enterprise-beans>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/naming/META-INF/jboss2.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=testTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=testQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=A">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Topic"
+	 name="jboss.mq.destination:service=Topic,name=testTopic">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=testQueue">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=A">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+</server>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/naming/dd-mdb-jbossmq-destinations-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-jduke=ENCUser,Echo
-jduke.CallerPrincipal=callerJduke
-invoker=HttpInvoker
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+jduke=ENCUser,Echo
+jduke.CallerPrincipal=callerJduke
+invoker=HttpInvoker
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/naming/roles.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-jduke=theduke
-jdukeman=anotherduke
-invoker=invoker

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+jduke=theduke
+jdukeman=anotherduke
+invoker=invoker


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/naming/users.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming-errors (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming-errors)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-   <display-name>Tests of invalid injection</display-name>
-   <enterprise-beans>
-      <session>
-         <description>A session bean on looks up stuff in the ENC</description>
-         <ejb-name>BadFieldMethodBean</ejb-name>
-         <env-entry>
-            <description>A flag indicating if the bean should perform the full ENC testsuite</description>
-            <env-entry-name>key</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value>BadFieldMethodBean</env-entry-value>
-            <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.naming.bad.BadFieldMethodBean</injection-target-class>
-               <injection-target-name>key</injection-target-name>
-            </injection-target>
-         </env-entry>
-      </session>
-   </enterprise-beans>
-
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<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">
+   <display-name>Tests of invalid injection</display-name>
+   <enterprise-beans>
+      <session>
+         <description>A session bean on looks up stuff in the ENC</description>
+         <ejb-name>BadFieldMethodBean</ejb-name>
+         <env-entry>
+            <description>A flag indicating if the bean should perform the full ENC testsuite</description>
+            <env-entry-name>key</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>BadFieldMethodBean</env-entry-value>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.naming.bad.BadFieldMethodBean</injection-target-class>
+               <injection-target-name>key</injection-target-name>
+            </injection-target>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/naming-errors/ejb-jar-method-field.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/pkg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/pkg)

Copied: branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/pkg/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/pkg/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/pkg/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/pkg/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30)

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application>
-    <display-name>EJB3 Testsuite</display-name>
- 
-    <module>
-        <ejb>multideploy.jar</ejb>
-    </module>
-    <module>
-        <ejb>multideploy-ejb3.jar</ejb>
-    </module>
-</application>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+    <display-name>EJB3 Testsuite</display-name>
+ 
+    <module>
+        <ejb>multideploy.jar</ejb>
+    </module>
+    <module>
+        <ejb>multideploy-ejb3.jar</ejb>
+    </module>
+</application>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,28 +0,0 @@
-<?xml version='1.0' ?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" 
-                         "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar>
-	<enterprise-beans>
-		<session>
-        	<ejb-name>ejb/Test2</ejb-name>
-         	<home>org.jboss.ejb3.test.reference21_30.Test2Home</home>
-         	<remote>org.jboss.ejb3.test.reference21_30.Test2</remote>
-         	<ejb-class>org.jboss.ejb3.test.reference21_30.Test2Bean</ejb-class>
-         	<session-type>Stateless</session-type>
-         	<transaction-type>Container</transaction-type>
-            <ejb-ref>
-				<ejb-ref-name>ejb/Test3</ejb-ref-name>
-				<ejb-ref-type>Session</ejb-ref-type>
-				<home>org.jboss.ejb3.test.reference21_30.Test3Home</home>
-				<remote>org.jboss.ejb3.test.reference21_30.Test3</remote>
-			</ejb-ref>
-			<ejb-ref>
-				<ejb-ref-name>ejb/Test3Home</ejb-ref-name>
-				<ejb-ref-type>Session</ejb-ref-type>
-				<home>org.jboss.ejb3.test.reference21_30.Test3Home</home>
-				<remote>org.jboss.ejb3.test.reference21_30.Test3</remote>
-			</ejb-ref> 
-    	</session>
-	</enterprise-beans>
-</ejb-jar>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,28 @@
+<?xml version='1.0' ?>
+<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" 
+                         "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+<ejb-jar>
+	<enterprise-beans>
+		<session>
+        	<ejb-name>ejb/Test2</ejb-name>
+         	<home>org.jboss.ejb3.test.reference21_30.Test2Home</home>
+         	<remote>org.jboss.ejb3.test.reference21_30.Test2</remote>
+         	<ejb-class>org.jboss.ejb3.test.reference21_30.Test2Bean</ejb-class>
+         	<session-type>Stateless</session-type>
+         	<transaction-type>Container</transaction-type>
+            <ejb-ref>
+				<ejb-ref-name>ejb/Test3</ejb-ref-name>
+				<ejb-ref-type>Session</ejb-ref-type>
+				<home>org.jboss.ejb3.test.reference21_30.Test3Home</home>
+				<remote>org.jboss.ejb3.test.reference21_30.Test3</remote>
+			</ejb-ref>
+			<ejb-ref>
+				<ejb-ref-name>ejb/Test3Home</ejb-ref-name>
+				<ejb-ref-type>Session</ejb-ref-type>
+				<home>org.jboss.ejb3.test.reference21_30.Test3Home</home>
+				<remote>org.jboss.ejb3.test.reference21_30.Test3</remote>
+			</ejb-ref> 
+    	</session>
+	</enterprise-beans>
+</ejb-jar>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version='1.0' ?>
-<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">
-	<enterprise-beans>
-		<session>
-			<ejb-name>Test3</ejb-name>
-			<ejb-ref>
-				<ejb-ref-name>ejb/Test2</ejb-ref-name>
-				<ejb-ref-type>Session</ejb-ref-type>
-			</ejb-ref>            
-		</session>
-	</enterprise-beans>
-</ejb-jar>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/ejb-jar3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version='1.0' ?>
+<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">
+	<enterprise-beans>
+		<session>
+			<ejb-name>Test3</ejb-name>
+			<ejb-ref>
+				<ejb-ref-name>ejb/Test2</ejb-ref-name>
+				<ejb-ref-type>Session</ejb-ref-type>
+			</ejb-ref>            
+		</session>
+	</enterprise-beans>
+</ejb-jar>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" 
-                         "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar> 
-   <description>jBoss test application </description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>Session21</ejb-name>
-         <home>org.jboss.ejb3.test.reference21_30.Session21Home</home>
-         <remote>org.jboss.ejb3.test.reference21_30.Session21</remote>
-         <ejb-class>org.jboss.ejb3.test.reference21_30.Session21Bean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/global-ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" 
+                         "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+<ejb-jar> 
+   <description>jBoss test application </description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>Session21</ejb-name>
+         <home>org.jboss.ejb3.test.reference21_30.Session21Home</home>
+         <remote>org.jboss.ejb3.test.reference21_30.Session21</remote>
+         <ejb-class>org.jboss.ejb3.test.reference21_30.Session21Bean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>Session21</ejb-name>
-         <jndi-name>Session21</jndi-name>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>Session21</ejb-name>
+         <jndi-name>Session21</jndi-name>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>Session21</ejb-name>
-         <jndi-name>Session21</jndi-name>
-      </session>
-      <session>
-         <ejb-name>Session30</ejb-name>
-         <ejb-ref>
-            <ejb-ref-name>injected</ejb-ref-name>
-            <ignore-dependency/>
-         </ejb-ref>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss-reference2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>Session21</ejb-name>
+         <jndi-name>Session21</jndi-name>
+      </session>
+      <session>
+         <ejb-name>Session30</ejb-name>
+         <ejb-ref>
+            <ejb-ref-name>injected</ejb-ref-name>
+            <ignore-dependency/>
+         </ejb-ref>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss>
-   <enterprise-beans>
-      <session>
-         <ejb-name>ejb/Test2</ejb-name>
-         <jndi-name>Test2</jndi-name>
-         <ejb-ref>
-		    <ejb-ref-name>ejb/Test3Home</ejb-ref-name>
-		    <jndi-name>Test3Home</jndi-name>
-		 </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Test3</ejb-ref-name>
-            <jndi-name>Test3</jndi-name>
-         </ejb-ref>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss2.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss>
+   <enterprise-beans>
+      <session>
+         <ejb-name>ejb/Test2</ejb-name>
+         <jndi-name>Test2</jndi-name>
+         <ejb-ref>
+		    <ejb-ref-name>ejb/Test3Home</ejb-ref-name>
+		    <jndi-name>Test3Home</jndi-name>
+		 </ejb-ref>
+         <ejb-ref>
+            <ejb-ref-name>ejb/Test3</ejb-ref-name>
+            <jndi-name>Test3</jndi-name>
+         </ejb-ref>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-	<enterprise-beans>
-		<session>
-			<ejb-name>Test3</ejb-name>
-			<ejb-ref>
-				<ejb-ref-name>ejb/Test2</ejb-ref-name>
-				<jndi-name>Test2</jndi-name>
-			</ejb-ref>
-		</session>
-	</enterprise-beans>
-</jboss>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/jboss3.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+	<enterprise-beans>
+		<session>
+			<ejb-name>Test3</ejb-name>
+			<ejb-ref>
+				<ejb-ref-name>ejb/Test2</ejb-ref-name>
+				<jndi-name>Test2</jndi-name>
+			</ejb-ref>
+		</session>
+	</enterprise-beans>
+</jboss>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-<?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">
-   <description>jBoss test application</description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>Session21</ejb-name>
-         <home>org.jboss.ejb3.test.reference21_30.Session21Home</home>
-         <remote>org.jboss.ejb3.test.reference21_30.Session21</remote>
-         <ejb-class>org.jboss.ejb3.test.reference21_30.Session21Bean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <ejb-ref-name>Session30</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <home>org.jboss.ejb3.test.reference21_30.Session30</home>
-            <remote>org.jboss.ejb3.test.reference21_30.Session30</remote>
-            <ejb-link>Session30</ejb-link>
-         </ejb-ref>
-      </session>
-      <session>
-         <ejb-name>Session30</ejb-name>
-         <home>org.jboss.ejb3.test.reference21_30.Session30Home</home>
-         <local-home>org.jboss.ejb3.test.reference21_30.Session30LocalHome</local-home>
-      </session>
-      <session>
-         <ejb-name>StatefulSession30</ejb-name>
-         <home>org.jboss.ejb3.test.reference21_30.StatefulSession30Home</home>
-         <local-home>org.jboss.ejb3.test.reference21_30.StatefulSession30LocalHome</local-home>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/META-INF/reference-ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+<?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">
+   <description>jBoss test application</description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>Session21</ejb-name>
+         <home>org.jboss.ejb3.test.reference21_30.Session21Home</home>
+         <remote>org.jboss.ejb3.test.reference21_30.Session21</remote>
+         <ejb-class>org.jboss.ejb3.test.reference21_30.Session21Bean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <ejb-ref>
+            <ejb-ref-name>Session30</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <home>org.jboss.ejb3.test.reference21_30.Session30</home>
+            <remote>org.jboss.ejb3.test.reference21_30.Session30</remote>
+            <ejb-link>Session30</ejb-link>
+         </ejb-ref>
+      </session>
+      <session>
+         <ejb-name>Session30</ejb-name>
+         <home>org.jboss.ejb3.test.reference21_30.Session30Home</home>
+         <local-home>org.jboss.ejb3.test.reference21_30.Session30LocalHome</local-home>
+      </session>
+      <session>
+         <ejb-name>StatefulSession30</ejb-name>
+         <home>org.jboss.ejb3.test.reference21_30.StatefulSession30Home</home>
+         <local-home>org.jboss.ejb3.test.reference21_30.StatefulSession30LocalHome</local-home>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-rolefail=willfail
-somebody=allowed
-customer=bankCustomer
-teller=bankTeller

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+rolefail=willfail
+somebody=allowed
+customer=bankCustomer
+teller=bankTeller

Deleted: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,4 +0,0 @@
-somebody=password
-rolefail=password
-customer=password
-teller=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/reference21_30/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/reference21_30/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/reference21_30/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/reference21_30/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,4 @@
+somebody=password
+rolefail=password
+customer=password
+teller=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree290)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree290/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree290/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree316)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree316/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree316/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree440)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree440/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>EJB3 Ear test</display-name>
-
-   <module>
-      <ejb>ejbthree440.jar</ejb>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>EJB3 Ear test</display-name>
+
+   <module>
+      <ejb>ejbthree440.jar</ejb>
+   </module>
+</application>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="mlog">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
-         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="mlog">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+         <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
+         <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree440/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/a)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/a/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application 
-		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/application_1_4.xsd"
-		version="1.4">
-	
-	<display-name>A</display-name>
-
-	<module>
-		<ejb>shared-a-ejb.jar</ejb>
-	</module>
-	
-	<module>
-		<ejb>a-ejb.jar</ejb>
-	</module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application 
+		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/application_1_4.xsd"
+		version="1.4">
+	
+	<display-name>A</display-name>
+
+	<module>
+		<ejb>shared-a-ejb.jar</ejb>
+	</module>
+	
+	<module>
+		<ejb>a-ejb.jar</ejb>
+	</module>
+</application>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-   <display-name>EnvEntry Tests</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>SharedBean</ejb-name>
-         <env-entry>
-            <env-entry-name>who</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value>A</env-entry-value>
-         </env-entry>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<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">
+   <display-name>EnvEntry Tests</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>SharedBean</ejb-name>
+         <env-entry>
+            <env-entry-name>who</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>A</env-entry-value>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/a/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/b)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/b/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application 
-		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/application_1_4.xsd"
-		version="1.4">
-	
-	<display-name>B</display-name>
-
-	<module>
-		<ejb>shared-b-ejb.jar</ejb>
-	</module>
-	
-	<module>
-		<ejb>b-ejb.jar</ejb>
-	</module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application 
+		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/application_1_4.xsd"
+		version="1.4">
+	
+	<display-name>B</display-name>
+
+	<module>
+		<ejb>shared-b-ejb.jar</ejb>
+	</module>
+	
+	<module>
+		<ejb>b-ejb.jar</ejb>
+	</module>
+</application>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-   <display-name>EnvEntry Tests</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>SharedBean</ejb-name>
-         <env-entry>
-            <env-entry-name>who</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value>B</env-entry-value>
-         </env-entry>
-      </session>
-   </enterprise-beans>
-</ejb-jar>
-   
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<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">
+   <display-name>EnvEntry Tests</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>SharedBean</ejb-name>
+         <env-entry>
+            <env-entry-name>who</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>B</env-entry-value>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+</ejb-jar>
+   
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree454/b/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree485)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree485/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>EJB3 Ear test</display-name>
-
-   <module>
-      <ejb>ejbthree485.jar</ejb>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>EJB3 Ear test</display-name>
+
+   <module>
+      <ejb>ejbthree485.jar</ejb>
+   </module>
+</application>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree485/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree625)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree625/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?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">
-   <assembly-descriptor>
-      <interceptor-binding>
-         <ejb-name>*</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.regression.ejbthree625.StupidInterceptor</interceptor-class>
-      </interceptor-binding>
-   </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?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">
+   <assembly-descriptor>
+      <interceptor-binding>
+         <ejb-name>*</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.regression.ejbthree625.StupidInterceptor</interceptor-class>
+      </interceptor-binding>
+   </assembly-descriptor>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/ejbthree625/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/salesforce7123)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/salesforce7123/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regression/salesforce7123/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regressionHHH275)

Copied: branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regressionHHH275/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/regressionHHH275/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/schema (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/schema)

Copied: branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/schema/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-<?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">
-   <description>jBoss test application</description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <bogus>Invalid</bogus>
-         <ejb-name>Teller</ejb-name>
-         <remote>org.jboss.ejb3.test.bank.Teller</remote>
-         <ejb-class>org.jboss.ejb3.test.bank.TellerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -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">
+   <description>jBoss test application</description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <bogus>Invalid</bogus>
+         <ejb-name>Teller</ejb-name>
+         <remote>org.jboss.ejb3.test.bank.Teller</remote>
+         <ejb-class>org.jboss.ejb3.test.bank.TellerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/schema/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <loader-repository loaderRepositoryClass='dot.com.LoaderRepository'>
-      dot.com:loader=unique-archive-name
-      <loader-repository-config configParserClass='dot.com.LoaderParser'>
-         java2ParentDelegaton=true
-      </loader-repository-config>
-   </loader-repository>
-   <security-domain>java:/jaas/default</security-domain>
-   <enterprise-beans>
-      <session>
-         <bogus>Invalid</bogus>
-         <ejb-name>Bank</ejb-name>
-         <jndi-name>bank/Bank</jndi-name>
-         <clustered>true</clustered>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/schema/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <loader-repository loaderRepositoryClass='dot.com.LoaderRepository'>
+      dot.com:loader=unique-archive-name
+      <loader-repository-config configParserClass='dot.com.LoaderParser'>
+         java2ParentDelegaton=true
+      </loader-repository-config>
+   </loader-repository>
+   <security-domain>java:/jaas/default</security-domain>
+   <enterprise-beans>
+      <session>
+         <bogus>Invalid</bogus>
+         <ejb-name>Bank</ejb-name>
+         <jndi-name>bank/Bank</jndi-name>
+         <clustered>true</clustered>
+      </session>
+   </enterprise-beans>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/schema/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader)

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear)

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>EJB3 Ear test</display-name>
-
-   <module>
-      <ejb>search-ejbs.jar</ejb>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>EJB3 Ear test</display-name>
+
+   <module>
+      <ejb>search-ejbs.jar</ejb>
+   </module>
+</application>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app>
-<loader-repository>insight.com:loader=ejbs.ear</loader-repository>
-<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
-</jboss-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+<loader-repository>insight.com:loader=ejbs.ear</loader-repository>
+<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+</jboss-app>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/ejbear/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webear)

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webear/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-   <display-name>salesforce6623 web</display-name>
-
-   <module>
-      <web>
-        <web-uri>webtools.war</web-uri>
-        <context-root>/webtools</context-root>
-     </web>
-   </module>
-   <module>
-       <ejb>sf-clientejb.jar</ejb>
-   </module>
-</application>

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>salesforce6623 web</display-name>
+
+   <module>
+      <web>
+        <web-uri>webtools.war</web-uri>
+        <context-root>/webtools</context-root>
+     </web>
+   </module>
+   <module>
+       <ejb>sf-clientejb.jar</ejb>
+   </module>
+</application>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app>
-<loader-repository>insight.com:loader=web.ear</loader-repository>
-<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
-</jboss-app>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app>
+<loader-repository>insight.com:loader=web.ear</loader-repository>
+<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+</jboss-app>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools)

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-Class-Path: search-ejbs-client.jar

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+Class-Path: search-ejbs-client.jar


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-</web-app>

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+</web-app>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-<%@ page import="java.util.Hashtable,
-                 javax.ejb.EJBNoSuchObjectException,
-                 javax.naming.InitialContext,
-                 javax.naming.NamingException" %>
-<%@ page import="org.jboss.ejb3.test.regression.scopedclassloader.StatelessRemote"%>
-<%@ page import="org.jboss.ejb3.test.regression.scopedclassloader.ValueObject"%>
-
-<%!
-
-%>
-
-<html>
-<body>
-<%
-   InitialContext ctx = new InitialContext();
-   StatelessRemote remote = (StatelessRemote)ctx.lookup(StatelessRemote.class.getName());
-   ValueObject vo = remote.doit();
-
-%>
-DONE!
-</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+<%@ page import="java.util.Hashtable,
+                 javax.ejb.EJBNoSuchObjectException,
+                 javax.naming.InitialContext,
+                 javax.naming.NamingException" %>
+<%@ page import="org.jboss.ejb3.test.regression.scopedclassloader.StatelessRemote"%>
+<%@ page import="org.jboss.ejb3.test.regression.scopedclassloader.ValueObject"%>
+
+<%!
+
+%>
+
+<html>
+<body>
+<%
+   InitialContext ctx = new InitialContext();
+   StatelessRemote remote = (StatelessRemote)ctx.lookup(StatelessRemote.class.getName());
+   ValueObject vo = remote.doit();
+
+%>
+DONE!
+</body>
+</html>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/scopedclassloader/webtools/test.jsp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam)

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?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">
-	<assembly-descriptor>
-		<interceptor-binding>
-			<ejb-name>*</ejb-name>
-			<interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class>
-		</interceptor-binding>
-	</assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?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">
+	<assembly-descriptor>
+		<interceptor-binding>
+			<ejb-name>*</ejb-name>
+			<interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class>
+		</interceptor-binding>
+	</assembly-descriptor>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/maven)

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm)

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Fri May 12 18:10:37 PDT 2006
-version=2.0-SNAPSHOT
-groupId=com.adapt.crm
-artifactId=crm-ejb

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri May 12 18:10:37 PDT 2006
+version=2.0-SNAPSHOT
+groupId=com.adapt.crm
+artifactId=crm-ejb


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,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>
-		<groupId>com.adapt.crm</groupId>
-		<artifactId>crm-shared</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>crm-ejb</artifactId>
-	<packaging>ejb</packaging>
-	<name>MarketFinder CRM EJBs</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-ejb-plugin</artifactId>
-			<version>2.0-adapt</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-</project>

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,20 @@
+<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>
+		<groupId>com.adapt.crm</groupId>
+		<artifactId>crm-shared</artifactId>
+		<version>2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>crm-ejb</artifactId>
+	<packaging>ejb</packaging>
+	<name>MarketFinder CRM EJBs</name>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-ejb-plugin</artifactId>
+			<version>2.0-adapt</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/seam/META-INF/maven/com.adapt.crm/crm-ejb/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/seam/jboss-seam.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/jboss-seam.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/jboss-seam.jar)
===================================================================
(Binary files differ)


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/seam/jboss-seam.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/seam.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-org.jboss.seam.core.init.jndiPattern=seam-test/#{ejbName}/remote

Copied: branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/seam/seam.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+org.jboss.seam.core.init.jndiPattern=seam-test/#{ejbName}/remote


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/seam/seam.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/secondary (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/secondary)

Copied: branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/secondary/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/secondary/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/secondary/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/secondary/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,1030 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE ejb-jar PUBLIC
-      "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
-      "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
-<ejb-jar>
-   <display-name>SecurityTests</display-name>
-   <enterprise-beans>
-      <session>
-         <description>A secured project repository stateful session bean</description>
-         <ejb-name>ProjRepository</ejb-name>
-         <home>org.jboss.test.security.interfaces.ProjRepositoryHome</home>
-         <remote>org.jboss.test.security.interfaces.ProjRepository</remote>
-         <ejb-class>org.jboss.test.security.ejb.project.ProjRepositoryBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-      <session>
-         <description>A secured project repository stateful session bean</description>
-         <ejb-name>StatefulSession</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatefulSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatefulSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.StatefulSessionBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-
-      <session>
-         <description>A secured trival echo session bean</description>
-         <ejb-name>UncheckedSession</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.UncheckedSessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-      <session>
-         <description>A deployment of UncheckedSessionBean that requires the Echo
-         security role for the echo method and unchecked for the rest. Its method
-         permission for the echo method is defined before the unchecked methods. 
-         </description>
-         <ejb-name>UncheckedSessionRemoteFirst</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.UncheckedSessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-      <session>
-         <description>A deployment of UncheckedSessionBean that requires the Echo
-         security role for the echo method and unchecked for the rest. Its method
-         permission for the echo method is defined after the unchecked methods. 
-         </description>
-         <ejb-name>UncheckedSessionRemoteLast</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.UncheckedSessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-
-      <session>
-         <description>A secured trival echo session bean</description>
-         <ejb-name>StatelessSession</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <!-- Use the 'EchoCaller' role name in the bean code to test role linking
-         with use of isCallerInRole().
-         -->
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-      <session>
-         <description>A secured trival echo session bean</description>
-         <ejb-name>StatelessSessionInDomain</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <!-- Use the 'EchoCaller' role name in the bean code to test role linking
-         with use of isCallerInRole().
-         -->
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-
-      <session>
-         <description>A secured echo session bean that calls a StatelessSessionLocal
-            when its invokeEcho method is called.
-         </description>
-         <ejb-name>CallerBean</ejb-name>
-         <home>org.jboss.test.security.interfaces.CalledSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.CalledSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.CallerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-local-ref>
-            <description></description>
-            <ejb-ref-name>ejb/local/CalleeHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-            <ejb-link>CalleeBean</ejb-link>
-         </ejb-local-ref>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-      <session>
-         <description>A secured echo session bean that calls its CalledSessionLocalHome
-            ejb-local-ref link invokeEcho method to test identity propagation.
-            testRunAsSFSB
-               CallerFacadeBean-testRunAsSFSB.invokeEcho()
-                  CallerFacadeTargetSFSB.invokeEcho()
-                     CallerFacadeTargetCallee.echo()
-         </description>
-         <ejb-name>CallerFacadeBean-testRunAsSFSB</ejb-name>
-         <home>org.jboss.test.security.interfaces.CalledSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.CalledSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.CallerFacadeBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-local-ref>
-            <description></description>
-            <ejb-ref-name>ejb/CalledSessionLocalHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.CalledSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.CalledSessionLocal</local>
-            <ejb-link>CallerFacadeTargetSFSB</ejb-link>
-         </ejb-local-ref>
-      </session>
-      <session>
-         <description>A secured echo session bean that calls its SessionLocalHome
-            ejb-local-ref link invokeEcho method to test identity propagation.
-         </description>
-         <ejb-name>CallerFacadeTargetSFSB</ejb-name>
-         <local-home>org.jboss.test.security.interfaces.CalledSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.CalledSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.FacadeTargetBean</ejb-class>
-         <session-type>Stateful</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-local-ref>
-            <description></description>
-            <ejb-ref-name>ejb/local/StatelessSessionLocalHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-            <ejb-link>CallerFacadeTargetCallee</ejb-link>
-         </ejb-local-ref>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>EchoLocal</role-link>
-         </security-role-ref>
-         <security-identity>
-            <description>Use a role that is not assigned to any users to
-               access restricted server side functionallity</description>
-            <run-as>
-               <role-name>InternalRole</role-name>
-            </run-as>
-         </security-identity>
-      </session>
-      <session>
-         <description>A secured echo session bean that is called by CallerFacadeTarget*
-         </description>
-         <ejb-name>CallerFacadeTargetCallee</ejb-name>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.CalleeBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>EchoLocal</role-link>
-         </security-role-ref>
-      </session>
-
-      <session>
-         <description>A secured echo session bean that calls a StatelessSessionLocal
-            when its invokeEcho method is called, and calls another CalledSession
-            invokeEcho when its callEcho method is called. This uses a run-as
-            role of InternalRole to test propagation of this role.
-            Level1CallerBean.callEcho()
-              + Level2CallerBean.invokeEcho()
-                + Level3CalleeBean.echo()
-         </description>
-         <ejb-name>Level1CallerBean</ejb-name>
-         <home>org.jboss.test.security.interfaces.CalledSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.CalledSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.CallerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <description>Another CallerBean used to test run-as propagation</description>
-            <ejb-ref-name>ejb/CallerHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.CalledSessionHome</home>
-            <remote>org.jboss.test.security.interfaces.CalledSession</remote>
-            <ejb-link>Level2CallerBean</ejb-link>
-         </ejb-ref>
-         <ejb-local-ref>
-            <description></description>
-            <ejb-ref-name>ejb/local/CalleeHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-            <ejb-link>CalleeBean</ejb-link>
-         </ejb-local-ref>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-         <security-role-ref>
-            <role-name>InternalRole</role-name>
-            <role-link>InternalRole</role-link>
-         </security-role-ref>
-         <security-identity>
-            <run-as>
-               <role-name>InternalRole</role-name>
-            </run-as>
-         </security-identity>
-      </session>
-      <session>
-         <description>A secured echo session bean that calls a StatelessSessionLocal
-            when its invokeEcho method is called, and calls another CalledSession
-            invokeEcho when its callEcho method is called. This uses a run-as
-            role of InternalRole to test propagation of this role.
-            DeepRunAsMDB
-              + Level1CallerBean.callEcho()
-                + Level2CallerBean.invokeEcho()
-                  + Level3CalleeBean.echo()
-         </description>
-         <ejb-name>Level1MDBCallerBean</ejb-name>
-         <local-home>org.jboss.test.security.interfaces.CalledSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.CalledSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.CallerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-local-ref>
-            <description>Another CallerBean used to test run-as propagation</description>
-            <ejb-ref-name>ejb/CallerHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.CalledSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.CalledSessionLocal</local>
-            <ejb-link>Level2CallerBean</ejb-link>
-         </ejb-local-ref>
-         <ejb-local-ref>
-            <description></description>
-            <ejb-ref-name>ejb/local/CalleeHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-            <ejb-link>CalleeBean</ejb-link>
-         </ejb-local-ref>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-         <security-role-ref>
-            <role-name>InternalRole</role-name>
-            <role-link>InternalRole</role-link>
-         </security-role-ref>
-      </session>
-      <session>
-         <description>A caller bean that is called by the </description>
-         <ejb-name>Level2CallerBean</ejb-name>
-         <home>org.jboss.test.security.interfaces.CalledSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.CalledSession</remote>
-         <local-home>org.jboss.test.security.interfaces.CalledSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.CalledSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.CallerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-local-ref>
-            <description></description>
-            <ejb-ref-name>ejb/local/CalleeHome</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-            <ejb-link>Level3CalleeBean</ejb-link>
-         </ejb-local-ref>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-         <security-role-ref>
-            <role-name>InternalRole</role-name>
-            <role-link>InternalRole</role-link>
-         </security-role-ref>
-         <security-identity>
-            <use-caller-identity />
-         </security-identity>
-      </session>
-      <session>
-         <description>A secured echo session bean that is called by CallerBean
-         </description>
-         <ejb-name>CalleeBean</ejb-name>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.CalleeBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-      <session>
-         <description>A secured echo session bean that is called by CallerBean
-         </description>
-         <ejb-name>Level3CalleeBean</ejb-name>
-         <local-home>org.jboss.test.security.interfaces.StatelessSessionLocalHome</local-home>
-         <local>org.jboss.test.security.interfaces.StatelessSessionLocal</local>
-         <ejb-class>org.jboss.test.security.ejb.CalleeBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-
-      <session>
-         <description>A secured trival echo session bean that calls
-            getCallerPrincpal in ejbCreate</description>
-         <ejb-name>SecureCreateSession</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean4</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-
-      <session>
-         <description>A secured trival echo session bean</description>
-         <ejb-name>org/jboss/test/security/ejb/StatelessSession_test</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <!-- Use the 'EchoCaller' role name in the bean code to test role linking
-         with use of isCallerInRole().
-         -->
-         <security-role-ref>
-            <role-name>EchoCaller</role-name>
-            <role-link>Echo</role-link>
-         </security-role-ref>
-      </session>
-
-      <session>
-         <description>A secured trival echo session bean that uses Entity</description>
-         <ejb-name>StatelessSession2</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean2</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Entity</ejb-ref-name>
-            <ejb-ref-type>Entity</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.EntityHome</home>
-            <remote>org.jboss.test.security.interfaces.Entity</remote>
-            <ejb-link>Entity</ejb-link>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Session</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-            <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-            <ejb-link>StatelessSession</ejb-link>
-         </ejb-ref>
-      </session>
-
-      <session>
-         <description>A secured trival echo session bean that uses PrivateEntity,
-            StatelessSession and itself via a runAs identity</description>
-         <ejb-name>RunAsStatelessSession</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean3</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Entity</ejb-ref-name>
-            <ejb-ref-type>Entity</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.EntityHome</home>
-            <remote>org.jboss.test.security.interfaces.Entity</remote>
-            <ejb-link>PrivateEntity</ejb-link>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Session</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-            <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-            <ejb-link>StatelessSession</ejb-link>
-         </ejb-ref>
-         <security-identity>
-            <description>Use a role that is not assigned to any users to
-               access restricted server side functionallity</description>
-            <run-as>
-               <role-name>InternalRole</role-name>
-            </run-as>
-         </security-identity>
-      </session>
-
-      <session>
-         <description>An unsecured trival echo session bean</description>
-         <ejb-name>UnsecureStatelessSession</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-      <session>
-         <description>An unsecured trival echo session bean type 2</description>
-         <ejb-name>UnsecureStatelessSession2</ejb-name>
-         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean2</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Entity</ejb-ref-name>
-            <ejb-ref-type>Entity</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.EntityHome</home>
-            <remote>org.jboss.test.security.interfaces.Entity</remote>
-            <ejb-link>Entity</ejb-link>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Session</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
-            <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
-            <ejb-link>StatelessSession</ejb-link>
-         </ejb-ref>
-      </session>
-
-      <session>
-         <description>A secured session bean that validates the </description>
-         <ejb-name>UserInRoleContextSession</ejb-name>
-         <home>org.jboss.test.security.interfaces.SecurityContextHome</home>
-         <remote>org.jboss.test.security.interfaces.SecurityContext</remote>
-         <ejb-class>org.jboss.test.security.ejb.SecurityContextBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-         <ejb-ref>
-            <ejb-ref-name>ejb/CalledBean</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.SecurityContextHome</home>
-            <remote>org.jboss.test.security.interfaces.SecurityContext</remote>
-            <ejb-link>UserInRoleContextSessionTarget</ejb-link>
-         </ejb-ref>
-      </session>
-      <session>
-         <ejb-name>UserInRoleContextSessionTarget</ejb-name>
-         <home>org.jboss.test.security.interfaces.SecurityContextHome</home>
-         <remote>org.jboss.test.security.interfaces.SecurityContext</remote>
-         <ejb-class>org.jboss.test.security.ejb.SecurityContextBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-
-      <session>
-        <description>A stateless session echo bean facade</description>
-        <ejb-name>PublicSessionFacade</ejb-name>
-        <home>org.jboss.test.security.ejb.jbas1852.SessionFacadeHome</home>
-        <remote>org.jboss.test.security.ejb.jbas1852.SessionFacade</remote>
-        <ejb-class>org.jboss.test.security.ejb.jbas1852.PublicSessionFacade</ejb-class>
-        <session-type>Stateless</session-type>
-        <transaction-type>Container</transaction-type>
-        <ejb-ref>
-          <ejb-ref-name>ejb/TargetEJB</ejb-ref-name>
-          <ejb-ref-type>Session</ejb-ref-type>
-          <home>org.jboss.test.security.ejb.jbas1852.SessionHome</home>
-          <remote>org.jboss.test.security.ejb.jbas1852.Session</remote>
-          <ejb-link>PublicSession</ejb-link>
-        </ejb-ref>
-        <security-role-ref>
-          <role-name>EchoUser</role-name>
-          <role-link>Echo</role-link>
-        </security-role-ref>
-        <security-identity>
-           <use-caller-identity />
-        </security-identity>
-      </session>
-     <session>
-       <description>A trival stateless session echo bean</description>
-       <ejb-name>PublicSession</ejb-name>
-       <home>org.jboss.test.security.ejb.jbas1852.SessionHome</home>
-       <remote>org.jboss.test.security.ejb.jbas1852.Session</remote>
-       <ejb-class>org.jboss.test.security.ejb.jbas1852.PublicSessionBean</ejb-class>
-       <session-type>Stateless</session-type>
-       <transaction-type>Container</transaction-type>
-       <ejb-ref>
-         <ejb-ref-name>ejb/PrivateSession</ejb-ref-name>
-         <ejb-ref-type>Session</ejb-ref-type>
-         <home>org.jboss.test.security.ejb.jbas1852.SessionHome</home>
-         <remote>org.jboss.test.security.ejb.jbas1852.Session</remote>
-         <ejb-link>PrivateSession</ejb-link>
-       </ejb-ref>
-       <security-role-ref>
-         <role-name>EchoUser</role-name>
-         <role-link>Echo</role-link>
-       </security-role-ref>
-       <security-identity>
-         <run-as>
-           <role-name>InternalUser</role-name>
-         </run-as>
-       </security-identity>
-     </session>
-     <session>
-       <description>A trival stateful session echo bean</description>
-       <ejb-name>PrivateSession</ejb-name>
-       <home>org.jboss.test.security.ejb.jbas1852.SessionHome</home>
-       <remote>org.jboss.test.security.ejb.jbas1852.Session</remote>
-       <ejb-class>org.jboss.test.security.ejb.jbas1852.PrivateSessionBean</ejb-class>
-       <session-type>Stateful</session-type>
-       <transaction-type>Container</transaction-type>
-       <security-role-ref>
-         <role-name>InternalUser</role-name>
-         <role-link>InternalUser</role-link>
-       </security-role-ref>
-     </session>
-
-      <entity>
-         <description>A trival echo entity bean</description>
-         <ejb-name>Entity</ejb-name>
-         <home>org.jboss.test.security.interfaces.EntityHome</home>
-         <remote>org.jboss.test.security.interfaces.Entity</remote>
-         <ejb-class>org.jboss.test.security.ejb.EntityBeanImpl</ejb-class>
-         <persistence-type>Bean</persistence-type>
-         <prim-key-class>java.lang.String</prim-key-class>
-         <reentrant>False</reentrant>
-      </entity>
-      <entity>
-         <description>A trival echo entity bean that should only be
-            accessible via other beans</description>
-         <ejb-name>PrivateEntity</ejb-name>
-         <home>org.jboss.test.security.interfaces.EntityHome</home>
-         <remote>org.jboss.test.security.interfaces.Entity</remote>
-         <ejb-class>org.jboss.test.security.ejb.EntityBeanImpl</ejb-class>
-         <persistence-type>Bean</persistence-type>
-         <prim-key-class>java.lang.String</prim-key-class>
-         <reentrant>False</reentrant>
-         <security-role-ref>
-            <role-name>InternalRole</role-name>
-            <role-link>InternalRole</role-link>
-         </security-role-ref>
-      </entity>
-
-      <message-driven>
-         <description>An mdb that access an entity bean as InternalUser</description>
-         <ejb-name>RunAsMDB</ejb-name>
-         <ejb-class>org.jboss.test.security.ejb.RunAsMDB</ejb-class>
-         <transaction-type>Container</transaction-type>
-         <message-driven-destination>
-            <destination-type>javax.jms.Queue</destination-type>
-            <subscription-durability>NonDurable</subscription-durability>
-         </message-driven-destination>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Entity</ejb-ref-name>
-            <ejb-ref-type>Entity</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.EntityHome</home>
-            <remote>org.jboss.test.security.interfaces.Entity</remote>
-            <ejb-link>PrivateEntity</ejb-link>
-         </ejb-ref>
-         <security-identity>
-            <description>Use a role that is not assigned to any users to
-               access restricted server side functionallity</description>
-            <run-as>
-               <role-name>InternalRole</role-name>
-            </run-as>
-         </security-identity>
-         <resource-ref>
-            <description>Default QueueFactory</description>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <res-type>javax.jms.QueueConnectionFactory</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-      </message-driven>
-      <message-driven>
-         <description>An mdb that access an entity bean as InternalUser to
-         test propagation of the run-as role through several levels</description>
-         <ejb-name>DeepRunAsMDB</ejb-name>
-         <ejb-class>org.jboss.test.security.ejb.RunAsPropagationMDB</ejb-class>
-         <transaction-type>Container</transaction-type>
-         <message-driven-destination>
-            <destination-type>javax.jms.Queue</destination-type>
-            <subscription-durability>NonDurable</subscription-durability>
-         </message-driven-destination>
-         <ejb-local-ref>
-            <ejb-ref-name>ejb/CalledSessionLocalHome</ejb-ref-name>
-            <ejb-ref-type>Entity</ejb-ref-type>
-            <local-home>org.jboss.test.security.interfaces.CalledSessionLocalHome</local-home>
-            <local>org.jboss.test.security.interfaces.CalledSessionLocal</local>
-            <ejb-link>Level1MDBCallerBean</ejb-link>
-         </ejb-local-ref>
-         <security-identity>
-            <description>Use a role that is not assigned to any users to
-               access restricted server side functionallity</description>
-            <run-as>
-               <role-name>InternalRole</role-name>
-            </run-as>
-         </security-identity>
-         <resource-ref>
-            <description>Default QueueFactory</description>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <res-type>javax.jms.QueueConnectionFactory</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-      </message-driven>
-      <message-driven>
-         <description>An mdb that access a session bean with multiple roles</description>
-         <ejb-name>RunAsWithRolesMDB</ejb-name>
-         <ejb-class>org.jboss.test.security.ejb.RunAsWithRolesMDB</ejb-class>
-         <transaction-type>Container</transaction-type>
-         <message-driven-destination>
-            <destination-type>javax.jms.Queue</destination-type>
-            <subscription-durability>NonDurable</subscription-durability>
-         </message-driven-destination>
-         <ejb-ref>
-            <ejb-ref-name>ejb/ProjRepository</ejb-ref-name>
-            <ejb-ref-type>Session</ejb-ref-type>
-            <home>org.jboss.test.security.interfaces.ProjRepositoryHome</home>
-            <remote>org.jboss.test.security.interfaces.ProjRepository</remote>
-            <ejb-link>ProjRepository</ejb-link>
-         </ejb-ref>
-         <security-identity>
-            <description>Use a role that is not assigned to any users to
-               access restricted server side functionallity. This needs to be
-               augmented with additional roles by the jboss.xml
-               security-identity element.
-            </description>
-            <run-as>
-               <role-name>InternalRole</role-name>
-            </run-as>
-         </security-identity>
-         <resource-ref>
-            <description>Default QueueFactory</description>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <res-type>javax.jms.QueueConnectionFactory</res-type>
-            <res-auth>Container</res-auth>
-         </resource-ref>
-      </message-driven>
-   </enterprise-beans>
-
-   <assembly-descriptor>
-      <security-role>
-         <description>The role required to invoke the echo method</description>
-         <role-name>Echo</role-name>
-      </security-role>
-      <security-role>
-         <description>The role required to invoke the echo method using the
-            StatelessSessionLocal interface</description>
-         <role-name>EchoLocal</role-name>
-      </security-role>
-      <security-role>
-         <description>The role used to prevent access to the PrivateEntity
-            bean from external users.
-         </description>
-         <role-name>InternalRole</role-name>
-      </security-role>
-      <security-role>
-         <role-name>ProjectAdmin</role-name>
-      </security-role>
-      <security-role>
-         <role-name>CreateFolder</role-name>
-      </security-role>
-      <security-role>
-         <role-name>DeleteFolder</role-name>
-      </security-role>
-      <security-role>
-         <role-name>Role1</role-name>
-      </security-role>
-      <security-role>
-         <role-name>Role2</role-name>
-      </security-role>
-
-      <!-- Define remote interface methods before the unchecked methods -->
-      <method-permission>
-         <role-name>Echo</role-name>
-         <method>
-            <ejb-name>UncheckedSessionRemoteFirst</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>echo</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>InternalRole</role-name>
-         <method>
-            <ejb-name>UncheckedSessionRemoteFirst</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>excluded</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <unchecked/>
-         <method>
-            <ejb-name>UncheckedSessionRemoteFirst</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>UserInRoleContextSessionTarget</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-
-      <!-- Define unchecked methods before the remote interface methods -->
-      <method-permission>
-         <unchecked/>
-         <method>
-            <ejb-name>UncheckedSessionRemoteLast</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>Echo</role-name>
-         <method>
-            <ejb-name>UncheckedSessionRemoteLast</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>echo</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>InternalRole</role-name>
-         <method>
-            <ejb-name>UncheckedSessionRemoteLast</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>excluded</method-name>
-         </method>
-      </method-permission>
-
-      <!-- Anyone can access the unchecked() method of the StatelessSession bean -->
-      <method-permission>
-         <unchecked/>
-         <method>
-            <ejb-name>StatelessSession</ejb-name>
-            <method-name>unchecked</method-name>
-         </method>
-
-         <method>
-            <ejb-name>UncheckedSession</ejb-name>
-            <method-name>create</method-name>
-         </method>
-         <method>
-            <ejb-name>UncheckedSession</ejb-name>
-            <method-name>unchecked</method-name>
-         </method>
-      </method-permission>
-
-      <!-- The methods the Echo role can access -->
-      <method-permission>
-         <role-name>Echo</role-name>
-
-         <method>
-            <ejb-name>StatelessSession</ejb-name>
-            <method-name>create</method-name>
-         </method>
-         <method>
-            <ejb-name>StatelessSession</ejb-name>
-            <method-name>remove</method-name>
-         </method>
-         <method>
-            <ejb-name>StatelessSession</ejb-name>
-            <method-name>echo</method-name>
-         </method>
-         <method>
-            <ejb-name>StatelessSession</ejb-name>
-            <method-name>npeError</method-name>
-         </method>
-
-         <method>
-            <ejb-name>StatefulSession</ejb-name>
-            <method-intf>Home</method-intf>
-            <method-name>create</method-name>
-         </method>
-         <method>
-            <ejb-name>StatefulSession</ejb-name>
-            <method-intf>Home</method-intf>
-            <method-name>remove</method-name>
-         </method>
-         <method>
-            <ejb-name>StatefulSession</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>CallerBean</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>CallerFacadeBean-testRunAsSFSB</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>Level1CallerBean</ejb-name>
-            <method-name>*</method-name>
-         </method>
-
-         <method>
-            <ejb-name>org/jboss/test/security/ejb/StatelessSession_test</ejb-name>
-            <method-name>*</method-name>
-         </method>
-
-         <method>
-            <ejb-name>SecureCreateSession</ejb-name>
-            <method-name>*</method-name>
-         </method>
-
-         <method>
-            <ejb-name>StatelessSession2</ejb-name>
-            <method-name>*</method-name>
-         </method>
-
-         <method>
-            <ejb-name>Entity</ejb-name>
-            <method-name>*</method-name>
-         </method>
-
-         <method>
-            <ejb-name>RunAsStatelessSession</ejb-name>
-            <method-name>create</method-name>
-         </method>
-         <method>
-            <ejb-name>RunAsStatelessSession</ejb-name>
-            <method-name>remove</method-name>
-         </method>
-         <method>
-            <ejb-name>RunAsStatelessSession</ejb-name>
-            <method-name>echo</method-name>
-         </method>
-         <method>
-            <ejb-name>RunAsStatelessSession</ejb-name>
-            <method-name>forward</method-name>
-         </method>
-         <method>
-            <ejb-name>RunAsStatelessSession</ejb-name>
-            <method-name>noop</method-name>
-         </method>
-         <method>
-            <ejb-name>StatelessSessionInDomain</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-
-      <!-- The methods the EchoLocal role can access -->
-      <method-permission>
-         <role-name>EchoLocal</role-name>
-
-         <method>
-            <ejb-name>CalleeBean</ejb-name>
-            <method-intf>LocalHome</method-intf>
-            <method-name>create</method-name>
-         </method>
-         <method>
-            <ejb-name>CalleeBean</ejb-name>
-            <method-intf>Local</method-intf>
-            <method-name>echo</method-name>
-         </method>
-         <method>
-            <ejb-name>CallerFacadeTargetSFSB</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-
-      <!-- The methods the InternalRole role can access -->
-      <method-permission>
-         <role-name>InternalRole</role-name>
-
-         <method>
-            <ejb-name>PrivateEntity</ejb-name>
-            <method-name>*</method-name>
-         </method>
-
-         <method>
-            <ejb-name>RunAsStatelessSession</ejb-name>
-            <method-name>excluded</method-name>
-         </method>
-         <method>
-            <ejb-name>Level1MDBCallerBean</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>Level2CallerBean</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>Level3CalleeBean</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>CallerFacadeTargetCallee</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-
-      <method-permission>
-         <role-name>ProjectUser</role-name>
-         <method>
-            <ejb-name>ProjRepository</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>ProjectAdmin</role-name>
-         <method>
-            <ejb-name>ProjRepository</ejb-name>
-            <method-intf>Home</method-intf>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>ProjRepository</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>remove</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>CreateFolder</role-name>
-         <method>
-            <ejb-name>ProjRepository</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>createFolder</method-name>
-         </method>
-         <method>
-            <ejb-name>ProjRepository</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>createItem</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>DeleteFolder</role-name>
-         <method>
-            <ejb-name>ProjRepository</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>deleteFolder</method-name>
-         </method>
-         <method>
-            <ejb-name>ProjRepository</ejb-name>
-            <method-intf>Remote</method-intf>
-            <method-name>deleteItem</method-name>
-         </method>
-      </method-permission>
-
-      <method-permission>
-         <role-name>Role1</role-name>
-         <method>
-            <ejb-name>UserInRoleContextSession</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-         <role-name>Role2</role-name>
-         <method>
-            <ejb-name>UserInRoleContextSession</ejb-name>
-            <method-name>*</method-name>
-         </method>
-      </method-permission>
-
-      <method-permission>
-        <role-name>Echo</role-name>
-         <method>
-           <ejb-name>PublicSession</ejb-name>
-           <method-name>*</method-name>
-         </method>
-         <method>
-           <ejb-name>PublicSessionFacade</ejb-name>
-           <method-name>*</method-name>
-         </method>
-      </method-permission>
-      <method-permission>
-        <role-name>InternalUser</role-name>
-        <method>
-          <ejb-name>PrivateSession</ejb-name>
-          <method-name>*</method-name>
-        </method>
-      </method-permission>
-
-      <!-- No one can access the excluded() method of the
-          StatelessSession and StatelessSession2 beans -->
-      <exclude-list>
-         <description>A method that no one can access in this deployment</description>
-         <method>
-            <ejb-name>StatelessSession</ejb-name>
-            <method-name>excluded</method-name>
-         </method>
-         <method>
-            <ejb-name>StatelessSession2</ejb-name>
-            <method-name>excluded</method-name>
-         </method>
-         <method>
-            <ejb-name>StatelessSessionInDomain</ejb-name>
-            <method-name>excluded</method-name>
-         </method>
-      </exclude-list>
-
-   </assembly-descriptor>
-
-</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-<policy>
-  <application-policy name="timer-runas-test">
-      <authentication>
-         <login-module code="org.jboss.security.auth.spi.AnonLoginModule"
-            flag="required">
-            <module-option name="unauthenticatedIdentity">nobody</module-option>
-         </login-module>
-      </authentication>
-   </application-policy>
-</policy>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+<policy>
+  <application-policy name="timer-runas-test">
+      <authentication>
+         <login-module code="org.jboss.security.auth.spi.AnonLoginModule"
+            flag="required">
+            <module-option name="unauthenticatedIdentity">nobody</module-option>
+         </login-module>
+      </authentication>
+   </application-policy>
+</policy>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jaas-test-config.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jboss.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jboss.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,218 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE jboss PUBLIC
-   "-//JBoss//DTD JBOSS 4.0//EN"
-   "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
-
-<!-- The jboss.xml descriptor for the security-spec.jar ejb unit.
-This descriptor redefines the JNDI names of the beans in the ejb-jar.xml
-descriptor so that there is no conflict with the security.jar deployment.
--->
-<jboss>
-   <security-domain>
-      java:/jaas/spec-test
-   </security-domain>
-   <unauthenticated-principal>nobody</unauthenticated-principal>
-
-   <enterprise-beans>
-      <entity>
-         <ejb-name>Entity</ejb-name>
-         <jndi-name>spec.Entity</jndi-name>
-      </entity>
-      <entity>
-         <ejb-name>PrivateEntity</ejb-name>
-         <jndi-name>spec.PrivateEntity</jndi-name>
-      </entity>
-      <session>
-         <ejb-name>StatefulSession</ejb-name>
-         <jndi-name>spec.StatefulSession</jndi-name>
-         <configuration-name>Standard Stateful SessionBean</configuration-name>
-      </session>
-      <session>
-         <ejb-name>StatelessSession</ejb-name>
-         <jndi-name>spec.StatelessSession</jndi-name>
-         <configuration-name>Standard Stateless SessionBean</configuration-name>
-      </session>
-      <session>
-         <ejb-name>UncheckedSession</ejb-name>
-         <jndi-name>spec.UncheckedSession</jndi-name>
-         <configuration-name>Standard Stateless SessionBean</configuration-name>
-      </session>
-      <session>
-         <ejb-name>UncheckedSessionRemoteFirst</ejb-name>
-         <jndi-name>spec.UncheckedSessionRemoteFirst</jndi-name>
-         <configuration-name>Standard Stateless SessionBean</configuration-name>
-      </session>
-      <session>
-         <ejb-name>UncheckedSessionRemoteLast</ejb-name>
-         <jndi-name>spec.UncheckedSessionRemoteLast</jndi-name>
-         <configuration-name>Standard Stateless SessionBean</configuration-name>
-      </session>
-      <session>
-         <ejb-name>StatelessSessionInDomain</ejb-name>
-         <jndi-name>spec.StatelessSessionInDomain</jndi-name>
-         <configuration-name>Domain Stateless SessionBean</configuration-name>
-      </session>
-      <session>
-         <ejb-name>CallerBean</ejb-name>
-         <jndi-name>spec.CallerBean</jndi-name>
-      </session>
-      <session>
-         <ejb-name>CallerFacadeBean-testRunAsSFSB</ejb-name>
-         <jndi-name>spec.CallerFacadeBean-testRunAsSFSB</jndi-name>
-      </session>
-      <session>
-         <ejb-name>CallerFacadeTargetSFSB</ejb-name>
-         <jndi-name>spec.CallerFacadeTargetSFSB</jndi-name>
-      </session>
-      <session>
-        <ejb-name>Level1CallerBean</ejb-name>
-        <jndi-name>spec.Level1CallerBean</jndi-name>
-      </session>
-      <session>
-        <ejb-name>Level2CallerBean</ejb-name>
-        <jndi-name>spec.Level2CallerBean</jndi-name>
-      </session>
-      <session>
-        <ejb-name>Level3CalleeBean</ejb-name>
-        <jndi-name>spec.Level3CalleeBean</jndi-name>
-      </session>
-      <session>
-         <ejb-name>SecureCreateSession</ejb-name>
-         <jndi-name>spec.SecureCreateSession</jndi-name>
-      </session>
-      <session>
-         <ejb-name>org/jboss/test/security/ejb/StatelessSession_test</ejb-name>
-         <jndi-name>spec.StatelessSession_test</jndi-name>
-      </session>
-      <session>
-         <ejb-name>StatelessSession2</ejb-name>
-         <jndi-name>spec.StatelessSession2</jndi-name>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Entity</ejb-ref-name>
-            <jndi-name>spec.Entity</jndi-name>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Session</ejb-ref-name>
-            <jndi-name>spec.StatelessSession</jndi-name>
-         </ejb-ref>
-      </session>
-      <session>
-         <ejb-name>RunAsStatelessSession</ejb-name>
-         <jndi-name>spec.RunAsStatelessSession</jndi-name>
-         <configuration-name>Standard Stateless SessionBean</configuration-name>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Entity</ejb-ref-name>
-            <jndi-name>spec.PrivateEntity</jndi-name>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Session</ejb-ref-name>
-            <jndi-name>spec.StatelessSession</jndi-name>
-         </ejb-ref>
-      </session>
-      <session>
-         <ejb-name>UnsecureStatelessSession</ejb-name>
-         <jndi-name>spec.UnsecureStatelessSession</jndi-name>
-         <configuration-name>Unsecure Stateless SessionBean</configuration-name>
-      </session>
-      <session>
-         <ejb-name>UnsecureStatelessSession2</ejb-name>
-         <jndi-name>spec.UnsecureStatelessSession2</jndi-name>
-         <configuration-name>Unsecure Stateless SessionBean</configuration-name>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Entity</ejb-ref-name>
-            <jndi-name>spec.Entity</jndi-name>
-         </ejb-ref>
-         <ejb-ref>
-            <ejb-ref-name>ejb/Session</ejb-ref-name>
-            <jndi-name>spec.StatelessSession</jndi-name>
-         </ejb-ref>
-      </session>
-      <session>
-         <ejb-name>UserInRoleContextSession</ejb-name>
-         <jndi-name>spec.UserInRoleContextSession</jndi-name>
-      </session>
-      <session>
-         <ejb-name>UserInRoleContextSessionTarget</ejb-name>
-         <jndi-name>spec.UserInRoleContextSessionTarget</jndi-name>
-         <configuration-name>Domain2 Stateless SessionBean</configuration-name>
-      </session>
-
-      <session>
-         <ejb-name>PublicSessionFacade</ejb-name>
-         <jndi-name>spec.PublicSessionFacade</jndi-name>
-      </session>
-      <session>
-         <ejb-name>PublicSession</ejb-name>
-         <jndi-name>spec.PublicSession</jndi-name>
-      </session>
-      <session>
-         <ejb-name>PrivateSession</ejb-name>
-         <jndi-name>spec.PrivateSession</jndi-name>
-      </session>
-
-      <message-driven>
-         <ejb-name>RunAsMDB</ejb-name>
-         <destination-jndi-name>queue/A</destination-jndi-name>
-         <resource-ref>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <jndi-name>ConnectionFactory</jndi-name>
-         </resource-ref>
-      </message-driven>
-      <message-driven>
-         <ejb-name>RunAsWithRolesMDB</ejb-name>
-         <destination-jndi-name>queue/C</destination-jndi-name>
-         <security-identity>
-            <run-as-principal>RunAsWithRolesMDBPrincipal</run-as-principal>
-         </security-identity>
-         <resource-ref>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <jndi-name>ConnectionFactory</jndi-name>
-         </resource-ref>
-      </message-driven>
-      <message-driven>
-         <ejb-name>DeepRunAsMDB</ejb-name>
-         <destination-jndi-name>queue/D</destination-jndi-name>
-         <security-identity>
-            <run-as-principal>InternalUser</run-as-principal>
-         </security-identity>
-         <resource-ref>
-            <res-ref-name>jms/QueFactory</res-ref-name>
-            <jndi-name>ConnectionFactory</jndi-name>
-         </resource-ref>
-      </message-driven>
-
-   </enterprise-beans>
-
-   <assembly-descriptor>
-      <security-role>
-         <role-name>ProjectAdmin</role-name>
-         <principal-name>RunAsWithRolesMDBPrincipal</principal-name>
-      </security-role>
-      <security-role>
-         <role-name>CreateFolder</role-name>
-         <principal-name>RunAsWithRolesMDBPrincipal</principal-name>
-      </security-role>
-      <security-role>
-         <role-name>DeleteFolder</role-name>
-         <principal-name>RunAsWithRolesMDBPrincipal</principal-name>
-      </security-role>
-   </assembly-descriptor>
-
-   <container-configurations>
-      <!-- A stateless session config that is not secured -->
-      <container-configuration extends="Standard Stateless SessionBean">
-         <container-name>Unsecure Stateless SessionBean</container-name>
-         <security-domain/>
-      </container-configuration>
-      <!-- A stateless session config that uses the spec-test-domain -->
-      <container-configuration extends="Standard Stateless SessionBean">
-         <container-name>Domain Stateless SessionBean</container-name>
-         <security-domain>java:/jaas/spec-test-domain</security-domain>
-      </container-configuration>
-      <!-- A stateless session config that uses the spec-test-domain2 -->
-      <container-configuration extends="Standard Stateless SessionBean">
-         <container-name>Domain2 Stateless SessionBean</container-name>
-         <security-domain>java:/jaas/spec-test-domain2</security-domain>
-      </container-configuration>
-   </container-configurations>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/security/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC
-   "-//JBoss//DTD Web Application 2.4//EN"
-   "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-    <security-domain>java:/jaas/security-web</security-domain>
-</jboss-web>

Copied: branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC
+   "-//JBoss//DTD Web Application 2.4//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+    <security-domain>java:/jaas/security-web</security-domain>
+</jboss-web>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/security/WEB-INF/web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4"
-   xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-   <servlet>
-      <servlet-name>EJBServlet</servlet-name>
-      <servlet-class>org.jboss.ejb3.test.security.servlets.EJBServlet</servlet-class>
-   </servlet>
-
-   <servlet-mapping>
-      <servlet-name>EJBServlet</servlet-name>
-      <url-pattern>/EJBServlet</url-pattern>
-   </servlet-mapping>
-</web-app>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/security/WEB-INF/web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4"
+   xmlns="http://java.sun.com/xml/ns/j2ee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+   <servlet>
+      <servlet-name>EJBServlet</servlet-name>
+      <servlet-class>org.jboss.ejb3.test.security.servlets.EJBServlet</servlet-class>
+   </servlet>
+
+   <servlet-mapping>
+      <servlet-name>EJBServlet</servlet-name>
+      <url-pattern>/EJBServlet</url-pattern>
+   </servlet-mapping>
+</web-app>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/security/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-   <!-- The custom JAAS login configuration service that installs 
-       a Configuration capable of dynamically updating the
-       config settings
-   -->
-   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
-         name="jboss.security.tests:service=DynamicLoginConfig">
-      <attribute name="AuthConfig">META-INF/jaas-test-config.xml</attribute>
-      <depends optional-attribute-name="LoginConfigService">
-         jboss.security:service=XMLLoginConfig
-      </depends>
-      <depends optional-attribute-name="SecurityManagerService">
-         jboss.security:service=JaasSecurityManager
-      </depends>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/security/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+   <!-- The custom JAAS login configuration service that installs 
+       a Configuration capable of dynamically updating the
+       config settings
+   -->
+   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+         name="jboss.security.tests:service=DynamicLoginConfig">
+      <attribute name="AuthConfig">META-INF/jaas-test-config.xml</attribute>
+      <depends optional-attribute-name="LoginConfigService">
+         jboss.security:service=XMLLoginConfig
+      </depends>
+      <depends optional-attribute-name="SecurityManagerService">
+         jboss.security:service=JaasSecurityManager
+      </depends>
+   </mbean>
+
+</server>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/security/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/securitydomain (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain)

Copied: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-<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">
-  <enterprise-beans>
-    <session>
-      <ejb-name>SecurityDomainTest</ejb-name>
-      <remote>org.jboss.ejb3.test.securitydomain.SecurityDomainTest</remote>
-      <ejb-class>org.jboss.ejb3.test.securitydomain.SecurityDomainTestBean</ejb-class>
-      <session-type>Stateless</session-type>
-      <transaction-type>Container</transaction-type>
-    </session>
-  </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<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">
+  <enterprise-beans>
+    <session>
+      <ejb-name>SecurityDomainTest</ejb-name>
+      <remote>org.jboss.ejb3.test.securitydomain.SecurityDomainTest</remote>
+      <ejb-class>org.jboss.ejb3.test.securitydomain.SecurityDomainTestBean</ejb-class>
+      <session-type>Stateless</session-type>
+      <transaction-type>Container</transaction-type>
+    </session>
+  </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <security-domain>java:/jaas/other</security-domain>
-   <enterprise-beans>
-      <session>
-         <ejb-name>SecurityDomainTest</ejb-name>
-         <jndi-name>SecurityDomainTest</jndi-name>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <security-domain>java:/jaas/other</security-domain>
+   <enterprise-beans>
+      <session>
+         <ejb-name>SecurityDomainTest</ejb-name>
+         <jndi-name>SecurityDomainTest</jndi-name>
+      </session>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-somebody=allowed
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/securitydomain/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+somebody=allowed
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-somebody=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/securitydomain/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/securitydomain/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/securitydomain/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/securitydomain/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+somebody=password

Deleted: branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?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"> 
-   <description>jBoss test application </description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>SessionBean</ejb-name>
-         <remote>org.jboss.ejb3.test.service.SessionRemote</remote>
-         <ejb-class>org.jboss.ejb3.test.service.SessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/service/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+                            http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+        version="3.0"> 
+   <description>jBoss test application </description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>SessionBean</ejb-name>
+         <remote>org.jboss.ejb3.test.service.SessionRemote</remote>
+         <ejb-class>org.jboss.ejb3.test.service.SessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+   </enterprise-beans>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="test">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/service/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="test">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/service/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=consumerqueuetest">
-      <attribute name="JNDIName">queue/consumertest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Topic"
-      name="jboss.mq.destination:service=Topic,name=topictest">
-      <attribute name="JNDIName">topic/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/service/test-destination-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queuetest">
+      <attribute name="JNDIName">queue/mdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=consumerqueuetest">
+      <attribute name="JNDIName">queue/consumertest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Topic"
+      name="jboss.mq.destination:service=Topic,name=topictest">
+      <attribute name="JNDIName">topic/mdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Topic"
+      name="jboss.mq.destination:service=Topic,name=testTopic">
+      <attribute name="JNDIName">topic/testTopic</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+
+</server>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/service/test-destination-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/servicexmbean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servicexmbean)

Copied: branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servicexmbean/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <service>
-         <ejb-name>ServiceOneDeploymentDescriptor</ejb-name>
-         <ejb-class>org.jboss.ejb3.test.servicexmbean.ServiceOneDeploymentDescriptor</ejb-class>
-         <object-name>jboss.ejb3.test:service=ServiceOneDeploymentDescriptor</object-name>
-         <remote>org.jboss.ejb3.test.servicexmbean.ServiceOneRemote</remote>
-         <xmbean>resource:service-xmbean.xml</xmbean>
-         <jndi-name>ServiceOneDeploymentDescriptor/remote</jndi-name>
-      </service>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <service>
+         <ejb-name>ServiceOneDeploymentDescriptor</ejb-name>
+         <ejb-class>org.jboss.ejb3.test.servicexmbean.ServiceOneDeploymentDescriptor</ejb-class>
+         <object-name>jboss.ejb3.test:service=ServiceOneDeploymentDescriptor</object-name>
+         <remote>org.jboss.ejb3.test.servicexmbean.ServiceOneRemote</remote>
+         <xmbean>resource:service-xmbean.xml</xmbean>
+         <jndi-name>ServiceOneDeploymentDescriptor/remote</jndi-name>
+      </service>
+   </enterprise-beans>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/service-xmbean.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servicexmbean/service-xmbean.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/service-xmbean.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mbean PUBLIC
-        "-//JBoss//DTD JBOSS XMBEAN 1.0//EN"
-        "http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_0.dtd">
-<mbean>
-
-    <description>EJB3 Service XMBean Example</description>
-    
-    <class>org.jboss.ejb3.test.servicexmbean.ServiceOne</class>
-   
-    <!-- Constructors -->
-    <constructor>
-        <description>The default constructor</description>
-        <name>ServiceOne</name>
-    </constructor>
-
-    <!-- Attributes -->
-    
-    <attribute access="read-write" getMethod="getStringAttribute" setMethod="setStringAttribute">
-        <description>Test attribute</description>
-        <name>StringAttribute</name>
-        <type>java.lang.String</type>
-    </attribute>
-
-    <!-- Operations -->
-    <operation>
-        <description>Resets</description>
-        <name>testOperation</name>
-        <return-type>java.lang.Void</return-type>
-    </operation>
-</mbean>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/service-xmbean.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servicexmbean/service-xmbean.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/service-xmbean.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servicexmbean/service-xmbean.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mbean PUBLIC
+        "-//JBoss//DTD JBOSS XMBEAN 1.0//EN"
+        "http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_0.dtd">
+<mbean>
+
+    <description>EJB3 Service XMBean Example</description>
+    
+    <class>org.jboss.ejb3.test.servicexmbean.ServiceOne</class>
+   
+    <!-- Constructors -->
+    <constructor>
+        <description>The default constructor</description>
+        <name>ServiceOne</name>
+    </constructor>
+
+    <!-- Attributes -->
+    
+    <attribute access="read-write" getMethod="getStringAttribute" setMethod="setStringAttribute">
+        <description>Test attribute</description>
+        <name>StringAttribute</name>
+        <type>java.lang.String</type>
+    </attribute>
+
+    <!-- Operations -->
+    <operation>
+        <description>Resets</description>
+        <name>testOperation</name>
+        <return-type>java.lang.Void</return-type>
+    </operation>
+</mbean>
+

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet)

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-Class-Path: servlet-client.jar
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+Class-Path: servlet-client.jar
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/application.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application>
-    <display-name>EJB3 Web Container Testsuite</display-name>
-
-    <module>
-    <web>
-        <description>The testsuite war</description>
-        <web-uri>servlet.war</web-uri>
-        <context-root>/servlet</context-root>
-    </web>
-    </module>
- 
-   <module>
-       <ejb>servlet-client.jar</ejb>
-   </module>
-
-    <module>
-        <ejb>servlet-ejbs.jar</ejb>
-    </module>
-</application>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/application.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+    <display-name>EJB3 Web Container Testsuite</display-name>
+
+    <module>
+    <web>
+        <description>The testsuite war</description>
+        <web-uri>servlet.war</web-uri>
+        <context-root>/servlet</context-root>
+    </web>
+    </module>
+ 
+   <module>
+       <ejb>servlet-client.jar</ejb>
+   </module>
+
+    <module>
+        <ejb>servlet-ejbs.jar</ejb>
+    </module>
+</application>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,7 +0,0 @@
-<jboss-app>
-   <loader-repository>jboss.test:war=servlet.war</loader-repository>
-
-   <module>
-      <service>servlet-security-service.xml</service>
-   </module>
-</jboss-app>

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,7 @@
+<jboss-app>
+   <loader-repository>jboss.test:war=servlet.war</loader-repository>
+
+   <module>
+      <service>servlet-security-service.xml</service>
+   </module>
+</jboss-app>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <!--loader-repository>
-      jboss.test:war=servlet.war
-      <loader-repository-config>
-         java2ParentDelegaton=false
-      </loader-repository-config>
-   </loader-repository-->
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <!--loader-repository>
+      jboss.test:war=servlet.war
+      <loader-repository-config>
+         java2ParentDelegaton=false
+      </loader-repository-config>
+   </loader-repository-->
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-web
-    PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-   <!--class-loading>
-      <loader-repository>
-         jboss.test:war=servlet.war
-         <loader-repository-config>
-            java2ParentDelegation=false
-         </loader-repository-config>
-      </loader-repository>
-   </class-loading-->
-   
-   <security-domain>java:/jaas/userinrole</security-domain>
-   
-   <ejb-ref>
-      <ejb-ref-name>ejb/remote/Session30</ejb-ref-name>
-      <jndi-name>ejb/Session30Home</jndi-name>
-   </ejb-ref>
-   
-   <ejb-local-ref>
-      <ejb-ref-name>ejb/local/Session30</ejb-ref-name>
-      <local-jndi-name>ejb/Session30LocalHome</local-jndi-name>
-   </ejb-local-ref>
-</jboss-web>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-web
+    PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+   <!--class-loading>
+      <loader-repository>
+         jboss.test:war=servlet.war
+         <loader-repository-config>
+            java2ParentDelegation=false
+         </loader-repository-config>
+      </loader-repository>
+   </class-loading-->
+   
+   <security-domain>java:/jaas/userinrole</security-domain>
+   
+   <ejb-ref>
+      <ejb-ref-name>ejb/remote/Session30</ejb-ref-name>
+      <jndi-name>ejb/Session30Home</jndi-name>
+   </ejb-ref>
+   
+   <ejb-local-ref>
+      <ejb-ref-name>ejb/local/Session30</ejb-ref-name>
+      <local-jndi-name>ejb/Session30LocalHome</local-jndi-name>
+   </ejb-local-ref>
+</jboss-web>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4"
-   xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-   <description>EJB3 Servlet Access Test</description>
-   
-   <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>Restricted</web-resource-name>
-         <url-pattern>/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint>
-         <role-name>allowed</role-name>
-      </auth-constraint>
-   </security-constraint>
-
-   <servlet>
-      <servlet-name>EJBServlet</servlet-name>
-      <servlet-class>org.jboss.ejb3.test.servlet.servlets.EJBServlet</servlet-class>
-   </servlet>
-
-   <!-- The servlet and jsp page mappings -->
-   <servlet-mapping>
-      <servlet-name>EJBServlet</servlet-name>
-      <url-pattern>/EJBServlet</url-pattern>
-   </servlet-mapping>
-   
-   <ejb-ref>
-      <ejb-ref-name>ejb/remote/Session30</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <home>org.jboss.ejb3.test.servlet.Session30Home</home>
-      <remote>org.jboss.ejb3.test.servlet.Session30</remote>
-   </ejb-ref>
-   
-   <ejb-local-ref>
-      <ejb-ref-name>ejb/local/Session30</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <local-home>org.jboss.ejb3.test.servlet.Session30LocalHome</local-home>
-      <local>org.jboss.ejb3.test.servlet.Session30</local>
-   </ejb-local-ref>
-   
-   <security-role>
-      <role-name>allowed</role-name>
-   </security-role>
-   
-   <login-config>
-      <auth-method>BASIC</auth-method>
-      <realm-name>JBossTest Servlets</realm-name>
-   </login-config>
-</web-app>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4"
+   xmlns="http://java.sun.com/xml/ns/j2ee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+   <description>EJB3 Servlet Access Test</description>
+   
+   <security-constraint>
+      <web-resource-collection>
+         <web-resource-name>Restricted</web-resource-name>
+         <url-pattern>/*</url-pattern>
+      </web-resource-collection>
+      <auth-constraint>
+         <role-name>allowed</role-name>
+      </auth-constraint>
+   </security-constraint>
+
+   <servlet>
+      <servlet-name>EJBServlet</servlet-name>
+      <servlet-class>org.jboss.ejb3.test.servlet.servlets.EJBServlet</servlet-class>
+   </servlet>
+
+   <!-- The servlet and jsp page mappings -->
+   <servlet-mapping>
+      <servlet-name>EJBServlet</servlet-name>
+      <url-pattern>/EJBServlet</url-pattern>
+   </servlet-mapping>
+   
+   <ejb-ref>
+      <ejb-ref-name>ejb/remote/Session30</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <home>org.jboss.ejb3.test.servlet.Session30Home</home>
+      <remote>org.jboss.ejb3.test.servlet.Session30</remote>
+   </ejb-ref>
+   
+   <ejb-local-ref>
+      <ejb-ref-name>ejb/local/Session30</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <local-home>org.jboss.ejb3.test.servlet.Session30LocalHome</local-home>
+      <local>org.jboss.ejb3.test.servlet.Session30</local>
+   </ejb-local-ref>
+   
+   <security-role>
+      <role-name>allowed</role-name>
+   </security-role>
+   
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>JBossTest Servlets</realm-name>
+   </login-config>
+</web-app>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,2 +0,0 @@
-somebody=allowed
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,2 @@
+somebody=allowed
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/roles.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/servlet-security-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/servlet-security-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/servlet-security-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-   <!-- The custom JAAS login configuration that installs 
-       a Configuration capable of dynamically updating the
-       config settings
-   -->
-   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
-      name="jboss.security.tests:service=LoginConfig">
-      <attribute name="PolicyConfig" serialDataType="jbxb">
-         <jaas:policy
-            xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd"
-            xmlns:jaas="urn:jboss:security-config:4.1"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            >
-            <jaas:application-policy name="userinrole">
-               <jaas:authentication>
-                  <jaas:login-module code="org.jboss.security.auth.spi.XMLLoginModule"
-                     flag="required">
-                     <jaas:module-option name="userInfo">
-                        <ur:users
-                           xsi:schemaLocation="urn:jboss:user-roles:1.0 resource:user-roles_1_0.xsd"
-                           xmlns:ur="urn:jboss:user-roles:1.0">
-                           <ur:user name="somebody" password="password">
-                              <ur:role name="allowed"/>
-                              <ur:role name="allowed" group="CallerPrincipal"/>
-                           </ur:user>
-                        </ur:users>
-                     </jaas:module-option>
-                     <jaas:module-option name="unauthenticatedIdentity">guest</jaas:module-option>
-                  </jaas:login-module>
-               </jaas:authentication>
-            </jaas:application-policy>
-         </jaas:policy>         
-      </attribute>
-      <depends optional-attribute-name="LoginConfigService">
-         jboss.security:service=XMLLoginConfig
-      </depends>
-      <depends optional-attribute-name="SecurityManagerService">
-         jboss.security:service=JaasSecurityManager
-      </depends>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/servlet-security-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/servlet-security-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/servlet-security-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/servlet-security-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+   <!-- The custom JAAS login configuration that installs 
+       a Configuration capable of dynamically updating the
+       config settings
+   -->
+   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+      name="jboss.security.tests:service=LoginConfig">
+      <attribute name="PolicyConfig" serialDataType="jbxb">
+         <jaas:policy
+            xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd"
+            xmlns:jaas="urn:jboss:security-config:4.1"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            >
+            <jaas:application-policy name="userinrole">
+               <jaas:authentication>
+                  <jaas:login-module code="org.jboss.security.auth.spi.XMLLoginModule"
+                     flag="required">
+                     <jaas:module-option name="userInfo">
+                        <ur:users
+                           xsi:schemaLocation="urn:jboss:user-roles:1.0 resource:user-roles_1_0.xsd"
+                           xmlns:ur="urn:jboss:user-roles:1.0">
+                           <ur:user name="somebody" password="password">
+                              <ur:role name="allowed"/>
+                              <ur:role name="allowed" group="CallerPrincipal"/>
+                           </ur:user>
+                        </ur:users>
+                     </jaas:module-option>
+                     <jaas:module-option name="unauthenticatedIdentity">guest</jaas:module-option>
+                  </jaas:login-module>
+               </jaas:authentication>
+            </jaas:application-policy>
+         </jaas:policy>         
+      </attribute>
+      <depends optional-attribute-name="LoginConfigService">
+         jboss.security:service=XMLLoginConfig
+      </depends>
+      <depends optional-attribute-name="SecurityManagerService">
+         jboss.security:service=JaasSecurityManager
+      </depends>
+   </mbean>
+
+</server>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-somebody=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/servlet/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+somebody=password


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/servlet/users.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/singletable (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/singletable)

Copied: branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/singletable/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/singletable/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/singletable/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/singletable/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/ssladvanced (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ssladvanced)

Copied: branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ssladvanced/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-   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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-   version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>OverrideStatefulClusteredBean</ejb-name>
-         <remote-binding>
-            <jndi-name>OverrideStatefulClusteredSSL</jndi-name>
-            <client-bind-url>sslsocket://0.0.0.0:3843</client-bind-url>
-         </remote-binding>
-         <remote-binding>
-            <jndi-name>OverrideStatefulClusteredNormal</jndi-name>
-            <client-bind-url>socket://0.0.0.0:3873</client-bind-url>
-         </remote-binding>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/ssladvanced/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<jboss
+   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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+   version="3.0">
+   <enterprise-beans>
+      <session>
+         <ejb-name>OverrideStatefulClusteredBean</ejb-name>
+         <remote-binding>
+            <jndi-name>OverrideStatefulClusteredSSL</jndi-name>
+            <client-bind-url>sslsocket://0.0.0.0:3843</client-bind-url>
+         </remote-binding>
+         <remote-binding>
+            <jndi-name>OverrideStatefulClusteredNormal</jndi-name>
+            <client-bind-url>socket://0.0.0.0:3873</client-bind-url>
+         </remote-binding>
+      </session>
+   </enterprise-beans>
+</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone)

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,14 +0,0 @@
-<?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">
-   <assembly-descriptor>
-      <interceptor-binding>
-         <ejb-name>*</ejb-name>
-         <interceptor-class>org.jboss.ejb3.test.standalone.StupidInterceptor</interceptor-class>
-      </interceptor-binding>
-   </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,14 @@
+<?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">
+   <assembly-descriptor>
+      <interceptor-binding>
+         <ejb-name>*</ejb-name>
+         <interceptor-class>org.jboss.ejb3.test.standalone.StupidInterceptor</interceptor-class>
+      </interceptor-binding>
+   </assembly-descriptor>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/deployer.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/deployer.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/deployer.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-
-   <bean name="EJBDeployment" class="org.jboss.ejb3.embedded.EJB3StandaloneDeployer">
-      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
-      <property name="archivesByResource" >
-         <set class="java.util.HashSet" elementClass="java.lang.String">
-             <value>marker.txt</value>
-         </set>
-      </property>
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-   </bean>
-
-</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/deployer.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/deployer.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/deployer.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/deployer.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+
+   <bean name="EJBDeployment" class="org.jboss.ejb3.embedded.EJB3StandaloneDeployer">
+      <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
+      <property name="archivesByResource" >
+         <set class="java.util.HashSet" elementClass="java.lang.String">
+             <value>marker.txt</value>
+         </set>
+      </property>
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+   </bean>
+
+</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/embeddedjms)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName"><value>mdbtest</value></property>
-   </bean>
-
-   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName"><value>topictest</value></property>
-   </bean>
-
-</deployment>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/embeddedjms/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName"><value>mdbtest</value></property>
+   </bean>
+
+   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName"><value>topictest</value></property>
+   </bean>
+
+</deployment>
+

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever)

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session1)

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager1">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <jar-file>../flushmodenever-util.jar</jar-file>
-      <properties>
-         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager1Factory"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/Manager1"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session1/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager1">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jar-file>../flushmodenever-util.jar</jar-file>
+      <properties>
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager1Factory"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/Manager1"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session2)

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="manager2">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <jar-file>../flushmodenever-util.jar</jar-file>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager2Factory"/>
-         <property name="jboss.entity.manager.jndi.name" value="java:/Manager2"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/flushmodenever/session2/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="manager2">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jar-file>../flushmodenever-util.jar</jar-file>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:/Manager2Factory"/>
+         <property name="jboss.entity.manager.jndi.name" value="java:/Manager2"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/kernel-test.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/kernel-test.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/kernel-test.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-
-   <bean name="SimpleDeployment" class="org.jboss.ejb3.test.standalone.SimpleDeployer">
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-   </bean>
-
-</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/kernel-test.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/kernel-test.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/kernel-test.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/kernel-test.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+
+   <bean name="SimpleDeployment" class="org.jboss.ejb3.test.standalone.SimpleDeployer">
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+   </bean>
+
+</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/security)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/security/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/security/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/security/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-kabir=somebody
-bill=nobody
-anyone=anyone
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/security/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/security/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/security/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/security/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+kabir=somebody
+bill=nobody
+anyone=anyone
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/security/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/security/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/security/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +0,0 @@
-kabir=password
-bill=password
-anyone=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/security/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/security/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/security/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/security/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,3 @@
+kabir=password
+bill=password
+anyone=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/standard (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/standard)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-
-   <bean name="jcainflow-rar-WorkManager" class="org.jboss.ejb3.embedded.resource.JBossWorkManager">
-   </bean>
-
-   <bean name="jcainflow-rar-DeploymentInfo" class="org.jboss.ejb3.embedded.resource.Ejb3DeploymentInfo">
-      <constructor>
-         <parameter class="java.lang.String">jcainflow.rar</parameter>
-         <parameter class="java.lang.String">org.jboss.ejb3.test.jca.inflow.TestMessageListener</parameter>
-         <parameter class="java.lang.String">org.jboss.ejb3.test.jca.inflow.TestActivationSpec</parameter>
-      </constructor>
-   </bean>
-   
-   <bean name="jboss.jca:name='jcainflow.rar',service=RARDeployment" class="org.jboss.ejb3.embedded.resource.RARDeployment">
-   <!--bean name="jboss.test:test=TestResourceAdapter" class="org.jboss.ejb3.embedded.resource.RARDeployment"-->
-         <constructor>
-         <parameter class="org.jboss.deployment.DeploymentInfo">
-            <inject bean="jcainflow-rar-DeploymentInfo"/>
-         </parameter>
-      </constructor>
-      <property name="workManager"><inject bean="jcainflow-rar-WorkManager"/></property>
-   </bean>
-   
-   <bean name="jboss.mq.destination:service=Queue,name=queuetest" class="org.jboss.mq.kernel.Queue">
-      <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-      <property name="destinationName"><value>inflowmdbtest</value></property>
-   </bean>
-
-</deployment>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+
+   <bean name="jcainflow-rar-WorkManager" class="org.jboss.ejb3.embedded.resource.JBossWorkManager">
+   </bean>
+
+   <bean name="jcainflow-rar-DeploymentInfo" class="org.jboss.ejb3.embedded.resource.Ejb3DeploymentInfo">
+      <constructor>
+         <parameter class="java.lang.String">jcainflow.rar</parameter>
+         <parameter class="java.lang.String">org.jboss.ejb3.test.jca.inflow.TestMessageListener</parameter>
+         <parameter class="java.lang.String">org.jboss.ejb3.test.jca.inflow.TestActivationSpec</parameter>
+      </constructor>
+   </bean>
+   
+   <bean name="jboss.jca:name='jcainflow.rar',service=RARDeployment" class="org.jboss.ejb3.embedded.resource.RARDeployment">
+   <!--bean name="jboss.test:test=TestResourceAdapter" class="org.jboss.ejb3.embedded.resource.RARDeployment"-->
+         <constructor>
+         <parameter class="org.jboss.deployment.DeploymentInfo">
+            <inject bean="jcainflow-rar-DeploymentInfo"/>
+         </parameter>
+      </constructor>
+      <property name="workManager"><inject bean="jcainflow-rar-WorkManager"/></property>
+   </bean>
+   
+   <bean name="jboss.mq.destination:service=Queue,name=queuetest" class="org.jboss.mq.kernel.Queue">
+      <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+      <property name="destinationName"><value>inflowmdbtest</value></property>
+   </bean>
+
+</deployment>
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/testjms.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/standard/testjms.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-  xmlns="urn:jboss:bean-deployer">
-  
-  <bean name="jboss.mq.destination:service=Queue,name=defaultedqueuetest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>defaultedmdbtest</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Queue,name=overridedefaultedqueuetest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>overridedefaultedmdbtest</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Queue,name=nondurablequeuetest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>nondurablemdbtest</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Queue,name=bmtqueuetest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>bmtmdbtest</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Queue,name=overridequeuetest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>overridequeuetest</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Topic,name=topictest" class="org.jboss.mq.kernel.Topic">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>mdbtest</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Queue,name=queuetest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>mdbtest</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Queue,name=expirytest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>expirytest</value></property>
-    <property name="expiryDestinationJndi"><value>queue/DLQ</value></property>
-  </bean>
-  
-  <bean name="jboss.mq.destination:service=Queue,name=dlqtest" class="org.jboss.mq.kernel.Queue">
-    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-    <property name="destinationName"><value>dlqtest</value></property>
-  </bean>
-  
-</deployment>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/testjms.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standalone/standard/testjms.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/testjms.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standalone/standard/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+  xmlns="urn:jboss:bean-deployer">
+  
+  <bean name="jboss.mq.destination:service=Queue,name=defaultedqueuetest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>defaultedmdbtest</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Queue,name=overridedefaultedqueuetest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>overridedefaultedmdbtest</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Queue,name=nondurablequeuetest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>nondurablemdbtest</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Queue,name=bmtqueuetest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>bmtmdbtest</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Queue,name=overridequeuetest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>overridequeuetest</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Topic,name=topictest" class="org.jboss.mq.kernel.Topic">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>mdbtest</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Queue,name=queuetest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>mdbtest</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Queue,name=expirytest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>expirytest</value></property>
+    <property name="expiryDestinationJndi"><value>queue/DLQ</value></property>
+  </bean>
+  
+  <bean name="jboss.mq.destination:service=Queue,name=dlqtest" class="org.jboss.mq.kernel.Queue">
+    <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+    <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+    <property name="destinationName"><value>dlqtest</value></property>
+  </bean>
+  
+</deployment>
+

Copied: branches/Branch_4_2/ejb3/src/resources/test/standaloneWar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standaloneWar)

Copied: branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standaloneWar/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <description>Standalone EJB3</description>
-
-   <listener>
-      <listener-class>org.jboss.ejb3.embedded.ServletBootstrapListener</listener-class>
-   </listener>
-
-</web-app>

Copied: branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+   <description>Standalone EJB3</description>
+
+   <listener>
+      <listener-class>org.jboss.ejb3.embedded.ServletBootstrapListener</listener-class>
+   </listener>
+
+</web-app>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/marker.txt
===================================================================

Copied: branches/Branch_4_2/ejb3/src/resources/test/standaloneWar/marker.txt (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/standaloneWar/marker.txt)
===================================================================

Deleted: branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <enterprise-beans>
-      <session>
-         <ejb-name>OverrideConcurrentStateful</ejb-name>
-         <jndi-name>OverrideConcurrentStateful</jndi-name>
-         <concurrent>false</concurrent>
-      </session>
-   </enterprise-beans>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/stateful/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <jmx-name>test.ejb3:name=Bill,service=EJB3</jmx-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>OverrideConcurrentStateful</ejb-name>
+         <jndi-name>OverrideConcurrentStateful</jndi-name>
+         <concurrent>false</concurrent>
+      </session>
+   </enterprise-beans>
+</jboss>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/stateful/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/stateful/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
-   "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
-   <interceptor class="org.jboss.ejb3.test.stateful.RemoteBindingInterceptor" scope="PER_VM"/>
-
-   <stack name="RemoteBindingStatefulSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.test.stateful.RemoteBindingInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-</aop>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+   "-//JBoss//DTD JBOSS AOP 1.0//EN"
+   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+   <interceptor class="org.jboss.ejb3.test.stateful.RemoteBindingInterceptor" scope="PER_VM"/>
+
+   <stack name="RemoteBindingStatefulSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.ejb3.test.stateful.RemoteBindingInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+</aop>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/strictpool/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/strictpool/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-      <enterprise-beans>
-         <session>
-            <ejb-name>OverrideStrictlyPooledSessionBean</ejb-name>
-            <annotation>
-               <annotation-class>org.jboss.annotation.ejb.PoolClass</annotation-class>
-               <annotation-implementation-class>org.jboss.annotation.ejb.PoolClassImpl</annotation-implementation-class>
-               <property>
-                  <property-name>value</property-name>
-                  <property-value>org.jboss.ejb3.StrictMaxPool</property-value>
-               </property>
-               <property>
-                  <property-name>maxSize</property-name>
-                  <property-value>5</property-value>
-               </property>
-               <property>
-                  <property-name>timeout</property-name>
-                  <property-value>10000</property-value>
-               </property>
-            </annotation>
-            <!--pool-config>
-               <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
-               <pool-max-size>5</pool-max-size>
-               <pool-timeout>10000</pool-timeout>
-            </pool-config-->
-         </session>
-         <message-driven>
-            <ejb-name>OverrideStrictlyPooledMDB</ejb-name>
-            <!--annotation>
-               <annotation-class>org.jboss.annotation.ejb.PoolClass</annotation-class>
-               <annotation-implementation-class>org.jboss.annotation.ejb.PoolClassImpl</annotation-implementation-class>
-               <property>
-                  <property-name>value</property-name>
-                  <property-value>org.jboss.ejb3.StrictMaxPool</property-value>
-               </property>
-               <property>
-                  <property-name>maxSize</property-name>
-                  <property-value>5</property-value>
-               </property>
-               <property>
-                  <property-name>timeout</property-name>
-                  <property-value>10000</property-value>
-               </property>
-            </annotation-->
-            <pool-config>
-               <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
-               <pool-max-size>5</pool-max-size>
-               <pool-timeout>10000</pool-timeout>
-            </pool-config>
-         </message-driven>
-      </enterprise-beans>
-   </jboss>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/strictpool/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+      <enterprise-beans>
+         <session>
+            <ejb-name>OverrideStrictlyPooledSessionBean</ejb-name>
+            <annotation>
+               <annotation-class>org.jboss.annotation.ejb.PoolClass</annotation-class>
+               <annotation-implementation-class>org.jboss.annotation.ejb.PoolClassImpl</annotation-implementation-class>
+               <property>
+                  <property-name>value</property-name>
+                  <property-value>org.jboss.ejb3.StrictMaxPool</property-value>
+               </property>
+               <property>
+                  <property-name>maxSize</property-name>
+                  <property-value>5</property-value>
+               </property>
+               <property>
+                  <property-name>timeout</property-name>
+                  <property-value>10000</property-value>
+               </property>
+            </annotation>
+            <!--pool-config>
+               <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+               <pool-max-size>5</pool-max-size>
+               <pool-timeout>10000</pool-timeout>
+            </pool-config-->
+         </session>
+         <message-driven>
+            <ejb-name>OverrideStrictlyPooledMDB</ejb-name>
+            <!--annotation>
+               <annotation-class>org.jboss.annotation.ejb.PoolClass</annotation-class>
+               <annotation-implementation-class>org.jboss.annotation.ejb.PoolClassImpl</annotation-implementation-class>
+               <property>
+                  <property-name>value</property-name>
+                  <property-value>org.jboss.ejb3.StrictMaxPool</property-value>
+               </property>
+               <property>
+                  <property-name>maxSize</property-name>
+                  <property-value>5</property-value>
+               </property>
+               <property>
+                  <property-name>timeout</property-name>
+                  <property-value>10000</property-value>
+               </property>
+            </annotation-->
+            <pool-config>
+               <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+               <pool-max-size>5</pool-max-size>
+               <pool-timeout>10000</pool-timeout>
+            </pool-config>
+         </message-driven>
+      </enterprise-beans>
+   </jboss>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/strictpool/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/tableperinheritance)

Copied: branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/tableperinheritance/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/tableperinheritance/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/txexceptions (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/txexceptions)

Copied: branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/txexceptions/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,26 +0,0 @@
-<?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">
-	<assembly-descriptor>
-		<application-exception>
-			<exception-class>
-				org.jboss.ejb3.test.txexceptions.DeploymentDescriptorAppException
-			</exception-class>
-			<rollback>
-				false
-			</rollback>
-		</application-exception>
-        <application-exception>
-            <exception-class>
-				org.jboss.ejb3.test.txexceptions.DeploymentDescriptorCheckedRollbackException
-			</exception-class>
-			<rollback>
-				true
-			</rollback>
-		</application-exception>
-      </assembly-descriptor>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,26 @@
+<?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">
+	<assembly-descriptor>
+		<application-exception>
+			<exception-class>
+				org.jboss.ejb3.test.txexceptions.DeploymentDescriptorAppException
+			</exception-class>
+			<rollback>
+				false
+			</rollback>
+		</application-exception>
+        <application-exception>
+            <exception-class>
+				org.jboss.ejb3.test.txexceptions.DeploymentDescriptorCheckedRollbackException
+			</exception-class>
+			<rollback>
+				true
+			</rollback>
+		</application-exception>
+      </assembly-descriptor>
+</ejb-jar>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-          <property name="jboss.entity.manager.jndi.name" value="java:/SimpleEntityManager"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+          <property name="jboss.entity.manager.jndi.name" value="java:/SimpleEntityManager"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/txexceptions/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal)

Copied: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-<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">
-  <enterprise-beans>
-    <session>
-      <ejb-name>StatelessBean</ejb-name>
-      <remote>org.jboss.ejb3.test.unauthenticatedprincipal.StatelessRemote</remote>
-      <ejb-class>org.jboss.ejb3.test.unauthenticatedprincipal.StatelessBean</ejb-class>
-      <session-type>Stateless</session-type>
-      <transaction-type>Container</transaction-type>
-    </session>
-  </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<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">
+  <enterprise-beans>
+    <session>
+      <ejb-name>StatelessBean</ejb-name>
+      <remote>org.jboss.ejb3.test.unauthenticatedprincipal.StatelessRemote</remote>
+      <ejb-class>org.jboss.ejb3.test.unauthenticatedprincipal.StatelessBean</ejb-class>
+      <session-type>Stateless</session-type>
+      <transaction-type>Container</transaction-type>
+    </session>
+  </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss
-        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-        version="3.0">
-   <security-domain>java:/jaas/other</security-domain>
-   <unauthenticated-principal>somebody</unauthenticated-principal>
-</jboss>

Copied: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/META-INF/jboss.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss
+        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://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <security-domain>java:/jaas/other</security-domain>
+   <unauthenticated-principal>somebody</unauthenticated-principal>
+</jboss>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-somebody=allowed
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/roles.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+somebody=allowed
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/users.properties
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/users.properties	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1 +0,0 @@
-somebody=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/users.properties (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/unauthenticatedprincipal/users.properties)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/users.properties	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/unauthenticatedprincipal/users.properties	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1 @@
+somebody=password

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices)

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/application-client.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/application-client.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/application-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client 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/application-client_1_4.xsd"
-  version="1.4">
-
-  <display-name>JSR-181 Annotation test</display-name>
-
-  <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
-    <service-interface>javax.xml.rpc.Service</service-interface>
-    <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
-    <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-    <port-component-ref>
-      <service-endpoint-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-endpoint-interface>
-    </port-component-ref>
-  </service-ref>
-
-</application-client>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/application-client.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/application-client.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/application-client.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/application-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client 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/application-client_1_4.xsd"
+  version="1.4">
+
+  <display-name>JSR-181 Annotation test</display-name>
+
+  <service-ref>
+    <service-ref-name>service/TestService</service-ref-name>
+    <service-interface>javax.xml.rpc.Service</service-interface>
+    <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+    <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+    <port-component-ref>
+      <service-endpoint-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-endpoint-interface>
+    </port-component-ref>
+  </service-ref>
+
+</application-client>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-<?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">
-   <description>jBoss test application </description>
-   <display-name>Test</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>StatelessBean</ejb-name>
-         <service-ref>
-		    <service-ref-name>service/Endpoint3</service-ref-name>
-		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
-		    <mapped-name>jbossws-client/service/TestService</mapped-name>
-		    <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
-               <injection-target-name>endpoint3</injection-target-name>
-            </injection-target>
-		 </service-ref>
-		 <service-ref>
-		    <service-ref-name>service/Endpoint4</service-ref-name>
-		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
-		    <mapped-name>jbossws-client/service/TestService</mapped-name>
-		    <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
-               <injection-target-name>setEndpoint4</injection-target-name>
-            </injection-target>
-		 </service-ref>
-		 <service-ref>
-		    <service-ref-name>service/Service3</service-ref-name>
-		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
-		    <mapped-name>jbossws-client/service/TestService</mapped-name>
-		    <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
-               <injection-target-name>service3</injection-target-name>
-            </injection-target>
-		 </service-ref>
-		 <service-ref>
-		    <service-ref-name>service/Service4</service-ref-name>
-		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
-		    <mapped-name>jbossws-client/service/TestService</mapped-name>
-		    <injection-target>
-               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
-               <injection-target-name>setService4</injection-target-name>
-            </injection-target>
-		 </service-ref>
-      </session>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+<?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">
+   <description>jBoss test application </description>
+   <display-name>Test</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>StatelessBean</ejb-name>
+         <service-ref>
+		    <service-ref-name>service/Endpoint3</service-ref-name>
+		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
+		    <mapped-name>jbossws-client/service/TestService</mapped-name>
+		    <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
+               <injection-target-name>endpoint3</injection-target-name>
+            </injection-target>
+		 </service-ref>
+		 <service-ref>
+		    <service-ref-name>service/Endpoint4</service-ref-name>
+		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
+		    <mapped-name>jbossws-client/service/TestService</mapped-name>
+		    <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
+               <injection-target-name>setEndpoint4</injection-target-name>
+            </injection-target>
+		 </service-ref>
+		 <service-ref>
+		    <service-ref-name>service/Service3</service-ref-name>
+		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
+		    <mapped-name>jbossws-client/service/TestService</mapped-name>
+		    <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
+               <injection-target-name>service3</injection-target-name>
+            </injection-target>
+		 </service-ref>
+		 <service-ref>
+		    <service-ref-name>service/Service4</service-ref-name>
+		    <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
+		    <mapped-name>jbossws-client/service/TestService</mapped-name>
+		    <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
+               <injection-target-name>setService4</injection-target-name>
+            </injection-target>
+		 </service-ref>
+      </session>
+   </enterprise-beans>
+</ejb-jar>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
-  <package-mapping>
-    <package-type>org.jboss.ejb3.test.webservices.jsr181</package-type>
-    <namespaceURI>http://www.openuri.org/2004/04/HelloWorld/types</namespaceURI>
-  </package-mapping>
-  <package-mapping>
-    <package-type>org.jboss.ejb3.test.webservices.jsr181</package-type>
-    <namespaceURI>http://www.openuri.org/2004/04/HelloWorld</namespaceURI>
-  </package-mapping>
-  <service-interface-mapping>
-    <service-interface>org.jboss.ejb3.test.webservices.jsr181.TestService</service-interface>
-    <wsdl-service-name xmlns:serviceNS="http://www.openuri.org/2004/04/HelloWorld">serviceNS:TestService</wsdl-service-name>
-    <port-mapping>
-      <port-name>EndpointInterfacePort</port-name>
-      <java-port-name>EndpointInterfacePort</java-port-name>
-    </port-mapping>
-  </service-interface-mapping>
-  <service-endpoint-interface-mapping>
-    <service-endpoint-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-endpoint-interface>
-    <wsdl-port-type xmlns:portTypeNS="http://www.openuri.org/2004/04/HelloWorld">portTypeNS:EndpointInterface</wsdl-port-type>
-    <wsdl-binding xmlns:bindingNS="http://www.openuri.org/2004/04/HelloWorld">bindingNS:EndpointInterfaceBinding</wsdl-binding>
-    <service-endpoint-method-mapping>
-      <java-method-name>echo</java-method-name>
-      <wsdl-operation>echo</wsdl-operation>
-      <method-param-parts-mapping>
-        <param-position>0</param-position>
-        <param-type>java.lang.String</param-type>
-        <wsdl-message-mapping>
-          <wsdl-message xmlns:wsdlMsgNS="http://www.openuri.org/2004/04/HelloWorld">wsdlMsgNS:EndpointInterface_echo</wsdl-message>
-          <wsdl-message-part-name>String_1</wsdl-message-part-name>
-          <parameter-mode>IN</parameter-mode>
-        </wsdl-message-mapping>
-      </method-param-parts-mapping>
-      <wsdl-return-value-mapping>
-        <method-return-value>java.lang.String</method-return-value>
-        <wsdl-message xmlns:wsdlMsgNS="http://www.openuri.org/2004/04/HelloWorld">wsdlMsgNS:EndpointInterface_echoResponse</wsdl-message>
-        <wsdl-message-part-name>result</wsdl-message-part-name>
-      </wsdl-return-value-mapping>
-    </service-endpoint-method-mapping>
-  </service-endpoint-interface-mapping>
-</java-wsdl-mapping>

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+  <package-mapping>
+    <package-type>org.jboss.ejb3.test.webservices.jsr181</package-type>
+    <namespaceURI>http://www.openuri.org/2004/04/HelloWorld/types</namespaceURI>
+  </package-mapping>
+  <package-mapping>
+    <package-type>org.jboss.ejb3.test.webservices.jsr181</package-type>
+    <namespaceURI>http://www.openuri.org/2004/04/HelloWorld</namespaceURI>
+  </package-mapping>
+  <service-interface-mapping>
+    <service-interface>org.jboss.ejb3.test.webservices.jsr181.TestService</service-interface>
+    <wsdl-service-name xmlns:serviceNS="http://www.openuri.org/2004/04/HelloWorld">serviceNS:TestService</wsdl-service-name>
+    <port-mapping>
+      <port-name>EndpointInterfacePort</port-name>
+      <java-port-name>EndpointInterfacePort</java-port-name>
+    </port-mapping>
+  </service-interface-mapping>
+  <service-endpoint-interface-mapping>
+    <service-endpoint-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-endpoint-interface>
+    <wsdl-port-type xmlns:portTypeNS="http://www.openuri.org/2004/04/HelloWorld">portTypeNS:EndpointInterface</wsdl-port-type>
+    <wsdl-binding xmlns:bindingNS="http://www.openuri.org/2004/04/HelloWorld">bindingNS:EndpointInterfaceBinding</wsdl-binding>
+    <service-endpoint-method-mapping>
+      <java-method-name>echo</java-method-name>
+      <wsdl-operation>echo</wsdl-operation>
+      <method-param-parts-mapping>
+        <param-position>0</param-position>
+        <param-type>java.lang.String</param-type>
+        <wsdl-message-mapping>
+          <wsdl-message xmlns:wsdlMsgNS="http://www.openuri.org/2004/04/HelloWorld">wsdlMsgNS:EndpointInterface_echo</wsdl-message>
+          <wsdl-message-part-name>String_1</wsdl-message-part-name>
+          <parameter-mode>IN</parameter-mode>
+        </wsdl-message-mapping>
+      </method-param-parts-mapping>
+      <wsdl-return-value-mapping>
+        <method-return-value>java.lang.String</method-return-value>
+        <wsdl-message xmlns:wsdlMsgNS="http://www.openuri.org/2004/04/HelloWorld">wsdlMsgNS:EndpointInterface_echoResponse</wsdl-message>
+        <wsdl-message-part-name>result</wsdl-message-part-name>
+      </wsdl-return-value-mapping>
+    </service-endpoint-method-mapping>
+  </service-endpoint-interface-mapping>
+</java-wsdl-mapping>

Deleted: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
-   "-//JBoss//DTD Application Client 4.0//EN"
-   "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
-  <jndi-name>jbossws-client</jndi-name>
-</jboss-client>

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss-client.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC
+   "-//JBoss//DTD Application Client 4.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+  <jndi-name>jbossws-client</jndi-name>
+</jboss-client>

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/wsdl)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<definitions name="TestService" targetNamespace="http://www.openuri.org/2004/04/HelloWorld" xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <types/>
-  <message name="EndpointInterface_echo">
-    <part name="String_1" type="xsd:string"/>
-  </message>
-  <message name="EndpointInterface_echoResponse">
-    <part name="result" type="xsd:string"/>
-  </message>
-  <portType name="EndpointInterface">
-    <operation name="echo" parameterOrder="String_1">
-      <input message="tns:EndpointInterface_echo"/>
-      <output message="tns:EndpointInterface_echoResponse"/>
-    </operation>
-  </portType>
-  <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-    <operation name="echo">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
-      </output>
-    </operation>
-  </binding>
-  <service name="TestService">
-    <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
-      <soap:address location="http://localhost:8080/jsr181"/>
-    </port>
-  </service>
-</definitions>

Copied: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService" targetNamespace="http://www.openuri.org/2004/04/HelloWorld" xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <types/>
+  <message name="EndpointInterface_echo">
+    <part name="String_1" type="xsd:string"/>
+  </message>
+  <message name="EndpointInterface_echoResponse">
+    <part name="result" type="xsd:string"/>
+  </message>
+  <portType name="EndpointInterface">
+    <operation name="echo" parameterOrder="String_1">
+      <input message="tns:EndpointInterface_echo"/>
+      <output message="tns:EndpointInterface_echoResponse"/>
+    </operation>
+  </portType>
+  <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="echo">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+      </input>
+      <output>
+        <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="TestService">
+    <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
+      <soap:address location="http://localhost:8080/jsr181"/>
+    </port>
+  </service>
+</definitions>

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls)

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar)

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/WEB-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <description>Jndi Test</description>
-
-   <servlet>
-      <servlet-name>jndiTest</servlet-name>
-      <jsp-file>/JndiTest.jsp</jsp-file>
-   </servlet>
-
-   <servlet-mapping>
-      <servlet-name>jndiTest</servlet-name>
-      <url-pattern>/JndiTest/*</url-pattern>
-   </servlet-mapping>
-
-</web-app>

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+   <description>Jndi Test</description>
+
+   <servlet>
+      <servlet-name>jndiTest</servlet-name>
+      <jsp-file>/JndiTest.jsp</jsp-file>
+   </servlet>
+
+   <servlet-mapping>
+      <servlet-name>jndiTest</servlet-name>
+      <url-pattern>/JndiTest/*</url-pattern>
+   </servlet-mapping>
+
+</web-app>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/jndi-web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <description>Standalone EJB3</description>
-
-   <context-param>
-      <param-name>jboss-kernel-deployments</param-name>
-      <param-value>embedded-jboss-beans.xml, jboss-jms-beans.xml, testjms.xml</param-value>
-   </context-param>
-
-   <listener>
-      <listener-class>org.jboss.ejb3.embedded.ServletBootstrapListener</listener-class>
-   </listener>
-
-   <servlet>
-      <servlet-name>ejb3</servlet-name>
-      <jsp-file>/EmbeddedEJB3.jsp</jsp-file>
-   </servlet>
-
-   <servlet-mapping>
-      <servlet-name>ejb3</servlet-name>
-      <url-pattern>/EmbeddedEJB3/*</url-pattern>
-   </servlet-mapping>
-
-</web-app>

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+   <description>Standalone EJB3</description>
+
+   <context-param>
+      <param-name>jboss-kernel-deployments</param-name>
+      <param-value>embedded-jboss-beans.xml, jboss-jms-beans.xml, testjms.xml</param-value>
+   </context-param>
+
+   <listener>
+      <listener-class>org.jboss.ejb3.embedded.ServletBootstrapListener</listener-class>
+   </listener>
+
+   <servlet>
+      <servlet-name>ejb3</servlet-name>
+      <jsp-file>/EmbeddedEJB3.jsp</jsp-file>
+   </servlet>
+
+   <servlet-mapping>
+      <servlet-name>ejb3</servlet-name>
+      <url-pattern>/EmbeddedEJB3/*</url-pattern>
+   </servlet-mapping>
+
+</web-app>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<weblogic-web-app>
-   <container-descriptor>
-      <prefer-web-inf-classes>true</prefer-web-inf-classes>
-   </container-descriptor>
-</weblogic-web-app>

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<weblogic-web-app>
+   <container-descriptor>
+      <prefer-web-inf-classes>true</prefer-web-inf-classes>
+   </container-descriptor>
+</weblogic-web-app>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/WEB-INF/weblogic.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/conf)

Deleted: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName"><value>mdbtest</value></property>
-   </bean>
-
-   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
-     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
-     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
-     <property name="destinationName"><value>topictest</value></property>
-   </bean>
-
-</deployment>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+   <bean name="jboss.mq.destination:service=Queue,name=mdbtest" class="org.jboss.mq.kernel.Queue">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName"><value>mdbtest</value></property>
+   </bean>
+
+   <bean name="jboss.mq.destination:service=Topic,name=mdbtest" class="org.jboss.mq.kernel.Topic">
+     <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+     <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+     <property name="destinationName"><value>topictest</value></property>
+   </bean>
+
+</deployment>
+


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/wls/embeddedwar/conf/testjms.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
-   <persistence-unit name="tempdb">
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <properties>
-          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
-   </persistence-unit>
-</persistence>

Copied: branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+   <persistence-unit name="tempdb">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+</persistence>


Property changes on: branches/Branch_4_2/ejb3/src/resources/test/xmlcfg/META-INF/persistence.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/conf)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,680 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id: jboss-service.xml 56406 2006-08-29 16:01:54Z anil.saldhana at jboss.com $ -->
-
-<!-- ===================================================================== -->
-<!--  JBoss Server Configuration                                           -->
-<!-- ===================================================================== -->
-
-<server>
-
-   <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
-     can be restricted to specific jars by specifying them in the archives
-     attribute.
-    -->
-   <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
-
-   <!-- ==================================================================== -->
-   <!-- JSR-77 Single JBoss Server Management Domain                         -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
-      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
-      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
-      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
-      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
-      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
-      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
-      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
-      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
-      <attribute name="CARDeployer">jboss.j2ee:service=ClientDeployer</attribute>
-      <attribute name="MailService">jboss:service=Mail</attribute>
-      <attribute name="JMSService">jboss.mq:service=DestinationManager</attribute>
-      <attribute name="JNDIService">jboss:service=Naming</attribute>
-      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
-      <attribute name="UserTransactionService">jboss:service=DistributedTransactionManager</attribute>
-      <attribute name="RMI_IIOPService">jboss:service=CorbaORB</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- XMBean Persistence                                                   -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.system.pm.AttributePersistenceService"
-      name="jboss:service=AttributePersistenceService"
-      xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
-      <!-- the AttributePersistenceService is persistent, itself -->
-
-      <!--
-      <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
-      <attribute name="AttributePersistenceManagerConfig">
-         <data-directory>data/xmbean-attrs</data-directory>
-      </attribute>
-      <attribute name="ApmDestroyOnServiceStop">false</attribute>
-      <attribute name="VersionTag"></attribute>
-      -->
-   </mbean>
-
-   <!-- A Thread pool service -->
-   <mbean code="org.jboss.util.threadpool.BasicThreadPool"
-      name="jboss.system:service=ThreadPool">
-      <attribute name="Name">JBoss System Threads</attribute>
-      <attribute name="ThreadGroupName">System Threads</attribute>
-      <!-- How long a thread will live without any tasks in MS -->
-      <attribute name="KeepAliveTime">60000</attribute>
-      <!-- The max number of threads in the pool -->
-      <attribute name="MaximumPoolSize">10</attribute>
-      <!-- The max number of tasks before the queue is full -->
-      <attribute name="MaximumQueueSize">1000</attribute>
-      <!-- The behavior of the pool when a task is added and the queue is full.
-      abort - a RuntimeException is thrown
-      run - the calling thread executes the task
-      wait - the calling thread blocks until the queue has room
-      discard - the task is silently discarded without being run
-      discardOldest - check to see if a task is about to complete and enque
-         the new task if possible, else run the task in the calling thread
-      -->
-      <attribute name="BlockingMode">run</attribute>
-   </mbean>
-
-   <!-- Preload all custom editors for VMs that don't use the thread
-        context class loader when searching for PropertyEditors. Uncomment
-        if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
-   <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
-     name="jboss:type=Service,name=BootstrapEditors">
-     <attribute name="BootstrapEditors">
-       java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
-       java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
-       java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
-       java.util.Date=org.jboss.util.propertyeditor.DateEditor
-       java.io.File=org.jboss.util.propertyeditor.FileEditor
-       java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
-       java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
-       javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
-       java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
-       [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
-       java.net.URL=org.jboss.util.propertyeditor.URLEditor
-     </attribute>
-   </mbean>
-   -->
-
-   <!-- ==================================================================== -->
-   <!-- Log4j Initialization                                                 -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.logging.Log4jService"
-      name="jboss.system:type=Log4jService,service=Logging"
-	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
-      <attribute name="ConfigurationURL">resource:log4j.xml</attribute>
-      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
-      this needs to be set to avoid a possible deadlock on exception at the
-      appender level. See bug#696819.
-      -->
-      <attribute name="Log4jQuietMode">true</attribute>
-      <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
-      <attribute name="RefreshPeriod">60</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Active Alarm Table                                                   -->
-   <!-- ==================================================================== -->
-
-   <!--
-      | The ActiveAlarmTable service is a simple JMX notification listener
-      | that maintains a table with the received notifications (alarms).
-      | The alarms can be acknowledged through the jmx or the web console.
-      | Modify the SubscriptionList below to subscribe for any notification
-      | in the system and treat it as an alarm.
-      | The JMXNotificationAppender is a log4j Appender that can be configured
-      | in log4j.xml, that trasforms logging events to JMX notification so they
-      | can be fed back into the table. By storing the WARN or higher level logging
-      | events you can have a quick view of important system faults.
-      |
-      | The following attributes may be set:
-      |
-      | MaxTableSize (default 1000)
-      |  - set an upper limit to the number of stored alarms
-      | LogLevel (default DEBUG)
-      |  - the log level to use for received notification, can be set to NONE
-      | ServerId (default jboss)
-      |  - used to construct unique alarm ids
-      | SubscriptionList
-      |  - subscribe for the notifications to be stored in the table
-
-   <mbean code="org.jboss.monitor.services.ActiveAlarmTable" 
-          name="jboss.monitor:service=ActiveAlarmTable">
-      <attribute name="SubscriptionList">
-         <subscription-list>
-            <mbean name="jboss.monitor:*">
-               <notification type="jboss.alarm"/>
-               <notification type="JBOSS_MONITOR_NOTIFICATION"/>               
-            </mbean>
-            <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-         </subscription-list>
-      </attribute>
-   </mbean>
-   -->
-   
-   <!-- ==================================================================== -->
-   <!-- JBoss RMI Classloader - only install when available                  -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
-      name="jboss.rmi:type=RMIClassLoader">
-      <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
-      <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Service Binding                                                      -->
-   <!-- ==================================================================== -->
-
-   <!-- Automatically activated when generatting the clustering environment -->
-   <!-- @TESTSUITE_CLUSTER_CONFIG@ -->
-
-   <!--
-      | Binding service manager for port/host mapping. This is a sample
-      | config that demonstrates a JBoss instances with a server name 'jboss1'
-      | loading its bindings from an XML file using the ServicesStoreFactory
-      | implementation returned by the XMLServicesStoreFactory.
-      |
-      | ServerName: The unique name assigned to a JBoss server instance for
-      | lookup purposes. This allows a single ServicesStore to handle mulitiple
-      | JBoss servers.
-      |
-      | StoreURL: The URL string passed to org.jboss.services.binding.ServicesStore
-      | during initialization that specifies how to connect to the bindings store.
-      | StoreFactory: The org.jboss.services.binding.ServicesStoreFactory interface
-      | implementation to create to obtain the ServicesStore instance.
-
-   <mbean code="org.jboss.services.binding.ServiceBindingManager"
-     name="jboss.system:service=ServiceBindingManager">
-     <attribute name="ServerName">ports-01</attribute>
-     <attribute name="StoreURL">../docs/examples/binding-manager/sample-bindings.xml</attribute>
-     <attribute name="StoreFactoryClassName">
-       org.jboss.services.binding.XMLServicesStoreFactory
-     </attribute>
-   </mbean>
-
-   -->
-
-   <!-- ==================================================================== -->
-   <!-- Class Loading                                                        -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.web.WebService"
-      name="jboss:service=WebService">
-      <attribute name="Port">8083</attribute>
-      <!-- Should non-EJB .class files be downloadable -->
-      <attribute name="DownloadServerClasses">true</attribute>
-      <!-- Should resources other than .class files be downloadable. Both
-         DownloadServerClasses and DownloadResources must be true for resources
-         to be downloadable. This is false by default because its generally a
-         bad idea as server configuration files that container security
-         information can be accessed.
-       -->
-      <attribute name="DownloadResources">false</attribute>
-      <attribute name="Host">${jboss.bind.address}</attribute>
-      <attribute name="BindAddress">${jboss.bind.address}</attribute>
-      <!-- Use the default thread pool for dynamic class loading -->
-      <depends optional-attribute-name="ThreadPool"
-         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- JNDI                                                                 -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.naming.NamingService"
-      name="jboss:service=Naming"
-      xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
-      <!-- The call by value mode. true if all lookups are unmarshalled using
-      the caller's TCL, false if in VM lookups return the value by reference.
-      -->
-      <attribute name="CallByValue">false</attribute>
-      <!-- The listening port for the bootstrap JNP service. Set this to -1
-        to run the NamingService without the JNP invoker listening port.
-      -->
-      <attribute name="Port">1099</attribute>
-      <!-- The bootstrap JNP server bind address. This also sets the default
-      RMI service bind address. Empty == all addresses
-       -->
-      <attribute name="BindAddress">${jboss.bind.address}</attribute>
-      <!-- The port of the RMI naming service, 0 == anonymous -->
-      <attribute name="RmiPort">1098</attribute>
-      <!-- The RMI service bind address. Empty == all addresses
-       -->
-      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
-      <!-- The thread pool service used to control the bootstrap lookups -->
-      <depends optional-attribute-name="LookupPool"
-         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
-   </mbean>
-
-   <mbean code="org.jboss.naming.JNDIView"
-   	name="jboss:service=JNDIView"
-   	xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
-   	<!-- The HANamingService service name -->
-   	<attribute name="HANamingService">jboss:service=HAJNDI</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Security                                                             -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.security.plugins.SecurityConfig"
-      name="jboss.security:service=SecurityConfig">
-      <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
-   </mbean>
-   <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
-      name="jboss.security:service=XMLLoginConfig">
-      <attribute name="ConfigResource">login-config.xml</attribute>
-   </mbean>
-
-   <!-- JAAS security manager and realm mapping -->
-   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
-      name="jboss.security:service=JaasSecurityManager">
-      <!-- A flag which indicates whether the SecurityAssociation server mode
-      is set on service creation. This is true by default since the
-      SecurityAssociation should be thread local for multi-threaded server
-      operation.
-      -->
-      <attribute name="ServerMode">true</attribute>
-      <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
-      <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute> 
-      <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
-      in seconds.
-      If you want to disable caching of security credentials, set this to 0 to
-      force authentication to occur every time. This has no affect if the
-      AuthenticationCacheJndiName has been changed from the default value.
-      -->
-       <attribute name="DefaultCacheTimeout">1800</attribute>
-      <!-- DefaultCacheResolution: Specifies the default timed cache policy
-      resolution in seconds. This controls the interval at which the cache
-      current timestamp is updated and should be less than the DefaultCacheTimeout
-      in order for the timeout to be meaningful. This has no affect if the
-      AuthenticationCacheJndiName has been changed from the default value.
-      -->
-      <attribute name="DefaultCacheResolution">60</attribute>
-   </mbean> 
-
-   <!-- Authorization manager-->
-   <mbean code="org.jboss.security.plugins.AuthorizationManagerService"
-      name="jboss.security:service=AuthorizationManager"> 
-      <attribute name="AuthorizationManagerClassName">org.jboss.security.plugins.JBossAuthorizationManager</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Transactions                                                         -->
-   <!-- ==================================================================== -->
-   <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
-   <mbean code="org.jboss.tm.XidFactory"
-      name="jboss:service=XidFactory">
-      <!--attribute name="Pad">true</attribute-->
-   </mbean>
-
-   <!-- TM Recovery
-   <mbean code="org.jboss.tm.recovery.XidFactoryInitializationService"
-      name="jboss:service=XidFactoryInitializer">
-      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
-      <attribute name="NextTxGenerationFile">${jboss.server.data.dir}/next-tx-generation.dat</attribute>
-   </mbean>
-
-   <mbean code="org.jboss.tm.recovery.BatchRecoveryLoggerService" name="jboss:service=RecoveryLogger">
-      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
-      <depends>jboss:service=XidFactoryInitializer</depends>
-      <attribute name="DirectoryList">${jboss.server.data.dir}/recovery-log</attribute>
-      <attribute name="LogFileSize">5000000</attribute>
-      <attribute name="HeuristicStatusLogDirectory">${jboss.server.data.dir}/heuristics-log</attribute>
-   </mbean>
-
-   <mbean code="org.jboss.tm.recovery.RecoveryManagerService" name="jboss:service=RecoveryManager">
-      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
-      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      <depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends>
-   </mbean>
-   -->
-
-   <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
-      name="jboss:service=TransactionManager">
-      <attribute name="TransactionTimeout">300</attribute>
-   </mbean>
-
-   <!--
-      | Old UserTransaction support.
-      | Commented out as UserTransaction is now supported
-      | by the distributed transaction manager (see below).
-   <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
-      name="jboss:service=ClientUserTransaction"
-      xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
-      <depends>
-         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
-            name="jboss:service=proxyFactory,target=ClientUserTransactionFactory">
-            <attribute name="InvokerName">jboss:service=invoker,type=unified</attribute>
-            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
-            <attribute name="JndiName">UserTransactionSessionFactory</attribute>
-            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory</attribute>
-            <attribute name="ClientInterceptors">
-               <interceptors>
-                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
-                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
-               </interceptors>
-            </attribute>
-            <depends>jboss:service=invoker,type=unified</depends>
-         </mbean>
-      </depends>
-      <depends optional-attribute-name="TxProxyName">
-         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
-            name="jboss:service=proxyFactory,target=ClientUserTransaction">
-            <attribute name="InvokerName">jboss:service=invoker,type=unified</attribute>
-            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
-            <attribute name="JndiName"></attribute>
-            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSession</attribute>
-            <attribute name="ClientInterceptors">
-               <interceptors>
-                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
-                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
-               </interceptors>
-            </attribute>
-            <depends>jboss:service=invoker,type=unified</depends>
-         </mbean>
-      </depends>
-   </mbean>
-   -->
-
-   <!--
-      | Distributed transaction manager.
-      | Includes support for UserTransaction over JBoss remoting.
-    -->
-   <mbean code="org.jboss.tm.remoting.server.DistributedTransactionManager"
-          name="jboss:service=DistributedTransactionManager">
-      <depends>jboss:service=TransactionManager</depends>
-      <depends-list optional-attribute-name="Connectors">
-         <depends-list-element>jboss.remoting:service=Connector,transport=socket</depends-list-element>
-      </depends-list>
-      <attribute name="InterpositionEnabled">false</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Invokers to the JMX node                                             -->
-   <!-- ==================================================================== -->
-
-   <!-- Unified invoker (based on remoting) -->
-   <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
-      name="jboss:service=invoker,type=unified">
-      <!-- To turn on strict RMI exception propagation uncomment block below -->
-      <!-- This will cause the UnifiedInvokerProxy to wrap RemoteExceptions  -->
-      <!-- within a ServerException, otherwise will throw root exception     -->
-      <!-- (not RemoteException)                                             -->
-      <!-- <attribute name="StrictRMIException">true</attribute> -->
-      <depends>jboss:service=TransactionManager</depends>
-      <depends>jboss.remoting:service=Connector,transport=socket</depends>
-   </mbean>
-
-   <!-- RMI/JRMP invoker -->
-   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker"
-      name="jboss:service=invoker,type=jrmp">
-      <attribute name="RMIObjectPort">4444</attribute>
-      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
-      <!--
-      <attribute name="RMIClientSocketFactory">custom</attribute>
-      <attribute name="RMIServerSocketFactory">custom</attribute>
-      <attribute name="RMIServerSocketAddr">custom</attribute>
-      <attribute name="SecurityDomain">ssl-domain-name</attribute>
-      -->
-      <depends>jboss:service=TransactionManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.invocation.local.LocalInvoker"
-      name="jboss:service=invoker,type=local">
-
-      <depends>jboss:service=TransactionManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.invocation.pooled.server.PooledInvoker"
-      name="jboss:service=invoker,type=pooled">
-      <attribute name="NumAcceptThreads">1</attribute>
-      <attribute name="MaxPoolSize">300</attribute>
-      <attribute name="ClientMaxPoolSize">300</attribute>
-      <attribute name="SocketTimeout">60000</attribute>
-      <attribute name="ServerBindAddress">${jboss.bind.address}</attribute>
-      <attribute name="ServerBindPort">4445</attribute>
-      <attribute name="ClientConnectAddress">${jboss.bind.address}</attribute>
-      <attribute name="ClientConnectPort">0</attribute>
-      <attribute name="ClientRetryCount">1</attribute>
-      <attribute name="EnableTcpNoDelay">false</attribute>
-
-      <!-- Customized socket factory attributes
-      <attribute name="ClientSocketFactoryName">custom.client.factory</attribute>
-      <attribute name="ServerSocketFactoryName">custom.server.factory</attribute>
-      <attribute name="SslDomain">java:/jaas/pooledInvoker</attribute>
-      -->
-      <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Remoting services 						                                   -->
-   <!-- ==================================================================== -->
-
-   <!-- For detailed description of all these configuration attributes, please see the -->
-   <!-- JBoss Remoting User's Guide or wiki (http://www.jboss.org/wiki/Wiki.jsp?page=Remoting_configuration) -->
-
-    <!-- The NetworkRegistry contains all the local and remote -->
-    <!-- servers that it recognizes.  The remote ones registered -->
-    <!-- are dependant on the detectors running and which domains -->
-    <!-- they are configured to identify.                         -->
-    <mbean code="org.jboss.remoting.network.NetworkRegistry"
-           name="jboss.remoting:service=NetworkRegistry"/>
-
-   <!-- The Connector is the core component of the remoting server service. -->
-   <!-- It binds the remoting invoker (transport protocol, callback configuration, -->
-   <!-- data marshalling, etc.) with the invocation handlers.  -->
-   <mbean code="org.jboss.remoting.transport.Connector"
-          name="jboss.remoting:service=Connector,transport=socket"
-          display-name="Socket transport Connector">
-
-       <!-- Can either just specify the InvokerLocator attribute and not the invoker element in the -->
-       <!-- Configuration attribute, or do the full invoker configuration in the in invoker element -->
-       <!-- of the Configuration attribute. -->
-
-       <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
-       <!-- otherwise, parser will complain. -->
-       <!-- <attribute name="InvokerLocator"><![CDATA[socket://${jboss.bind.address}:4446/?datatype=invocation]]></attribute> -->
-
-      <attribute name="Configuration">
-         <!-- Using the following <invoker> element instead of the InvokerLocator above because specific attributes needed. -->
-         <!-- If wanted to use any of the parameters below, can just add them as parameters to the url above if wanted use the InvokerLocator attribute. -->
-         <config>
-            <!-- Other than transport type and handler, none of these configurations are required (will just use defaults). -->
-            <invoker transport="socket">
-               <attribute name="dataType" isParam="true">invocation</attribute>
-               <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
-               <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
-               <!-- This will be port on which the marshall loader port runs on.  -->
-               <!-- <attribute name="loaderport" isParam="true">4447</attribute> -->
-               <!-- The following are specific to socket invoker -->
-               <!-- <attribute name="numAcceptThreads">1</attribute>-->
-               <!-- <attribute name="maxPoolSize">303</attribute>-->
-               <!-- <attribute name="clientMaxPoolSize" isParam="true">304</attribute>-->
-               <attribute name="socketTimeout" isParam="true">600000</attribute>
-               <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
-               <attribute name="serverBindPort">4446</attribute>
-               <!-- <attribute name="clientConnectAddress">216.23.33.2</attribute> -->
-               <!-- <attribute name="clientConnectPort">7777</attribute> -->
-               <attribute name="enableTcpNoDelay" isParam="true">true</attribute>
-               <!-- <attribute name="backlog">200</attribute>-->
-               <!-- The following is for callback configuration and is independant of invoker type -->
-               <!-- <attribute name="callbackMemCeiling">30</attribute>-->
-               <!-- indicates callback store by fully qualified class name -->
-               <!-- <attribute name="callbackStore">org.jboss.remoting.CallbackStore</attribute>-->
-               <!-- indicates callback store by object name -->
-               <!-- <attribute name="callbackStore">jboss.remoting:service=CallbackStore,type=Serializable</attribute> -->
-               <!-- config params for callback store.  if were declaring callback store via object name, -->
-               <!-- could have specified these config params there. -->
-               <!-- StoreFilePath indicates to which directory to write the callback objects. -->
-               <!-- The default value is the property value of 'jboss.server.data.dir' and if this is not set, -->
-               <!-- then will be 'data'. Will then append 'remoting' and the callback client's session id. -->
-               <!-- An example would be 'data\remoting\5c4o05l-9jijyx-e5b6xyph-1-e5b6xyph-2'. -->
-               <!-- <attribute name="StoreFilePath">callback</attribute>-->
-               <!-- StoreFileSuffix indicates the file suffix to use for the callback objects written to disk. -->
-               <!-- The default value for file suffix is 'ser'. -->
-               <!-- <attribute name="StoreFileSuffix">cst</attribute>-->
-            </invoker>
-
-            <!-- At least one handler is required by the connector.  If have more than one, must decalre -->
-            <!-- different subsystem values.  Otherwise, all invocations will be routed to the only one -->
-            <!-- that is declared. -->
-            <handlers>
-               <!-- can also specify handler by fully qualified classname -->
-               <handler subsystem="invoker">jboss:service=invoker,type=unified</handler>
-            </handlers>
-         </config>
-      </attribute>
-      <depends>jboss.remoting:service=NetworkRegistry</depends>
-   </mbean>
-
-
-   <!-- <mbean code="org.jboss.remoting.detection.jndi.JNDIDetector"-->
-   <!--      name="jboss.remoting:service=Detector,transport=jndi">-->
-   <!-- host to which the detector will connect to for the JNDI server. -->
-   <!-- <attribute name="Host">localhost</attribute>-->
-   <!-- port to which detector will connect to for the JNDI server. -->
-   <!-- <attribute name="Port">5555</attribute>-->
-   <!-- context factory string used when connecting to the JNDI server. -->
-   <!-- The default is org.jnp.interfaces.NamingContextFactory. -->
-   <!-- <attribute name="ContextFactory">org.acme.NamingContextFactory</attribute> -->
-   <!-- url package string to use when connecting to the JNDI server. -->
-   <!-- The default is org.jboss.naming:org.jnp.interfaces. -->
-   <!-- <attribute name="URLPackage">org.acme.naming</attribute> -->
-   <!-- Sets the number of detection iterations before manually pinging -->
-   <!-- remote server to make sure still alive. This is needed since remote server -->
-   <!-- could crash and yet still have an entry in the JNDI server, -->
-   <!-- thus making it appear that it is still there. The default value is 5. -->
-   <!-- <attribute name="CleanDetectionNumber">20</attribute>-->
-
-   <!-- Specifies the domains in which the detector will recognize -->
-   <!-- detections.  If servers are not configured to be in these -->
-   <!-- domains, they will not be added to NetworkRegistry. -->
-   <!--      <attribute name="Configuration">-->
-   <!--         <domains>-->
-   <!--            <domain>roxanne</domain>-->
-   <!--            <domain>sparky</domain>-->
-   <!--         </domains>-->
-   <!--      </attribute>-->
-   <!--   </mbean>-->
-
-   <!-- ==================================================================== -->
-   <!-- Monitoring and Management                                            -->
-   <!-- ==================================================================== -->
-
-   <!-- Uncomment to enable JMX monitoring of the bean cache
-   <mbean code="org.jboss.monitor.BeanCacheMonitor"
-          name="jboss.monitor:name=BeanCacheMonitor"/>
-   -->
-
-   <!-- Uncomment to enable JMX monitoring of the entity bean locking
-   <mbean code="org.jboss.monitor.EntityLockMonitor"
-          name="jboss.monitor:name=EntityLockMonitor"/>
-   -->
-
-   <!-- ==================================================================== -->
-   <!-- An MBean that is a registry for JDBC type-mapping metadata           -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
-      name="jboss.jdbc:service=metadata"/>
-
-   <!-- ==================================================================== -->
-   <!-- Deployment Scanning                                                  -->
-   <!-- ==================================================================== -->
-
-   <!-- An mbean for hot deployment/undeployment of archives.
-   -->
-   <mbean code="org.jboss.deployment.scanner.URLDeploymentScanner"
-      name="jboss.deployment:type=DeploymentScanner,flavor=URL">
-
-      <!-- Uncomment (and comment/remove version below) to enable usage of the
-        DeploymentCache
-      <depends optional-attribute-name="Deployer">jboss.deployment:type=DeploymentCache</depends>
-      -->
-      <depends optional-attribute-name="Deployer">jboss.system:service=MainDeployer</depends>
-
-      <!-- The URLComparator can be used to specify a deployment ordering
-           for deployments found in a scanned directory.  The class specified
-           must be an implementation of java.util.Comparator, it must be able
-           to compare two URL objects, and it must have a no-arg constructor.
-           Two deployment comparators are shipped with JBoss:
-             - org.jboss.deployment.DeploymentSorter
-               Sorts by file extension, as follows:
-                 "sar", "service.xml", "rar", "jar", "war", "wsr", "ear", "zip",
-                 "*"
-             - org.jboss.deployment.scanner.PrefixDeploymentSorter
-               If the name portion of the url begins with 1 or more digits, those
-               digits are converted to an int (ignoring leading zeroes), and
-               files are deployed in that order.  Files that do not start with
-               any digits will be deployed first, and they will be sorted by
-               extension as above with DeploymentSorter.
-      -->
-      <attribute name="URLComparator">org.jboss.deployment.DeploymentSorter</attribute>
-      <!--
-      <attribute name="URLComparator">org.jboss.deployment.scanner.PrefixDeploymentSorter</attribute>
-      -->
-
-      <!-- The FilterInstance specifies a URLLister.URLFilter for scanned
-           directories. This DeploymentFilter is initialized with the given
-           prefixes, suffixes and matches that define which URLs should be
-           ignored.
-      -->
-      <attribute name="FilterInstance"
-         attributeClass="org.jboss.deployment.scanner.DeploymentFilter"
-         serialDataType="javaBean">
-         <!-- Files starting with theses strings are ignored -->
-         <property name="prefixes">#,%,\,,.,_$</property>
-         <!-- Files ending with theses strings are ignored -->
-         <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
-         <!-- Files matching with theses strings are ignored -->
-         <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
-      </attribute>
-
-      <!-- Frequency in milliseconds to rescan the URLs for changes -->
-      <attribute name="ScanPeriod">5000</attribute>
-      <!-- A flag to disable the scans -->
-      <attribute name="ScanEnabled">true</attribute>
-
-      <!-- URLs are comma separated and resolve relative to the server home URL
-         unless the given path is absolute. If the URL ends in "/" it is
-         considered a collection and scanned, otherwise it is simply deployed;
-         this follows RFC2518 convention and allows discrimination between
-         collections and directories that are simply unpacked archives.
-
-         URLs may be local (file:) or remote (http:). Scanning is supported
-         for remote URLs but unpacked deployment units are not.
-
-         Example URLs:
-            deploy/
-                 scans ${jboss.server.url}/deploy/, which is local or remote
-                 depending on the URL used to boot the server
-            ${jboss.server.home}/deploy/
-                 scans ${jboss.server.home)/deploy, which is always local
-            file:/var/opt/myapp.ear
-                 deploy myapp.ear from a local location
-            file:/var/opt/apps/
-                 scans the specified directory
-            http://www.test.com/netboot/myapp.ear
-                 deploys myapp.ear from a remote location
-            http://www.test.com/netboot/apps/
-                 scans the specified WebDAV location
-       -->
-      <attribute name="URLs">
-         deploy/
-      </attribute>
-
-      <!-- Indicates if the scanner should recursively scan directories that
-      contain no "." in their names. This can be used to group applications
-      and services that must be deployed and that have the same
-      logical function in the same directory i.e.
-        deploy/JMX/
-        deploy/JMS/
-        ...
-      -->
-      <attribute name="RecursiveSearch">True</attribute>
-
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/conf/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jboss-service.xml 56406 2006-08-29 16:01:54Z anil.saldhana at jboss.com $ -->
+
+<!-- ===================================================================== -->
+<!--  JBoss Server Configuration                                           -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
+     can be restricted to specific jars by specifying them in the archives
+     attribute.
+    -->
+   <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
+
+   <!-- ==================================================================== -->
+   <!-- JSR-77 Single JBoss Server Management Domain                         -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
+      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
+      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
+      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
+      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
+      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
+      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
+      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
+      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
+      <attribute name="CARDeployer">jboss.j2ee:service=ClientDeployer</attribute>
+      <attribute name="MailService">jboss:service=Mail</attribute>
+      <attribute name="JMSService">jboss.mq:service=DestinationManager</attribute>
+      <attribute name="JNDIService">jboss:service=Naming</attribute>
+      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
+      <attribute name="UserTransactionService">jboss:service=DistributedTransactionManager</attribute>
+      <attribute name="RMI_IIOPService">jboss:service=CorbaORB</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- XMBean Persistence                                                   -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.system.pm.AttributePersistenceService"
+      name="jboss:service=AttributePersistenceService"
+      xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
+      <!-- the AttributePersistenceService is persistent, itself -->
+
+      <!--
+      <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
+      <attribute name="AttributePersistenceManagerConfig">
+         <data-directory>data/xmbean-attrs</data-directory>
+      </attribute>
+      <attribute name="ApmDestroyOnServiceStop">false</attribute>
+      <attribute name="VersionTag"></attribute>
+      -->
+   </mbean>
+
+   <!-- A Thread pool service -->
+   <mbean code="org.jboss.util.threadpool.BasicThreadPool"
+      name="jboss.system:service=ThreadPool">
+      <attribute name="Name">JBoss System Threads</attribute>
+      <attribute name="ThreadGroupName">System Threads</attribute>
+      <!-- How long a thread will live without any tasks in MS -->
+      <attribute name="KeepAliveTime">60000</attribute>
+      <!-- The max number of threads in the pool -->
+      <attribute name="MaximumPoolSize">10</attribute>
+      <!-- The max number of tasks before the queue is full -->
+      <attribute name="MaximumQueueSize">1000</attribute>
+      <!-- The behavior of the pool when a task is added and the queue is full.
+      abort - a RuntimeException is thrown
+      run - the calling thread executes the task
+      wait - the calling thread blocks until the queue has room
+      discard - the task is silently discarded without being run
+      discardOldest - check to see if a task is about to complete and enque
+         the new task if possible, else run the task in the calling thread
+      -->
+      <attribute name="BlockingMode">run</attribute>
+   </mbean>
+
+   <!-- Preload all custom editors for VMs that don't use the thread
+        context class loader when searching for PropertyEditors. Uncomment
+        if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
+   <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
+     name="jboss:type=Service,name=BootstrapEditors">
+     <attribute name="BootstrapEditors">
+       java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
+       java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
+       java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
+       java.util.Date=org.jboss.util.propertyeditor.DateEditor
+       java.io.File=org.jboss.util.propertyeditor.FileEditor
+       java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
+       java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
+       javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
+       java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
+       [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
+       java.net.URL=org.jboss.util.propertyeditor.URLEditor
+     </attribute>
+   </mbean>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- Log4j Initialization                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.logging.Log4jService"
+      name="jboss.system:type=Log4jService,service=Logging"
+	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+      <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
+      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
+      this needs to be set to avoid a possible deadlock on exception at the
+      appender level. See bug#696819.
+      -->
+      <attribute name="Log4jQuietMode">true</attribute>
+      <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
+      <attribute name="RefreshPeriod">60</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Active Alarm Table                                                   -->
+   <!-- ==================================================================== -->
+
+   <!--
+      | The ActiveAlarmTable service is a simple JMX notification listener
+      | that maintains a table with the received notifications (alarms).
+      | The alarms can be acknowledged through the jmx or the web console.
+      | Modify the SubscriptionList below to subscribe for any notification
+      | in the system and treat it as an alarm.
+      | The JMXNotificationAppender is a log4j Appender that can be configured
+      | in log4j.xml, that trasforms logging events to JMX notification so they
+      | can be fed back into the table. By storing the WARN or higher level logging
+      | events you can have a quick view of important system faults.
+      |
+      | The following attributes may be set:
+      |
+      | MaxTableSize (default 1000)
+      |  - set an upper limit to the number of stored alarms
+      | LogLevel (default DEBUG)
+      |  - the log level to use for received notification, can be set to NONE
+      | ServerId (default jboss)
+      |  - used to construct unique alarm ids
+      | SubscriptionList
+      |  - subscribe for the notifications to be stored in the table
+
+   <mbean code="org.jboss.monitor.services.ActiveAlarmTable" 
+          name="jboss.monitor:service=ActiveAlarmTable">
+      <attribute name="SubscriptionList">
+         <subscription-list>
+            <mbean name="jboss.monitor:*">
+               <notification type="jboss.alarm"/>
+               <notification type="JBOSS_MONITOR_NOTIFICATION"/>               
+            </mbean>
+            <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+         </subscription-list>
+      </attribute>
+   </mbean>
+   -->
+   
+   <!-- ==================================================================== -->
+   <!-- JBoss RMI Classloader - only install when available                  -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
+      name="jboss.rmi:type=RMIClassLoader">
+      <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
+      <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Service Binding                                                      -->
+   <!-- ==================================================================== -->
+
+   <!-- Automatically activated when generatting the clustering environment -->
+   <!-- @TESTSUITE_CLUSTER_CONFIG@ -->
+
+   <!--
+      | Binding service manager for port/host mapping. This is a sample
+      | config that demonstrates a JBoss instances with a server name 'jboss1'
+      | loading its bindings from an XML file using the ServicesStoreFactory
+      | implementation returned by the XMLServicesStoreFactory.
+      |
+      | ServerName: The unique name assigned to a JBoss server instance for
+      | lookup purposes. This allows a single ServicesStore to handle mulitiple
+      | JBoss servers.
+      |
+      | StoreURL: The URL string passed to org.jboss.services.binding.ServicesStore
+      | during initialization that specifies how to connect to the bindings store.
+      | StoreFactory: The org.jboss.services.binding.ServicesStoreFactory interface
+      | implementation to create to obtain the ServicesStore instance.
+
+   <mbean code="org.jboss.services.binding.ServiceBindingManager"
+     name="jboss.system:service=ServiceBindingManager">
+     <attribute name="ServerName">ports-01</attribute>
+     <attribute name="StoreURL">../docs/examples/binding-manager/sample-bindings.xml</attribute>
+     <attribute name="StoreFactoryClassName">
+       org.jboss.services.binding.XMLServicesStoreFactory
+     </attribute>
+   </mbean>
+
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- Class Loading                                                        -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.web.WebService"
+      name="jboss:service=WebService">
+      <attribute name="Port">8083</attribute>
+      <!-- Should non-EJB .class files be downloadable -->
+      <attribute name="DownloadServerClasses">true</attribute>
+      <!-- Should resources other than .class files be downloadable. Both
+         DownloadServerClasses and DownloadResources must be true for resources
+         to be downloadable. This is false by default because its generally a
+         bad idea as server configuration files that container security
+         information can be accessed.
+       -->
+      <attribute name="DownloadResources">false</attribute>
+      <attribute name="Host">${jboss.bind.address}</attribute>
+      <attribute name="BindAddress">${jboss.bind.address}</attribute>
+      <!-- Use the default thread pool for dynamic class loading -->
+      <depends optional-attribute-name="ThreadPool"
+         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- JNDI                                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.naming.NamingService"
+      name="jboss:service=Naming"
+      xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
+      <!-- The call by value mode. true if all lookups are unmarshalled using
+      the caller's TCL, false if in VM lookups return the value by reference.
+      -->
+      <attribute name="CallByValue">false</attribute>
+      <!-- The listening port for the bootstrap JNP service. Set this to -1
+        to run the NamingService without the JNP invoker listening port.
+      -->
+      <attribute name="Port">1099</attribute>
+      <!-- The bootstrap JNP server bind address. This also sets the default
+      RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="BindAddress">${jboss.bind.address}</attribute>
+      <!-- The port of the RMI naming service, 0 == anonymous -->
+      <attribute name="RmiPort">1098</attribute>
+      <!-- The RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+      <!-- The thread pool service used to control the bootstrap lookups -->
+      <depends optional-attribute-name="LookupPool"
+         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+   </mbean>
+
+   <mbean code="org.jboss.naming.JNDIView"
+   	name="jboss:service=JNDIView"
+   	xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
+   	<!-- The HANamingService service name -->
+   	<attribute name="HANamingService">jboss:service=HAJNDI</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Security                                                             -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.security.plugins.SecurityConfig"
+      name="jboss.security:service=SecurityConfig">
+      <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
+   </mbean>
+   <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
+      name="jboss.security:service=XMLLoginConfig">
+      <attribute name="ConfigResource">login-config.xml</attribute>
+   </mbean>
+
+   <!-- JAAS security manager and realm mapping -->
+   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
+      name="jboss.security:service=JaasSecurityManager">
+      <!-- A flag which indicates whether the SecurityAssociation server mode
+      is set on service creation. This is true by default since the
+      SecurityAssociation should be thread local for multi-threaded server
+      operation.
+      -->
+      <attribute name="ServerMode">true</attribute>
+      <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
+      <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute> 
+      <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
+      in seconds.
+      If you want to disable caching of security credentials, set this to 0 to
+      force authentication to occur every time. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+       <attribute name="DefaultCacheTimeout">1800</attribute>
+      <!-- DefaultCacheResolution: Specifies the default timed cache policy
+      resolution in seconds. This controls the interval at which the cache
+      current timestamp is updated and should be less than the DefaultCacheTimeout
+      in order for the timeout to be meaningful. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheResolution">60</attribute>
+   </mbean> 
+
+   <!-- Authorization manager
+   <mbean code="org.jboss.security.plugins.AuthorizationManagerService"
+      name="jboss.security:service=AuthorizationManager"> 
+      <attribute name="AuthorizationManagerClassName">org.jboss.security.plugins.JBossAuthorizationManager</attribute>
+   </mbean>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- Transactions                                                         -->
+   <!-- ==================================================================== -->
+   <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
+   <mbean code="org.jboss.tm.XidFactory"
+      name="jboss:service=XidFactory">
+      <!--attribute name="Pad">true</attribute-->
+   </mbean>
+
+   <!-- TM Recovery
+   <mbean code="org.jboss.tm.recovery.XidFactoryInitializationService"
+      name="jboss:service=XidFactoryInitializer">
+      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+      <attribute name="NextTxGenerationFile">${jboss.server.data.dir}/next-tx-generation.dat</attribute>
+   </mbean>
+
+   <mbean code="org.jboss.tm.recovery.BatchRecoveryLoggerService" name="jboss:service=RecoveryLogger">
+      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+      <depends>jboss:service=XidFactoryInitializer</depends>
+      <attribute name="DirectoryList">${jboss.server.data.dir}/recovery-log</attribute>
+      <attribute name="LogFileSize">5000000</attribute>
+      <attribute name="HeuristicStatusLogDirectory">${jboss.server.data.dir}/heuristics-log</attribute>
+   </mbean>
+
+   <mbean code="org.jboss.tm.recovery.RecoveryManagerService" name="jboss:service=RecoveryManager">
+      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+      <depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends>
+   </mbean>
+   -->
+
+   <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+      name="jboss:service=TransactionManager">
+      <attribute name="TransactionTimeout">300</attribute>
+   </mbean>
+
+   <!--
+      | Old UserTransaction support.
+      | Commented out as UserTransaction is now supported
+      | by the distributed transaction manager (see below).
+   <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
+      name="jboss:service=ClientUserTransaction"
+      xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
+      <depends>
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransactionFactory">
+            <attribute name="InvokerName">jboss:service=invoker,type=unified</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName">UserTransactionSessionFactory</attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=unified</depends>
+         </mbean>
+      </depends>
+      <depends optional-attribute-name="TxProxyName">
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransaction">
+            <attribute name="InvokerName">jboss:service=invoker,type=unified</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName"></attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSession</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=unified</depends>
+         </mbean>
+      </depends>
+   </mbean>
+   -->
+
+   <!--
+      | Distributed transaction manager.
+      | Includes support for UserTransaction over JBoss remoting.
+   <mbean code="org.jboss.tm.remoting.server.DistributedTransactionManager"
+          name="jboss:service=DistributedTransactionManager">
+      <depends>jboss:service=TransactionManager</depends>
+      <depends-list optional-attribute-name="Connectors">
+         <depends-list-element>jboss.remoting:service=Connector,transport=socket</depends-list-element>
+      </depends-list>
+      <attribute name="InterpositionEnabled">false</attribute>
+   </mbean>
+    -->
+
+   <!-- ==================================================================== -->
+   <!-- Invokers to the JMX node                                             -->
+   <!-- ==================================================================== -->
+
+   <!-- Unified invoker (based on remoting) -->
+   <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
+      name="jboss:service=invoker,type=unified">
+      <!-- To turn on strict RMI exception propagation uncomment block below -->
+      <!-- This will cause the UnifiedInvokerProxy to wrap RemoteExceptions  -->
+      <!-- within a ServerException, otherwise will throw root exception     -->
+      <!-- (not RemoteException)                                             -->
+      <!-- <attribute name="StrictRMIException">true</attribute> -->
+      <depends>jboss:service=TransactionManager</depends>
+      <depends>jboss.remoting:service=Connector,transport=socket</depends>
+   </mbean>
+
+   <!-- RMI/JRMP invoker -->
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker"
+      name="jboss:service=invoker,type=jrmp">
+      <attribute name="RMIObjectPort">4444</attribute>
+      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
+      <!--
+      <attribute name="RMIClientSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketAddr">custom</attribute>
+      <attribute name="SecurityDomain">ssl-domain-name</attribute>
+      -->
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.invocation.local.LocalInvoker"
+      name="jboss:service=invoker,type=local">
+
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.invocation.pooled.server.PooledInvoker"
+      name="jboss:service=invoker,type=pooled">
+      <attribute name="NumAcceptThreads">1</attribute>
+      <attribute name="MaxPoolSize">300</attribute>
+      <attribute name="ClientMaxPoolSize">300</attribute>
+      <attribute name="SocketTimeout">60000</attribute>
+      <attribute name="ServerBindAddress">${jboss.bind.address}</attribute>
+      <attribute name="ServerBindPort">4445</attribute>
+      <attribute name="ClientConnectAddress">${jboss.bind.address}</attribute>
+      <attribute name="ClientConnectPort">0</attribute>
+      <attribute name="ClientRetryCount">1</attribute>
+      <attribute name="EnableTcpNoDelay">false</attribute>
+
+      <!-- Customized socket factory attributes
+      <attribute name="ClientSocketFactoryName">custom.client.factory</attribute>
+      <attribute name="ServerSocketFactoryName">custom.server.factory</attribute>
+      <attribute name="SslDomain">java:/jaas/pooledInvoker</attribute>
+      -->
+      <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Remoting services 						                                   -->
+   <!-- ==================================================================== -->
+
+   <!-- For detailed description of all these configuration attributes, please see the -->
+   <!-- JBoss Remoting User's Guide or wiki (http://www.jboss.org/wiki/Wiki.jsp?page=Remoting_configuration) -->
+
+    <!-- The NetworkRegistry contains all the local and remote -->
+    <!-- servers that it recognizes.  The remote ones registered -->
+    <!-- are dependant on the detectors running and which domains -->
+    <!-- they are configured to identify.                         -->
+    <mbean code="org.jboss.remoting.network.NetworkRegistry"
+           name="jboss.remoting:service=NetworkRegistry"/>
+
+   <!-- The Connector is the core component of the remoting server service. -->
+   <!-- It binds the remoting invoker (transport protocol, callback configuration, -->
+   <!-- data marshalling, etc.) with the invocation handlers.  -->
+   <mbean code="org.jboss.remoting.transport.Connector"
+          name="jboss.remoting:service=Connector,transport=socket"
+          display-name="Socket transport Connector">
+
+       <!-- Can either just specify the InvokerLocator attribute and not the invoker element in the -->
+       <!-- Configuration attribute, or do the full invoker configuration in the in invoker element -->
+       <!-- of the Configuration attribute. -->
+
+       <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
+       <!-- otherwise, parser will complain. -->
+       <!-- <attribute name="InvokerLocator"><![CDATA[socket://${jboss.bind.address}:4446/?datatype=invocation]]></attribute> -->
+
+      <attribute name="Configuration">
+         <!-- Using the following <invoker> element instead of the InvokerLocator above because specific attributes needed. -->
+         <!-- If wanted to use any of the parameters below, can just add them as parameters to the url above if wanted use the InvokerLocator attribute. -->
+         <config>
+            <!-- Other than transport type and handler, none of these configurations are required (will just use defaults). -->
+            <invoker transport="socket">
+               <attribute name="dataType" isParam="true">invocation</attribute>
+               <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
+               <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
+               <!-- This will be port on which the marshall loader port runs on.  -->
+               <!-- <attribute name="loaderport" isParam="true">4447</attribute> -->
+               <!-- The following are specific to socket invoker -->
+               <!-- <attribute name="numAcceptThreads">1</attribute>-->
+               <!-- <attribute name="maxPoolSize">303</attribute>-->
+               <!-- <attribute name="clientMaxPoolSize" isParam="true">304</attribute>-->
+               <attribute name="socketTimeout" isParam="true">600000</attribute>
+               <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+               <attribute name="serverBindPort">4446</attribute>
+               <!-- <attribute name="clientConnectAddress">216.23.33.2</attribute> -->
+               <!-- <attribute name="clientConnectPort">7777</attribute> -->
+               <attribute name="enableTcpNoDelay" isParam="true">true</attribute>
+               <!-- <attribute name="backlog">200</attribute>-->
+               <!-- The following is for callback configuration and is independant of invoker type -->
+               <!-- <attribute name="callbackMemCeiling">30</attribute>-->
+               <!-- indicates callback store by fully qualified class name -->
+               <!-- <attribute name="callbackStore">org.jboss.remoting.CallbackStore</attribute>-->
+               <!-- indicates callback store by object name -->
+               <!-- <attribute name="callbackStore">jboss.remoting:service=CallbackStore,type=Serializable</attribute> -->
+               <!-- config params for callback store.  if were declaring callback store via object name, -->
+               <!-- could have specified these config params there. -->
+               <!-- StoreFilePath indicates to which directory to write the callback objects. -->
+               <!-- The default value is the property value of 'jboss.server.data.dir' and if this is not set, -->
+               <!-- then will be 'data'. Will then append 'remoting' and the callback client's session id. -->
+               <!-- An example would be 'data\remoting\5c4o05l-9jijyx-e5b6xyph-1-e5b6xyph-2'. -->
+               <!-- <attribute name="StoreFilePath">callback</attribute>-->
+               <!-- StoreFileSuffix indicates the file suffix to use for the callback objects written to disk. -->
+               <!-- The default value for file suffix is 'ser'. -->
+               <!-- <attribute name="StoreFileSuffix">cst</attribute>-->
+            </invoker>
+
+            <!-- At least one handler is required by the connector.  If have more than one, must decalre -->
+            <!-- different subsystem values.  Otherwise, all invocations will be routed to the only one -->
+            <!-- that is declared. -->
+            <handlers>
+               <!-- can also specify handler by fully qualified classname -->
+               <handler subsystem="invoker">jboss:service=invoker,type=unified</handler>
+            </handlers>
+         </config>
+      </attribute>
+      <depends>jboss.remoting:service=NetworkRegistry</depends>
+   </mbean>
+
+
+   <!-- <mbean code="org.jboss.remoting.detection.jndi.JNDIDetector"-->
+   <!--      name="jboss.remoting:service=Detector,transport=jndi">-->
+   <!-- host to which the detector will connect to for the JNDI server. -->
+   <!-- <attribute name="Host">localhost</attribute>-->
+   <!-- port to which detector will connect to for the JNDI server. -->
+   <!-- <attribute name="Port">5555</attribute>-->
+   <!-- context factory string used when connecting to the JNDI server. -->
+   <!-- The default is org.jnp.interfaces.NamingContextFactory. -->
+   <!-- <attribute name="ContextFactory">org.acme.NamingContextFactory</attribute> -->
+   <!-- url package string to use when connecting to the JNDI server. -->
+   <!-- The default is org.jboss.naming:org.jnp.interfaces. -->
+   <!-- <attribute name="URLPackage">org.acme.naming</attribute> -->
+   <!-- Sets the number of detection iterations before manually pinging -->
+   <!-- remote server to make sure still alive. This is needed since remote server -->
+   <!-- could crash and yet still have an entry in the JNDI server, -->
+   <!-- thus making it appear that it is still there. The default value is 5. -->
+   <!-- <attribute name="CleanDetectionNumber">20</attribute>-->
+
+   <!-- Specifies the domains in which the detector will recognize -->
+   <!-- detections.  If servers are not configured to be in these -->
+   <!-- domains, they will not be added to NetworkRegistry. -->
+   <!--      <attribute name="Configuration">-->
+   <!--         <domains>-->
+   <!--            <domain>roxanne</domain>-->
+   <!--            <domain>sparky</domain>-->
+   <!--         </domains>-->
+   <!--      </attribute>-->
+   <!--   </mbean>-->
+
+   <!-- ==================================================================== -->
+   <!-- Monitoring and Management                                            -->
+   <!-- ==================================================================== -->
+
+   <!-- Uncomment to enable JMX monitoring of the bean cache
+   <mbean code="org.jboss.monitor.BeanCacheMonitor"
+          name="jboss.monitor:name=BeanCacheMonitor"/>
+   -->
+
+   <!-- Uncomment to enable JMX monitoring of the entity bean locking
+   <mbean code="org.jboss.monitor.EntityLockMonitor"
+          name="jboss.monitor:name=EntityLockMonitor"/>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- An MBean that is a registry for JDBC type-mapping metadata           -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
+      name="jboss.jdbc:service=metadata"/>
+
+   <!-- ==================================================================== -->
+   <!-- Deployment Scanning                                                  -->
+   <!-- ==================================================================== -->
+
+   <!-- An mbean for hot deployment/undeployment of archives.
+   -->
+   <mbean code="org.jboss.deployment.scanner.URLDeploymentScanner"
+      name="jboss.deployment:type=DeploymentScanner,flavor=URL">
+
+      <!-- Uncomment (and comment/remove version below) to enable usage of the
+        DeploymentCache
+      <depends optional-attribute-name="Deployer">jboss.deployment:type=DeploymentCache</depends>
+      -->
+      <depends optional-attribute-name="Deployer">jboss.system:service=MainDeployer</depends>
+
+      <!-- The URLComparator can be used to specify a deployment ordering
+           for deployments found in a scanned directory.  The class specified
+           must be an implementation of java.util.Comparator, it must be able
+           to compare two URL objects, and it must have a no-arg constructor.
+           Two deployment comparators are shipped with JBoss:
+             - org.jboss.deployment.DeploymentSorter
+               Sorts by file extension, as follows:
+                 "sar", "service.xml", "rar", "jar", "war", "wsr", "ear", "zip",
+                 "*"
+             - org.jboss.deployment.scanner.PrefixDeploymentSorter
+               If the name portion of the url begins with 1 or more digits, those
+               digits are converted to an int (ignoring leading zeroes), and
+               files are deployed in that order.  Files that do not start with
+               any digits will be deployed first, and they will be sorted by
+               extension as above with DeploymentSorter.
+      -->
+      <attribute name="URLComparator">org.jboss.deployment.DeploymentSorter</attribute>
+      <!--
+      <attribute name="URLComparator">org.jboss.deployment.scanner.PrefixDeploymentSorter</attribute>
+      -->
+
+      <!-- The FilterInstance specifies a URLLister.URLFilter for scanned
+           directories. This DeploymentFilter is initialized with the given
+           prefixes, suffixes and matches that define which URLs should be
+           ignored.
+      -->
+      <attribute name="FilterInstance"
+         attributeClass="org.jboss.deployment.scanner.DeploymentFilter"
+         serialDataType="javaBean">
+         <!-- Files starting with theses strings are ignored -->
+         <property name="prefixes">#,%,\,,.,_$</property>
+         <!-- Files ending with theses strings are ignored -->
+         <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
+         <!-- Files matching with theses strings are ignored -->
+         <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
+      </attribute>
+
+      <!-- Frequency in milliseconds to rescan the URLs for changes -->
+      <attribute name="ScanPeriod">5000</attribute>
+      <!-- A flag to disable the scans -->
+      <attribute name="ScanEnabled">true</attribute>
+
+      <!-- URLs are comma separated and resolve relative to the server home URL
+         unless the given path is absolute. If the URL ends in "/" it is
+         considered a collection and scanned, otherwise it is simply deployed;
+         this follows RFC2518 convention and allows discrimination between
+         collections and directories that are simply unpacked archives.
+
+         URLs may be local (file:) or remote (http:). Scanning is supported
+         for remote URLs but unpacked deployment units are not.
+
+         Example URLs:
+            deploy/
+                 scans ${jboss.server.url}/deploy/, which is local or remote
+                 depending on the URL used to boot the server
+            ${jboss.server.home}/deploy/
+                 scans ${jboss.server.home)/deploy, which is always local
+            file:/var/opt/myapp.ear
+                 deploy myapp.ear from a local location
+            file:/var/opt/apps/
+                 scans the specified directory
+            http://www.test.com/netboot/myapp.ear
+                 deploys myapp.ear from a remote location
+            http://www.test.com/netboot/apps/
+                 scans the specified WebDAV location
+       -->
+      <attribute name="URLs">
+         deploy/
+      </attribute>
+
+      <!-- Indicates if the scanner should recursively scan directories that
+      contain no "." in their names. This can be used to group applications
+      and services that must be deployed and that have the same
+      logical function in the same directory i.e.
+        deploy/JMX/
+        deploy/JMS/
+        ...
+      -->
+      <attribute name="RecursiveSearch">True</attribute>
+
+   </mbean>
+
+</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/lib)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-integration.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-integration.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-integration.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-jacorb.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-jacorb.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/lib/jbossjts-jacorb.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossjts.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/lib/jbossjts.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossts-common.jar
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/lib/jbossts-common.jar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/arjuna/lib/jbossts-common.jar)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
-"-//JBoss//DTD JBOSS AOP 1.0//EN"
-"http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
-   <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.aspects.remoting.IsLocalInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
-
-   <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
-
-   <stack name="ServiceClientInterceptors">
-      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="AsynchronousStatelessSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="AsynchronousStatefulSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="StatelessSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="StatefulSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="ClusteredStatelessSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="ClusteredStatefulSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
-   <interceptor factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor class="org.jboss.ejb3.security.RunAsSecurityInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
-   <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
-   <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
-   <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
-   <interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
-
-   <typedef name="ejb3intercepted" expr="class(@javax.ejb.Interceptors) OR class(@javax.ejb.Interceptor) OR has(* *->@javax.ejb.AroundInvoke(..))"/>
-
-   <domain name="Stateless Bean">
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="Stateful Bean">
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
-      </bind>
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* @javax.persistence.PersistenceContext->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
-      </bind>
-
-      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(* *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
-      </annotation>
-
-      <!-- NON Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
-      </annotation>
-
-      <!-- Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
-      </annotation>
-   </domain>
-
-   <domain name="Message Driven Bean">
-      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="Service Bean">
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-      </bind>
-      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-   </domain>
-
-</aop>

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+"-//JBoss//DTD JBOSS AOP 1.0//EN"
+"http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+   <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.aspects.remoting.IsLocalInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
+
+   <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
+
+   <stack name="ServiceClientInterceptors">
+      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="AsynchronousStatelessSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="AsynchronousStatefulSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="StatelessSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="StatefulSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="ClusteredStatelessSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="ClusteredStatefulSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
+   <interceptor factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor class="org.jboss.ejb3.security.RunAsSecurityInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
+   <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
+   <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+   <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
+   <interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
+
+   <typedef name="ejb3intercepted" expr="class(@javax.ejb.Interceptors) OR class(@javax.ejb.Interceptor) OR has(* *->@javax.ejb.AroundInvoke(..))"/>
+
+   <domain name="Stateless Bean">
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+      </annotation>
+   </domain>
+
+   <domain name="Stateful Bean">
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->@javax.ejb.Remove(..))">
+         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* @javax.persistence.PersistenceContext->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
+      </bind>
+
+      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(* *->@javax.ejb.Remove(..))">
+         <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+      </annotation>
+
+      <!-- NON Clustered cache configuration -->
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
+      </annotation>
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+      </annotation>
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
+      </annotation>
+
+      <!-- Clustered cache configuration -->
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+      </annotation>
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
+      </annotation>
+   </domain>
+
+   <domain name="Message Driven Bean">
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+      </annotation>
+   </domain>
+
+   <domain name="Service Bean">
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+   </domain>
+
+</aop>

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-
-<server>
-   <mbean code="org.jboss.security.jacc.DelegatingPolicy"
-      name="jboss.security:service=JaccPolicyProvider"
-      xmbean-dd="">
-      <xmbean>
-         <attribute access="read-only" getMethod="getPolicyProxy">
-            <description>The java.security.Policy implementation</description>
-            <name>PolicyProxy</name>
-            <type>java.security.Policy</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getExternalPermissionTypes"
-                    setMethod="setExternalPermissionTypes">
-            <description>The types of non-javax.security.jacc permissions that
-               should be validated against this policy</description>
-            <name>ExternalPermissionTypes</name>
-            <type>[Ljava.lang.Class;</type>
-         </attribute>
-         <operation>
-            <name>listContextPolicies</name>
-            <return-type>java.lang.String</return-type>
-         </operation>
-      </xmbean>
-      <!-- Not used, just here to test that custom permissions don't break the
-      current behavior of javax.security.jacc.* permissions.
-      -->
-      <attribute name="ExternalPermissionTypes">org.jboss.security.srp.SRPPermission</attribute>
-   </mbean>
-   <mbean code="org.jboss.security.jacc.SecurityService"
-      name="jboss.security:service=JaccSecurityService"
-      xmbean-dd="">
-      <xmbean>
-         <descriptors>
-            <injection id="MBeanServerType" setMethod="setMBeanServer" />
-            <!--injection id="ObjectNameType" setMethod="setObjectName" /-->
-         </descriptors>
-         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
-            <description>The policy provider MBean name</description>
-            <name>PolicyName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-         <attribute access="read-write" getMethod="getPolicyAttributeName"
-            setMethod="setPolicyAttributeName">
-            <description>The Policy attribute name on the PolicyName MBean</description>
-            <name>PolicyAttributeName</name>
-            <type>java.lang.String</type>
-         </attribute>
-         <operation>
-            <name>start</name>
-         </operation>
-         <operation>
-            <name>stop</name>
-         </operation>
-      </xmbean>
-      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
-      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
-   </mbean>
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jacc-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+
+<server>
+   <mbean code="org.jboss.security.jacc.DelegatingPolicy"
+      name="jboss.security:service=JaccPolicyProvider"
+      xmbean-dd="">
+      <xmbean>
+         <attribute access="read-only" getMethod="getPolicyProxy">
+            <description>The java.security.Policy implementation</description>
+            <name>PolicyProxy</name>
+            <type>java.security.Policy</type>
+         </attribute>
+         <attribute access="read-write" getMethod="getExternalPermissionTypes"
+                    setMethod="setExternalPermissionTypes">
+            <description>The types of non-javax.security.jacc permissions that
+               should be validated against this policy</description>
+            <name>ExternalPermissionTypes</name>
+            <type>[Ljava.lang.Class;</type>
+         </attribute>
+         <operation>
+            <name>listContextPolicies</name>
+            <return-type>java.lang.String</return-type>
+         </operation>
+      </xmbean>
+      <!-- Not used, just here to test that custom permissions don't break the
+      current behavior of javax.security.jacc.* permissions.
+      -->
+      <attribute name="ExternalPermissionTypes">org.jboss.security.srp.SRPPermission</attribute>
+   </mbean>
+   <mbean code="org.jboss.security.jacc.SecurityService"
+      name="jboss.security:service=JaccSecurityService"
+      xmbean-dd="">
+      <xmbean>
+         <descriptors>
+            <injection id="MBeanServerType" setMethod="setMBeanServer" />
+            <!--injection id="ObjectNameType" setMethod="setObjectName" /-->
+         </descriptors>
+         <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName">
+            <description>The policy provider MBean name</description>
+            <name>PolicyName</name>
+            <type>javax.management.ObjectName</type>
+         </attribute>
+         <attribute access="read-write" getMethod="getPolicyAttributeName"
+            setMethod="setPolicyAttributeName">
+            <description>The Policy attribute name on the PolicyName MBean</description>
+            <name>PolicyAttributeName</name>
+            <type>java.lang.String</type>
+         </attribute>
+         <operation>
+            <name>start</name>
+         </operation>
+         <operation>
+            <name>stop</name>
+         </operation>
+      </xmbean>
+      <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute>
+      <attribute name="PolicyAttributeName">PolicyProxy</attribute>
+   </mbean>
+</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: jboss-service-all.xml 55263 2006-08-04 19:14:21Z dimitris at jboss.org $ -->
-<server>
-   <mbean code="org.jboss.web.tomcat.tc6.Tomcat6"
-      name="jboss.web:service=WebServer" xmbean-dd="META-INF/webserver-xmbean.xml"> 
-      
-      <!-- You can configure a set of authenticators keyed by http-auth method used. This
-      will apply the same set of authenticators across all web applications. You can
-      override the set of authenticators at the web application level by adding
-      <authenticators> element to the respective jboss-web.xml --> 
-      <!--
-      <attribute name="Authenticators" serialDataType="jbxb">
-         <java:properties xmlns:java="urn:jboss:java-properties"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-            xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
-            <java:property>
-               <java:key>BASIC</java:key>
-               <java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
-            </java:property>
-            <java:property>
-               <java:key>CLIENT-CERT</java:key>
-               <java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
-            </java:property>
-            <java:property>
-               <java:key>DIGEST</java:key>
-               <java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
-            </java:property>
-            <java:property>
-               <java:key>FORM</java:key>
-               <java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value>
-            </java:property> 
-            <java:property>
-               <java:key>NONE</java:key>
-               <java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
-            </java:property> 
-         </java:properties>
-      </attribute> 
-      -->
-      
-      <!-- The JAAS security domain to use in the absense of an explicit
-      security-domain specification in the war WEB-INF/jboss-web.xml
-      -->
-      <attribute name="DefaultSecurityDomain">java:/jaas/other</attribute>
-      
-      <!-- Get the flag indicating if the normal Java2 parent first class
-      loading model should be used over the servlet 2.3 web container first
-      model.
-      -->
-      <attribute name="Java2ClassLoadingCompliance">false</attribute>
-      <!-- A flag indicating if the JBoss Loader should be used. This loader
-      uses a unified class loader as the class loader rather than the tomcat
-      specific class loader.
-      The default is false to ensure that wars have isolated class loading
-      for duplicate jars and jsp files.
-      -->
-      <attribute name="UseJBossWebLoader">false</attribute>
-      <!-- The list of package names that should not be loaded without
-      delegating to the parent class loader before trying the web app
-      class loader. The packages listed here are those tha are used by
-      the web container implementation and cannot be overriden.
-      This only applies when UseJBossWebLoader=false.
-      -->
-      <attribute name="FilteredPackages">org.apache.commons.logging</attribute>
-      
-      <attribute name="LenientEjbLink">true</attribute>
-      
-      <!--
-      Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
-      - org.jboss.web.tomcat.tc6.session.JBossCacheManager
-      -->
-      <attribute name="ManagerClass">
-         org.jboss.web.tomcat.tc6.session.JBossCacheManager</attribute>
-      
-      <!-- The name of the request attribute under with the authenticated JAAS
-      Subject is stored on successful authentication. If null or empty then
-      the Subject will not be stored.
-      -->
-      <!--
-      <attribute name="SubjectAttributeName">j_subject</attribute>
-      -->
-      
-      <!-- The SessionIdAlphabet is the set of characters used to create a session Id
-      It must be made up of exactly 65 unique characters
-      <attribute name="SessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</attribute>
-      -->
-      
-      <!--
-      *******************************************************
-      ****************** CLUSTERING *************************
-      *******************************************************
-      In order to activate HTTP Session clustering for Tomcat
-      make sure you run JBoss's "all" configuration i.e.
-      "run -c all"
-      (the default configuration doesn't contain clustering)
-      
-      Furthermore, you may change SnapshotMode and
-      SnapshotInterval attributes below to indicate when to
-      synchronize changes with the other node(s).
-      
-      If you use Apache+mod_jk(2) you will most probably use
-      the AJP1.3 connector below. Thus, if you so wish,
-      you may comment (i.e. deactivate) the HTTP connector
-      as it won't be used anymore.
-      
-      *******************************************************
-      *******************************************************
-      *******************************************************
-      -->
-      
-      <!--
-      If you are using clustering, the following two attributes
-      define when the sessions are replicated to the other nodes.
-      The default value, "instant", synchronously replicates changes
-      to the other nodes at the end of requests. In this case, the 
-      "SnapshotInterval" attribute is not used.
-      The "interval" mode, in association with the "SnapshotInterval"
-      attribute, indicates that modified sessions will only be replicated
-      every "SnapshotInterval" milliseconds at most.   
-      
-      Note that this attribute is not in effect if the replication-granularity
-      is set to FIELD. If it is FIELD, it will be per http request (that is, 
-      "instant" mode.)
-      -->
-      <attribute name="SnapshotMode">instant</attribute>
-      <!-- you may switch to "interval" -->
-      <attribute name="SnapshotInterval">2000</attribute>
-      
-      <!--
-      Whether to use MOD_JK(2) for load balancing with sticky session 
-      combined with JvmRoute. If set to true, it will insert a JvmRouteValve 
-      to intercept every request and replace the JvmRoute if it detects a 
-      failover. In addition, you will need to set the JvmRoute inside
-      Tomcat, e.g.,
-      Engine name="jboss.web" jmvRoute="Node1" defaultHost="localhost" 
-      in server.xml.
-      
-      For clustering purpose only.
-      -->
-      <attribute name="UseJK">false</attribute>
-      
-      <attribute name="Domain">jboss.web</attribute>
-
-      <!-- A mapping to the server security manager service which must be
-      operation compatible with type
-      org.jboss.security.plugins.JaasSecurityManagerServiceMBean. This is only
-      needed if web applications are allowed to flush the security manager
-      authentication cache when the web sessions invalidate.
-      -->
-      <depends optional-attribute-name="SecurityManagerService"
-         proxy-type="attribute">jboss.security:service=JaasSecurityManager
-      </depends>
-      
-      <!--
-         Needed if using HTTP Session Clustering or if the
-         ClusteredSingleSignOn valve is enabled in the tomcat server.xml file
-      -->
-      <depends>jboss.cache:service=TomcatClusteringCache</depends>
-      
-      <depends>jboss:service=TransactionManager</depends>
-      
-      <!-- Only needed if the org.jboss.web.tomcat.tc6.jca.CachedConnectionValve
-      is enabled in the tomcat server.xml file.
-      -->
-      <depends>jboss.jca:service=CachedConnectionManager</depends>
-      
-      <depends>jboss.security:service=JaccSecurityService</depends>   
-   </mbean>
-
-</server>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: jboss-service-all.xml 55263 2006-08-04 19:14:21Z dimitris at jboss.org $ -->
+<server>
+   <mbean code="org.jboss.web.tomcat.tc6.Tomcat6"
+      name="jboss.web:service=WebServer" xmbean-dd="META-INF/webserver-xmbean.xml"> 
+      
+      <!-- You can configure a set of authenticators keyed by http-auth method used. This
+      will apply the same set of authenticators across all web applications. You can
+      override the set of authenticators at the web application level by adding
+      <authenticators> element to the respective jboss-web.xml --> 
+      <!--
+      <attribute name="Authenticators" serialDataType="jbxb">
+         <java:properties xmlns:java="urn:jboss:java-properties"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+            xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
+            <java:property>
+               <java:key>BASIC</java:key>
+               <java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>CLIENT-CERT</java:key>
+               <java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>DIGEST</java:key>
+               <java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>FORM</java:key>
+               <java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value>
+            </java:property> 
+            <java:property>
+               <java:key>NONE</java:key>
+               <java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
+            </java:property> 
+         </java:properties>
+      </attribute> 
+      -->
+      
+      <!-- The JAAS security domain to use in the absense of an explicit
+      security-domain specification in the war WEB-INF/jboss-web.xml
+      -->
+      <attribute name="DefaultSecurityDomain">java:/jaas/other</attribute>
+      
+      <!-- Get the flag indicating if the normal Java2 parent first class
+      loading model should be used over the servlet 2.3 web container first
+      model.
+      -->
+      <attribute name="Java2ClassLoadingCompliance">false</attribute>
+      <!-- A flag indicating if the JBoss Loader should be used. This loader
+      uses a unified class loader as the class loader rather than the tomcat
+      specific class loader.
+      The default is false to ensure that wars have isolated class loading
+      for duplicate jars and jsp files.
+      -->
+      <attribute name="UseJBossWebLoader">false</attribute>
+      <!-- The list of package names that should not be loaded without
+      delegating to the parent class loader before trying the web app
+      class loader. The packages listed here are those tha are used by
+      the web container implementation and cannot be overriden.
+      This only applies when UseJBossWebLoader=false.
+      -->
+      <attribute name="FilteredPackages">org.apache.commons.logging</attribute>
+      
+      <attribute name="LenientEjbLink">true</attribute>
+      
+      <!--
+      Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
+      - org.jboss.web.tomcat.tc6.session.JBossCacheManager
+      -->
+      <attribute name="ManagerClass">
+         org.jboss.web.tomcat.tc6.session.JBossCacheManager</attribute>
+      
+      <!-- The name of the request attribute under with the authenticated JAAS
+      Subject is stored on successful authentication. If null or empty then
+      the Subject will not be stored.
+      -->
+      <!--
+      <attribute name="SubjectAttributeName">j_subject</attribute>
+      -->
+      
+      <!-- The SessionIdAlphabet is the set of characters used to create a session Id
+      It must be made up of exactly 65 unique characters
+      <attribute name="SessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</attribute>
+      -->
+      
+      <!--
+      *******************************************************
+      ****************** CLUSTERING *************************
+      *******************************************************
+      In order to activate HTTP Session clustering for Tomcat
+      make sure you run JBoss's "all" configuration i.e.
+      "run -c all"
+      (the default configuration doesn't contain clustering)
+      
+      Furthermore, you may change SnapshotMode and
+      SnapshotInterval attributes below to indicate when to
+      synchronize changes with the other node(s).
+      
+      If you use Apache+mod_jk(2) you will most probably use
+      the AJP1.3 connector below. Thus, if you so wish,
+      you may comment (i.e. deactivate) the HTTP connector
+      as it won't be used anymore.
+      
+      *******************************************************
+      *******************************************************
+      *******************************************************
+      -->
+      
+      <!--
+      If you are using clustering, the following two attributes
+      define when the sessions are replicated to the other nodes.
+      The default value, "instant", synchronously replicates changes
+      to the other nodes at the end of requests. In this case, the 
+      "SnapshotInterval" attribute is not used.
+      The "interval" mode, in association with the "SnapshotInterval"
+      attribute, indicates that modified sessions will only be replicated
+      every "SnapshotInterval" milliseconds at most.   
+      
+      Note that this attribute is not in effect if the replication-granularity
+      is set to FIELD. If it is FIELD, it will be per http request (that is, 
+      "instant" mode.)
+      -->
+      <attribute name="SnapshotMode">instant</attribute>
+      <!-- you may switch to "interval" -->
+      <attribute name="SnapshotInterval">2000</attribute>
+      
+      <!--
+      Whether to use MOD_JK(2) for load balancing with sticky session 
+      combined with JvmRoute. If set to true, it will insert a JvmRouteValve 
+      to intercept every request and replace the JvmRoute if it detects a 
+      failover. In addition, you will need to set the JvmRoute inside
+      Tomcat, e.g.,
+      Engine name="jboss.web" jmvRoute="Node1" defaultHost="localhost" 
+      in server.xml.
+      
+      For clustering purpose only.
+      -->
+      <attribute name="UseJK">false</attribute>
+      
+      <attribute name="Domain">jboss.web</attribute>
+
+      <!-- A mapping to the server security manager service which must be
+      operation compatible with type
+      org.jboss.security.plugins.JaasSecurityManagerServiceMBean. This is only
+      needed if web applications are allowed to flush the security manager
+      authentication cache when the web sessions invalidate.
+      -->
+      <depends optional-attribute-name="SecurityManagerService"
+         proxy-type="attribute">jboss.security:service=JaasSecurityManager
+      </depends>
+      
+      <!--
+         Needed if using HTTP Session Clustering or if the
+         ClusteredSingleSignOn valve is enabled in the tomcat server.xml file
+      -->
+      <depends>jboss.cache:service=TomcatClusteringCache</depends>
+      
+      <depends>jboss:service=TransactionManager</depends>
+      
+      <!-- Only needed if the org.jboss.web.tomcat.tc6.jca.CachedConnectionValve
+      is enabled in the tomcat server.xml file.
+      -->
+      <depends>jboss.jca:service=CachedConnectionManager</depends>
+      
+      <depends>jboss.security:service=JaccSecurityService</depends>   
+   </mbean>
+
+</server>
+

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-<Server>
-
-   <!-- Optional listener which ensures correct init and shutdown of APR,
-        and provides information if it is not installed -->
-   <Listener className="org.apache.catalina.core.AprLifecycleListener" />
-
-   <Service name="jboss.web"
-      className="org.jboss.web.tomcat.tc6.StandardService">
-
-      <Connector port="8080" address="${jboss.bind.address}"
-         maxThreads="250" strategy="ms" maxHttpHeaderSize="8192"
-         emptySessionPath="true"
-         enableLookups="false" redirectPort="8443" acceptCount="100"
-         connectionTimeout="20000" disableUploadTimeout="true"/>
-
-      <Engine name="jboss.web" defaultHost="localhost">
-         <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
-            certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
-            allRolesMode="authOnly"
-            />
-         
-         <Host name="localhost"
-            autoDeploy="false" deployOnStartup="false" deployXML="false" >
-            
-            <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-            
-            <DefaultContext cookies="true" crossContext="true" override="true"/>
-         </Host> 
-      </Engine>
-   </Service>
-</Server>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-jacc/deploy/jbossweb-tomcat6.sar/server.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+<Server>
+
+   <!-- Optional listener which ensures correct init and shutdown of APR,
+        and provides information if it is not installed -->
+   <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+
+   <Service name="jboss.web"
+      className="org.jboss.web.tomcat.tc6.StandardService">
+
+      <Connector port="8080" address="${jboss.bind.address}"
+         maxThreads="250" strategy="ms" maxHttpHeaderSize="8192"
+         emptySessionPath="true"
+         enableLookups="false" redirectPort="8443" acceptCount="100"
+         connectionTimeout="20000" disableUploadTimeout="true"/>
+
+      <Engine name="jboss.web" defaultHost="localhost">
+         <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
+            certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+            allRolesMode="authOnly"
+            />
+         
+         <Host name="localhost"
+            autoDeploy="false" deployOnStartup="false" deployXML="false" >
+            
+            <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+            
+            <DefaultContext cookies="true" crossContext="true" override="true"/>
+         </Host> 
+      </Engine>
+   </Service>
+</Server>
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -2,7 +2,6 @@
 
 <server>
    <mbean code="org.jboss.remoting.transport.Connector"
-          xmbean-dd="org/jboss/remoting/transport/Connector.xml"
           name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
       <depends>jboss.aop:service=AspectDeployer</depends>
       <attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute>
@@ -59,7 +58,7 @@
          commons-beanutils.jar,
          jboss-ejb3.jar,
          dom4j.jar,
-         commons-codec.jar,
+         commons-codec-1.2.jar,
          wsdl4j.jar,
          xmlsec.jar,
          jbossws.jar,
@@ -75,7 +74,7 @@
          myfaces-impl.jar,
          commons-beanutils.jar,
          myfaces-jsf-api.jar,
-         commons-codec.jar,
+         commons-codec-1.2.jar,
          catalina-optional.jar,
          tomcat-util.jar,
          jasper-compiler.jar,
@@ -84,7 +83,7 @@
          tomcat-http.jar,
          catalina-manager.jar,
          jasper-runtime.jar,
-         jboss-web-service.jar,
+         tomcat55-service.jar,
          servlets-invoker.jar,
          catalina.jar,
          naming-resources.jar,
@@ -277,7 +276,6 @@
    </mbean>
 
    <mbean code="org.jboss.remoting.transport.Connector"
-      xmbean-dd="org/jboss/remoting/transport/Connector.xml"
       name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
       <depends>jboss.aop:service=AspectDeployer</depends>
       <attribute name="InvokerLocator">sslsocket://0.0.0.0:3843</attribute>

Modified: branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -2,7 +2,6 @@
 
 <server>
    <mbean code="org.jboss.remoting.transport.Connector"
-          xmbean-dd="org/jboss/remoting/transport/Connector.xml"
           name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
       <depends>jboss.aop:service=AspectDeployer</depends>
       <attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute>
@@ -59,7 +58,7 @@
          commons-beanutils.jar,
          jboss-ejb3.jar,
          dom4j.jar,
-         commons-codec.jar,
+         commons-codec-1.2.jar,
          wsdl4j.jar,
          xmlsec.jar,
          jbossws.jar,
@@ -75,7 +74,7 @@
          myfaces-impl.jar,
          commons-beanutils.jar,
          myfaces-jsf-api.jar,
-         commons-codec.jar,
+         commons-codec-1.2.jar,
          catalina-optional.jar,
          tomcat-util.jar,
          jasper-compiler.jar,
@@ -84,7 +83,7 @@
          tomcat-http.jar,
          catalina-manager.jar,
          jasper-runtime.jar,
-         jboss-web-service.jar,
+         tomcat55-service.jar,
          servlets-invoker.jar,
          catalina.jar,
          naming-resources.jar,
@@ -301,7 +300,6 @@
    <!-- It binds the remoting invoker (transport protocol, callback configuration, -->
    <!-- data marshalling, etc.) with the invocation handlers.  -->
    <mbean code="org.jboss.remoting.transport.Connector"
-          xmbean-dd="org/jboss/remoting/transport/Connector.xml"
           name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
           display-name="Socket transport Connector">
 

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   JBoss EJB3Deployer
-   
-   $Id: jboss-service.xml 41488 2006-02-25 00:14:09Z dimitris $
--->
-<server>
-
-   <mbean code="org.jboss.remoting.transport.Connector"
-          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
-      <depends>jboss.aop:service=AspectDeployer</depends>
-      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
-      <attribute name="Configuration">
-         <handlers>
-            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
-         </handlers>
-      </attribute>
-   </mbean>
-  
-   <mbean code="org.jboss.ejb3.JarsIgnoredForScanning" name="jboss.ejb3:service=JarsIgnoredForScanning">
-      <attribute name="IgnoredJars">
-         snmp-adaptor.jar,
-         otherimages.jar,
-         applet.jar,
-         jcommon.jar,
-         console-mgr-classes.jar,
-         jfreechart.jar,
-         juddi-service.jar,
-         wsdl4j.jar,
-         commons-collections.jar,
-         commons-pool.jar,
-         juddi.jar,
-         commons-discovery.jar,
-         uddi4j.jar,
-         axis.jar,
-         commons-dbcp.jar,
-         jboss-juddiaxis.jar,
-         trove.jar,
-         javassist.jar,
-         jboss-aop-jdk50.jar,
-         jboss-aspect-library-jdk50.jar,
-         ejb3-persistence.jar,
-         commons-validator-1.1.3.jar,
-         commons-collections.jar,
-         commons-fileupload.jar,
-         commons-pool.jar,
-         hibernate-entitymanager.jar,
-         jboss-ejb3x.jar,
-         commons-digester-1.6.jar,
-         cglib-2.1.1.jar,
-         commons-discovery.jar,
-         jboss-annotations-ejb3.jar,
-         jaxen-1.1-beta-4.jar,
-         hibernate-annotations.jar,
-         commons-httpclient.jar,
-         commons-logging.jar,
-         commons-vfs.jar,
-         hibernate3.jar,
-         commons-logging-api.jar,
-         asm.jar,
-         asm-attrs.jar,
-         commons-lang-2.0.jar,
-         commons-beanutils.jar,
-         jboss-ejb3.jar,
-         dom4j.jar,
-         commons-codec-1.2.jar,
-         wsdl4j.jar,
-         xmlsec.jar,
-         jbossws.jar,
-         jboss-bean-deployer.jar,
-         jboss-microcontainer.jar,
-         jboss-dependency.jar,
-         jboss-container.jar,
-         tomcat-coyote.jar,
-         commons-collections.jar,
-         myfaces.jar,
-         jstl.jar,
-         commons-digester-1.6.jar,
-         myfaces-impl.jar,
-         commons-beanutils.jar,
-         myfaces-jsf-api.jar,
-         commons-codec-1.2.jar,
-         catalina-optional.jar,
-         tomcat-util.jar,
-         jasper-compiler.jar,
-         commons-el.jar,
-         jasper-compiler-jdt.jar,
-         tomcat-http.jar,
-         catalina-manager.jar,
-         jasper-runtime.jar,
-         tomcat55-service.jar,
-         servlets-invoker.jar,
-         catalina.jar,
-         naming-resources.jar,
-         servlets-default.jar,
-         tomcat-ajp.jar,
-         commons-modeler.jar,
-         tomcat-apr.jar,
-         servlets-webdav.jar
-      </attribute>
-   </mbean>
-
-   <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer" xmbean-dd="">
-
-      <!-- Inline XMBean Descriptor BEGIN -->
-      <xmbean>
-         <description>The EJB3Deployer responsible for ejb3 deployment</description>
-         <descriptors>
-            <interceptors>
-               <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
-               <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
-            </interceptors>
-         </descriptors>
-         <class>org.jboss.ejb3.EJB3Deployer</class>
-
-         <!-- ServiceMBean attributes -->
-         <attribute access="read-only" getMethod="getName">
-            <description>The class name of the MBean</description>
-            <name>Name</name>
-            <type>java.lang.String</type>
-         </attribute>
-
-         <attribute access="read-only" getMethod="getState">
-            <description>The status of the MBean</description>
-            <name>State</name>
-            <type>int</type>
-         </attribute>
-
-         <attribute access="read-only" getMethod="getStateString">
-            <description>The status of the MBean in text form</description>
-            <name>StateString</name>
-            <type>java.lang.String</type>
-         </attribute>
-
-         <!-- SubDeployerMBean attributes -->
-         <attribute access="read-only" getMethod="getServiceName">
-            <description>The ObjectName of the Subdeployer</description>
-            <name>ServiceName</name>
-            <type>javax.management.ObjectName</type>
-         </attribute>
-
-         <attribute access="read-write" getMethod="getSuffixes" setMethod="setSuffixes">
-            <description>The suffixes of interest to this deployer</description>
-            <name>Suffixes</name>
-            <type>[Ljava.lang.String;</type>
-         </attribute>
-
-         <attribute access="read-write" getMethod="getRelativeOrder" setMethod="setRelativeOrder">
-            <description>The relative order of the suffixes in the global suffixes list</description>
-            <name>RelativeOrder</name>
-            <type>int</type>
-         </attribute>
-
-         <!-- EJB3DeployerMBean attributes -->
-         <attribute access="read-only" getMethod="getDefaultProperties">
-            <name>DefaultProperties</name>
-            <type>java.util.Properties</type>
-         </attribute>
-
-         <attribute access="write-only" setMethod="setJarsIgnoredForScanning">
-            <description>mbean that has list of jars to ignore</description>
-            <name>JarsIgnoredForScanning</name>
-            <type>org.jboss.ejb3.JarsIgnoredForScanningMBean</type>
-         </attribute>
-
-         <!-- ServiceMBean operations -->
-         <operation>
-            <description>Standard MBean lifecycle method</description>
-            <name>create</name>
-         </operation>
-
-         <operation>
-            <description>The start lifecycle operation</description>
-            <name>start</name>
-         </operation>
-
-         <operation>
-            <description>The stop lifecycle operation</description>
-            <name>stop</name>
-         </operation>
-
-         <operation>
-            <description>The destroy lifecycle operation</description>
-            <name>destroy</name>
-         </operation>
-
-         <operation>
-            <description>The detyped lifecycle operation (for internal use only)</description>
-            <name>jbossInternalLifecycle</name>
-            <parameter>
-               <description>The lifecycle operation</description>
-               <name>method</name>
-               <type>java.lang.String</type>
-            </parameter>
-            <return-type>void</return-type>
-         </operation>
-
-         <!-- SubDeployerMBean operations -->
-         <operation>
-            <description>Accept a module for deployment</description>
-            <name>accepts</name>
-            <parameter>
-               <name>info</name>
-               <type>org.jboss.deployment.DeploymentInfo</type>
-            </parameter>
-            <return-type>boolean</return-type>
-         </operation>
-
-         <operation>
-            <description>Initialize deployment step</description>
-            <name>init</name>
-            <parameter>
-               <name>info</name>
-               <type>org.jboss.deployment.DeploymentInfo</type>
-            </parameter>
-         </operation>
-
-         <operation>
-            <description>Create deployment step</description>
-            <name>create</name>
-            <parameter>
-               <name>info</name>
-               <type>org.jboss.deployment.DeploymentInfo</type>
-            </parameter>
-         </operation>
-
-         <operation>
-            <description>Start deployment step</description>
-            <name>start</name>
-            <parameter>
-               <name>info</name>
-               <type>org.jboss.deployment.DeploymentInfo</type>
-            </parameter>
-         </operation>
-
-         <operation>
-            <description>Stop deployment step</description>
-            <name>stop</name>
-            <parameter>
-               <name>info</name>
-               <type>org.jboss.deployment.DeploymentInfo</type>
-            </parameter>
-         </operation>
-
-         <operation>
-            <description>Destroy deployment step</description>
-            <name>destroy</name>
-            <parameter>
-               <name>info</name>
-               <type>org.jboss.deployment.DeploymentInfo</type>
-            </parameter>
-         </operation>
-
-         <!-- Interceptable operations -->
-         <operation>
-            <description>Add dynamically an operation interceptor</description>
-            <name>addOperationInterceptor</name>
-            <parameter>
-               <description>The Interceptor</description>
-               <name>interceptor</name>
-               <type>org.jboss.mx.interceptor.Interceptor</type>
-            </parameter>
-         </operation>
-
-         <operation>
-            <description>Remove dynamically an operation interceptor</description>
-            <name>removeOperationInterceptor</name>
-            <parameter>
-               <description>The Interceptor</description>
-               <name>interceptor</name>
-               <type>org.jboss.mx.interceptor.Interceptor</type>
-            </parameter>
-         </operation>
-      </xmbean>
-      <!-- Inline XMBean Descriptor END -->
-
-      <depends>jboss.aop:service=AspectDeployer</depends>
-      <depends>jboss.ejb:service=EJBDeployer</depends>
-      <depends optional-attribute-name="JarsIgnoredForScanning" proxy-type="org.jboss.ejb3.JarsIgnoredForScanningMBean">jboss.ejb3:service=JarsIgnoredForScanning</depends>
-   </mbean>
-
-   <mbean code="org.jboss.remoting.transport.Connector"
-      name="jboss.remoting:service=Connector,transport=Servlet"
-      display-name="Servlet transport Connector">
-      <depends>jboss.aop:service=AspectDeployer</depends>
-      <attribute name="InvokerLocator">
-         servlet://${jboss.bind.address}:8080/servlet-invoker/ServerInvokerServlet
-      </attribute>
-      
-      <attribute name="Configuration">
-         <handlers>
-            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
-         </handlers>
-      </attribute>
-   </mbean>
-
-</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   JBoss EJB3Deployer
+   
+   $Id: jboss-service.xml 41488 2006-02-25 00:14:09Z dimitris $
+-->
+<server>
+
+   <mbean code="org.jboss.remoting.transport.Connector"
+          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
+      <depends>jboss.aop:service=AspectDeployer</depends>
+      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+      <attribute name="Configuration">
+         <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+         </handlers>
+      </attribute>
+   </mbean>
+  
+   <mbean code="org.jboss.ejb3.JarsIgnoredForScanning" name="jboss.ejb3:service=JarsIgnoredForScanning">
+      <attribute name="IgnoredJars">
+         snmp-adaptor.jar,
+         otherimages.jar,
+         applet.jar,
+         jcommon.jar,
+         console-mgr-classes.jar,
+         jfreechart.jar,
+         juddi-service.jar,
+         wsdl4j.jar,
+         commons-collections.jar,
+         commons-pool.jar,
+         juddi.jar,
+         commons-discovery.jar,
+         uddi4j.jar,
+         axis.jar,
+         commons-dbcp.jar,
+         jboss-juddiaxis.jar,
+         trove.jar,
+         javassist.jar,
+         jboss-aop-jdk50.jar,
+         jboss-aspect-library-jdk50.jar,
+         ejb3-persistence.jar,
+         commons-validator-1.1.3.jar,
+         commons-collections.jar,
+         commons-fileupload.jar,
+         commons-pool.jar,
+         hibernate-entitymanager.jar,
+         jboss-ejb3x.jar,
+         commons-digester-1.6.jar,
+         cglib-2.1.1.jar,
+         commons-discovery.jar,
+         jboss-annotations-ejb3.jar,
+         jaxen-1.1-beta-4.jar,
+         hibernate-annotations.jar,
+         commons-httpclient.jar,
+         commons-logging.jar,
+         commons-vfs.jar,
+         hibernate3.jar,
+         commons-logging-api.jar,
+         asm.jar,
+         asm-attrs.jar,
+         commons-lang-2.0.jar,
+         commons-beanutils.jar,
+         jboss-ejb3.jar,
+         dom4j.jar,
+         commons-codec-1.2.jar,
+         wsdl4j.jar,
+         xmlsec.jar,
+         jbossws.jar,
+         jboss-bean-deployer.jar,
+         jboss-microcontainer.jar,
+         jboss-dependency.jar,
+         jboss-container.jar,
+         tomcat-coyote.jar,
+         commons-collections.jar,
+         myfaces.jar,
+         jstl.jar,
+         commons-digester-1.6.jar,
+         myfaces-impl.jar,
+         commons-beanutils.jar,
+         myfaces-jsf-api.jar,
+         commons-codec-1.2.jar,
+         catalina-optional.jar,
+         tomcat-util.jar,
+         jasper-compiler.jar,
+         commons-el.jar,
+         jasper-compiler-jdt.jar,
+         tomcat-http.jar,
+         catalina-manager.jar,
+         jasper-runtime.jar,
+         tomcat55-service.jar,
+         servlets-invoker.jar,
+         catalina.jar,
+         naming-resources.jar,
+         servlets-default.jar,
+         tomcat-ajp.jar,
+         commons-modeler.jar,
+         tomcat-apr.jar,
+         servlets-webdav.jar
+      </attribute>
+   </mbean>
+
+   <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer" xmbean-dd="">
+
+      <!-- Inline XMBean Descriptor BEGIN -->
+      <xmbean>
+         <description>The EJB3Deployer responsible for ejb3 deployment</description>
+         <descriptors>
+            <interceptors>
+               <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
+               <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
+            </interceptors>
+         </descriptors>
+         <class>org.jboss.ejb3.EJB3Deployer</class>
+
+         <!-- ServiceMBean attributes -->
+         <attribute access="read-only" getMethod="getName">
+            <description>The class name of the MBean</description>
+            <name>Name</name>
+            <type>java.lang.String</type>
+         </attribute>
+
+         <attribute access="read-only" getMethod="getState">
+            <description>The status of the MBean</description>
+            <name>State</name>
+            <type>int</type>
+         </attribute>
+
+         <attribute access="read-only" getMethod="getStateString">
+            <description>The status of the MBean in text form</description>
+            <name>StateString</name>
+            <type>java.lang.String</type>
+         </attribute>
+
+         <!-- SubDeployerMBean attributes -->
+         <attribute access="read-only" getMethod="getServiceName">
+            <description>The ObjectName of the Subdeployer</description>
+            <name>ServiceName</name>
+            <type>javax.management.ObjectName</type>
+         </attribute>
+
+         <attribute access="read-write" getMethod="getSuffixes" setMethod="setSuffixes">
+            <description>The suffixes of interest to this deployer</description>
+            <name>Suffixes</name>
+            <type>[Ljava.lang.String;</type>
+         </attribute>
+
+         <attribute access="read-write" getMethod="getRelativeOrder" setMethod="setRelativeOrder">
+            <description>The relative order of the suffixes in the global suffixes list</description>
+            <name>RelativeOrder</name>
+            <type>int</type>
+         </attribute>
+
+         <!-- EJB3DeployerMBean attributes -->
+         <attribute access="read-only" getMethod="getDefaultProperties">
+            <name>DefaultProperties</name>
+            <type>java.util.Properties</type>
+         </attribute>
+
+         <attribute access="write-only" setMethod="setJarsIgnoredForScanning">
+            <description>mbean that has list of jars to ignore</description>
+            <name>JarsIgnoredForScanning</name>
+            <type>org.jboss.ejb3.JarsIgnoredForScanningMBean</type>
+         </attribute>
+
+         <!-- ServiceMBean operations -->
+         <operation>
+            <description>Standard MBean lifecycle method</description>
+            <name>create</name>
+         </operation>
+
+         <operation>
+            <description>The start lifecycle operation</description>
+            <name>start</name>
+         </operation>
+
+         <operation>
+            <description>The stop lifecycle operation</description>
+            <name>stop</name>
+         </operation>
+
+         <operation>
+            <description>The destroy lifecycle operation</description>
+            <name>destroy</name>
+         </operation>
+
+         <operation>
+            <description>The detyped lifecycle operation (for internal use only)</description>
+            <name>jbossInternalLifecycle</name>
+            <parameter>
+               <description>The lifecycle operation</description>
+               <name>method</name>
+               <type>java.lang.String</type>
+            </parameter>
+            <return-type>void</return-type>
+         </operation>
+
+         <!-- SubDeployerMBean operations -->
+         <operation>
+            <description>Accept a module for deployment</description>
+            <name>accepts</name>
+            <parameter>
+               <name>info</name>
+               <type>org.jboss.deployment.DeploymentInfo</type>
+            </parameter>
+            <return-type>boolean</return-type>
+         </operation>
+
+         <operation>
+            <description>Initialize deployment step</description>
+            <name>init</name>
+            <parameter>
+               <name>info</name>
+               <type>org.jboss.deployment.DeploymentInfo</type>
+            </parameter>
+         </operation>
+
+         <operation>
+            <description>Create deployment step</description>
+            <name>create</name>
+            <parameter>
+               <name>info</name>
+               <type>org.jboss.deployment.DeploymentInfo</type>
+            </parameter>
+         </operation>
+
+         <operation>
+            <description>Start deployment step</description>
+            <name>start</name>
+            <parameter>
+               <name>info</name>
+               <type>org.jboss.deployment.DeploymentInfo</type>
+            </parameter>
+         </operation>
+
+         <operation>
+            <description>Stop deployment step</description>
+            <name>stop</name>
+            <parameter>
+               <name>info</name>
+               <type>org.jboss.deployment.DeploymentInfo</type>
+            </parameter>
+         </operation>
+
+         <operation>
+            <description>Destroy deployment step</description>
+            <name>destroy</name>
+            <parameter>
+               <name>info</name>
+               <type>org.jboss.deployment.DeploymentInfo</type>
+            </parameter>
+         </operation>
+
+         <!-- Interceptable operations -->
+         <operation>
+            <description>Add dynamically an operation interceptor</description>
+            <name>addOperationInterceptor</name>
+            <parameter>
+               <description>The Interceptor</description>
+               <name>interceptor</name>
+               <type>org.jboss.mx.interceptor.Interceptor</type>
+            </parameter>
+         </operation>
+
+         <operation>
+            <description>Remove dynamically an operation interceptor</description>
+            <name>removeOperationInterceptor</name>
+            <parameter>
+               <description>The Interceptor</description>
+               <name>interceptor</name>
+               <type>org.jboss.mx.interceptor.Interceptor</type>
+            </parameter>
+         </operation>
+      </xmbean>
+      <!-- Inline XMBean Descriptor END -->
+
+      <depends>jboss.aop:service=AspectDeployer</depends>
+      <depends>jboss.ejb:service=EJBDeployer</depends>
+      <depends optional-attribute-name="JarsIgnoredForScanning" proxy-type="org.jboss.ejb3.JarsIgnoredForScanningMBean">jboss.ejb3:service=JarsIgnoredForScanning</depends>
+   </mbean>
+
+   <mbean code="org.jboss.remoting.transport.Connector"
+      name="jboss.remoting:service=Connector,transport=Servlet"
+      display-name="Servlet transport Connector">
+      <depends>jboss.aop:service=AspectDeployer</depends>
+      <attribute name="InvokerLocator">
+         servlet://${jboss.bind.address}:8080/servlet-invoker/ServerInvokerServlet
+      </attribute>
+      
+      <attribute name="Configuration">
+         <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+         </handlers>
+      </attribute>
+   </mbean>
+
+</server>

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.class
===================================================================
(Binary files differ)

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.class (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/classes/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.class)
===================================================================
(Binary files differ)

Deleted: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-   "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<!-- The the JBossRemoting server invoker servlet web.xml descriptor
-$Id: web.xml,v 1.1 2005/06/16 21:12:48 telrod Exp $
--->
-<web-app>
-    <servlet>
-        <servlet-name>ServerInvokerServlet</servlet-name>
-        <description>The ServerInvokerServlet receives requests via HTTP
-           protocol from within a web container and passes it onto the
-           ServletServerInvoker for processing.
-        </description>
-        <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
-        <init-param>
-            <param-name>invokerName</param-name>
-            <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
-            <description>The servlet server invoker</description>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>ServerInvokerServlet</servlet-name>
-        <url-pattern>/ServerInvokerServlet/*</url-pattern>
-    </servlet-mapping>
-</web-app>
-

Copied: branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml)
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!-- The the JBossRemoting server invoker servlet web.xml descriptor
+$Id: web.xml,v 1.1 2005/06/16 21:12:48 telrod Exp $
+-->
+<web-app>
+    <servlet>
+        <servlet-name>ServerInvokerServlet</servlet-name>
+        <description>The ServerInvokerServlet receives requests via HTTP
+           protocol from within a web container and passes it onto the
+           ServletServerInvoker for processing.
+        </description>
+        <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
+        <init-param>
+            <param-name>invokerName</param-name>
+            <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+            <description>The servlet server invoker</description>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ServerInvokerServlet</servlet-name>
+        <url-pattern>/ServerInvokerServlet/*</url-pattern>
+    </servlet-mapping>
+</web-app>
+

Copied: branches/Branch_4_2/ejb3/src/test/JNDIView.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/JNDIView.jsp)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/JNDIView.jsp	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/JNDIView.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,184 @@
+<%@ page import="java.util.Hashtable,
+                 javax.naming.*" %>
+<%@ page import="java.lang.reflect.Proxy"%>
+<%@ page import="org.jboss.ejb3.Ejb3Registry"%>
+<%@ page import="org.jboss.ejb3.Container"%>
+<%@ page import="java.util.Iterator"%>
+
+<%!
+
+   public void list(Context ctx, String indent, StringBuffer buffer, boolean verbose)
+   {
+      ClassLoader loader = Thread.currentThread().getContextClassLoader();
+      try
+      {
+         NamingEnumeration ne = ctx.list("");
+         while (ne.hasMore())
+         {
+            NameClassPair pair = (NameClassPair) ne.next();
+
+            String name = pair.getName();
+            String className = pair.getClassName();
+            boolean recursive = false;
+            boolean isLinkRef = false;
+            boolean isProxy = false;
+            Class c = null;
+            try
+            {
+               c = loader.loadClass(className);
+
+               if (Context.class.isAssignableFrom(c))
+                  recursive = true;
+               if (LinkRef.class.isAssignableFrom(c))
+                  isLinkRef = true;
+
+               isProxy = Proxy.isProxyClass(c);
+            }
+            catch (ClassNotFoundException cnfe)
+            {
+               // If this is a $Proxy* class its a proxy
+               if (className.startsWith("$Proxy"))
+               {
+                  isProxy = true;
+                  // We have to get the class from the binding
+                  try
+                  {
+                     Object p = ctx.lookup(name);
+                     c = p.getClass();
+                  }
+                  catch (NamingException e)
+                  {
+                     Throwable t = e.getRootCause();
+                     if (t instanceof ClassNotFoundException)
+                     {
+                        // Get the class name from the exception msg
+                        String msg = t.getMessage();
+                        if (msg != null)
+                        {
+                           // Reset the class name to the CNFE class
+                           className = msg;
+                        }
+                     }
+                  }
+               }
+            }
+
+            buffer.append(indent + " +- " + name);
+
+            // Display reference targets
+            if (isLinkRef)
+            {
+               // Get the
+               try
+               {
+                  Object obj = ctx.lookupLink(name);
+
+                  LinkRef link = (LinkRef) obj;
+                  buffer.append("[link -> ");
+                  buffer.append(link.getLinkName());
+                  buffer.append(']');
+               }
+               catch (Throwable t)
+               {
+                  buffer.append("invalid]");
+               }
+            }
+
+            // Display proxy interfaces
+            if (isProxy)
+            {
+               buffer.append(" (proxy: " + pair.getClassName());
+               if (c != null)
+               {
+                  Class[] ifaces = c.getInterfaces();
+                  buffer.append(" implements ");
+                  for (int i = 0; i < ifaces.length; i++)
+                  {
+                     buffer.append(ifaces[i]);
+                     buffer.append(',');
+                  }
+                  buffer.setCharAt(buffer.length() - 1, ')');
+               }
+               else
+               {
+                  buffer.append(" implements " + className + ")");
+               }
+            }
+            else if (verbose)
+            {
+               buffer.append(" (class: " + pair.getClassName() + ")");
+            }
+
+            buffer.append('\n');
+            if (recursive)
+            {
+               try
+               {
+                  Object value = ctx.lookup(name);
+                  if (value instanceof Context)
+                  {
+                     Context subctx = (Context) value;
+                     list(subctx, indent + " |  ", buffer, verbose);
+                  }
+                  else
+                  {
+                     buffer.append(indent + " |   NonContext: " + value);
+                     buffer.append('\n');
+                  }
+               }
+               catch (Throwable t)
+               {
+                  buffer.append("Failed to lookup: " + name + ", errmsg=" + t.getMessage());
+                  buffer.append('\n');
+               }
+            }
+         }
+         ne.close();
+      }
+      catch (NamingException ne)
+      {
+         buffer.append("error while listing context " + ctx.toString() + ": " + ne.toString(true));
+      }
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+
+
+%>
+
+<html>
+<body>
+<%
+   StringBuffer buf = new StringBuffer();
+   buf.append("GLOBAL JNDI\n");
+   list(getInitialContext(), "    ", buf, true);
+   buf.append("\n\n-------------\n");
+   buf.append("java:/ Namespace\n");
+   list((Context)(getInitialContext().lookup("java:/")), "    ", buf, true);
+   buf.append("\n\n-------------\n");
+   buf.append("EJB ENCs");
+   Iterator it = Ejb3Registry.getContainers().iterator();
+   while (it.hasNext())
+   {
+      Container container = (Container)it.next();
+      buf.append("\n   " + container.getObjectName().getCanonicalName() + "\n");
+      list(container.getEnc(), "        ", buf, true);
+   }
+   String bufOut = buf.toString();
+%>
+<h1>EMBEDDED JNDI VIEW</h1>
+<pre><%=bufOut%></pre>
+</body>
+</html>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/JNDIView.jsp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * Generate a large stateless session bean to test deployment times
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class SessionBeanGenerator
-{
-   public static void main(String[] args) throws Exception
-   {
-      File intf = new File("BigInterface.java");
-      File bean = new File("BigBean.java");
-      FileOutputStream intfFp = new FileOutputStream(intf);
-      FileOutputStream beanFp = new FileOutputStream(bean);
-      PrintWriter intfWriter = new PrintWriter(intfFp);
-      PrintWriter beanWriter = new PrintWriter(beanFp);
-
-      intfWriter.println("package org.jboss.tutorial.simple;");
-      intfWriter.println();
-      intfWriter.println("public interface BigInterface");
-      intfWriter.println("{");
-
-      beanWriter.println("package org.jboss.tutorial.simple;");
-      beanWriter.println();
-      beanWriter.println("import javax.ejb.Stateless;");
-      beanWriter.println();
-      beanWriter.println("@Stateless");
-      beanWriter.println("public class BigBean implements BigInterface");
-      beanWriter.println("{");
-
-      for (int i = 0; i < 100; i++)
-      {
-         String methodSignature = "   public void method" + i + "(String param)";
-         intfWriter.println(methodSignature + ";");
-         beanWriter.println(methodSignature + " {}");
-      }
-
-      beanWriter.println("}");
-      intfWriter.println("}");
-      beanWriter.flush();
-      intfWriter.flush();
-      intfFp.close();
-      beanFp.close();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * Generate a large stateless session bean to test deployment times
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class SessionBeanGenerator
+{
+   public static void main(String[] args) throws Exception
+   {
+      File intf = new File("BigInterface.java");
+      File bean = new File("BigBean.java");
+      FileOutputStream intfFp = new FileOutputStream(intf);
+      FileOutputStream beanFp = new FileOutputStream(bean);
+      PrintWriter intfWriter = new PrintWriter(intfFp);
+      PrintWriter beanWriter = new PrintWriter(beanFp);
+
+      intfWriter.println("package org.jboss.tutorial.simple;");
+      intfWriter.println();
+      intfWriter.println("public interface BigInterface");
+      intfWriter.println("{");
+
+      beanWriter.println("package org.jboss.tutorial.simple;");
+      beanWriter.println();
+      beanWriter.println("import javax.ejb.Stateless;");
+      beanWriter.println();
+      beanWriter.println("@Stateless");
+      beanWriter.println("public class BigBean implements BigInterface");
+      beanWriter.println("{");
+
+      for (int i = 0; i < 100; i++)
+      {
+         String methodSignature = "   public void method" + i + "(String param)";
+         intfWriter.println(methodSignature + ";");
+         beanWriter.println(methodSignature + " {}");
+      }
+
+      beanWriter.println("}");
+      intfWriter.println("}");
+      beanWriter.flush();
+      intfWriter.flush();
+      intfFp.close();
+      beanFp.close();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/SessionBeanGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.appclient;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(HelloWorldService.class)
-public class HelloWorldBean implements HelloWorldService
-{
-   public String sayHelloTo(String name)
-   {
-      return "Hi " + name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.appclient;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateless
+ at Remote(HelloWorldService.class)
+public class HelloWorldBean implements HelloWorldService
+{
+   public String sayHelloTo(String name)
+   {
+      return "Hi " + name;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.appclient;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface HelloWorldService
-{
-   String sayHelloTo(String name);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/HelloWorldService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.appclient;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface HelloWorldService
+{
+   String sayHelloTo(String name);
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,86 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.appclient;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
-import org.jboss.logging.Logger;
-
-/**
- * This message bean will just reply the message.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at MessageDriven(activationConfig = {
-   @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-   @ActivationConfigProperty(propertyName="destination", propertyValue="queue/messageReplier")
-})
-public class MessageReplierBean implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(MessageReplierBean.class);
-   
-   @Resource(mappedName="java:ConnectionFactory")
-   private ConnectionFactory connectionFactory;
-   
-   public void onMessage(Message message)
-   {
-      try
-      {
-         if(message.getJMSReplyTo() != null)
-         {
-            Destination destination = message.getJMSReplyTo();
-            
-            Connection conn = connectionFactory.createConnection();
-            try
-            {
-               Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-               MessageProducer producer = session.createProducer(destination);
-               producer.send(destination, message);
-               producer.close();
-               session.close();
-            }
-            finally
-            {
-               conn.close();
-            }
-         }
-         else
-            log.info("no reply to specified");
-      }
-      catch(JMSException e)
-      {
-         throw new EJBException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/MessageReplierBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,86 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.appclient;
+
+import javax.annotation.Resource;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.EJBException;
+import javax.ejb.MessageDriven;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.jboss.logging.Logger;
+
+/**
+ * This message bean will just reply the message.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at MessageDriven(activationConfig = {
+   @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+   @ActivationConfigProperty(propertyName="destination", propertyValue="queue/messageReplier")
+})
+public class MessageReplierBean implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(MessageReplierBean.class);
+   
+   @Resource(mappedName="java:ConnectionFactory")
+   private ConnectionFactory connectionFactory;
+   
+   public void onMessage(Message message)
+   {
+      try
+      {
+         if(message.getJMSReplyTo() != null)
+         {
+            Destination destination = message.getJMSReplyTo();
+            
+            Connection conn = connectionFactory.createConnection();
+            try
+            {
+               Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+               MessageProducer producer = session.createProducer(destination);
+               producer.send(destination, message);
+               producer.close();
+               session.close();
+            }
+            finally
+            {
+               conn.close();
+            }
+         }
+         else
+            log.info("no reply to specified");
+      }
+      catch(JMSException e)
+      {
+         throw new EJBException(e);
+      }
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/client)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,129 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.appclient.client;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.jboss.ejb3.test.appclient.HelloWorldService;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class HelloWorldClient
-{
-   @EJB
-   private static HelloWorldService helloWorldService;
-   
-   @Resource(name="msg")
-   private static String msg;
-   
-   private static String result;
-   
-   @Resource(mappedName="ConnectionFactory")
-   private static ConnectionFactory connectionFactory;
-   
-   @Resource(name="messageReplier")
-   private static Destination destination;
-   
-   private static int postConstructCalls = 0;
-   
-   public static int getPostConstructCalls()
-   {
-      return postConstructCalls;
-   }
-   
-   public static String getResult()
-   {
-      return result;
-   }
-   
-   public static void main(String args[])
-   {
-      String name = "unspecified";
-      if(args.length > 0)
-         name = args[0];
-      
-      if(helloWorldService == null)
-         throw new NullPointerException("helloWorldService is null");
-      
-      if(msg == null)
-         throw new NullPointerException("msg is null");
-      
-      result = helloWorldService.sayHelloTo(name) + ", " + msg;
-      
-      testMDB();
-   }
-   
-   public static void testMDB()
-   {
-      if(connectionFactory == null)
-         throw new NullPointerException("connectionFactory is null");
-      
-      if(destination == null)
-         throw new NullPointerException("destination is null");
-      
-      try
-      {
-         Connection conn = connectionFactory.createConnection();
-         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         
-         Queue replyTo = session.createTemporaryQueue();
-         TextMessage msg = session.createTextMessage("Hello world");
-         msg.setJMSReplyTo(replyTo);
-         
-         MessageConsumer consumer = session.createConsumer(replyTo);
-         conn.start();
-         
-         MessageProducer producer = session.createProducer(destination);
-         producer.send(destination, msg);
-         
-         TextMessage reply = (TextMessage) consumer.receive(2000);
-         System.out.println("reply = " + reply.getText());
-         
-         producer.close();
-         conn.stop();
-         consumer.close();
-         session.close();
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   public static void postConstruct()
-   {
-      postConstructCalls++;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/HelloWorldClient.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,129 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.appclient.client;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.jboss.ejb3.test.appclient.HelloWorldService;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class HelloWorldClient
+{
+   @EJB
+   private static HelloWorldService helloWorldService;
+   
+   @Resource(name="msg")
+   private static String msg;
+   
+   private static String result;
+   
+   @Resource(mappedName="ConnectionFactory")
+   private static ConnectionFactory connectionFactory;
+   
+   @Resource(name="messageReplier")
+   private static Destination destination;
+   
+   private static int postConstructCalls = 0;
+   
+   public static int getPostConstructCalls()
+   {
+      return postConstructCalls;
+   }
+   
+   public static String getResult()
+   {
+      return result;
+   }
+   
+   public static void main(String args[])
+   {
+      String name = "unspecified";
+      if(args.length > 0)
+         name = args[0];
+      
+      if(helloWorldService == null)
+         throw new NullPointerException("helloWorldService is null");
+      
+      if(msg == null)
+         throw new NullPointerException("msg is null");
+      
+      result = helloWorldService.sayHelloTo(name) + ", " + msg;
+      
+      testMDB();
+   }
+   
+   public static void testMDB()
+   {
+      if(connectionFactory == null)
+         throw new NullPointerException("connectionFactory is null");
+      
+      if(destination == null)
+         throw new NullPointerException("destination is null");
+      
+      try
+      {
+         Connection conn = connectionFactory.createConnection();
+         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         Queue replyTo = session.createTemporaryQueue();
+         TextMessage msg = session.createTextMessage("Hello world");
+         msg.setJMSReplyTo(replyTo);
+         
+         MessageConsumer consumer = session.createConsumer(replyTo);
+         conn.start();
+         
+         MessageProducer producer = session.createProducer(destination);
+         producer.send(destination, msg);
+         
+         TextMessage reply = (TextMessage) consumer.receive(2000);
+         System.out.println("reply = " + reply.getText());
+         
+         producer.close();
+         conn.stop();
+         consumer.close();
+         session.close();
+      }
+      catch(Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   public static void postConstruct()
+   {
+      postConstructCalls++;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.appclient.client;
-
-import javax.annotation.Resource;
-
-/**
- * This client only uses a simple resource.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class SimpleResourceClient
-{
-   @Resource(name="msg")
-   private static String msg;
-   
-   /**
-    * @param args
-    */
-   public static void main(String[] args)
-   {
-      if(msg == null)
-         throw new NullPointerException("msg is null");
-      
-      System.out.println("msg = " + msg);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/client/SimpleResourceClient.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.appclient.client;
+
+import javax.annotation.Resource;
+
+/**
+ * This client only uses a simple resource.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class SimpleResourceClient
+{
+   @Resource(name="msg")
+   private static String msg;
+   
+   /**
+    * @param args
+    */
+   public static void main(String[] args)
+   {
+      if(msg == null)
+         throw new NullPointerException("msg is null");
+      
+      System.out.println("msg = " + msg);
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.appclient.unit;
-
-import java.net.URL;
-import java.util.Date;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.test.appclient.client.HelloWorldClient;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class AppClientUnitTestCase extends JBossTestCase
-{
-   public AppClientUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void test1() throws Exception
-   {
-      URL url = Thread.currentThread().getContextClassLoader().getResource("appclient/application-client.xml");
-      URL jbossClientURL = Thread.currentThread().getContextClassLoader().getResource("appclient/jboss-client.xml");
-      ApplicationClientDD xml = ClientLauncher.loadXML(url, jbossClientURL);
-      
-      String mainClassName = HelloWorldClient.class.getName();
-      String applicationClientName = "applicationclient_test"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
-      String name = new Date().toString();
-      String args[] = { name };
-      
-      ClientLauncher.launch(xml, mainClassName, applicationClientName, args);
-      
-      {
-         String actual = HelloWorldClient.getResult();
-         String expected = "Hi " + name + ", how are you?";
-         assertEquals(expected, actual);
-      }
-      
-      {
-         int actual = HelloWorldClient.getPostConstructCalls();
-         int expected = 1;
-         assertEquals("postConstruct should be called once", expected, actual);
-      }
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(AppClientUnitTestCase.class, "appclient-test.ear");
-      //return getDeploySetup(AppClientUnitTestCase.class, "appclient-test.jar,appclient-test-client.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/AppClientUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.appclient.unit;
+
+import java.net.URL;
+import java.util.Date;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.client.ClientLauncher;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.test.appclient.client.HelloWorldClient;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class AppClientUnitTestCase extends JBossTestCase
+{
+   public AppClientUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void test1() throws Exception
+   {
+      URL url = Thread.currentThread().getContextClassLoader().getResource("appclient/application-client.xml");
+      URL jbossClientURL = Thread.currentThread().getContextClassLoader().getResource("appclient/jboss-client.xml");
+      ApplicationClientDD xml = ClientLauncher.loadXML(url, jbossClientURL);
+      
+      String mainClassName = HelloWorldClient.class.getName();
+      String applicationClientName = "applicationclient_test"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
+      String name = new Date().toString();
+      String args[] = { name };
+      
+      ClientLauncher.launch(xml, mainClassName, applicationClientName, args);
+      
+      {
+         String actual = HelloWorldClient.getResult();
+         String expected = "Hi " + name + ", how are you?";
+         assertEquals(expected, actual);
+      }
+      
+      {
+         int actual = HelloWorldClient.getPostConstructCalls();
+         int expected = 1;
+         assertEquals("postConstruct should be called once", expected, actual);
+      }
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(AppClientUnitTestCase.class, "appclient-test.ear");
+      //return getDeploySetup(AppClientUnitTestCase.class, "appclient-test.jar,appclient-test-client.jar");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,115 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.appclient.unit;
-
-import java.net.URL;
-
-import javax.naming.Context;
-import javax.naming.NameNotFoundException;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.test.appclient.client.SimpleResourceClient;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class SimpleResourceEarUnitTestCase extends JBossTestCase
-{
-
-   public SimpleResourceEarUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   /**
-    * Test to see if the client deployer has setup enc env correctly.
-    * 
-    * @throws Exception
-    */
-   public void testJNDI() throws Exception
-   {
-      String clientName = "appclient-simpleresource-client";
-      Context ctx = getInitialContext();
-      try
-      {
-         ctx = (Context) ctx.lookup(clientName);
-      }
-      catch(NameNotFoundException e)
-      {
-         fail(clientName + " not bound");
-      }
-      
-      try
-      {
-         String value = (String) ctx.lookup("env/msg");
-         assertEquals("Hello world", value);
-      }
-      catch(NameNotFoundException e)
-      {
-         fail("env/msg not bound");
-      }
-      
-      // TODO: shouldn't org.jboss.ejb3.test.appclient.client.SimpleResourceClient/msg be bound?
-      
-//      NamingEnumeration<NameClassPair> e = ctx.list("env");
-//      while(e.hasMore())
-//      {
-//         NameClassPair ncp = e.next();
-//         System.out.println(ncp.getName());
-//      }
-//      try
-//      {
-//         
-//      }
-//      catch(NameNotFoundException e)
-//      {
-//         
-//      }
-   }
-   
-   public void testClientLauncher() throws Exception
-   {
-      URL url = Thread.currentThread().getContextClassLoader().getResource("appclient/simpleresource/application-client.xml");
-      //URL jbossClientURL = Thread.currentThread().getContextClassLoader().getResource("appclient/jboss-client.xml");
-      URL jbossClientURL = null;
-      ApplicationClientDD xml = ClientLauncher.loadXML(url, jbossClientURL);
-      
-      String mainClassName = SimpleResourceClient.class.getName();
-      String applicationClientName = "appclient-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
-      String args[] = { };
-      
-      ClientLauncher.launch(xml, mainClassName, applicationClientName, args);
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(SimpleResourceEarUnitTestCase.class, "appclient-simpleresource.ear");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceEarUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.appclient.unit;
+
+import java.net.URL;
+
+import javax.naming.Context;
+import javax.naming.NameNotFoundException;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.client.ClientLauncher;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.test.appclient.client.SimpleResourceClient;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class SimpleResourceEarUnitTestCase extends JBossTestCase
+{
+
+   public SimpleResourceEarUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   /**
+    * Test to see if the client deployer has setup enc env correctly.
+    * 
+    * @throws Exception
+    */
+   public void testJNDI() throws Exception
+   {
+      String clientName = "appclient-simpleresource-client";
+      Context ctx = getInitialContext();
+      try
+      {
+         ctx = (Context) ctx.lookup(clientName);
+      }
+      catch(NameNotFoundException e)
+      {
+         fail(clientName + " not bound");
+      }
+      
+      try
+      {
+         String value = (String) ctx.lookup("env/msg");
+         assertEquals("Hello world", value);
+      }
+      catch(NameNotFoundException e)
+      {
+         fail("env/msg not bound");
+      }
+      
+      // TODO: shouldn't org.jboss.ejb3.test.appclient.client.SimpleResourceClient/msg be bound?
+      
+//      NamingEnumeration<NameClassPair> e = ctx.list("env");
+//      while(e.hasMore())
+//      {
+//         NameClassPair ncp = e.next();
+//         System.out.println(ncp.getName());
+//      }
+//      try
+//      {
+//         
+//      }
+//      catch(NameNotFoundException e)
+//      {
+//         
+//      }
+   }
+   
+   public void testClientLauncher() throws Exception
+   {
+      URL url = Thread.currentThread().getContextClassLoader().getResource("appclient/simpleresource/application-client.xml");
+      //URL jbossClientURL = Thread.currentThread().getContextClassLoader().getResource("appclient/jboss-client.xml");
+      URL jbossClientURL = null;
+      ApplicationClientDD xml = ClientLauncher.loadXML(url, jbossClientURL);
+      
+      String mainClassName = SimpleResourceClient.class.getName();
+      String applicationClientName = "appclient-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
+      String args[] = { };
+      
+      ClientLauncher.launch(xml, mainClassName, applicationClientName, args);
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(SimpleResourceEarUnitTestCase.class, "appclient-simpleresource.ear");
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,115 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.appclient.unit;
-
-import java.net.URL;
-
-import javax.naming.Context;
-import javax.naming.NameNotFoundException;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.test.appclient.client.SimpleResourceClient;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class SimpleResourceUnitTestCase extends JBossTestCase
-{
-
-   public SimpleResourceUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   /**
-    * Test to see if the client deployer has setup enc env correctly.
-    * 
-    * @throws Exception
-    */
-   public void testJNDI() throws Exception
-   {
-      String clientName = "appclient-simpleresource-client";
-      Context ctx = getInitialContext();
-      try
-      {
-         ctx = (Context) ctx.lookup(clientName);
-      }
-      catch(NameNotFoundException e)
-      {
-         fail(clientName + " not bound");
-      }
-      
-      try
-      {
-         String value = (String) ctx.lookup("env/msg");
-         assertEquals("Hello world", value);
-      }
-      catch(NameNotFoundException e)
-      {
-         fail("env/msg not bound");
-      }
-      
-      // TODO: shouldn't org.jboss.ejb3.test.appclient.client.SimpleResourceClient/msg be bound?
-      
-//      NamingEnumeration<NameClassPair> e = ctx.list("env");
-//      while(e.hasMore())
-//      {
-//         NameClassPair ncp = e.next();
-//         System.out.println(ncp.getName());
-//      }
-//      try
-//      {
-//         
-//      }
-//      catch(NameNotFoundException e)
-//      {
-//         
-//      }
-   }
-   
-   public void testClientLauncher() throws Exception
-   {
-      URL url = Thread.currentThread().getContextClassLoader().getResource("appclient/simpleresource/application-client.xml");
-      //URL jbossClientURL = Thread.currentThread().getContextClassLoader().getResource("appclient/jboss-client.xml");
-      URL jbossClientURL = null;
-      ApplicationClientDD xml = ClientLauncher.loadXML(url, jbossClientURL);
-      
-      String mainClassName = SimpleResourceClient.class.getName();
-      String applicationClientName = "appclient-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
-      String args[] = { };
-      
-      ClientLauncher.launch(xml, mainClassName, applicationClientName, args);
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(SimpleResourceUnitTestCase.class, "appclient-simpleresource-client.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/appclient/unit/SimpleResourceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.appclient.unit;
+
+import java.net.URL;
+
+import javax.naming.Context;
+import javax.naming.NameNotFoundException;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.client.ClientLauncher;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.test.appclient.client.SimpleResourceClient;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class SimpleResourceUnitTestCase extends JBossTestCase
+{
+
+   public SimpleResourceUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   /**
+    * Test to see if the client deployer has setup enc env correctly.
+    * 
+    * @throws Exception
+    */
+   public void testJNDI() throws Exception
+   {
+      String clientName = "appclient-simpleresource-client";
+      Context ctx = getInitialContext();
+      try
+      {
+         ctx = (Context) ctx.lookup(clientName);
+      }
+      catch(NameNotFoundException e)
+      {
+         fail(clientName + " not bound");
+      }
+      
+      try
+      {
+         String value = (String) ctx.lookup("env/msg");
+         assertEquals("Hello world", value);
+      }
+      catch(NameNotFoundException e)
+      {
+         fail("env/msg not bound");
+      }
+      
+      // TODO: shouldn't org.jboss.ejb3.test.appclient.client.SimpleResourceClient/msg be bound?
+      
+//      NamingEnumeration<NameClassPair> e = ctx.list("env");
+//      while(e.hasMore())
+//      {
+//         NameClassPair ncp = e.next();
+//         System.out.println(ncp.getName());
+//      }
+//      try
+//      {
+//         
+//      }
+//      catch(NameNotFoundException e)
+//      {
+//         
+//      }
+   }
+   
+   public void testClientLauncher() throws Exception
+   {
+      URL url = Thread.currentThread().getContextClassLoader().getResource("appclient/simpleresource/application-client.xml");
+      //URL jbossClientURL = Thread.currentThread().getContextClassLoader().getResource("appclient/jboss-client.xml");
+      URL jbossClientURL = null;
+      ApplicationClientDD xml = ClientLauncher.loadXML(url, jbossClientURL);
+      
+      String mainClassName = SimpleResourceClient.class.getName();
+      String applicationClientName = "appclient-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
+      String args[] = { };
+      
+      ClientLauncher.launch(xml, mainClassName, applicationClientName, args);
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(SimpleResourceUnitTestCase.class, "appclient-simpleresource-client.jar");
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.arjuna;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at javax.persistence.Entity
- at Table(name = "ENTITY")
-public class Entity implements java.io.Serializable
-{
-   private Long id;
-   private String name;
-
-   @Id
-   //@GeneratedValue(strategy= GenerationType.IDENTITY)
-   public Long getId()
-   {
-      return id;
-   }
-
-   public void setId(Long id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/Entity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.arjuna;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at javax.persistence.Entity
+ at Table(name = "ENTITY")
+public class Entity implements java.io.Serializable
+{
+   private Long id;
+   private String name;
+
+   @Id
+   //@GeneratedValue(strategy= GenerationType.IDENTITY)
+   public Long getId()
+   {
+      return id;
+   }
+
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.arjuna;
-
-import org.jboss.ejb3.test.arjuna.Entity;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatefulTx
-{
-   boolean isArjunaTransactedRequired() throws javax.transaction.SystemException;
-   
-   boolean isArjunaTransactedRequiresNew() throws javax.transaction.SystemException;
-   
-   boolean clear(Entity entity) throws javax.transaction.SystemException;
-   
-   boolean persist(Entity entity) throws javax.transaction.SystemException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTx.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.arjuna;
+
+import org.jboss.ejb3.test.arjuna.Entity;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulTx
+{
+   boolean isArjunaTransactedRequired() throws javax.transaction.SystemException;
+   
+   boolean isArjunaTransactedRequiresNew() throws javax.transaction.SystemException;
+   
+   boolean clear(Entity entity) throws javax.transaction.SystemException;
+   
+   boolean persist(Entity entity) throws javax.transaction.SystemException;
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,96 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.arjuna;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.transaction.TransactionManager;
-
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.test.arjuna.Entity;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateful(name="StatefulTx")
- at Remote(StatefulTx.class)
- at RemoteBinding(jndiBinding = "StatefulTx")
- at TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) 
-public class StatefulTxBean implements StatefulTx
-{
-   private static final Logger log = Logger.getLogger(StatefulTxBean.class);
-   
-   @JndiInject(jndiName="java:/TransactionManager") private TransactionManager tm;
-   
-   @PersistenceContext private EntityManager manager;
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public boolean clear(Entity entity) throws javax.transaction.SystemException
-   {
-     entity = manager.find(Entity.class, entity.getId());
-     if (entity != null)
-        manager.remove(entity);
-     
-     return getReturn();
-   }
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public boolean persist(Entity entity) throws javax.transaction.SystemException
-   {
-      manager.persist(entity);
-      
-      return getReturn();
-   }
-    
-   @TransactionAttribute(TransactionAttributeType.REQUIRED)
-   public boolean isArjunaTransactedRequired() throws javax.transaction.SystemException
-   {
-      return getReturn();
-   }
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public boolean isArjunaTransactedRequiresNew() throws javax.transaction.SystemException
-   {
-      return getReturn();
-   }
-   
-   protected boolean getReturn() throws javax.transaction.SystemException
-   {
-      if (tm.getTransaction() == null)
-         return false;
-      
-      if (!tm.getClass().toString().contains("arjuna"))
-         return false;
-      
-      if (!tm.getTransaction().getClass().toString().contains("arjuna"))
-         return false;
-      
-      return true;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,96 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.arjuna;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.TransactionManager;
+
+import org.jboss.annotation.JndiInject;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.test.arjuna.Entity;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateful(name="StatefulTx")
+ at Remote(StatefulTx.class)
+ at RemoteBinding(jndiBinding = "StatefulTx")
+ at TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) 
+public class StatefulTxBean implements StatefulTx
+{
+   private static final Logger log = Logger.getLogger(StatefulTxBean.class);
+   
+   @JndiInject(jndiName="java:/TransactionManager") private TransactionManager tm;
+   
+   @PersistenceContext private EntityManager manager;
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public boolean clear(Entity entity) throws javax.transaction.SystemException
+   {
+     entity = manager.find(Entity.class, entity.getId());
+     if (entity != null)
+        manager.remove(entity);
+     
+     return getReturn();
+   }
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public boolean persist(Entity entity) throws javax.transaction.SystemException
+   {
+      manager.persist(entity);
+      
+      return getReturn();
+   }
+    
+   @TransactionAttribute(TransactionAttributeType.REQUIRED)
+   public boolean isArjunaTransactedRequired() throws javax.transaction.SystemException
+   {
+      return getReturn();
+   }
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public boolean isArjunaTransactedRequiresNew() throws javax.transaction.SystemException
+   {
+      return getReturn();
+   }
+   
+   protected boolean getReturn() throws javax.transaction.SystemException
+   {
+      if (tm.getTransaction() == null)
+         return false;
+      
+      if (!tm.getClass().toString().contains("arjuna"))
+         return false;
+      
+      if (!tm.getTransaction().getClass().toString().contains("arjuna"))
+         return false;
+      
+      return true;
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.arjuna.unit;
-
-import org.jboss.ejb3.test.arjuna.StatefulTx;
-import org.jboss.ejb3.test.arjuna.Entity;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ArjunaTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(ArjunaTestCase.class);
-
-   public ArjunaTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testStatefulTx() throws Exception
-   {     
-      StatefulTx stateful = (StatefulTx)getInitialContext().lookup("StatefulTx");
-      assertNotNull(stateful);
-      
-      boolean arjunaTransacted = stateful.isArjunaTransactedRequired();
-      assertTrue(arjunaTransacted);
-      arjunaTransacted = stateful.isArjunaTransactedRequiresNew();
-      assertTrue(arjunaTransacted);
-      
-      Entity entity = new Entity();
-      entity.setName("test-entity");
-      entity.setId(1234L);
-      
-      arjunaTransacted = stateful.clear(entity);
-      assertTrue(arjunaTransacted);
-      
-      arjunaTransacted = stateful.persist(entity);
-      assertTrue(arjunaTransacted);
-      
-      stateful.clear(entity);
-   }
- 
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ArjunaTestCase.class, "arjuna-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/arjuna/unit/ArjunaTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.arjuna.unit;
+
+import org.jboss.ejb3.test.arjuna.StatefulTx;
+import org.jboss.ejb3.test.arjuna.Entity;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ArjunaTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(ArjunaTestCase.class);
+
+   public ArjunaTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testStatefulTx() throws Exception
+   {     
+      StatefulTx stateful = (StatefulTx)getInitialContext().lookup("StatefulTx");
+      assertNotNull(stateful);
+      
+      boolean arjunaTransacted = stateful.isArjunaTransactedRequired();
+      assertTrue(arjunaTransacted);
+      arjunaTransacted = stateful.isArjunaTransactedRequiresNew();
+      assertTrue(arjunaTransacted);
+      
+      Entity entity = new Entity();
+      entity.setName("test-entity");
+      entity.setId(1234L);
+      
+      arjunaTransacted = stateful.clear(entity);
+      assertTrue(arjunaTransacted);
+      
+      arjunaTransacted = stateful.persist(entity);
+      assertTrue(arjunaTransacted);
+      
+      stateful.clear(entity);
+   }
+ 
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ArjunaTestCase.class, "arjuna-test.jar");
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.aspectdomain;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.PoolClass;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="DeploymentDescriptorStateful")
- at Remote(org.jboss.ejb3.test.aspectdomain.Stateful.class)
- at RemoteBinding(jndiBinding = "DeploymentDescriptorStateful")
- at PoolClass(value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- at CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
-public class DeploymentDescriptorStatefulBean
-   implements org.jboss.ejb3.test.aspectdomain.Stateful
-{
-   private static final Logger log = Logger.getLogger(DeploymentDescriptorStatefulBean.class);
-   
-   public String test() throws Exception
-   {
-      return "Not intercepted";
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.aspectdomain;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.cache.Cache;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="DeploymentDescriptorStateful")
+ at Remote(org.jboss.ejb3.test.aspectdomain.Stateful.class)
+ at RemoteBinding(jndiBinding = "DeploymentDescriptorStateful")
+ at PoolClass(value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+ at CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
+public class DeploymentDescriptorStatefulBean
+   implements org.jboss.ejb3.test.aspectdomain.Stateful
+{
+   private static final Logger log = Logger.getLogger(DeploymentDescriptorStatefulBean.class);
+   
+   public String test() throws Exception
+   {
+      return "Not intercepted";
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.aspectdomain;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface Stateful
-{
-   public String test() throws Exception;
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.aspectdomain;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface Stateful
+{
+   public String test() throws Exception;
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/Stateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.aspectdomain;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.AspectDomain;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.PoolClass;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="Stateful")
- at Remote(org.jboss.ejb3.test.aspectdomain.Stateful.class)
- at RemoteBinding(jndiBinding = "Stateful")
- at AspectDomain("Test Aspect Domain")
- at PoolClass(value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- at CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
-public class StatefulBean
-   implements org.jboss.ejb3.test.aspectdomain.Stateful
-{
-   private static final Logger log = Logger.getLogger(StatefulBean.class);
-   
-   public String test() throws Exception
-   {
-      return "Not intercepted";
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.aspectdomain;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.AspectDomain;
+import org.jboss.annotation.ejb.cache.Cache;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="Stateful")
+ at Remote(org.jboss.ejb3.test.aspectdomain.Stateful.class)
+ at RemoteBinding(jndiBinding = "Stateful")
+ at AspectDomain("Test Aspect Domain")
+ at PoolClass(value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+ at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+ at CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
+public class StatefulBean
+   implements org.jboss.ejb3.test.aspectdomain.Stateful
+{
+   private static final Logger log = Logger.getLogger(StatefulBean.class);
+   
+   public String test() throws Exception
+   {
+      return "Not intercepted";
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.aspectdomain;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class TestInterceptor implements Interceptor, java.io.Serializable
-{
-   private static final Logger log = Logger.getLogger(TestInterceptor.class);
-   
-   public TestInterceptor()
-   {
-   }
-
-   public String getName()
-   {
-      return "TestInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      try 
-      {
-         return getName();
-      } 
-      finally
-      {
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.aspectdomain;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class TestInterceptor implements Interceptor, java.io.Serializable
+{
+   private static final Logger log = Logger.getLogger(TestInterceptor.class);
+   
+   public TestInterceptor()
+   {
+   }
+
+   public String getName()
+   {
+      return "TestInterceptor";
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      try 
+      {
+         return getName();
+      } 
+      finally
+      {
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/TestInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.aspectdomain.unit;
-
-import org.jboss.ejb3.test.aspectdomain.Stateful;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class AspectDomainUnitTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(AspectDomainUnitTestCase.class);
-
-   public AspectDomainUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testAspectDomain() throws Exception
-   {
-     Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
-     String result = stateful.test();
-     assertEquals("TestInterceptor", result);
-   }
-   
-   public void testDeploymentDescriptorAspectDomain() throws Exception
-   {
-     Stateful stateful = (Stateful)getInitialContext().lookup("DeploymentDescriptorStateful");
-     String result = stateful.test();
-     assertEquals("TestInterceptor", result);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(AspectDomainUnitTestCase.class, "aspectdomain.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.aspectdomain.unit;
+
+import org.jboss.ejb3.test.aspectdomain.Stateful;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class AspectDomainUnitTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(AspectDomainUnitTestCase.class);
+
+   public AspectDomainUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testAspectDomain() throws Exception
+   {
+     Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
+     String result = stateful.test();
+     assertEquals("TestInterceptor", result);
+   }
+   
+   public void testDeploymentDescriptorAspectDomain() throws Exception
+   {
+     Stateful stateful = (Stateful)getInitialContext().lookup("DeploymentDescriptorStateful");
+     String result = stateful.test();
+     assertEquals("TestInterceptor", result);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(AspectDomainUnitTestCase.class, "aspectdomain.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/unit/AspectDomainUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/BankBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/BankBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/BankBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -27,6 +27,7 @@
 import javax.annotation.Resource;
 import javax.ejb.EJBException;
 import javax.ejb.Init;
+import javax.ejb.Remove;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
@@ -110,7 +111,6 @@
 
    public void remove()
    {
-
    }
 
    @Init

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.bank;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface ProxyFactoryInterface
-{
-   String method();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bank;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface ProxyFactoryInterface
+{
+   String method();
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/ProxyFactoryInterface.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -193,13 +193,18 @@
    
    public void testTransactionTimeout()
    {
+      boolean exceptionCaught = false;
       try
       {
+         log.info("************* calling bank.testTransactionTimeout()");
          bank.testTransactionTimeout();
-      } 
+         log.info("************* finished calling bank.testTransactionTimeout()");
+      }
       catch (Exception e)
       {
-         e.printStackTrace();
+         log.info("********** caught exception");
+         exceptionCaught = true;
       }
+      if (!exceptionCaught) throw new RuntimeException("Failed to catch transactionTimeout");
    }
 }

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.bank;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class TellerInterceptor implements Interceptor, java.io.Serializable
-{
-   private static final Logger log = Logger.getLogger(TellerInterceptor.class);
-   
-   public static boolean accessed = false;
-   
-   public TellerInterceptor()
-   {
-   }
-
-   public String getName()
-   {
-      return "TellerInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      try 
-      {
-         return invocation.invokeNext();
-      } 
-      finally
-      {
-         accessed = true;
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bank;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class TellerInterceptor implements Interceptor, java.io.Serializable
+{
+   private static final Logger log = Logger.getLogger(TellerInterceptor.class);
+   
+   public static boolean accessed = false;
+   
+   public TellerInterceptor()
+   {
+   }
+
+   public String getName()
+   {
+      return "TellerInterceptor";
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      try 
+      {
+         return invocation.invokeNext();
+      } 
+      finally
+      {
+         accessed = true;
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.bank;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class TellerRemoteProxyFactory extends org.jboss.ejb3.stateless.StatelessRemoteProxyFactory
-{
-   private static final Logger log = Logger.getLogger(TellerRemoteProxyFactory.class);
-   
-   protected Class[] getInterfaces()
-   {
-      Class[] remoteInterfaces = super.getInterfaces();
-
-      Class[] interfaces = new Class[remoteInterfaces.length + 1];
-
-      System.arraycopy(remoteInterfaces, 0, interfaces, 0, remoteInterfaces.length);
-      interfaces[remoteInterfaces.length] = org.jboss.ejb3.test.bank.ProxyFactoryInterface.class;
-
-      return interfaces;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bank;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class TellerRemoteProxyFactory extends org.jboss.ejb3.stateless.StatelessRemoteProxyFactory
+{
+   private static final Logger log = Logger.getLogger(TellerRemoteProxyFactory.class);
+   
+   protected Class[] getInterfaces()
+   {
+      Class[] remoteInterfaces = super.getInterfaces();
+
+      Class[] interfaces = new Class[remoteInterfaces.length + 1];
+
+      System.arraycopy(remoteInterfaces, 0, interfaces, 0, remoteInterfaces.length);
+      interfaces[remoteInterfaces.length] = org.jboss.ejb3.test.bank.ProxyFactoryInterface.class;
+
+      return interfaces;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -23,6 +23,7 @@
 
 import javax.ejb.EJBAccessException;
 import javax.ejb.EJBException;
+import javax.ejb.NoSuchEJBException;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
@@ -251,9 +252,10 @@
       try {
          bank.testResource();
          assertTrue(false);
-      } catch (EJBException e)
+      }
+      catch (NoSuchEJBException e)
       {
-         assertTrue(e instanceof EJBException);
+         // correct exception
       }
    }
    
@@ -309,22 +311,18 @@
       
       Teller teller = (Teller) jndiContext.lookup(Teller.JNDI_NAME);
       assertNotNull(teller);
-      
-      teller.testTransactionTimeout();
-      
-      SecurityAssociation.setPrincipal(new SimplePrincipal("teller"));
-      SecurityAssociation.setCredential("password".toCharArray());
-      
-      Bank bank = (Bank) jndiContext.lookup(Bank.JNDI_NAME);
-      assertNotNull(bank);
-      
+
+      boolean exceptionThrown = false;
       try
       {
-         String state = bank.getTransactionState();
-         assertEquals("failed", state);
-      } catch (Exception e){
-         e.printStackTrace();
+         teller.testTransactionTimeout();
       }
+      catch (Exception e)
+      {
+         exceptionThrown = true;
+      }
+      assertTrue(exceptionThrown);
+
    }
    
    public void testStatefulTransactionTimeout() throws Exception
@@ -342,18 +340,9 @@
          String state = bank.getTransactionState();
          assertEquals("failed", state);
       } catch (Exception e){
-         e.printStackTrace();
       }
    }
 
-   protected void setUp() throws Exception
-   {
-   }
-   
-   protected void tearDown() throws Exception
-   {
-   }
-
    public static Test suite() throws Exception
    {
       ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-import javax.transaction.Transaction;
-import org.jboss.annotation.JndiInject;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DeploymentDescriptorStatefulBean implements DeploymentDescriptorStatefulLocal
-{
-   @Resource UserTransaction ut;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-
-   public Transaction beginNoEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      return tm.getTransaction();
-   }
-
-   public void endCommit(Transaction old) throws Exception
-   {
-      if (old != tm.getTransaction()) throw new TestException("No matching TX");
-      ut.commit();
-   }
-
-   public void endRollback(Transaction old) throws Exception
-   {
-      if (old != tm.getTransaction()) throw new TestException("No matching TX");
-      ut.rollback();
-   }
-
-   public void beginCommitEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.commit();
-   }
-
-   public void beginRollbackEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.rollback();
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import javax.transaction.Transaction;
+import org.jboss.annotation.JndiInject;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DeploymentDescriptorStatefulBean implements DeploymentDescriptorStatefulLocal
+{
+   @Resource UserTransaction ut;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+
+   public Transaction beginNoEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      return tm.getTransaction();
+   }
+
+   public void endCommit(Transaction old) throws Exception
+   {
+      if (old != tm.getTransaction()) throw new TestException("No matching TX");
+      ut.commit();
+   }
+
+   public void endRollback(Transaction old) throws Exception
+   {
+      if (old != tm.getTransaction()) throw new TestException("No matching TX");
+      ut.rollback();
+   }
+
+   public void beginCommitEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.commit();
+   }
+
+   public void beginRollbackEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.rollback();
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.transaction.Transaction;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface DeploymentDescriptorStatefulLocal
-{
-   Transaction beginNoEnd() throws Exception;
-
-   void endCommit(Transaction old) throws Exception;
-
-   void endRollback(Transaction old) throws Exception;
-
-   void beginCommitEnd() throws Exception;
-
-   void beginRollbackEnd() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.transaction.Transaction;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface DeploymentDescriptorStatefulLocal
+{
+   Transaction beginNoEnd() throws Exception;
+
+   void endCommit(Transaction old) throws Exception;
+
+   void endRollback(Transaction old) throws Exception;
+
+   void beginCommitEnd() throws Exception;
+
+   void beginRollbackEnd() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.annotation.Resource;
-import javax.transaction.UserTransaction;
-import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DeploymentDescriptorStatelessBean implements DeploymentDescriptorStatelessLocal
-{
-   @Resource UserTransaction ut;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-
-   public void beginNoEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-   }
-
-   public void beginCommitEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.commit();
-   }
-
-   public void beginRollbackEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.rollback();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.ejb.Stateless;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.annotation.Resource;
+import javax.transaction.UserTransaction;
+import javax.transaction.TransactionManager;
+import org.jboss.annotation.JndiInject;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DeploymentDescriptorStatelessBean implements DeploymentDescriptorStatelessLocal
+{
+   @Resource UserTransaction ut;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+
+   public void beginNoEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+   }
+
+   public void beginCommitEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.commit();
+   }
+
+   public void beginRollbackEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.rollback();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface DeploymentDescriptorStatelessLocal
-{
-   void beginNoEnd() throws Exception;
-
-   void beginCommitEnd() throws Exception;
-
-   void beginRollbackEnd() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface DeploymentDescriptorStatelessLocal
+{
+   void beginNoEnd() throws Exception;
+
+   void beginCommitEnd() throws Exception;
+
+   void beginRollbackEnd() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,119 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.ejb.EJB;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.naming.InitialContext;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.JndiInject;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DeploymentDescriptorTesterBean implements DeploymentDescriptorTesterRemote
-{
-   @EJB DeploymentDescriptorStatelessLocal stateless;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-
-
-   protected static Logger log = Logger.getLogger(DeploymentDescriptorTesterBean.class);
-
-   public void testStatelessWithTx() throws Exception
-   {
-      stateless.beginCommitEnd();
-      stateless.beginRollbackEnd();
-
-      try
-      {
-         stateless.beginNoEnd();
-      }
-      catch (Exception e)
-      {
-         if (e instanceof TestException) throw e;
-         log.info("should be EJBException thrown that begin and no end was called: ", e);
-      }
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void testStatelessWithoutTx() throws Exception
-   {
-      stateless.beginCommitEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateless.beginRollbackEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-
-      try
-      {
-         stateless.beginNoEnd();
-      }
-      catch (Exception e)
-      {
-         if (e instanceof TestException) throw e;
-         log.info("should be EJBException thrown that begin and no end was called: ", e);
-      }
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-   }
-
-   DeploymentDescriptorStatefulLocal getStateful() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      return (DeploymentDescriptorStatefulLocal)ctx.lookup("DeploymentDescriptorStateful/local");
-   }
-
-   public void testStatefulWithTx() throws Exception
-   {
-      DeploymentDescriptorStatefulLocal stateful = getStateful();
-      Transaction tx = stateful.beginNoEnd();
-      stateful.endCommit(tx);
-      tx = stateful.beginNoEnd();
-      stateful.endRollback(tx);
-
-      stateful.beginCommitEnd();
-      stateful.beginRollbackEnd();
-
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void testStatefulWithoutTx() throws Exception
-   {
-      DeploymentDescriptorStatefulLocal stateful = getStateful();
-      Transaction tx = stateful.beginNoEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateful.endCommit(tx);
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      tx = stateful.beginNoEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateful.endRollback(tx);
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-
-      stateful.beginCommitEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateful.beginRollbackEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.ejb.EJB;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.transaction.TransactionManager;
+import javax.transaction.Transaction;
+import javax.naming.InitialContext;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.JndiInject;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DeploymentDescriptorTesterBean implements DeploymentDescriptorTesterRemote
+{
+   @EJB DeploymentDescriptorStatelessLocal stateless;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+
+
+   protected static Logger log = Logger.getLogger(DeploymentDescriptorTesterBean.class);
+
+   public void testStatelessWithTx() throws Exception
+   {
+      stateless.beginCommitEnd();
+      stateless.beginRollbackEnd();
+
+      try
+      {
+         stateless.beginNoEnd();
+      }
+      catch (Exception e)
+      {
+         if (e instanceof TestException) throw e;
+         log.info("should be EJBException thrown that begin and no end was called: ", e);
+      }
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void testStatelessWithoutTx() throws Exception
+   {
+      stateless.beginCommitEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateless.beginRollbackEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+
+      try
+      {
+         stateless.beginNoEnd();
+      }
+      catch (Exception e)
+      {
+         if (e instanceof TestException) throw e;
+         log.info("should be EJBException thrown that begin and no end was called: ", e);
+      }
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+   }
+
+   DeploymentDescriptorStatefulLocal getStateful() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      return (DeploymentDescriptorStatefulLocal)ctx.lookup("DeploymentDescriptorStateful/local");
+   }
+
+   public void testStatefulWithTx() throws Exception
+   {
+      DeploymentDescriptorStatefulLocal stateful = getStateful();
+      Transaction tx = stateful.beginNoEnd();
+      stateful.endCommit(tx);
+      tx = stateful.beginNoEnd();
+      stateful.endRollback(tx);
+
+      stateful.beginCommitEnd();
+      stateful.beginRollbackEnd();
+
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void testStatefulWithoutTx() throws Exception
+   {
+      DeploymentDescriptorStatefulLocal stateful = getStateful();
+      Transaction tx = stateful.beginNoEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateful.endCommit(tx);
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      tx = stateful.beginNoEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateful.endRollback(tx);
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+
+      stateful.beginCommitEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateful.beginRollbackEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.Remote;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Remote
-public interface DeploymentDescriptorTesterRemote
-{
-   void testStatelessWithTx() throws Exception;
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   void testStatelessWithoutTx() throws Exception;
-
-   void testStatefulWithTx() throws Exception;
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   void testStatefulWithoutTx() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.Remote;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Remote
+public interface DeploymentDescriptorTesterRemote
+{
+   void testStatelessWithTx() throws Exception;
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   void testStatelessWithoutTx() throws Exception;
+
+   void testStatefulWithTx() throws Exception;
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   void testStatefulWithoutTx() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-import javax.transaction.Transaction;
-import org.jboss.annotation.JndiInject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at TransactionManagement(TransactionManagementType.BEAN)
-public class StatefulBean implements StatefulLocal
-{
-   @Resource UserTransaction ut;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-
-   public Transaction beginNoEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      return tm.getTransaction();
-   }
-
-   public void endCommit(Transaction old) throws Exception
-   {
-      if (old != tm.getTransaction()) throw new TestException("No matching TX");
-      ut.commit();
-   }
-
-   public void endRollback(Transaction old) throws Exception
-   {
-      if (old != tm.getTransaction()) throw new TestException("No matching TX");
-      ut.rollback();
-   }
-
-   public void beginCommitEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.commit();
-   }
-
-   public void beginRollbackEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.rollback();
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import javax.transaction.Transaction;
+import org.jboss.annotation.JndiInject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at TransactionManagement(TransactionManagementType.BEAN)
+public class StatefulBean implements StatefulLocal
+{
+   @Resource UserTransaction ut;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+
+   public Transaction beginNoEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      return tm.getTransaction();
+   }
+
+   public void endCommit(Transaction old) throws Exception
+   {
+      if (old != tm.getTransaction()) throw new TestException("No matching TX");
+      ut.commit();
+   }
+
+   public void endRollback(Transaction old) throws Exception
+   {
+      if (old != tm.getTransaction()) throw new TestException("No matching TX");
+      ut.rollback();
+   }
+
+   public void beginCommitEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.commit();
+   }
+
+   public void beginRollbackEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.rollback();
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.transaction.Transaction;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface StatefulLocal
-{
-   Transaction beginNoEnd() throws Exception;
-
-   void endCommit(Transaction old) throws Exception;
-
-   void endRollback(Transaction old) throws Exception;
-
-   void beginCommitEnd() throws Exception;
-
-   void beginRollbackEnd() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.transaction.Transaction;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface StatefulLocal
+{
+   Transaction beginNoEnd() throws Exception;
+
+   void endCommit(Transaction old) throws Exception;
+
+   void endRollback(Transaction old) throws Exception;
+
+   void beginCommitEnd() throws Exception;
+
+   void beginRollbackEnd() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.annotation.Resource;
-import javax.transaction.UserTransaction;
-import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at TransactionManagement(TransactionManagementType.BEAN)
-public class StatelessBean implements StatelessLocal
-{
-   @Resource UserTransaction ut;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-
-   public void beginNoEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-   }
-
-   public void beginCommitEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.commit();
-   }
-
-   public void beginRollbackEnd() throws Exception
-   {
-      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
-      ut.begin();
-      ut.rollback();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.ejb.Stateless;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.annotation.Resource;
+import javax.transaction.UserTransaction;
+import javax.transaction.TransactionManager;
+import org.jboss.annotation.JndiInject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at TransactionManagement(TransactionManagementType.BEAN)
+public class StatelessBean implements StatelessLocal
+{
+   @Resource UserTransaction ut;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+
+   public void beginNoEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+   }
+
+   public void beginCommitEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.commit();
+   }
+
+   public void beginRollbackEnd() throws Exception
+   {
+      if (tm.getTransaction() != null) throw new TestException("THERE IS AN EXISTING TRANSACTION");
+      ut.begin();
+      ut.rollback();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface StatelessLocal
-{
-   void beginNoEnd() throws Exception;
-
-   void beginCommitEnd() throws Exception;
-
-   void beginRollbackEnd() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface StatelessLocal
+{
+   void beginNoEnd() throws Exception;
+
+   void beginCommitEnd() throws Exception;
+
+   void beginRollbackEnd() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class TestException extends Exception
-{
-   public TestException()
-   {
-   }
-
-   public TestException(String message)
-   {
-      super(message);
-   }
-
-   public TestException(String message, Throwable cause)
-   {
-      super(message, cause);
-   }
-
-   public TestException(Throwable cause)
-   {
-      super(cause);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class TestException extends Exception
+{
+   public TestException()
+   {
+   }
+
+   public TestException(String message)
+   {
+      super(message);
+   }
+
+   public TestException(String message, Throwable cause)
+   {
+      super(message, cause);
+   }
+
+   public TestException(Throwable cause)
+   {
+      super(cause);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TestException.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.ejb.EJB;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.Stateless;
-import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.naming.InitialContext;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.JndiInject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class TesterBean implements TesterRemote
-{
-   @EJB StatelessLocal stateless;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-
-
-   protected static Logger log = Logger.getLogger(TesterBean.class);
-
-   public void testStatelessWithTx() throws Exception
-   {
-      stateless.beginCommitEnd();
-      stateless.beginRollbackEnd();
-
-      try
-      {
-         stateless.beginNoEnd();
-      }
-      catch (Exception e)
-      {
-         if (e instanceof TestException) throw e;
-         log.info("should be EJBException thrown that begin and no end was called: ", e);
-      }
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void testStatelessWithoutTx() throws Exception
-   {
-      stateless.beginCommitEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateless.beginRollbackEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-
-      try
-      {
-         stateless.beginNoEnd();
-      }
-      catch (Exception e)
-      {
-         if (e instanceof TestException) throw e;
-         log.info("should be EJBException thrown that begin and no end was called: ", e);
-      }
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-   }
-
-   StatefulLocal getStateful() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      return (StatefulLocal)ctx.lookup("StatefulBean/local");
-   }
-
-   public void testStatefulWithTx() throws Exception
-   {
-      StatefulLocal stateful = getStateful();
-      Transaction tx = stateful.beginNoEnd();
-      stateful.endCommit(tx);
-      tx = stateful.beginNoEnd();
-      stateful.endRollback(tx);
-
-      stateful.beginCommitEnd();
-      stateful.beginRollbackEnd();
-
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void testStatefulWithoutTx() throws Exception
-   {
-      StatefulLocal stateful = getStateful();
-      Transaction tx = stateful.beginNoEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateful.endCommit(tx);
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      tx = stateful.beginNoEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateful.endRollback(tx);
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-
-      stateful.beginCommitEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-      stateful.beginRollbackEnd();
-      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.ejb.EJB;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.Stateless;
+import javax.transaction.TransactionManager;
+import javax.transaction.Transaction;
+import javax.naming.InitialContext;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.JndiInject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class TesterBean implements TesterRemote
+{
+   @EJB StatelessLocal stateless;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+
+
+   protected static Logger log = Logger.getLogger(TesterBean.class);
+
+   public void testStatelessWithTx() throws Exception
+   {
+      stateless.beginCommitEnd();
+      stateless.beginRollbackEnd();
+
+      try
+      {
+         stateless.beginNoEnd();
+      }
+      catch (Exception e)
+      {
+         if (e instanceof TestException) throw e;
+         log.info("should be EJBException thrown that begin and no end was called: ", e);
+      }
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void testStatelessWithoutTx() throws Exception
+   {
+      stateless.beginCommitEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateless.beginRollbackEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+
+      try
+      {
+         stateless.beginNoEnd();
+      }
+      catch (Exception e)
+      {
+         if (e instanceof TestException) throw e;
+         log.info("should be EJBException thrown that begin and no end was called: ", e);
+      }
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+   }
+
+   StatefulLocal getStateful() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      return (StatefulLocal)ctx.lookup("StatefulBean/local");
+   }
+
+   public void testStatefulWithTx() throws Exception
+   {
+      StatefulLocal stateful = getStateful();
+      Transaction tx = stateful.beginNoEnd();
+      stateful.endCommit(tx);
+      tx = stateful.beginNoEnd();
+      stateful.endRollback(tx);
+
+      stateful.beginCommitEnd();
+      stateful.beginRollbackEnd();
+
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void testStatefulWithoutTx() throws Exception
+   {
+      StatefulLocal stateful = getStateful();
+      Transaction tx = stateful.beginNoEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateful.endCommit(tx);
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      tx = stateful.beginNoEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateful.endRollback(tx);
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+
+      stateful.beginCommitEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+      stateful.beginRollbackEnd();
+      if (tm.getTransaction() != null) throw new RuntimeException("tx is associated");
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt;
-
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface TesterRemote
-{
-   void testStatelessWithTx() throws Exception;
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   void testStatelessWithoutTx() throws Exception;
-
-   void testStatefulWithTx() throws Exception;
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   void testStatefulWithoutTx() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt;
+
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface TesterRemote
+{
+   void testStatelessWithTx() throws Exception;
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   void testStatelessWithoutTx() throws Exception;
+
+   void testStatefulWithTx() throws Exception;
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   void testStatefulWithoutTx() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.bmt.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.bmt.TesterRemote;
-import org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterRemote;
-import org.jboss.embedded.junit.EmbeddedTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- */
-
-public class BMTUnitEmbeddedTest
-        extends BMTUnitTestCase
-{
-   public BMTUnitEmbeddedTest(String name)
-   {
-
-      super(name);
-
-   }
-   public static Test suite() throws Exception
-   {
-      return EmbeddedTestCase.getAdaptedSetup(BMTUnitEmbeddedTest.class, "bmt-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitEmbeddedTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.bmt.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.bmt.TesterRemote;
+import org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterRemote;
+import org.jboss.embedded.junit.EmbeddedTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ */
+
+public class BMTUnitEmbeddedTest
+        extends BMTUnitTestCase
+{
+   public BMTUnitEmbeddedTest(String name)
+   {
+
+      super(name);
+
+   }
+   public static Test suite() throws Exception
+   {
+      return EmbeddedTestCase.getAdaptedSetup(BMTUnitEmbeddedTest.class, "bmt-test.jar");
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.bmt.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.bmt.TesterRemote;
-import org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterRemote;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- */
-
-public class BMTUnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public BMTUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testStateless() throws Exception
-   {
-      TesterRemote tester = (TesterRemote)getInitialContext().lookup("TesterBean/remote");
-      tester.testStatelessWithoutTx();
-      tester.testStatelessWithTx();
-   }
-
-   public void testStateful() throws Exception
-   {
-      TesterRemote tester = (TesterRemote)getInitialContext().lookup("TesterBean/remote");
-      tester.testStatefulWithoutTx();
-      tester.testStatefulWithTx();
-   }
-   
-   public void testDeploymentDescriptorStateless() throws Exception
-   {
-      DeploymentDescriptorTesterRemote tester = (DeploymentDescriptorTesterRemote)getInitialContext().lookup("DeploymentDescriptorTester/remote");
-      tester.testStatelessWithoutTx();
-      tester.testStatelessWithTx();
-   }
-
-   public void testDeploymentDescriptorStateful() throws Exception
-   {
-      DeploymentDescriptorTesterRemote tester = (DeploymentDescriptorTesterRemote)getInitialContext().lookup("DeploymentDescriptorTester/remote");
-      tester.testStatefulWithoutTx();
-      tester.testStatefulWithTx();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(BMTUnitTestCase.class, "bmt-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.bmt.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.bmt.TesterRemote;
+import org.jboss.ejb3.test.bmt.DeploymentDescriptorTesterRemote;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ */
+
+public class BMTUnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public BMTUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testStateless() throws Exception
+   {
+      TesterRemote tester = (TesterRemote)getInitialContext().lookup("TesterBean/remote");
+      tester.testStatelessWithoutTx();
+      tester.testStatelessWithTx();
+   }
+
+   public void testStateful() throws Exception
+   {
+      TesterRemote tester = (TesterRemote)getInitialContext().lookup("TesterBean/remote");
+      tester.testStatefulWithoutTx();
+      tester.testStatefulWithTx();
+   }
+   
+   public void testDeploymentDescriptorStateless() throws Exception
+   {
+      DeploymentDescriptorTesterRemote tester = (DeploymentDescriptorTesterRemote)getInitialContext().lookup("DeploymentDescriptorTester/remote");
+      tester.testStatelessWithoutTx();
+      tester.testStatelessWithTx();
+   }
+
+   public void testDeploymentDescriptorStateful() throws Exception
+   {
+      DeploymentDescriptorTesterRemote tester = (DeploymentDescriptorTesterRemote)getInitialContext().lookup("DeploymentDescriptorTester/remote");
+      tester.testStatefulWithoutTx();
+      tester.testStatefulWithTx();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(BMTUnitTestCase.class, "bmt-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/bmt/unit/BMTUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/Tester.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/Tester.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/Tester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -24,10 +24,11 @@
 import java.io.File;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
+
+import org.jboss.cache.TreeCache;
 import org.jboss.cache.TreeCacheMBean;
 import org.jboss.cache.loader.FileCacheLoader;
 //import org.jboss.ejb3.cache.tree.PassivationEvictionPolicy;
-import org.jboss.ejb3.cache.tree.PassivationTreeCache;
 import org.jboss.mx.util.MBeanProxy;
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.system.server.ServerConfig;
@@ -44,7 +45,7 @@
    {
       ObjectName cacheON = new ObjectName("jboss.cache:service=EJB3TreeCache");
       TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxy.get(TreeCacheMBean.class, cacheON, server);
-      PassivationTreeCache cache = (PassivationTreeCache) mbean.getInstance();
+      TreeCache cache = (TreeCache) mbean.getInstance();
 //      PassivationEvictionPolicy policy = (PassivationEvictionPolicy) cache.getEvictionPolicy();
 //      policy.createRegion("/mySFSB", 100, 1L);
 

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.cache.nested;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface NestedStateful
-{
-   int increment();
-   void reset();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,20 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.cache.nested;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface NestedStateful
+{
+   int increment();
+   void reset();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.cache.nested;
-
-import org.jboss.logging.Logger;
-
-import javax.ejb.*;
-import java.rmi.dgc.VMID;
-
-/**
- * Nested SFSB
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateful(name="testNestedStateful")
- at org.jboss.annotation.ejb.cache.simple.CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
-public class NestedStatefulBean implements java.io.Serializable, NestedStateful
-{
-   private static Logger log = Logger.getLogger(NestedStatefulBean.class);
-   private int counter = 0;
-
-   public int increment()
-   {
-      log.debug("INCREMENT - nested counter: " + (counter++));
-      return counter;
-   }
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   public int getPostActivate()
-   {
-      return postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return prePassivateCalled;
-   }
-
-   public void reset()
-   {
-      counter = 0;
-      NestedStatefulBean.postActivateCalled = 0;
-      NestedStatefulBean.prePassivateCalled = 0;
-   }
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++NestedStatefulBean.postActivateCalled;
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++NestedStatefulBean.prePassivateCalled;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.cache.nested;
+
+import org.jboss.logging.Logger;
+
+import javax.ejb.*;
+import java.rmi.dgc.VMID;
+
+/**
+ * Nested SFSB
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateful(name="testNestedStateful")
+ at org.jboss.annotation.ejb.cache.simple.CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+public class NestedStatefulBean implements java.io.Serializable, NestedStateful
+{
+   private static Logger log = Logger.getLogger(NestedStatefulBean.class);
+   private int counter = 0;
+
+   public int increment()
+   {
+      log.debug("INCREMENT - nested counter: " + (counter++));
+      return counter;
+   }
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   public int getPostActivate()
+   {
+      return postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return prePassivateCalled;
+   }
+
+   public void reset()
+   {
+      counter = 0;
+      NestedStatefulBean.postActivateCalled = 0;
+      NestedStatefulBean.prePassivateCalled = 0;
+   }
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++NestedStatefulBean.postActivateCalled;
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++NestedStatefulBean.prePassivateCalled;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/NestedStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,170 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.cache.nested;
-
-import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
-
-import javax.interceptor.Interceptors;
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remove;
-import javax.ejb.EJBException;
-import java.rmi.dgc.VMID;
-
-/**
- * SFSB with nested bean
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateful(name="testParentStateful")
- at org.jboss.annotation.ejb.cache.simple.CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
- at Remote(ParentStatefulRemote.class)
-public class ParentStatefulBean implements java.io.Serializable, ParentStatefulRemote
-{
-   private static Logger log = Logger.getLogger(ParentStatefulBean.class);
-   private int counter = 0;
-   private String state;
-   public transient VMID myId = null;
-   public String name;
-
-   @EJB
-   private NestedStateful nested;
-
-   public int increment()
-   {
-      counter = nested.increment();
-
-      log.debug("INCREMENT - parent counter: " + counter);
-      return counter;
-   }
-
-   public String getHostAddress()
-   {
-      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
-   }
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   /**
-    * Sleep to test
-    * @throws Exception
-    */
-   public void longRunning() throws Exception
-   {
-      log.debug("+++ longRunning() enter ");
-      Thread.sleep(10000);
-      log.debug("+++ longRunning() leave ");
-   }
-
-   public int getPostActivate()
-   {
-      return ParentStatefulBean.postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return ParentStatefulBean.prePassivateCalled;
-   }
-
-   public int getNestedPostActivate()
-   {
-      return NestedStatefulBean.postActivateCalled;
-   }
-
-   public int getNestedPrePassivate()
-   {
-      return NestedStatefulBean.prePassivateCalled;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-
-   public String getState()
-   {
-      log.debug("getState(): entering ...");
-      return this.state;
-   }
-
-   public void reset()
-   {
-      state = null;
-      counter = 0;
-      ParentStatefulBean.postActivateCalled = 0;
-      ParentStatefulBean.prePassivateCalled = 0;
-   }
-
-   public void resetActivationCounter()
-   {
-      ParentStatefulBean.postActivateCalled = 0;
-      ParentStatefulBean.prePassivateCalled = 0;
-      NestedStatefulBean.postActivateCalled = 0;
-      NestedStatefulBean.prePassivateCalled = 0;
-   }
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++ParentStatefulBean.postActivateCalled;
-      if (this.myId == null)
-      {
-         //it is a failover: we need to assign ourself an id
-         this.myId = new VMID();
-      }
-      log.debug("Activate. My ID: " + this.myId + " name: " + this.name);
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++ParentStatefulBean.prePassivateCalled;
-      log.debug("Passivate. My ID: " + this.myId + " name: " + this.name);
-   }
-
-   @Remove
-   public void remove()
-   {
-   }
-
-   @PostConstruct
-   public void ejbCreate()
-   {
-      this.myId = new VMID();
-      log.debug("My ID: " + this.myId);
-   }
-
-   // Remote Interface implementation ----------------------------------------------
-
-   public void setName(String name)
-   {
-      this.name = name;
-      log.debug("Name set to " + name);
-   }
-
-   public void setNameOnlyOnNode(String name, VMID node)
-   {
-      if (node.equals(this.myId))
-         this.setName(name);
-      else
-         throw new EJBException("Trying to assign value on node " + this.myId + " but this node expected: " + node);
-   }
-
-   public void setUpFailover(String failover) {
-      // To setup the failover property
-      log.debug("Setting up failover property: " +failover);
-      System.setProperty ("JBossCluster-DoFail", failover);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.cache.nested;
+
+import org.jboss.logging.Logger;
+import org.jboss.system.server.ServerConfig;
+
+import javax.interceptor.Interceptors;
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+import javax.ejb.Stateful;
+import javax.ejb.Remote;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remove;
+import javax.ejb.EJBException;
+import java.rmi.dgc.VMID;
+
+/**
+ * SFSB with nested bean
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateful(name="testParentStateful")
+ at org.jboss.annotation.ejb.cache.simple.CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at Remote(ParentStatefulRemote.class)
+public class ParentStatefulBean implements java.io.Serializable, ParentStatefulRemote
+{
+   private static Logger log = Logger.getLogger(ParentStatefulBean.class);
+   private int counter = 0;
+   private String state;
+   public transient VMID myId = null;
+   public String name;
+
+   @EJB
+   private NestedStateful nested;
+
+   public int increment()
+   {
+      counter = nested.increment();
+
+      log.debug("INCREMENT - parent counter: " + counter);
+      return counter;
+   }
+
+   public String getHostAddress()
+   {
+      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
+   }
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   /**
+    * Sleep to test
+    * @throws Exception
+    */
+   public void longRunning() throws Exception
+   {
+      log.debug("+++ longRunning() enter ");
+      Thread.sleep(10000);
+      log.debug("+++ longRunning() leave ");
+   }
+
+   public int getPostActivate()
+   {
+      return ParentStatefulBean.postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return ParentStatefulBean.prePassivateCalled;
+   }
+
+   public int getNestedPostActivate()
+   {
+      return NestedStatefulBean.postActivateCalled;
+   }
+
+   public int getNestedPrePassivate()
+   {
+      return NestedStatefulBean.prePassivateCalled;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+
+   public String getState()
+   {
+      log.debug("getState(): entering ...");
+      return this.state;
+   }
+
+   public void reset()
+   {
+      state = null;
+      counter = 0;
+      ParentStatefulBean.postActivateCalled = 0;
+      ParentStatefulBean.prePassivateCalled = 0;
+   }
+
+   public void resetActivationCounter()
+   {
+      ParentStatefulBean.postActivateCalled = 0;
+      ParentStatefulBean.prePassivateCalled = 0;
+      NestedStatefulBean.postActivateCalled = 0;
+      NestedStatefulBean.prePassivateCalled = 0;
+   }
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++ParentStatefulBean.postActivateCalled;
+      if (this.myId == null)
+      {
+         //it is a failover: we need to assign ourself an id
+         this.myId = new VMID();
+      }
+      log.debug("Activate. My ID: " + this.myId + " name: " + this.name);
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++ParentStatefulBean.prePassivateCalled;
+      log.debug("Passivate. My ID: " + this.myId + " name: " + this.name);
+   }
+
+   @Remove
+   public void remove()
+   {
+   }
+
+   @PostConstruct
+   public void ejbCreate()
+   {
+      this.myId = new VMID();
+      log.debug("My ID: " + this.myId);
+   }
+
+   // Remote Interface implementation ----------------------------------------------
+
+   public void setName(String name)
+   {
+      this.name = name;
+      log.debug("Name set to " + name);
+   }
+
+   public void setNameOnlyOnNode(String name, VMID node)
+   {
+      if (node.equals(this.myId))
+         this.setName(name);
+      else
+         throw new EJBException("Trying to assign value on node " + this.myId + " but this node expected: " + node);
+   }
+
+   public void setUpFailover(String failover) {
+      // To setup the failover property
+      log.debug("Setting up failover property: " +failover);
+      System.setProperty ("JBossCluster-DoFail", failover);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.cache.nested;
-
-import java.rmi.dgc.VMID;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface ParentStatefulRemote
-{
-   int increment();
-   String getHostAddress();
-
-   int getPostActivate();
-
-   int getPrePassivate();
-
-   int getNestedPostActivate();
-
-   int getNestedPrePassivate();
-
-   void setState(String state);
-
-   String getState();
-
-   void reset();
-
-   void resetActivationCounter();
-
-   void longRunning() throws Exception;
-
-   void remove();
-
-   public void setName(String name);
-
-   public void setNameOnlyOnNode(String name, VMID node);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.cache.nested;
+
+import java.rmi.dgc.VMID;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface ParentStatefulRemote
+{
+   int increment();
+   String getHostAddress();
+
+   int getPostActivate();
+
+   int getPrePassivate();
+
+   int getNestedPostActivate();
+
+   int getNestedPrePassivate();
+
+   void setState(String state);
+
+   String getState();
+
+   void reset();
+
+   void resetActivationCounter();
+
+   void longRunning() throws Exception;
+
+   void remove();
+
+   public void setName(String name);
+
+   public void setNameOnlyOnNode(String name, VMID node);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/nested/ParentStatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/CacheUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/CacheUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/CacheUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.cache.unit;
-
-import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-import org.jboss.test.JBossTestCase;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class CacheUnitTestCase
-extends JBossTestCase
-{
-   org.apache.log4j.Category log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public CacheUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testSimple() throws Exception
-   {
-      /* Tests are in StatefulUnit now.
-      MBeanServerConnection server = getServer();
-      ObjectName testerName = new ObjectName("jboss.ejb3:service=Tester,test=cache");
-      Object[] params = {};
-      String[] sig = {};
-      server.invoke(testerName, "test", params, sig);
-      */
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(CacheUnitTestCase.class, "testejb3-cache-service.xml, cache-test.sar");
-   }
-
-}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/NestedBeanUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/NestedBeanUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/NestedBeanUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,121 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.cache.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.cache.nested.ParentStatefulRemote;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-import junit.framework.Test;
-
-/**
- * Test nested SFSB for load-balancing and failover behaviour
- *
- * @author  Ben.Wang at jboss.org
- * @version $Revision$
- */
-public class NestedBeanUnitTestCase extends JBossTestCase
-{
-   static boolean deployed = false;
-   public static int test = 0;
-   static Date startDate = new Date();
-
-   protected final String namingFactory =
-   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-
-   protected final String providerURL =
-   System.getProperty(Context.PROVIDER_URL);
-
-   public NestedBeanUnitTestCase (String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(NestedBeanUnitTestCase.class, "cache-test.jar");
-   }
-
-   public void testBasic()
-   throws Exception
-   {
-      getLog().debug(NestedBeanUnitTestCase.test +"- "
-              +"Trying the context...");
-
-      getLog().debug("Test Nested Stateful Bean");
-      getLog().debug("==================================");
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Looking up testBasic...");
-      InitialContext ctx = getInitialContext();
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-
-      stateful.setName("The Code");
-      _sleep(300);
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   public void testPassivation()
-   throws Exception
-   {
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext();
-
-      getLog().debug("Test Nested Stateful Bean");
-      getLog().debug("==================================");
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-
-      stateful.setName("The Code");
-      _sleep(300);
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-      _sleep(11000);
-      assertEquals("Counter: ", 3, stateful.increment());
-      assertEquals(1, stateful.getPrePassivate());
-      assertEquals(1, stateful.getPostActivate());
-      assertEquals(1, stateful.getNestedPrePassivate());
-      assertEquals(1, stateful.getNestedPostActivate());
-
-      stateful.remove();
-      getLog().debug("ok: done");
-      // passivate for the second time.
-      _sleep(12000);
-   }
-
-   protected void _sleep(long time)
-   {
-      try {
-         Thread.sleep(time);
-      } catch (InterruptedException e) {
-         e.printStackTrace();
-      }
-   }
-}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/StatefulUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/StatefulUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/cache/unit/StatefulUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -38,7 +38,7 @@
 public class StatefulUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.circulardependency;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.naming.NamingException;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(StatelessRemote.class)
- at RemoteBinding(jndiBinding = "Stateless1")
-public class StatelessBean1 implements StatelessRemote
-{
-   private static final Logger log = Logger.getLogger(StatelessBean1.class);
-   
-   @EJB(beanName="StatelessBean2") StatelessRemote stateless;
-   
-   public int method(int i) throws NamingException
-   {
-      return stateless.method(i);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.circulardependency;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+ at RemoteBinding(jndiBinding = "Stateless1")
+public class StatelessBean1 implements StatelessRemote
+{
+   private static final Logger log = Logger.getLogger(StatelessBean1.class);
+   
+   @EJB(beanName="StatelessBean2") StatelessRemote stateless;
+   
+   public int method(int i) throws NamingException
+   {
+      return stateless.method(i);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.circulardependency;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.naming.NamingException;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(StatelessRemote.class)
- at RemoteBinding(jndiBinding = "Stateless2")
-public class StatelessBean2 implements StatelessRemote
-{
-   private static final Logger log = Logger.getLogger(StatelessBean2.class);
-   
-   @EJB(beanName="StatelessBean1") StatelessRemote stateless;
-   
-   public int method(int i) throws NamingException
-   {
-      return i;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.circulardependency;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+ at RemoteBinding(jndiBinding = "Stateless2")
+public class StatelessBean2 implements StatelessRemote
+{
+   private static final Logger log = Logger.getLogger(StatelessBean2.class);
+   
+   @EJB(beanName="StatelessBean1") StatelessRemote stateless;
+   
+   public int method(int i) throws NamingException
+   {
+      return i;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.circulardependency;
-
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatelessRemote
-{
-   int method(int i) throws NamingException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.circulardependency;
+
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatelessRemote
+{
+   int method(int i) throws NamingException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.circulardependency.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.test.circulardependency.StatelessRemote;
-import org.jboss.embedded.junit.EmbeddedTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision: 44507 $
- */
-public class IgnoreDependencyEmbeddedTest extends IgnoreDependencyTestCase
-{
-
-   public IgnoreDependencyEmbeddedTest(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return EmbeddedTestCase.getAdaptedSetup(IgnoreDependencyEmbeddedTest.class, "circulardependency-test.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyEmbeddedTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.circulardependency.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.logging.Logger;
+import org.jboss.ejb3.test.circulardependency.StatelessRemote;
+import org.jboss.embedded.junit.EmbeddedTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision: 44507 $
+ */
+public class IgnoreDependencyEmbeddedTest extends IgnoreDependencyTestCase
+{
+
+   public IgnoreDependencyEmbeddedTest(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return EmbeddedTestCase.getAdaptedSetup(IgnoreDependencyEmbeddedTest.class, "circulardependency-test.jar");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.circulardependency.unit;
-
-import javax.ejb.EJBAccessException;
-
-import org.jboss.ejb3.test.circulardependency.StatelessRemote;
-
-import org.jboss.logging.Logger;
-
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class IgnoreDependencyTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(IgnoreDependencyTestCase.class);
-
-   public IgnoreDependencyTestCase(String name)
-   {
-      super(name);
-   }
- 
-   public void testCircular() throws Exception
-   {
-      StatelessRemote stateless = (StatelessRemote) getInitialContext().lookup("Stateless1");
-      assertNotNull(stateless);
-      
-      assertEquals(123, stateless.method(123));
-   }
- 
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(IgnoreDependencyTestCase.class, "circulardependency-test.jar");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.circulardependency.unit;
+
+import javax.ejb.EJBAccessException;
+
+import org.jboss.ejb3.test.circulardependency.StatelessRemote;
+
+import org.jboss.logging.Logger;
+
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class IgnoreDependencyTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(IgnoreDependencyTestCase.class);
+
+   public IgnoreDependencyTestCase(String name)
+   {
+      super(name);
+   }
+ 
+   public void testCircular() throws Exception
+   {
+      StatelessRemote stateless = (StatelessRemote) getInitialContext().lookup("Stateless1");
+      assertNotNull(stateless);
+      
+      assertEquals(123, stateless.method(123));
+   }
+ 
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(IgnoreDependencyTestCase.class, "circulardependency-test.jar");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/circulardependency/unit/IgnoreDependencyTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.classloader;
-
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30 
-{
-   Throwable checkVersion();
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.classloader;
+
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30 
+{
+   Throwable checkVersion();
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.classloader;
-
-import java.lang.reflect.Method;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import java.net.URL;
-
-import org.apache.log4j.Category;
-import org.apache.log4j.PropertyConfigurator;
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="Session30")
- at Remote(Session30.class)
- at RemoteBinding(jndiBinding = "Session30")
-public class Session30Bean implements Session30
-{
-   private Category log;
-   
-   public Throwable checkVersion()
-   {
-      Throwable error = null;
-      // Validate the log4j env against the 1.1.3 classes
-      try
-      {
-         Class categoryClass = Category.class;
-         System.out.println("Category.CS: "+categoryClass.getProtectionDomain().getCodeSource());
-         // Check that the 1.1.3 assert(boolean, String) method exists
-         Class[] sig = {boolean.class, String.class};
-         Method m = categoryClass.getDeclaredMethod("assert", sig);
-         System.out.println("found assert method: "+m);
-         // Find the log4j.properties file
-         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-         URL resURL = loader.getResource("log4j.properties");
-         System.out.println("found log4j.properties: "+resURL);
-         PropertyConfigurator config = new PropertyConfigurator();
-         log = Category.getInstance(Session30Bean.class);
-         config.configure(resURL);
-      }
-      catch(Throwable t)
-      {
-         t.printStackTrace();
-         error = t;
-      }
-      return error;
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.classloader;
+
+import java.lang.reflect.Method;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import java.net.URL;
+
+import org.apache.log4j.Category;
+import org.apache.log4j.PropertyConfigurator;
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="Session30")
+ at Remote(Session30.class)
+ at RemoteBinding(jndiBinding = "Session30")
+public class Session30Bean implements Session30
+{
+   private Category log;
+   
+   public Throwable checkVersion()
+   {
+      Throwable error = null;
+      // Validate the log4j env against the 1.1.3 classes
+      try
+      {
+         Class categoryClass = Category.class;
+         System.out.println("Category.CS: "+categoryClass.getProtectionDomain().getCodeSource());
+         // Check that the 1.1.3 assert(boolean, String) method exists
+         Class[] sig = {boolean.class, String.class};
+         Method m = categoryClass.getDeclaredMethod("assert", sig);
+         System.out.println("found assert method: "+m);
+         // Find the log4j.properties file
+         ClassLoader loader = Thread.currentThread().getContextClassLoader();
+         URL resURL = loader.getResource("log4j.properties");
+         System.out.println("found log4j.properties: "+resURL);
+         PropertyConfigurator config = new PropertyConfigurator();
+         log = Category.getInstance(Session30Bean.class);
+         config.configure(resURL);
+      }
+      catch(Throwable t)
+      {
+         t.printStackTrace();
+         error = t;
+      }
+      return error;
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.classloader;
-
-import java.lang.reflect.Method;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import java.net.URL;
-
-import org.apache.log4j.Category;
-import org.apache.log4j.PropertyConfigurator;
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="Shared")
- at Remote(Session30.class)
- at RemoteBinding(jndiBinding = "Shared")
-public class SharedBean implements Session30
-{
-   private Category log;
-   
-   public Throwable checkVersion()
-   {
-      Throwable error = null;
-      // Validate the log4j env against the 1.1.3 classes
-      try
-      {
-         Class categoryClass = Category.class;
-         System.out.println("Category.CS: "+categoryClass.getProtectionDomain().getCodeSource());
-         // Check that the 1.1.3 assert(boolean, String) method exists
-         Class[] sig = {boolean.class, String.class};
-         Method m = categoryClass.getDeclaredMethod("assert", sig);
-         System.out.println("found assert method: "+m);
-         // Find the log4j.properties file
-         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-         URL resURL = loader.getResource("log4j.properties");
-         System.out.println("found log4j.properties: "+resURL);
-         PropertyConfigurator config = new PropertyConfigurator();
-         log = Category.getInstance(Session30Bean.class);
-         config.configure(resURL);
-      }
-      catch(Throwable t)
-      {
-         t.printStackTrace();
-         error = t;
-      }
-      return error;
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.classloader;
+
+import java.lang.reflect.Method;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import java.net.URL;
+
+import org.apache.log4j.Category;
+import org.apache.log4j.PropertyConfigurator;
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="Shared")
+ at Remote(Session30.class)
+ at RemoteBinding(jndiBinding = "Shared")
+public class SharedBean implements Session30
+{
+   private Category log;
+   
+   public Throwable checkVersion()
+   {
+      Throwable error = null;
+      // Validate the log4j env against the 1.1.3 classes
+      try
+      {
+         Class categoryClass = Category.class;
+         System.out.println("Category.CS: "+categoryClass.getProtectionDomain().getCodeSource());
+         // Check that the 1.1.3 assert(boolean, String) method exists
+         Class[] sig = {boolean.class, String.class};
+         Method m = categoryClass.getDeclaredMethod("assert", sig);
+         System.out.println("found assert method: "+m);
+         // Find the log4j.properties file
+         ClassLoader loader = Thread.currentThread().getContextClassLoader();
+         URL resURL = loader.getResource("log4j.properties");
+         System.out.println("found log4j.properties: "+resURL);
+         PropertyConfigurator config = new PropertyConfigurator();
+         log = Category.getInstance(Session30Bean.class);
+         config.configure(resURL);
+      }
+      catch(Throwable t)
+      {
+         t.printStackTrace();
+         error = t;
+      }
+      return error;
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.classloader;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-
-public class TestObject implements java.io.Serializable
-{
-   public TestObject()
-   {
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.classloader;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+
+public class TestObject implements java.io.Serializable
+{
+   public TestObject()
+   {
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/TestObject.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.classloader;
-
-import java.lang.reflect.Method;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import java.net.URL;
-
-import org.apache.log4j.Category;
-import org.apache.log4j.PropertyConfigurator;
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="Unshared")
- at Remote(Session30.class)
- at RemoteBinding(jndiBinding = "Unshared")
-public class UnsharedBean implements Session30
-{
-   private Category log;
-   
-   public Throwable checkVersion()
-   {
-      Throwable error = null;
-      // Validate the log4j env against the 1.1.3 classes
-      try
-      {
-         Class categoryClass = Category.class;
-         System.out.println("Category.CS: "+categoryClass.getProtectionDomain().getCodeSource());
-         // Check that the 1.1.3 assert(boolean, String) method exists
-         Class[] sig = {boolean.class, String.class};
-         Method m = categoryClass.getDeclaredMethod("assert", sig);
-         System.out.println("found assert method: "+m);
-         // Find the log4j.properties file
-         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-         URL resURL = loader.getResource("log4j.properties");
-         System.out.println("found log4j.properties: "+resURL);
-         PropertyConfigurator config = new PropertyConfigurator();
-         log = Category.getInstance(Session30Bean.class);
-         config.configure(resURL);
-      }
-      catch(Throwable t)
-      {
-         t.printStackTrace();
-         error = t;
-      }
-      return error;
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.classloader;
+
+import java.lang.reflect.Method;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import java.net.URL;
+
+import org.apache.log4j.Category;
+import org.apache.log4j.PropertyConfigurator;
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="Unshared")
+ at Remote(Session30.class)
+ at RemoteBinding(jndiBinding = "Unshared")
+public class UnsharedBean implements Session30
+{
+   private Category log;
+   
+   public Throwable checkVersion()
+   {
+      Throwable error = null;
+      // Validate the log4j env against the 1.1.3 classes
+      try
+      {
+         Class categoryClass = Category.class;
+         System.out.println("Category.CS: "+categoryClass.getProtectionDomain().getCodeSource());
+         // Check that the 1.1.3 assert(boolean, String) method exists
+         Class[] sig = {boolean.class, String.class};
+         Method m = categoryClass.getDeclaredMethod("assert", sig);
+         System.out.println("found assert method: "+m);
+         // Find the log4j.properties file
+         ClassLoader loader = Thread.currentThread().getContextClassLoader();
+         URL resURL = loader.getResource("log4j.properties");
+         System.out.println("found log4j.properties: "+resURL);
+         PropertyConfigurator config = new PropertyConfigurator();
+         log = Category.getInstance(Session30Bean.class);
+         config.configure(resURL);
+      }
+      catch(Throwable t)
+      {
+         t.printStackTrace();
+         error = t;
+      }
+      return error;
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.classloader.unit;
-
-import junit.framework.Test;
-
-import javax.naming.InitialContext;
-
-import org.jboss.test.JBossTestCase;
-
-import org.jboss.ejb3.test.classloader.Session30;
-
-/** 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ClassloaderUnitTestCase extends JBossTestCase
-{
-   
-   public ClassloaderUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEJBOverride() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      Session30 stateless = (Session30)jndiContext.lookup("Session30");
-      assertNull(stateless.checkVersion());
-   }
-   
-   public void testSharedRepository() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      Session30 stateless = (Session30)jndiContext.lookup("Shared");
-      assertNull(stateless.checkVersion());
-   }
-   
-   public void testUnharedRepository() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      Session30 stateless = (Session30)jndiContext.lookup("Unshared");
-      Throwable t = stateless.checkVersion();
-      assertNotNull(t);
-      assertTrue(t instanceof java.lang.NoSuchMethodException);
-   }
-   
-   /**
-    * Setup the test suite.
-    */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ClassloaderUnitTestCase.class, "classloader.jar, classloader-shared.jar, classloader-unshared.jar");
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.classloader.unit;
+
+import junit.framework.Test;
+
+import javax.naming.InitialContext;
+
+import org.jboss.test.JBossTestCase;
+
+import org.jboss.ejb3.test.classloader.Session30;
+
+/** 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ClassloaderUnitTestCase extends JBossTestCase
+{
+   
+   public ClassloaderUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEJBOverride() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      Session30 stateless = (Session30)jndiContext.lookup("Session30");
+      assertNull(stateless.checkVersion());
+   }
+   
+   public void testSharedRepository() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      Session30 stateless = (Session30)jndiContext.lookup("Shared");
+      assertNull(stateless.checkVersion());
+   }
+   
+   public void testUnharedRepository() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      Session30 stateless = (Session30)jndiContext.lookup("Unshared");
+      Throwable t = stateless.checkVersion();
+      assertNotNull(t);
+      assertTrue(t instanceof java.lang.NoSuchMethodException);
+   }
+   
+   /**
+    * Setup the test suite.
+    */
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ClassloaderUnitTestCase.class, "classloader.jar, classloader-shared.jar, classloader-unshared.jar");
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/classloader/unit/ClassloaderUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.clientinterceptor;
-
-import java.io.Serializable;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.util.PayloadKey;
-import org.jboss.ejb3.interceptor.ClientInterceptorUtil;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class CustomInterceptor implements Interceptor, Serializable
-{
-   public String getName()
-   {
-      return "CustomInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      ClientInterceptorUtil.addMetadata(invocation, "as_is", "AS_IS", PayloadKey.AS_IS);
-      ClientInterceptorUtil.addMetadata(invocation, "marshalled", new NeedsMarshallingValue("NEEDS MARSHALLING"));
-      
-      return invocation.invokeNext();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.clientinterceptor;
+
+import java.io.Serializable;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.util.PayloadKey;
+import org.jboss.ejb3.interceptor.ClientInterceptorUtil;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class CustomInterceptor implements Interceptor, Serializable
+{
+   public String getName()
+   {
+      return "CustomInterceptor";
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      ClientInterceptorUtil.addMetadata(invocation, "as_is", "AS_IS", PayloadKey.AS_IS);
+      ClientInterceptorUtil.addMetadata(invocation, "marshalled", new NeedsMarshallingValue("NEEDS MARSHALLING"));
+      
+      return invocation.invokeNext();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/CustomInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.clientinterceptor;
-
-import java.io.Serializable;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class NeedsMarshallingValue implements Serializable
-{
-   String val;
-
-   public NeedsMarshallingValue(String s)
-   {
-      val = s;
-   }
-
-   public String getValue()
-   {
-      return val;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.clientinterceptor;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class NeedsMarshallingValue implements Serializable
+{
+   String val;
+
+   public NeedsMarshallingValue(String s)
+   {
+      val = s;
+   }
+
+   public String getValue()
+   {
+      return val;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/NeedsMarshallingValue.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.clientinterceptor;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
- at RemoteBinding(interceptorStack="CustomStatelessSessionClientInterceptors")
-public class StatelessBean implements StatelessRemote
-{
-   boolean interceptorFired;
-
-   public void test()
-   {
-      System.out.println("test()");
-      if (!interceptorFired) throw new RuntimeException("interceptor did not work");
-   }
-
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("intercept()");
-      String asisData = (String)ctx.getContextData().get("as_is");
-
-      if (!"AS_IS".equals(asisData))
-      {
-         throw new RuntimeException("Wrong test metadata: " + asisData);
-      }
-
-      NeedsMarshallingValue marshalledValue = (NeedsMarshallingValue)ctx.getContextData().get("marshalled");
-      if (marshalledValue == null)
-      {
-         throw new RuntimeException("Null marshalled value");
-      }
-
-      if (!marshalledValue.getValue().equals("NEEDS MARSHALLING"))
-      {
-         throw new RuntimeException("Wrong marshalled value: " + marshalledValue.getValue());
-      }
-
-      System.out.println("values ok");
-      interceptorFired = true;
-      return ctx.proceed();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.clientinterceptor;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at RemoteBinding(interceptorStack="CustomStatelessSessionClientInterceptors")
+public class StatelessBean implements StatelessRemote
+{
+   boolean interceptorFired;
+
+   public void test()
+   {
+      System.out.println("test()");
+      if (!interceptorFired) throw new RuntimeException("interceptor did not work");
+   }
+
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("intercept()");
+      String asisData = (String)ctx.getContextData().get("as_is");
+
+      if (!"AS_IS".equals(asisData))
+      {
+         throw new RuntimeException("Wrong test metadata: " + asisData);
+      }
+
+      NeedsMarshallingValue marshalledValue = (NeedsMarshallingValue)ctx.getContextData().get("marshalled");
+      if (marshalledValue == null)
+      {
+         throw new RuntimeException("Null marshalled value");
+      }
+
+      if (!marshalledValue.getValue().equals("NEEDS MARSHALLING"))
+      {
+         throw new RuntimeException("Wrong marshalled value: " + marshalledValue.getValue());
+      }
+
+      System.out.println("values ok");
+      interceptorFired = true;
+      return ctx.proceed();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.clientinterceptor;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface StatelessRemote
-{
-   public void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.clientinterceptor;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatelessRemote
+{
+   public void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clientinterceptor.unit;
-
-import org.jboss.ejb3.test.clientinterceptor.StatelessRemote;
-import org.jboss.test.JBossTestCase;
-
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class ClientInterceptorTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public ClientInterceptorTestCase(String name)
-   {
-
-      super(name);
-
-   }
-   
-   public void testAll() throws Exception
-   {
-      StatelessRemote remote = (StatelessRemote)getInitialContext().lookup("StatelessBean/remote");
-      remote.test();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return JBossTestCase.getDeploySetup(ClientInterceptorTestCase.class, "clientinterceptor-test.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clientinterceptor.unit;
+
+import org.jboss.ejb3.test.clientinterceptor.StatelessRemote;
+import org.jboss.test.JBossTestCase;
+
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class ClientInterceptorTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public ClientInterceptorTestCase(String name)
+   {
+
+      super(name);
+
+   }
+   
+   public void testAll() throws Exception
+   {
+      StatelessRemote remote = (StatelessRemote)getInitialContext().lookup("StatelessBean/remote");
+      remote.test();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return JBossTestCase.getDeploySetup(ClientInterceptorTestCase.class, "clientinterceptor-test.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/unit/ClientInterceptorTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,4 +36,6 @@
    Customer findByCustomerId(Integer id);
    
    void loadedFromCache();
+   
+   void cleanup();
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -22,9 +22,11 @@
 package org.jboss.ejb3.test.clusteredentity;
 
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 import javax.ejb.Remote;
+import javax.ejb.Remove;
 import javax.ejb.Stateless;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -33,8 +35,8 @@
 
 import org.jboss.cache.Fqn;
 import org.jboss.cache.TreeCache;
+import org.jboss.cache.TreeCacheMBean;
 import org.jboss.cache.TreeCacheListener;
-import org.jboss.cache.TreeCacheMBean;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jgroups.View;
@@ -154,6 +156,20 @@
       }
       
    }
+   
+   @Remove
+   public void cleanup()
+   {
+      Customer c = findByCustomerId(1);
+      if (c != null)
+      {
+         Set contacts = c.getContacts();
+         for (Iterator it = contacts.iterator(); it.hasNext();)
+            manager.remove(it.next());
+         c.setContacts(null);
+         manager.remove(c);
+      }
+   }
 
    private TreeCache getCache() throws Exception
    {
@@ -173,48 +189,73 @@
          visited.clear();
       }
       
-      public void cacheStarted(TreeCache cache)
+      public void nodeVisited(Fqn fqn, boolean pre)
       {
+         if (!pre)
+         {
+            System.out.println("MyListener - Visiting node " + fqn.toString());
+            String name = fqn.toString();
+            String token = ".clusteredentity.";
+            int index = name.indexOf(token);
+            index += token.length();
+            name = name.substring(index);
+            System.out.println(name);
+            visited.add(name);
+         }
       }
 
-      public void cacheStopped(TreeCache cache)
+      public void cacheStarted(TreeCache arg0)
       {
+         // TODO Auto-generated method stub
+         
       }
 
-      public void nodeCreated(Fqn fqn)
+      public void cacheStopped(TreeCache arg0)
       {
+         // TODO Auto-generated method stub
+         
       }
 
-      public void nodeEvicted(Fqn fqn)
+      public void nodeCreated(Fqn arg0)
       {
+         // TODO Auto-generated method stub
+         
       }
 
-      public void nodeLoaded(Fqn fqn)
+      public void nodeEvicted(Fqn arg0)
       {
+         // TODO Auto-generated method stub
+         
       }
 
-      public void nodeModified(Fqn fqn)
+      public void nodeLoaded(Fqn arg0)
       {
+         // TODO Auto-generated method stub
+         
       }
 
-      public void nodeRemoved(Fqn fqn)
+      public void nodeModified(Fqn arg0)
       {
+         // TODO Auto-generated method stub
+         
       }
 
-      public void nodeVisited(Fqn fqn)
+      public void nodeRemoved(Fqn arg0)
       {
-         System.out.println("MyListener - Visiting node " + fqn.toString());
-         String name = fqn.toString();
-         String token = ".clusteredentity.";
-         int index = name.indexOf(token);
-         index += token.length();
-         name = name.substring(index);
-         System.out.println(name);
-         visited.add(name);
+         // TODO Auto-generated method stub
+         
       }
 
-      public void viewChange(View new_view)
+      public void nodeVisited(Fqn arg0)
       {
+         // TODO Auto-generated method stub
+         
       }
+
+      public void viewChange(View arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
    }
 }

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-package org.jboss.ejb3.test.clusteredentity.classloader;
-
-import java.io.Serializable;
-
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.QueryHint;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
- at Entity
- at Cache (usage=CacheConcurrencyStrategy.TRANSACTIONAL)
- at NamedQueries({
-   @NamedQuery(name="account.totalbalance.default",query="select account.balance from Account as account where account.accountHolder = ?1",
-               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
-   @NamedQuery(name="account.totalbalance.namedregion",query="select account.balance from Account as account where account.accountHolder = ?1",
-               hints={@QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"),
-                      @QueryHint(name="org.hibernate.cacheable",value="true")
-                     }),
-   @NamedQuery(name="account.branch.default",query="select account.branch from Account as account where account.accountHolder = ?1",
-               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
-   @NamedQuery(name="account.branch.namedregion",query="select account.branch from Account as account where account.accountHolder = ?1",
-               hints={@QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"),
-                      @QueryHint(name="org.hibernate.cacheable",value="true")
-                     }),
-   @NamedQuery(name="account.bybranch.default",query="select account from Account as account where account.branch = ?1",
-               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
-   @NamedQuery(name="account.bybranch.namedregion",query="select account from Account as account where account.branch = ?1",
-               hints={@QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"),
-                      @QueryHint(name="org.hibernate.cacheable",value="true")
-                     })
-})
-public class Account implements Serializable
-{
-   
-   private static final long serialVersionUID = 1L;
-   
-   private Integer id;
-   private AccountHolderPK accountHolder;
-   private Integer balance;
-   private String branch;
-   
-   @Id
-   public Integer getId()
-   {
-      return id;
-   }
-   public void setId(Integer id)
-   {
-      this.id = id;
-   }
-   
-//   @Embedded
-   @Lob
-   public AccountHolderPK getAccountHolder()
-   {
-      return accountHolder;
-   }
-   public void setAccountHolder(AccountHolderPK accountHolder)
-   {
-      this.accountHolder = accountHolder;
-   }
-   
-   public Integer getBalance()
-   {
-      return balance;
-   }
-   public void setBalance(Integer balance)
-   {
-      this.balance = balance;
-   }
-   public String getBranch()
-   {
-      return branch;
-   }
-   public void setBranch(String branch)
-   {
-      this.branch = branch;
-   }
-   
-   
-   
-   
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+package org.jboss.ejb3.test.clusteredentity.classloader;
+
+import java.io.Serializable;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.QueryHint;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+ at Entity
+ at Cache (usage=CacheConcurrencyStrategy.TRANSACTIONAL)
+ at NamedQueries({
+   @NamedQuery(name="account.totalbalance.default",query="select account.balance from Account as account where account.accountHolder = ?1",
+               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
+   @NamedQuery(name="account.totalbalance.namedregion",query="select account.balance from Account as account where account.accountHolder = ?1",
+               hints={@QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"),
+                      @QueryHint(name="org.hibernate.cacheable",value="true")
+                     }),
+   @NamedQuery(name="account.branch.default",query="select account.branch from Account as account where account.accountHolder = ?1",
+               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
+   @NamedQuery(name="account.branch.namedregion",query="select account.branch from Account as account where account.accountHolder = ?1",
+               hints={@QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"),
+                      @QueryHint(name="org.hibernate.cacheable",value="true")
+                     }),
+   @NamedQuery(name="account.bybranch.default",query="select account from Account as account where account.branch = ?1",
+               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
+   @NamedQuery(name="account.bybranch.namedregion",query="select account from Account as account where account.branch = ?1",
+               hints={@QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"),
+                      @QueryHint(name="org.hibernate.cacheable",value="true")
+                     })
+})
+public class Account implements Serializable
+{
+   
+   private static final long serialVersionUID = 1L;
+   
+   private Integer id;
+   private AccountHolderPK accountHolder;
+   private Integer balance;
+   private String branch;
+   
+   @Id
+   public Integer getId()
+   {
+      return id;
+   }
+   public void setId(Integer id)
+   {
+      this.id = id;
+   }
+   
+//   @Embedded
+   @Lob
+   public AccountHolderPK getAccountHolder()
+   {
+      return accountHolder;
+   }
+   public void setAccountHolder(AccountHolderPK accountHolder)
+   {
+      this.accountHolder = accountHolder;
+   }
+   
+   public Integer getBalance()
+   {
+      return balance;
+   }
+   public void setBalance(Integer balance)
+   {
+      this.balance = balance;
+   }
+   public String getBranch()
+   {
+      return branch;
+   }
+   public void setBranch(String branch)
+   {
+      this.branch = branch;
+   }
+   
+   
+   
+   
+   
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,69 +0,0 @@
-package org.jboss.ejb3.test.clusteredentity.classloader;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import javax.persistence.Embeddable;
-
-//@Embeddable
-public class AccountHolderPK implements Serializable
-{   
-   private static final long serialVersionUID = 1L;
-   
-   private String lastName;
-   private String ssn;
-   private transient boolean deserialized;
-   
-   public AccountHolderPK( ) {}
-   
-   public AccountHolderPK(String lastName, String ssn)
-   {
-      this.lastName = lastName;
-      this.ssn = ssn;
-   }
-   
-   public String getLastName( ) { return this.lastName; }
-   public void setLastName(String lastName) { this.lastName = lastName; }
-   
-   public String getSsn( ) { return ssn; }
-   public void setSsn(String ssn) { this.ssn = ssn; }
-   
-   public boolean equals(Object obj)
-   {
-      if (obj == this) return true;
-      if (!(obj instanceof AccountHolderPK)) return false;
-      AccountHolderPK pk = (AccountHolderPK)obj;
-      if (!lastName.equals(pk.lastName)) return false;
-      if (!ssn.equals(pk.ssn)) return false;
-      return true;
-   }
-   
-   public int hashCode( )
-   {
-      int result = 17;
-      result = result * 31 + lastName.hashCode();
-      result = result * 31 + ssn.hashCode();
-      return result;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(getClass().getName());
-      sb.append("[lastName=");
-      sb.append(lastName);
-      sb.append(",ssn=");
-      sb.append(ssn);
-      sb.append(",deserialized=");
-      sb.append(deserialized);
-      sb.append("]");
-      return sb.toString();
-   }
-   
-   private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException
-   {
-      ois.defaultReadObject();
-      deserialized = true;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/AccountHolderPK.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,69 @@
+package org.jboss.ejb3.test.clusteredentity.classloader;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+
+import javax.persistence.Embeddable;
+
+//@Embeddable
+public class AccountHolderPK implements Serializable
+{   
+   private static final long serialVersionUID = 1L;
+   
+   private String lastName;
+   private String ssn;
+   private transient boolean deserialized;
+   
+   public AccountHolderPK( ) {}
+   
+   public AccountHolderPK(String lastName, String ssn)
+   {
+      this.lastName = lastName;
+      this.ssn = ssn;
+   }
+   
+   public String getLastName( ) { return this.lastName; }
+   public void setLastName(String lastName) { this.lastName = lastName; }
+   
+   public String getSsn( ) { return ssn; }
+   public void setSsn(String ssn) { this.ssn = ssn; }
+   
+   public boolean equals(Object obj)
+   {
+      if (obj == this) return true;
+      if (!(obj instanceof AccountHolderPK)) return false;
+      AccountHolderPK pk = (AccountHolderPK)obj;
+      if (!lastName.equals(pk.lastName)) return false;
+      if (!ssn.equals(pk.ssn)) return false;
+      return true;
+   }
+   
+   public int hashCode( )
+   {
+      int result = 17;
+      result = result * 31 + lastName.hashCode();
+      result = result * 31 + ssn.hashCode();
+      return result;
+   }
+   
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(getClass().getName());
+      sb.append("[lastName=");
+      sb.append(lastName);
+      sb.append(",ssn=");
+      sb.append(ssn);
+      sb.append(",deserialized=");
+      sb.append(deserialized);
+      sb.append("]");
+      return sb.toString();
+   }
+   
+   private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException
+   {
+      ois.defaultReadObject();
+      deserialized = true;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,29 +0,0 @@
-package org.jboss.ejb3.test.clusteredentity.classloader;
-
-public interface EntityQueryTest
-{
-
-//   public abstract void createAccountHolder(AccountHolderPK pk, String postCode);
-   
-   public abstract void updateAccountBranch(Integer id, String branch);   
-
-   public abstract void createAccount(AccountHolderPK pk, Integer id, Integer openingBalance, String branch);
-   
-   public abstract void updateAccountBalance(Integer id, Integer newBalance);
-
-   
-   public abstract int getCountForBranch(String branch, boolean useNamed, boolean useRegion);
-   
-   public abstract String getBranch(AccountHolderPK pk, boolean useNamed, boolean useRegion);
-
-   public abstract int getTotalBalance(AccountHolderPK pk, boolean useNamed, boolean useRegion);
-
-   public abstract boolean getSawRegionModification(String regionName);
-
-   public abstract boolean getSawRegionAccess(String regionName);
-   
-   public abstract void cleanup();
-   
-   public abstract void remove();
-
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,29 @@
+package org.jboss.ejb3.test.clusteredentity.classloader;
+
+public interface EntityQueryTest
+{
+
+//   public abstract void createAccountHolder(AccountHolderPK pk, String postCode);
+   
+   public abstract void updateAccountBranch(Integer id, String branch);   
+
+   public abstract void createAccount(AccountHolderPK pk, Integer id, Integer openingBalance, String branch);
+   
+   public abstract void updateAccountBalance(Integer id, Integer newBalance);
+
+   
+   public abstract int getCountForBranch(String branch, boolean useNamed, boolean useRegion);
+   
+   public abstract String getBranch(AccountHolderPK pk, boolean useNamed, boolean useRegion);
+
+   public abstract int getTotalBalance(AccountHolderPK pk, boolean useNamed, boolean useRegion);
+
+   public abstract boolean getSawRegionModification(String regionName);
+
+   public abstract boolean getSawRegionAccess(String regionName);
+   
+   public abstract void cleanup();
+   
+   public abstract void remove();
+
+}
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,288 +0,0 @@
-package org.jboss.ejb3.test.clusteredentity.classloader;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.jboss.cache.AbstractCacheListener;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.Cache;
-import org.jboss.cache.jmx.CacheJmxWrapperMBean;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-
- at Stateful
- at Remote(EntityQueryTest.class)
-public class EntityQueryTestBean implements EntityQueryTest
-{
-   private static final Logger log = Logger.getLogger(EntityQueryTestBean.class);
-   
-   @PersistenceContext
-   private EntityManager manager;
-   
-   private MyListener listener;
-
-   public EntityQueryTestBean()
-   {
-      try
-      {
-         //Just to initialise the cache with a listener
-         Cache cache = getCache();
-         listener = new MyListener();
-         cache.addCacheListener(listener);         
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
-   public void updateAccountBranch(Integer id, String branch)
-   {
-      Account account = (Account) manager.find(Account.class, id);
-      account.setBranch(branch);
-   }
-   
-   public int getCountForBranch(String branch, boolean useNamed, boolean useRegion)
-   {
-      if (useNamed)
-         return getCountForBranchViaNamedQuery(branch, useRegion);
-      else
-         return getCountForBranchViaLocalQuery(branch, useRegion);
-   }
-   
-   private int getCountForBranchViaLocalQuery(String branch, boolean useRegion)
-   {
-      Query query = manager.createQuery("select account from Account as account where account.branch = ?1");
-      query.setParameter(1, branch);
-      if (useRegion)
-      {
-         query.setHint("org.hibernate.cacheRegion", "AccountRegion");
-      }
-      query.setHint("org.hibernate.cacheable", Boolean.TRUE);
-      return query.getResultList().size();
-      
-   }
-   
-   private int getCountForBranchViaNamedQuery(String branch, boolean useRegion)
-   {
-      String queryName = useRegion ? "account.bybranch.namedregion"
-                                   : "account.bybranch.default";
-      Query query = manager.createNamedQuery(queryName);
-      query.setParameter(1, branch);
-      return query.getResultList().size();      
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.test.clusteredentity.EntityQueryTest#createAccount(org.jboss.ejb3.test.clusteredentity.AccountHolderPK, Integer, Integer)
-    */
-   public void createAccount(AccountHolderPK pk, Integer id, Integer openingBalance, String branch)
-   {
-      Account account = new Account();
-      account.setId(id);
-      account.setAccountHolder(pk);
-      account.setBalance(openingBalance);
-      account.setBranch(branch);
-      manager.persist(account);
-   }
-   
-   public void updateAccountBalance(Integer id, Integer newBalance)
-   {
-      Account account = (Account) manager.find(Account.class, id);
-      account.setBalance(newBalance);
-   }
-   
-   public String getBranch(AccountHolderPK pk, boolean useNamed, boolean useRegion)
-   {
-      if (useNamed)
-         return getBranchViaNamedQuery(pk, useRegion);
-      else
-         return getBranchViaLocalQuery(pk, useRegion);
-   }
-   
-   private String getBranchViaLocalQuery(AccountHolderPK pk, boolean useRegion)
-   {
-      Query query = manager.createQuery("select account.branch from Account as account where account.accountHolder = ?1");
-      query.setParameter(1, pk);
-      if (useRegion)
-      {
-         query.setHint("org.hibernate.cacheRegion", "AccountRegion");
-      }
-      query.setHint("org.hibernate.cacheable", Boolean.TRUE);
-      return (String) query.getResultList().get(0);
-   }
-   
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.test.clusteredentity.EntityQueryTest#getPostCodeViaNamedQuery(org.jboss.ejb3.test.clusteredentity.AccountHolderPK, boolean)
-    */
-   private String getBranchViaNamedQuery(AccountHolderPK pk, boolean useRegion)
-   {
-      String queryName = useRegion ? "account.branch.namedregion"
-                                   : "account.branch.default";
-      Query query = manager.createNamedQuery(queryName);
-      query.setParameter(1, pk);
-      return (String) query.getResultList().get(0);
-   }
-   public int getTotalBalance(AccountHolderPK pk, boolean useNamed, boolean useRegion)
-   {
-      if (useNamed)
-         return getTotalBalanceViaNamedQuery(pk, useRegion);
-      else
-         return getTotalBalanceViaLocalQuery(pk, useRegion);
-   }
-   
-   private int getTotalBalanceViaLocalQuery(AccountHolderPK pk, boolean useRegion)
-   {
-      Query query = manager.createQuery("select account.balance from Account as account where account.accountHolder = ?1");
-      query.setParameter(1, pk);
-      query.setHint("org.hibernate.cacheable", Boolean.TRUE);
-      return totalBalances(query);
-   }
-   
-   private int getTotalBalanceViaNamedQuery(AccountHolderPK pk, boolean useRegion)
-   {
-      String queryName = useRegion ? "account.totalbalance.namedregion"
-                                   : "account.totalbalance.default";
-      Query query = manager.createNamedQuery(queryName);
-      query.setParameter(1, pk);
-      return totalBalances(query);
-   }
-   
-   private int totalBalances(Query balanceQuery)
-   {
-      List results = balanceQuery.getResultList();
-      int total = 0;
-      if (results != null)
-      {
-         for (Iterator it = results.iterator(); it.hasNext();)
-         {            
-            total += ((Integer) it.next()).intValue();
-            System.out.println("Total = " + total);
-         }
-      }
-      return total;      
-   }
-   
-   public boolean getSawRegionModification(String regionName)
-   {
-      return getSawRegion(regionName, listener.modified);
-   }
-   
-   public boolean getSawRegionAccess(String regionName)
-   {
-      return getSawRegion(regionName, listener.accessed);
-   }
-   
-   private boolean getSawRegion(String regionName, Set sawEvent)
-   {
-      boolean saw = false;
-      Fqn fqn = Fqn.fromString("/" + regionName.replace(".", "/"));
-      for (Iterator it = sawEvent.iterator(); it.hasNext();)
-      {
-         Fqn modified = (Fqn) it.next();
-         if (modified.isChildOf(fqn))
-         {
-            it.remove();
-            saw = true;
-         }
-      }
-   return saw;
-      
-   }
-   
-   public void cleanup()
-   {  
-      Query query = manager.createQuery("select account from Account as account");
-      List accts = query.getResultList();
-      if (accts != null)
-      {
-         for (Iterator it = accts.iterator(); it.hasNext();)
-         {
-            try
-            {
-               Account acct = (Account) it.next();
-               log.info("Removing " + acct);
-               manager.remove(acct);
-            }
-            catch (Exception ignored) {}
-         }
-      }
-   }
-   
-   @Remove
-   public void remove()
-   {
-      cleanup();
-      listener.clear();
-      try
-      {
-         getCache().removeCacheListener(listener);
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-
-   private Cache getCache() throws Exception
-   {
-      MBeanServer server = MBeanServerLocator.locateJBoss();
-      CacheJmxWrapperMBean proxy = (CacheJmxWrapperMBean)MBeanProxyExt.create(CacheJmxWrapperMBean.class, new ObjectName("jboss.cache:service=EJB3EntityTreeCache"), server);
-      Cache cache = proxy.getCache();
-      
-      return cache;
-   }
-
-   class MyListener extends AbstractCacheListener
-   {
-      HashSet modified = new HashSet(); 
-      HashSet accessed = new HashSet();
-      
-      public void clear()
-      {
-         modified.clear();
-         accessed.clear();
-      }
-      
-      @Override
-      public void nodeModified(Fqn fqn, boolean pre, boolean isLocal, 
-                               ModificationType type, Map mods)
-      {
-         if (!pre)
-         {
-            System.out.println("MyListener - Modified node " + fqn.toString());
-            modified.add(fqn);
-         }
-      }
-
-      @Override
-      public void nodeCreated(Fqn fqn, boolean pre, boolean isLocal)
-      {   
-         if (!pre)
-         {
-            System.out.println("MyListener - Created node " + fqn.toString());
-            modified.add(fqn);
-         }
-      }   
-
-      @Override
-      public void nodeVisited(Fqn fqn, boolean pre)
-      {      
-         System.out.println("MyListener - Visited node " + fqn.toString());
-         accessed.add(fqn); 
-      }    
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,340 @@
+package org.jboss.ejb3.test.clusteredentity.classloader;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+import org.jboss.cache.Fqn;
+import org.jboss.cache.TreeCache;
+import org.jboss.cache.TreeCacheListener;
+import org.jboss.cache.TreeCacheMBean;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jgroups.View;
+
+ at Stateful
+ at Remote(EntityQueryTest.class)
+public class EntityQueryTestBean implements EntityQueryTest
+{
+   private static final Logger log = Logger.getLogger(EntityQueryTestBean.class);
+   
+   @PersistenceContext
+   private EntityManager manager;
+   
+   private MyListener listener;
+
+   public EntityQueryTestBean()
+   {
+      try
+      {
+         //Just to initialise the cache with a listener
+         TreeCache cache = getCache();
+         listener = new MyListener();
+         cache.addTreeCacheListener(listener);         
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   public void updateAccountBranch(Integer id, String branch)
+   {
+      Account account = (Account) manager.find(Account.class, id);
+      account.setBranch(branch);
+   }
+   
+   public int getCountForBranch(String branch, boolean useNamed, boolean useRegion)
+   {
+      if (useNamed)
+         return getCountForBranchViaNamedQuery(branch, useRegion);
+      else
+         return getCountForBranchViaLocalQuery(branch, useRegion);
+   }
+   
+   private int getCountForBranchViaLocalQuery(String branch, boolean useRegion)
+   {
+      Query query = manager.createQuery("select account from Account as account where account.branch = ?1");
+      query.setParameter(1, branch);
+      if (useRegion)
+      {
+         query.setHint("org.hibernate.cacheRegion", "AccountRegion");
+      }
+      query.setHint("org.hibernate.cacheable", Boolean.TRUE);
+      return query.getResultList().size();
+      
+   }
+   
+   private int getCountForBranchViaNamedQuery(String branch, boolean useRegion)
+   {
+      String queryName = useRegion ? "account.bybranch.namedregion"
+                                   : "account.bybranch.default";
+      Query query = manager.createNamedQuery(queryName);
+      query.setParameter(1, branch);
+      return query.getResultList().size();      
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.ejb3.test.clusteredentity.EntityQueryTest#createAccount(org.jboss.ejb3.test.clusteredentity.AccountHolderPK, Integer, Integer)
+    */
+   public void createAccount(AccountHolderPK pk, Integer id, Integer openingBalance, String branch)
+   {
+      Account account = new Account();
+      account.setId(id);
+      account.setAccountHolder(pk);
+      account.setBalance(openingBalance);
+      account.setBranch(branch);
+      manager.persist(account);
+   }
+   
+   public void updateAccountBalance(Integer id, Integer newBalance)
+   {
+      Account account = (Account) manager.find(Account.class, id);
+      account.setBalance(newBalance);
+   }
+   
+   public String getBranch(AccountHolderPK pk, boolean useNamed, boolean useRegion)
+   {
+      if (useNamed)
+         return getBranchViaNamedQuery(pk, useRegion);
+      else
+         return getBranchViaLocalQuery(pk, useRegion);
+   }
+   
+   private String getBranchViaLocalQuery(AccountHolderPK pk, boolean useRegion)
+   {
+      Query query = manager.createQuery("select account.branch from Account as account where account.accountHolder = ?1");
+      query.setParameter(1, pk);
+      if (useRegion)
+      {
+         query.setHint("org.hibernate.cacheRegion", "AccountRegion");
+      }
+      query.setHint("org.hibernate.cacheable", Boolean.TRUE);
+      return (String) query.getResultList().get(0);
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.ejb3.test.clusteredentity.EntityQueryTest#getPostCodeViaNamedQuery(org.jboss.ejb3.test.clusteredentity.AccountHolderPK, boolean)
+    */
+   private String getBranchViaNamedQuery(AccountHolderPK pk, boolean useRegion)
+   {
+      String queryName = useRegion ? "account.branch.namedregion"
+                                   : "account.branch.default";
+      Query query = manager.createNamedQuery(queryName);
+      query.setParameter(1, pk);
+      return (String) query.getResultList().get(0);
+   }
+   public int getTotalBalance(AccountHolderPK pk, boolean useNamed, boolean useRegion)
+   {
+      if (useNamed)
+         return getTotalBalanceViaNamedQuery(pk, useRegion);
+      else
+         return getTotalBalanceViaLocalQuery(pk, useRegion);
+   }
+   
+   private int getTotalBalanceViaLocalQuery(AccountHolderPK pk, boolean useRegion)
+   {
+      Query query = manager.createQuery("select account.balance from Account as account where account.accountHolder = ?1");
+      query.setParameter(1, pk);
+      query.setHint("org.hibernate.cacheable", Boolean.TRUE);
+      return totalBalances(query);
+   }
+   
+   private int getTotalBalanceViaNamedQuery(AccountHolderPK pk, boolean useRegion)
+   {
+      String queryName = useRegion ? "account.totalbalance.namedregion"
+                                   : "account.totalbalance.default";
+      Query query = manager.createNamedQuery(queryName);
+      query.setParameter(1, pk);
+      return totalBalances(query);
+   }
+   
+   private int totalBalances(Query balanceQuery)
+   {
+      List results = balanceQuery.getResultList();
+      int total = 0;
+      if (results != null)
+      {
+         for (Iterator it = results.iterator(); it.hasNext();)
+         {            
+            total += ((Integer) it.next()).intValue();
+            System.out.println("Total = " + total);
+         }
+      }
+      return total;      
+   }
+   
+   public boolean getSawRegionModification(String regionName)
+   {
+      return getSawRegion(regionName, listener.modified);
+   }
+   
+   public boolean getSawRegionAccess(String regionName)
+   {
+      return getSawRegion(regionName, listener.accessed);
+   }
+   
+   private boolean getSawRegion(String regionName, Set sawEvent)
+   {
+      boolean saw = false;
+      Fqn fqn = Fqn.fromString("/" + regionName.replace(".", "/"));
+      for (Iterator it = sawEvent.iterator(); it.hasNext();)
+      {
+         Fqn modified = (Fqn) it.next();
+         if (modified.isChildOf(fqn))
+         {
+            it.remove();
+            saw = true;
+         }
+      }
+   return saw;
+      
+   }
+   
+   public void cleanup()
+   {  
+      Query query = manager.createQuery("select account from Account as account");
+      List accts = query.getResultList();
+      if (accts != null)
+      {
+         for (Iterator it = accts.iterator(); it.hasNext();)
+         {
+            try
+            {
+               Account acct = (Account) it.next();
+               log.info("Removing " + acct);
+               manager.remove(acct);
+            }
+            catch (Exception ignored) {}
+         }
+      }
+   }
+   
+   @Remove
+   public void remove()
+   {
+      cleanup();
+      listener.clear();
+      try
+      {
+         getCache().removeTreeCacheListener(listener);
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+
+   private TreeCache getCache() throws Exception
+   {
+      MBeanServer server = MBeanServerLocator.locateJBoss();
+      TreeCacheMBean proxy = (TreeCacheMBean)MBeanProxyExt.create(TreeCacheMBean.class, new ObjectName("jboss.cache:service=EJB3EntityTreeCache"), server);
+      TreeCache cache = proxy.getInstance();
+      
+      return cache;
+   }
+
+   class MyListener implements TreeCacheListener
+   {
+      HashSet modified = new HashSet(); 
+      HashSet accessed = new HashSet();
+      
+      public void clear()
+      {
+         modified.clear();
+         accessed.clear();
+      }
+
+      // FIXME: NYI
+//      public void nodeModified(Fqn fqn, boolean pre, boolean isLocal, 
+//                               ModificationType type, Map mods)
+//      {
+//         if (!pre)
+//         {
+//            System.out.println("MyListener - Modified node " + fqn.toString());
+//            modified.add(fqn);
+//         }
+//      }
+
+      public void nodeCreated(Fqn fqn, boolean pre, boolean isLocal)
+      {   
+         if (!pre)
+         {
+            System.out.println("MyListener - Created node " + fqn.toString());
+            modified.add(fqn);
+         }
+      }   
+
+      public void nodeVisited(Fqn fqn, boolean pre)
+      {      
+         System.out.println("MyListener - Visited node " + fqn.toString());
+         accessed.add(fqn); 
+      }
+
+      public void cacheStarted(TreeCache arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void cacheStopped(TreeCache arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void nodeCreated(Fqn arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void nodeEvicted(Fqn arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void nodeLoaded(Fqn arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void nodeModified(Fqn arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void nodeRemoved(Fqn arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void nodeVisited(Fqn arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }
+
+      public void viewChange(View arg0)
+      {
+         // TODO Auto-generated method stub
+         
+      }    
+      
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredentity.embeddedid;
-
-import java.util.List;
-
-
-/**
- * SFSB interface for {@link EmbeddedIdTestBean}.
- * 
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
-public interface EmbeddedIdTest
-{
-   static final MusicianPK DEFAULT_PK = new MusicianPK("Brian", "Stansberry", "None of your business");
-   
-   void createMusician(MusicianPK pk, String instrument);
-   
-   List<MusicianPK> getMusiciansForInstrument(String instrument, boolean useNamedRegion);
-   
-   void cleanup();
-   
-   void remove();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.embeddedid;
+
+import java.util.List;
+
+
+/**
+ * SFSB interface for {@link EmbeddedIdTestBean}.
+ * 
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+public interface EmbeddedIdTest
+{
+   static final MusicianPK DEFAULT_PK = new MusicianPK("Brian", "Stansberry", "None of your business");
+   
+   void createMusician(MusicianPK pk, String instrument);
+   
+   List<MusicianPK> getMusiciansForInstrument(String instrument, boolean useNamedRegion);
+   
+   void cleanup();
+   
+   void remove();
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredentity.embeddedid;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.jboss.logging.Logger;
-
-/**
- * SFSB used for testing replicated query caching with an @EmbeddedId.
- * 
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Stateful
- at Remote(EmbeddedIdTest.class)
-public class EmbeddedIdTestBean implements EmbeddedIdTest
-{
-   private static final Logger log = Logger.getLogger(EmbeddedIdTestBean.class);
-   
-   @PersistenceContext
-   private EntityManager manager;
-
-   public void createMusician(MusicianPK pk, String instrument)
-   {
-      Musician musician = new Musician();
-      musician.setId(pk);
-      musician.setInstrument(instrument);
-      manager.persist(musician);
-   }
-
-   public List<MusicianPK> getMusiciansForInstrument(String instrument, boolean useNamedRegion)
-   {
-      String queryName = useNamedRegion ? "musician.byinstrument.namedregion"
-                                        : "musician.byinstrument.default";
-      Query query = manager.createNamedQuery(queryName);
-      query.setParameter(1, instrument);
-      List<MusicianPK> result = new ArrayList<MusicianPK>();
-      List users = query.getResultList();
-      if (users != null)
-      {
-         for (Iterator it = users.iterator(); it.hasNext();)
-         {
-            result.add(((Musician) it.next()).getId());
-         }
-      }
-      return result;
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.test.clusteredentity.classloader.UserTest#cleanup()
-    */
-   public void cleanup()
-   {
-      Query query = manager.createQuery("select musician from Musician as musician");
-      List accts = query.getResultList();
-      if (accts != null)
-      {
-         for (Iterator it = accts.iterator(); it.hasNext();)
-         {
-            try
-            {
-               Musician musician = (Musician) it.next();
-               log.info("Removing " + musician);
-               manager.remove(musician);
-            }
-            catch (Exception ignored) {}
-         }
-      }
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.test.clusteredentity.classloader.UserTest#remove()
-    */
-   @Remove
-   public void remove()
-   {
-      cleanup();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.embeddedid;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+import org.jboss.logging.Logger;
+
+/**
+ * SFSB used for testing replicated query caching with an @EmbeddedId.
+ * 
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful
+ at Remote(EmbeddedIdTest.class)
+public class EmbeddedIdTestBean implements EmbeddedIdTest
+{
+   private static final Logger log = Logger.getLogger(EmbeddedIdTestBean.class);
+   
+   @PersistenceContext
+   private EntityManager manager;
+
+   public void createMusician(MusicianPK pk, String instrument)
+   {
+      Musician musician = new Musician();
+      musician.setId(pk);
+      musician.setInstrument(instrument);
+      manager.persist(musician);
+   }
+
+   public List<MusicianPK> getMusiciansForInstrument(String instrument, boolean useNamedRegion)
+   {
+      String queryName = useNamedRegion ? "musician.byinstrument.namedregion"
+                                        : "musician.byinstrument.default";
+      Query query = manager.createNamedQuery(queryName);
+      query.setParameter(1, instrument);
+      List<MusicianPK> result = new ArrayList<MusicianPK>();
+      List users = query.getResultList();
+      if (users != null)
+      {
+         for (Iterator it = users.iterator(); it.hasNext();)
+         {
+            result.add(((Musician) it.next()).getId());
+         }
+      }
+      return result;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.ejb3.test.clusteredentity.classloader.UserTest#cleanup()
+    */
+   public void cleanup()
+   {
+      Query query = manager.createQuery("select musician from Musician as musician");
+      List accts = query.getResultList();
+      if (accts != null)
+      {
+         for (Iterator it = accts.iterator(); it.hasNext();)
+         {
+            try
+            {
+               Musician musician = (Musician) it.next();
+               log.info("Removing " + musician);
+               manager.remove(musician);
+            }
+            catch (Exception ignored) {}
+         }
+      }
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.ejb3.test.clusteredentity.classloader.UserTest#remove()
+    */
+   @Remove
+   public void remove()
+   {
+      cleanup();
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredentity.embeddedid;
-
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.QueryHint;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
-/**
- * Entity used for testing replicated query caching with an @EmbeddedId.
- * 
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Entity
- at Cache (usage=CacheConcurrencyStrategy.TRANSACTIONAL)
- at NamedQueries({
-   @NamedQuery(name="musician.byinstrument.default",query="select musician from Musician as musician where musician.instrument = ?1",
-               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
-   @NamedQuery(name="musician.byinstrument.namedregion",query="select musician from Musician as musician where musician.instrument = ?1",
-         hints={@QueryHint(name="org.hibernate.cacheable",value="true"),
-                @QueryHint(name="org.hibernate.cacheable",value="true")
-               })
-})
-public class Musician
-{
-   private MusicianPK id;
-   private String instrument;
-   
-   @EmbeddedId
-   public MusicianPK getId()
-   {
-      return id;
-   }
-   public void setId(MusicianPK id)
-   {
-      this.id = id;
-   }
-   
-   public String getInstrument()
-   {
-      return instrument;
-   }
-   public void setInstrument(String instrument)
-   {
-      this.instrument = instrument;
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/Musician.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.embeddedid;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.QueryHint;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+/**
+ * Entity used for testing replicated query caching with an @EmbeddedId.
+ * 
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Entity
+ at Cache (usage=CacheConcurrencyStrategy.TRANSACTIONAL)
+ at NamedQueries({
+   @NamedQuery(name="musician.byinstrument.default",query="select musician from Musician as musician where musician.instrument = ?1",
+               hints={@QueryHint(name="org.hibernate.cacheable",value="true")}),
+   @NamedQuery(name="musician.byinstrument.namedregion",query="select musician from Musician as musician where musician.instrument = ?1",
+         hints={@QueryHint(name="org.hibernate.cacheable",value="true"),
+                @QueryHint(name="org.hibernate.cacheable",value="true")
+               })
+})
+public class Musician
+{
+   private MusicianPK id;
+   private String instrument;
+   
+   @EmbeddedId
+   public MusicianPK getId()
+   {
+      return id;
+   }
+   public void setId(MusicianPK id)
+   {
+      this.id = id;
+   }
+   
+   public String getInstrument()
+   {
+      return instrument;
+   }
+   public void setInstrument(String instrument)
+   {
+      this.instrument = instrument;
+   }
+   
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredentity.embeddedid;
-
-import java.io.Serializable;
-
-import javax.persistence.Embeddable;
-
-/**
- * Primary key for the {@link Musician} entity.
- * 
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Embeddable
-public class MusicianPK implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-   
-   private String firstName;
-   private String lastName;
-   private String ssn;
-   
-   /**
-    * Default constructor
-    */
-   public MusicianPK() {}
-   
-   public MusicianPK(String firstName, String lastName, String ssn)
-   {
-      this.firstName = firstName;
-      this.lastName = lastName;
-      this.ssn = ssn;
-   }
-   
-   public String getFirstName()
-   {
-      return firstName;
-   }
-   
-   public void setFirstName(String firstName)
-   {
-      this.firstName = firstName;
-   }
-   
-   public String getLastName()
-   {
-      return lastName;
-   }
-   
-   public void setLastName(String lastName)
-   {
-      this.lastName = lastName;
-   }
-   
-   public String getSsn()
-   {
-      return ssn;
-   }
-   
-   public void setSsn(String ssn)
-   {
-      this.ssn = ssn;
-   }
-
-   @Override
-   public boolean equals(Object obj)
-   {
-      boolean equal = (this == obj);
-      
-      if (!equal && obj instanceof MusicianPK)
-      {
-         MusicianPK other = (MusicianPK) obj;
-         
-         equal = firstName.equals(other.firstName)
-                  && lastName.equals(other.lastName)
-                  && ssn.equals(other.ssn);
-      }
-      return equal;
-   }
-
-   @Override
-   public int hashCode()
-   {
-      int result = 19;
-      result = result * 29 + firstName.hashCode();
-      result = result * 29 + lastName.hashCode();
-      result = result * 29 + ssn.hashCode();
-      return result;
-   }
-
-   @Override
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(getClass().getName());
-      sb.append("[firstName=");
-      sb.append(firstName);
-      sb.append(",lastName=");
-      sb.append(lastName);
-      sb.append(",ssn=");
-      sb.append(ssn);
-      sb.append("]");
-      return sb.toString();
-   }
-   
-   
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/MusicianPK.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.embeddedid;
+
+import java.io.Serializable;
+
+import javax.persistence.Embeddable;
+
+/**
+ * Primary key for the {@link Musician} entity.
+ * 
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Embeddable
+public class MusicianPK implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+   
+   private String firstName;
+   private String lastName;
+   private String ssn;
+   
+   /**
+    * Default constructor
+    */
+   public MusicianPK() {}
+   
+   public MusicianPK(String firstName, String lastName, String ssn)
+   {
+      this.firstName = firstName;
+      this.lastName = lastName;
+      this.ssn = ssn;
+   }
+   
+   public String getFirstName()
+   {
+      return firstName;
+   }
+   
+   public void setFirstName(String firstName)
+   {
+      this.firstName = firstName;
+   }
+   
+   public String getLastName()
+   {
+      return lastName;
+   }
+   
+   public void setLastName(String lastName)
+   {
+      this.lastName = lastName;
+   }
+   
+   public String getSsn()
+   {
+      return ssn;
+   }
+   
+   public void setSsn(String ssn)
+   {
+      this.ssn = ssn;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      boolean equal = (this == obj);
+      
+      if (!equal && obj instanceof MusicianPK)
+      {
+         MusicianPK other = (MusicianPK) obj;
+         
+         equal = firstName.equals(other.firstName)
+                  && lastName.equals(other.lastName)
+                  && ssn.equals(other.ssn);
+      }
+      return equal;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      int result = 19;
+      result = result * 29 + firstName.hashCode();
+      result = result * 29 + lastName.hashCode();
+      result = result * 29 + ssn.hashCode();
+      return result;
+   }
+
+   @Override
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(getClass().getName());
+      sb.append("[firstName=");
+      sb.append(firstName);
+      sb.append(",lastName=");
+      sb.append(lastName);
+      sb.append(",ssn=");
+      sb.append(ssn);
+      sb.append("]");
+      return sb.toString();
+   }
+   
+   
+   
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/DBSetup.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/DBSetup.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/DBSetup.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/DBSetup.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.unit;
+
+import java.sql.DriverManager;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+/** A TestSetup that starts hypersonic before the testcase with a tcp
+ * listening port at 1701.
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revison:$
+ */
+public class DBSetup extends TestSetup
+{
+   public DBSetup(Test test)
+   {
+      super(test);
+   }
+
+   protected void setUp() throws Exception
+   {
+         File hypersoniDir = new File("output/hypersonic");
+         if (!hypersoniDir.exists())
+         {
+            hypersoniDir.mkdirs();
+         }
+
+         if (!hypersoniDir.isDirectory())
+         {
+            throw new IOException("Failed to create directory: " + hypersoniDir);
+         }
+      
+         File dbPath = new File(hypersoniDir, "clusteredentity-db");
+
+         // Start DB in new thread, or else it will block us
+         DBThread serverThread = new DBThread(dbPath);
+         serverThread.start();
+         
+         int elapsed = 0;
+         while (!serverThread.isStarted() && elapsed < 15000)
+         {
+            try 
+            {
+               Thread.sleep(100);
+               elapsed += 100;
+            }
+            catch (InterruptedException ie)
+            {
+               System.out.println("Interrupted while waiting for Hypersonic");
+            }
+         }
+         
+         if (!serverThread.isStarted())
+            System.out.println("Hypersonic failed to start in a timely fashion");
+   }
+
+   protected void tearDown() throws Exception
+   {
+      Class.forName("org.hsqldb.jdbcDriver");
+      String dbURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host", "localhost") + ":1701";
+      Connection conn = DriverManager.getConnection(dbURL, "sa", "");
+      Statement statement = conn.createStatement();      
+      statement.executeQuery("SHUTDOWN COMPACT");
+      
+   }
+
+   public static void main(String[] args) throws Exception
+   {
+      DBSetup setup = new DBSetup(null);
+      setup.setUp();
+      Thread.sleep(120*1000);
+      setup.tearDown();
+   }
+   
+   class DBThread extends Thread
+   {
+      boolean started;
+      File dbPath;
+      
+      DBThread(File dbPath)
+      {
+         super("hypersonic");
+         this.dbPath = dbPath;
+      }
+      
+      boolean isStarted()
+      {
+         return started;
+      }
+      
+      public void run()
+      {
+         try
+         {
+            // Create startup arguments
+            String[] args = {
+                  "-database",
+                  dbPath.toString(),
+                  "-port",
+                  String.valueOf(1701),
+                  "-silent",
+                  "false",
+                  "-trace",
+                  "false",
+                  "-no_system_exit",
+                  "true",
+             };
+            System.out.println("Starting hsqldb");
+            // HACK Do this by reflection for now until we determine how 
+            // we want to handle this in EJB3
+            Class clazz = Thread.currentThread().getContextClassLoader().loadClass("org.hsqldb.Server");
+            Method main = clazz.getDeclaredMethod("main", new Class[] { String[].class });
+            main.invoke(null, new Object[] { args });
+//            org.hsqldb.Server.main(args);
+            System.out.println("Done");
+         }
+         catch (Exception e)
+         {
+            e.printStackTrace();
+         }
+         finally
+         {
+            started = true;
+         }
+      }
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.unit;
+
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.naming.InitialContext;
+import org.jboss.ejb3.test.clusteredentity.Customer;
+import org.jboss.ejb3.test.clusteredentity.EntityTest;
+import org.jboss.ejb3.test.clusteredentity.classloader.EntityQueryTest;
+import org.jboss.ejb3.test.clusteredentity.embeddedid.MusicianPK;
+import org.jboss.ejb3.test.clusteredentity.embeddedid.EmbeddedIdTest;
+import org.jboss.test.JBossClusteredTestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Simple test of replication of entities and related queries with @EmbeddedId 
+ * fields involved.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+public class EmbeddedIdClassloaderTestCase
+extends JBossClusteredTestCase
+{
+   private org.apache.log4j.Logger log = getLog();
+
+   protected static final long SLEEP_TIME = 300L;
+
+   private EmbeddedIdTest sfsb0;
+   private EmbeddedIdTest sfsb1;
+   
+   public EmbeddedIdClassloaderTestCase(String name)
+   {
+      super(name);
+   }
+   
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      
+      sfsb0 = getUserTest(System.getProperty("jbosstest.cluster.node0"));
+      sfsb1 = getUserTest(System.getProperty("jbosstest.cluster.node1"));  
+      sfsb0.cleanup();
+      sfsb1.cleanup();
+   }
+    
+   protected void tearDown() throws Exception
+   {
+      if (sfsb0 != null)
+      {
+         try
+         {
+            sfsb0.remove();
+         }
+         catch (Exception e) {}
+      }
+      if (sfsb1 != null)
+      {
+         try
+         {
+            sfsb1.remove();
+         }
+         catch (Exception e) {}
+      }
+      
+      sfsb0 = sfsb1 = null;
+   }
+   
+   protected EmbeddedIdTest getUserTest(String nodeJNDIAddress) throws Exception
+   {
+      Properties prop1 = new Properties();
+      prop1.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
+      prop1.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      prop1.put("java.naming.provider.url", "jnp://" + nodeJNDIAddress + ":1099");
+   
+      log.info("===== Naming properties for " + nodeJNDIAddress + ": ");
+      log.info(prop1);
+      log.info("Create InitialContext for " + nodeJNDIAddress);
+      InitialContext ctx1 = new InitialContext(prop1);
+   
+      log.info("Lookup sfsb from " + nodeJNDIAddress);
+      return (EmbeddedIdTest) ctx1.lookup("clusteredentity-embeddedid-test/EmbeddedIdTestBean/remote");
+      
+   }
+   
+   public void testQuery() throws Exception
+   {
+      try
+      {
+         sfsb0.createMusician(EmbeddedIdTest.DEFAULT_PK, "zither");
+         
+         queryByInstrument(sfsb0, "zither", false);
+         queryByInstrument(sfsb0, "zither", true);
+         
+         // pause to let queries replicate async
+         sleep(SLEEP_TIME);
+         
+         queryByInstrument(sfsb1, "zither", false);
+         queryByInstrument(sfsb1, "zither", true);
+      }
+      finally
+      {
+         // cleanup the db so we can run this test multiple times w/o restarting the cluster
+         sfsb0.cleanup();
+      }
+   }
+   
+   private void queryByInstrument(EmbeddedIdTest sfsb, String instrument, boolean useNamedRegion)
+   {
+      List<MusicianPK> pks = sfsb.getMusiciansForInstrument(instrument, useNamedRegion);
+      assertNotNull("Got pks", pks);
+      assertEquals("Got one pk", 1, pks.size());
+      assertEquals("Got correct pks", EmbeddedIdTest.DEFAULT_PK, pks.get(0));
+   }
+   
+   protected void sleep(long millis)
+   {
+      try
+      {
+         Thread.sleep(millis);
+      }
+      catch (InterruptedException e)
+      {
+         log.warn("Interrupted while sleeping", e);
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+
+      TestSuite suite = new TestSuite();
+      Test t1 = getDeploySetup(EmbeddedIdClassloaderTestCase.class, 
+                               "clusteredentity-embeddedid-test.ear");
+
+      suite.addTest(t1);
+
+      // Create an initializer for the test suite
+      DBSetup wrapper = new DBSetup(suite);
+      return wrapper;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,300 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.unit;
+
+import java.util.Properties;
+import javax.naming.InitialContext;
+
+import org.hibernate.cache.StandardQueryCache;
+import org.jboss.ejb3.test.clusteredentity.classloader.Account;
+import org.jboss.ejb3.test.clusteredentity.classloader.AccountHolderPK;
+import org.jboss.ejb3.test.clusteredentity.classloader.EntityQueryTest;
+import org.jboss.test.JBossClusteredTestCase;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Base class for tests involving clustered entities with a scoped classloader.
+ *
+ * @author Brian Stansberry
+ * @version $Id: EntityUnitTestCase.java 57207 2006-09-26 12:06:13Z dimitris at jboss.org $
+ */
+
+public class EntityClassloaderTestBase
+extends JBossClusteredTestCase
+{
+   protected org.apache.log4j.Logger log = getLog();
+
+   protected static final long SLEEP_TIME = 300L;
+   
+   
+   static boolean deployed0 = true;
+   static boolean deployed1 = true;
+
+   protected static final AccountHolderPK SMITH = new AccountHolderPK("Smith", "1000");
+   protected static final AccountHolderPK JONES = new AccountHolderPK("Jones", "2000");
+   protected static final AccountHolderPK BARNEY = new AccountHolderPK("Barney", "3000");
+   
+   protected EntityQueryTest sfsb0;
+
+   protected EntityQueryTest sfsb1;
+   
+   public EntityClassloaderTestBase(String name)
+   {
+      super(name);
+   }
+   
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      
+      sfsb0 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node0"));
+      sfsb1 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node1"));  
+      sfsb0.cleanup();
+      sfsb1.cleanup();
+   }
+   
+   protected EntityQueryTest getEntityQueryTest(String nodeJNDIAddress) throws Exception
+   {
+      Properties prop1 = new Properties();
+      prop1.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
+      prop1.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      prop1.put("java.naming.provider.url", "jnp://" + nodeJNDIAddress + ":1099");
+   
+      log.info("===== Naming properties for " + nodeJNDIAddress + ": ");
+      log.info(prop1);
+      log.info("Create InitialContext for " + nodeJNDIAddress);
+      InitialContext ctx1 = new InitialContext(prop1);
+   
+      log.info("Lookup sfsb from " + nodeJNDIAddress);
+      return (EntityQueryTest)ctx1.lookup("clusteredentity-classloader-test/EntityQueryTestBean/remote");
+      
+   }
+    
+   protected void tearDown() throws Exception
+   {
+      if (sfsb0 != null)
+      {
+         try
+         {
+            sfsb0.remove();
+         }
+         catch (Exception e) {}
+      }
+      if (sfsb1 != null)
+      {
+         try
+         {
+            sfsb1.remove();
+         }
+         catch (Exception e) {}
+      }
+      
+      sfsb0 = sfsb1 = null;
+   }
+   
+   protected void standardEntitySetup()
+   {
+//      sfsb0.createAccountHolder(SMITH, "94536");
+      sfsb0.createAccount(SMITH, new Integer(1001), new Integer(5), "94536");
+      sfsb0.createAccount(SMITH, new Integer(1002), new Integer(15), "94536");
+      sfsb0.createAccount(SMITH, new Integer(1003), new Integer(20), "94536");
+      
+//      sfsb0.createAccountHolder(JONES, "63088");
+      sfsb0.createAccount(JONES, new Integer(2001), new Integer(5), "63088");
+      sfsb0.createAccount(JONES, new Integer(2002), new Integer(15), "63088");
+      sfsb0.createAccount(JONES, new Integer(2003), new Integer(20), "63088");
+      
+//      sfsb0.createAccountHolder(BARNEY, "63088");
+      sfsb0.createAccount(BARNEY, new Integer(3001), new Integer(5), "63088");
+      sfsb0.createAccount(BARNEY, new Integer(3002), new Integer(15), "63088");
+      sfsb0.createAccount(BARNEY, new Integer(3003), new Integer(20), "63088");
+      
+      log.info("Standard entities created");
+   }
+   
+   protected void resetRegionUsageState()
+   {  
+      sfsb0.getSawRegionModification(StandardQueryCache.class.getName());
+      sfsb0.getSawRegionModification("AccountRegion");
+      
+      sfsb0.getSawRegionAccess(StandardQueryCache.class.getName());
+      sfsb0.getSawRegionAccess("AccountRegion");
+
+      
+      sfsb1.getSawRegionModification(StandardQueryCache.class.getName());
+      sfsb1.getSawRegionModification("AccountRegion");
+      
+      sfsb1.getSawRegionAccess(StandardQueryCache.class.getName());
+      sfsb1.getSawRegionAccess("AccountRegion");
+      
+      log.info("Region usage state cleared");
+      
+   }
+   
+   protected void modifyEntities(EntityQueryTest bean)
+   {
+      bean.updateAccountBranch(1001, "63088");
+      bean.updateAccountBalance(2001, 15);
+      
+      log.info("Entities modified");
+   }
+   
+   protected void restoreEntities(EntityQueryTest bean)
+   {
+      // Undo the mods done in queryTest
+      bean.updateAccountBranch(1001, "94536");
+      bean.updateAccountBalance(2001, 5);
+      
+      log.info("Standard entities restored to initial state");
+   }
+
+   protected void queryTest(boolean setupEntities, boolean useNamedQuery, boolean useNamedRegion, boolean checkEmptyRegion)
+   {
+      if (setupEntities)
+         standardEntitySetup();
+      else
+         restoreEntities(sfsb0);
+      
+      resetRegionUsageState();
+      
+      // Initial ops on node 0
+      
+      String regionName = useNamedRegion ? "AccountRegion" : StandardQueryCache.class.getName();
+      
+      // Query on post code count
+      assertEquals("63088 has correct # of accounts", 6, sfsb0.getCountForBranch("63088", useNamedQuery, useNamedRegion));
+      
+      assertTrue("Query cache used", sfsb0.getSawRegionModification(regionName));
+      // Clear the access state
+      sfsb0.getSawRegionAccess(regionName);
+      
+      log.info("First query on node0 done");
+      
+      // Do it again from node 1
+      // Sleep a bit to allow async repl to happen
+      sleep(SLEEP_TIME);
+      
+      // If region isn't activated yet, should not have been modified      
+      if (checkEmptyRegion)
+      {
+         assertFalse("Query cache remotely modified", sfsb1.getSawRegionModification(regionName));
+         // Clear the access state
+         sfsb1.getSawRegionAccess(regionName);
+      }
+      else if (useNamedRegion)
+      {
+         assertTrue("Query cache remotely modified", sfsb1.getSawRegionModification(regionName));
+         // Clear the access state
+         sfsb1.getSawRegionAccess(regionName);         
+      }
+      
+      assertEquals("63088 has correct # of accounts", 6, sfsb1.getCountForBranch("63088", useNamedQuery, useNamedRegion));
+      
+      if (checkEmptyRegion)
+      {
+         // Query should have been inserted
+         assertTrue("Query cache modified", sfsb1.getSawRegionModification(regionName));
+         // Clear the access state
+         sfsb1.getSawRegionAccess(regionName);
+      }
+      
+      log.info("First query on node 1 done");
+      
+      // We now have the query cache region activated on both nodes.
+      
+      // Sleep a bit to allow async repl to happen
+      sleep(SLEEP_TIME);
+      
+      // Do some more queries on node 0
+      
+      assertEquals("Correct branch for Smith", "94536", sfsb0.getBranch(SMITH, useNamedQuery, useNamedRegion));
+      
+      assertEquals("Correct high balances for Jones", 40, sfsb0.getTotalBalance(JONES, useNamedQuery, useNamedRegion));
+      
+      assertTrue("Query cache used", sfsb0.getSawRegionModification(regionName));
+      // Clear the access state
+      sfsb0.getSawRegionAccess(regionName);
+      
+      log.info("Second set of queries on node0 done");
+      
+      // Sleep a bit to allow async repl to happen
+      sleep(SLEEP_TIME);
+      
+      // Do it again from node 1
+      
+      // First check if the previous queries replicated (if the region is replicable)
+      
+      if (useNamedRegion)
+      {
+         assertTrue("Query cache remotely modified", sfsb1.getSawRegionModification(regionName));
+         // Clear the access state
+         sfsb1.getSawRegionAccess(regionName);
+      }
+      
+      assertEquals("Correct branch for Smith", "94536", sfsb1.getBranch(SMITH, useNamedQuery, useNamedRegion));
+      
+      assertEquals("Correct high balances for Jones", 40, sfsb1.getTotalBalance(JONES, useNamedQuery, useNamedRegion));
+      
+      if (useNamedRegion)
+      {
+         // Should be no change; query was already there
+         assertFalse("Query cache modified", sfsb1.getSawRegionModification(regionName));
+         assertTrue("Query cache accessed", sfsb1.getSawRegionAccess(regionName));
+      }
+      else
+      {
+         // Query should have been inserted
+         assertTrue("Query cache modified", sfsb1.getSawRegionModification(regionName));
+         // Clear the access state
+         sfsb1.getSawRegionAccess(regionName);
+      }      
+      
+      log.info("Second set of queries on node1 done");
+      
+      // Modify underlying data on node 1
+      modifyEntities(sfsb1);
+      
+      // Confirm query results are correct on node 0
+      
+      assertEquals("63088 has correct # of accounts", 7, sfsb0.getCountForBranch("63088", useNamedQuery, useNamedRegion));
+      
+      assertEquals("Correct branch for Smith", "63088", sfsb0.getBranch(SMITH, useNamedQuery, useNamedRegion));
+      
+      assertEquals("Correct high balances for Jones", 50, sfsb0.getTotalBalance(JONES, useNamedQuery, useNamedRegion));
+      
+      log.info("Third set of queries on node0 done");
+   }
+   
+   protected void sleep(long millis)
+   {
+      try
+      {
+         Thread.sleep(millis);
+      }
+      catch (InterruptedException e)
+      {
+         log.warn("Interrupted while sleeping", e);
+      }
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.unit;
+
+import java.util.Properties;
+import javax.naming.InitialContext;
+
+import org.hibernate.cache.StandardQueryCache;
+import org.jboss.ejb3.test.clusteredentity.classloader.Account;
+import org.jboss.ejb3.test.clusteredentity.classloader.AccountHolderPK;
+import org.jboss.ejb3.test.clusteredentity.classloader.EntityQueryTest;
+import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Tests EJB redeployment when entities with @Lob fields are stored
+ * in the second level cache.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+public class EntityQueryRedeployUnitTestCase
+extends EntityClassloaderTestBase
+{
+   private static boolean firstNamedRegionTest = true;
+   private static final String EAR_NAME = "clusteredentity-classloader-test.ear";
+   
+   public EntityQueryRedeployUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testRedeploy() throws Exception
+   {
+      // Set things up with the default region
+      queryTest(true, true, false, true);
+      // Now get the named query regions active
+      queryTest(false, true, true, true);
+      
+      // Don't set this false, as after redeploy it's as if its the first test
+//      firstNamedRegionTest = false;
+      
+      redeploy();
+      
+      // Redo the test, but no entity creation
+      queryTest(false, true, false, true);
+      queryTest(false, true, true, true);
+   }
+   
+   private void redeploy() throws Exception
+   {
+      RMIAdaptor[] adaptors = getAdaptors();
+      undeploy(adaptors[1], EAR_NAME);
+      
+      sleep(2000);
+      
+      deploy(adaptors[1], EAR_NAME);
+      
+      sleep(2000);
+      
+      // Get the SFSB again
+      sfsb1 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node1"));
+   }
+   
+   
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      Test t1 = getDeploySetup(EntityQueryRedeployUnitTestCase.class, EAR_NAME);
+
+      suite.addTest(t1);
+
+      // Create an initializer for the test suite
+      DBSetup wrapper = new DBSetup(suite);
+      return wrapper;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredentity.unit;
+
+import java.util.Properties;
+import javax.naming.InitialContext;
+
+import org.hibernate.cache.StandardQueryCache;
+import org.jboss.ejb3.test.clusteredentity.classloader.Account;
+import org.jboss.ejb3.test.clusteredentity.classloader.AccountHolderPK;
+import org.jboss.ejb3.test.clusteredentity.classloader.EntityQueryTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Tests caching of queries involving custom types.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+public class EntityQueryUnitTestCase
+extends EntityClassloaderTestBase
+{
+   private static boolean firstNamedRegionTest = true;
+   
+   public EntityQueryUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testManualQueryDefaultRegion() throws Exception
+   {
+      log.info("+++ start testManualQueryDefaultRegion");
+      queryTest(false, false);
+      log.info("+++ end testManualQueryDefaultRegion");
+   }
+   
+   public void testManualQueryNamedRegion() throws Exception
+   {      
+      log.info("+++ start testManualQueryNamedRegion");
+      try
+      {
+         queryTest(false, true);
+      }
+      finally
+      {
+         firstNamedRegionTest = false;
+      }
+      log.info("+++ end testManualQueryNamedRegion");
+   }
+   
+   public void testNamedQueryDefaultRegion() throws Exception
+   {    
+      log.info("+++ start testNamedQueryDefaultRegion");
+      queryTest(true, false);
+      log.info("+++ end testNamedQueryDefaultRegion");
+   }
+   
+   public void testNamedQueryNamedRegion() throws Exception
+   {      
+      log.info("+++ start testNamedQueryNamedRegion");
+      try
+      {
+         queryTest(true, true);
+      }
+      finally
+      {
+         firstNamedRegionTest = false;
+      }
+      log.info("+++ start testNamedQueryNamedRegion");
+   }
+
+   private void queryTest(boolean useNamedQuery, boolean useNamedRegion)
+   {
+      queryTest(true, useNamedQuery, useNamedRegion, firstNamedRegionTest);
+   }
+   
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      Test t1 = getDeploySetup(EntityQueryUnitTestCase.class, 
+                               "clusteredentity-classloader-test.ear");
+
+      suite.addTest(t1);
+
+      // Create an initializer for the test suite
+      DBSetup wrapper = new DBSetup(suite);
+      return wrapper;
+   }
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -38,8 +38,10 @@
 public class EntityUnitTestCase
 extends JBossClusteredTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
+   private static final long SLEEP_TIME = 300l;
+   
    static boolean deployed = false;
    static int test = 0;
 
@@ -77,31 +79,57 @@
       
       System.out.println("Create node 0");
       EntityTest tester0 = (EntityTest)ctx0.lookup("EntityTestBean/remote");
-      Customer customer = tester0.createCustomer();
 
-      //Call finder twice since Hibernate seems to not actually save collections 
-      //into cache on persist(), so make sure it is put into cache on find.       
-      System.out.println("Find node 0");
-      customer = tester0.findByCustomerId(customer.getId());
-      System.out.println("Find(2) node 0");
-      customer = tester0.findByCustomerId(customer.getId());
-
-      //Check everything was in cache
-      System.out.println("Check cache 0");
-      tester0.loadedFromCache();
-
-      //Now connect to cache on node2 and make sure it is all there
-      System.out.println("Lookup node 1");
-      InitialContext ctx1 = new InitialContext(prop1);
-      
-      EntityTest tester1 = (EntityTest)ctx1.lookup("EntityTestBean/remote");
-      System.out.println("Find node 1");
-      customer = tester1.findByCustomerId(customer.getId());
-
-      //Check everything was in cache
-      System.out.println("Check cache 1");
-      tester1.loadedFromCache();
-      
+      try
+      {
+         Customer customer = tester0.createCustomer();
+         
+         //Call finder twice since Hibernate seems to not actually save collections 
+         //into cache on persist(), so make sure it is put into cache on find.       
+         System.out.println("Find node 0");
+         customer = tester0.findByCustomerId(customer.getId());
+         System.out.println("Find(2) node 0");
+         customer = tester0.findByCustomerId(customer.getId());
+         
+         //Check everything was in cache
+         System.out.println("Check cache 0");
+         try
+         {
+            tester0.loadedFromCache();
+         }
+         catch (Exception e)
+         {
+            fail(e.getMessage());
+         }
+   
+         // The above placement of the collection in the cache is replicated async
+         // so pause a bit before checking node 1
+         sleep(SLEEP_TIME);
+         
+         //Now connect to cache on node2 and make sure it is all there
+         System.out.println("Lookup node 1");
+         InitialContext ctx1 = new InitialContext(prop1);
+         
+         EntityTest tester1 = (EntityTest)ctx1.lookup("EntityTestBean/remote");
+         System.out.println("Find node 1");
+         customer = tester1.findByCustomerId(customer.getId());
+   
+         //Check everything was in cache
+         System.out.println("Check cache 1");
+         try
+         {
+            tester1.loadedFromCache();
+         }
+         catch (Exception e)
+         {
+            fail(e.getMessage());
+         }
+      }
+      finally
+      {
+         // cleanup the db so we can run this test multiple times w/o restarting the cluster
+         tester0.cleanup();
+      }
    }
 
    public static Test suite() throws Exception

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,77 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice;
-import javax.ejb.Remote;
-import javax.ejb.Local;
-
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Service(objectName = "default:service=service")
- at Clustered(partition = "HASingletonPartition") 
- at Remote(ServiceRemote.class)
- at Local(ServiceLocal.class)
- at Management(ServiceManagement.class)
- at Depends("jboss.ha:service=HASingletonDeployer,type=Barrier")
-public class ServiceBean implements ServiceLocal, ServiceRemote, ServiceManagement
-{
-   private static final Logger log = Logger.getLogger(ServiceBean.class);
-   
-   private int remoteAccessed = 0;
-   
-   public synchronized void localMethod()
-   {
-   }
-
-   public synchronized void remoteMethod()
-   {
-      log.info("ACESSSED " + ++remoteAccessed);
-   }
-
-   public void create() throws Exception
-   {
-      log.info("CREATE");
-   }
-
-   public void start() throws Exception
-   {
-      log.info("START");
-   }
-
-   public void stop()
-   {
-      log.info("STOP");
-   }
-
-   public void destroy()
-   {
-      log.info("DESTROY");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice;
+import javax.ejb.Remote;
+import javax.ejb.Local;
+
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.Depends;
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Service(objectName = "default:service=service")
+ at Clustered(partition = "HASingletonPartition") 
+ at Remote(ServiceRemote.class)
+ at Local(ServiceLocal.class)
+ at Management(ServiceManagement.class)
+ at Depends("jboss.ha:service=HASingletonDeployer,type=Barrier")
+public class ServiceBean implements ServiceLocal, ServiceRemote, ServiceManagement
+{
+   private static final Logger log = Logger.getLogger(ServiceBean.class);
+   
+   private int remoteAccessed = 0;
+   
+   public synchronized void localMethod()
+   {
+   }
+
+   public synchronized void remoteMethod()
+   {
+      log.info("ACESSSED " + ++remoteAccessed);
+   }
+
+   public void create() throws Exception
+   {
+      log.info("CREATE");
+   }
+
+   public void start() throws Exception
+   {
+      log.info("START");
+   }
+
+   public void stop()
+   {
+      log.info("STOP");
+   }
+
+   public void destroy()
+   {
+      log.info("DESTROY");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ServiceLocal
-{
-   void localMethod();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceLocal
+{
+   void localMethod();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ServiceManagement
-{
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceManagement
+{
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ServiceRemote
-{
-   void remoteMethod();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceRemote
+{
+   void remoteMethod();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice;
-
-import javax.jws.WebMethod; 
-import javax.jws.WebService; 
-import javax.jws.soap.SOAPBinding; 
-import javax.naming.InitialContext; 
-import javax.naming.NamingException; 
-import javax.naming.Context; 
-import javax.xml.rpc.ServiceException; 
-import javax.xml.rpc.server.ServiceLifecycle; 
-import javax.rmi.PortableRemoteObject; 
-import java.util.Properties; 
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at WebService 
- at SOAPBinding(style = SOAPBinding.Style.RPC) 
-public class ServiceWeb implements ServiceLifecycle
-{ 
-   ServiceRemote service; 
-
-   public ServiceWeb() {} 
-
-   @WebMethod(operationName = "RemoteMethod") 
-   public void remoteMethod() { 
-      System.out.println("ServiceWeb.remoteMethod"); 
-      try
-      { 
-         service.remoteMethod(); 
-      } catch (Exception e)
-      {
-         e.printStackTrace(); 
-      } 
-   } 
-
-   private InitialContext getContext() throws NamingException{ 
-      Properties p = new Properties(); 
-      p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); 
-      p.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces"); 
-      p.put("jnp.partitionName", "HASingletonPartition"); 
-      return new InitialContext(p); 
-   } 
-
-   public void init(Object object) throws ServiceException { 
-      try
-      { 
-         service = (ServiceRemote) PortableRemoteObject.narrow( 
-               getContext().lookup("ServiceBean/remote"), ServiceRemote.class); 
-      } catch (NamingException e)
-      { 
-         e.printStackTrace(); 
-         throw new ServiceException("Could not find Service in JNDI service", e); 
-      } 
-   } 
-
-   public void destroy() { 
-   } 
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice;
+
+import javax.jws.WebMethod; 
+import javax.jws.WebService; 
+import javax.jws.soap.SOAPBinding; 
+import javax.naming.InitialContext; 
+import javax.naming.NamingException; 
+import javax.naming.Context; 
+import javax.xml.rpc.ServiceException; 
+import javax.xml.rpc.server.ServiceLifecycle; 
+import javax.rmi.PortableRemoteObject; 
+import java.util.Properties; 
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at WebService 
+ at SOAPBinding(style = SOAPBinding.Style.RPC) 
+public class ServiceWeb implements ServiceLifecycle
+{ 
+   ServiceRemote service; 
+
+   public ServiceWeb() {} 
+
+   @WebMethod(operationName = "RemoteMethod") 
+   public void remoteMethod() { 
+      System.out.println("ServiceWeb.remoteMethod"); 
+      try
+      { 
+         service.remoteMethod(); 
+      } catch (Exception e)
+      {
+         e.printStackTrace(); 
+      } 
+   } 
+
+   private InitialContext getContext() throws NamingException{ 
+      Properties p = new Properties(); 
+      p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); 
+      p.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces"); 
+      p.put("jnp.partitionName", "HASingletonPartition"); 
+      return new InitialContext(p); 
+   } 
+
+   public void init(Object object) throws ServiceException { 
+      try
+      { 
+         service = (ServiceRemote) PortableRemoteObject.narrow( 
+               getContext().lookup("ServiceBean/remote"), ServiceRemote.class); 
+      } catch (NamingException e)
+      { 
+         e.printStackTrace(); 
+         throw new ServiceException("Could not find Service in JNDI service", e); 
+      } 
+   } 
+
+   public void destroy() { 
+   } 
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceWeb.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice.servlets;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import java.util.Properties;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.ejb3.test.clusteredservice.ServiceRemote;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class EJBServlet extends HttpServlet
-{
-   private static final Logger log = Logger.getLogger(EJBServlet.class);
-   
-   protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      try
-      {
-         ServiceRemote test = (ServiceRemote) getInitialContext().lookup("ServiceBean/remote");
-         test.remoteMethod();
-         
-  /*       MBeanServer server = org.jboss.mx.util.MBeanServerLocator.locateJBoss();
-         ObjectName testerName = new ObjectName("default:service=service");
-         Object[] params = {};
-         String[] sig = {};
-         server.invoke(testerName, "", params, sig);*/
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-        
-         throw new ServletException("Failed to call ServiceBean through remote or local interfaces", e);
-      }
-      response.setContentType("text/html");
-      PrintWriter out = response.getWriter();
-      out.println("<html>");
-      out.println("<head><title>EJBServlet</title></head>");
-      out.println("<body>Tests passed<br></body>");
-      out.println("</html>");
-      out.close();
-   }
-   
-   protected InitialContext getInitialContext() throws Exception
-   {
-      Properties p = new Properties();
-      p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
-      p.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces");
-      p.put(Context.PROVIDER_URL, "localhost:1100"); 
-      return new InitialContext(p);
-   }
-
-   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      processRequest(request, response);
-   }
-
-   protected void doPost(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      processRequest(request, response);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import java.util.Properties;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.ejb3.test.clusteredservice.ServiceRemote;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class EJBServlet extends HttpServlet
+{
+   private static final Logger log = Logger.getLogger(EJBServlet.class);
+   
+   protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      try
+      {
+         ServiceRemote test = (ServiceRemote) getInitialContext().lookup("ServiceBean/remote");
+         test.remoteMethod();
+         
+  /*       MBeanServer server = org.jboss.mx.util.MBeanServerLocator.locateJBoss();
+         ObjectName testerName = new ObjectName("default:service=service");
+         Object[] params = {};
+         String[] sig = {};
+         server.invoke(testerName, "", params, sig);*/
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+        
+         throw new ServletException("Failed to call ServiceBean through remote or local interfaces", e);
+      }
+      response.setContentType("text/html");
+      PrintWriter out = response.getWriter();
+      out.println("<html>");
+      out.println("<head><title>EJBServlet</title></head>");
+      out.println("<body>Tests passed<br></body>");
+      out.println("</html>");
+      out.close();
+   }
+   
+   protected InitialContext getInitialContext() throws Exception
+   {
+      Properties p = new Properties();
+      p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      p.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces");
+      p.put(Context.PROVIDER_URL, "localhost:1100"); 
+      return new InitialContext(p);
+   }
+
+   protected void doGet(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      processRequest(request, response);
+   }
+
+   protected void doPost(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      processRequest(request, response);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/servlets/EJBServlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,180 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice.unit;
-
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.io.IOException;
-import java.lang.System;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.methods.OptionsMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.TraceMethod;
-import org.jboss.logging.Logger;
-
-/** Utilities for client http requests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class HttpUtils
-{
-   private static Logger log = Logger.getLogger(HttpUtils.class);
-   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
-   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
-
-   public static final int GET = 1;
-   public static final int POST = 2;
-   public static final int HEAD = 3;
-   public static final int OPTIONS = 4;
-   public static final int PUT = 5;
-   public static final int DELETE = 6;
-   public static final int TRACE = 7;
-   
-   public static String getBaseURL()
-   {
-      return baseURL;
-   }
-   public static String getBaseURL(String username, String password)
-   {
-      String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
-         + Integer.getInteger("web.port", 8080) + "/";
-      return url;
-   }
-   public static String getBaseURLNoAuth()
-   {
-      return baseURLNoAuth;
-   }
-
-   /** Perform a get on the indicated URL and assert an HTTP_OK response code
-    *
-    * @param url
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url) throws Exception
-   {
-      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
-   }
-   /** Perform a get on the indicated URL and assert that the response code
-    * matches the expectedHttpCode argument.
-    *
-    * @param url
-    * @param expectedHttpCode the http response code expected
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, int type)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null, type);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs, int type)
-      throws Exception
-   {
-      HttpClient httpConn = new HttpClient();
-      HttpMethodBase request = createMethod(url, type);
-
-      int hdrCount = hdrs != null ? hdrs.length : 0;
-      for(int n = 0; n < hdrCount; n ++)
-         request.addRequestHeader(hdrs[n]);
-      try
-      {
-         log.debug("Connecting to: "+url);
-         String userInfo = url.getUserInfo();
-
-         if( userInfo != null )
-         {
-            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
-            httpConn.getState().setCredentials(realm, url.getHost(), auth);
-         }
-         log.debug("RequestURI: "+request.getURI());
-         int responseCode = httpConn.executeMethod(request);
-         String response = request.getStatusText();
-         log.debug("responseCode="+responseCode+", response="+response);
-         String content = request.getResponseBodyAsString();
-         log.debug(content);
-         // Validate that we are seeing the requested response code
-         if( responseCode != expectedHttpCode )
-         {
-            throw new IOException("Expected reply code:"+expectedHttpCode
-               +", actual="+responseCode);
-         }
-      }
-      catch(IOException e)
-      {
-         throw e;
-      }
-      return request;
-   }
-
-   public static HttpMethodBase createMethod(URL url, int type)
-   {
-      HttpMethodBase request = null;
-      switch( type )
-      {
-         case GET:
-            request = new GetMethod(url.toString());
-            break;
-         case POST:
-            request = new PostMethod(url.toString());
-            break;
-         case HEAD:
-            request = new HeadMethod(url.toString());
-            break;
-         case OPTIONS:
-            request = new OptionsMethod(url.toString());
-            break;
-         case PUT:
-            request = new PutMethod(url.toString());
-            break;
-         case DELETE:
-            request = new DeleteMethod(url.toString());
-            break;
-         case TRACE:
-            request = new TraceMethod(url.toString());
-            break;
-      }
-      return request;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,180 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice.unit;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.IOException;
+import java.lang.System;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.HeadMethod;
+import org.apache.commons.httpclient.methods.OptionsMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.TraceMethod;
+import org.jboss.logging.Logger;
+
+/** Utilities for client http requests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class HttpUtils
+{
+   private static Logger log = Logger.getLogger(HttpUtils.class);
+   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
+   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+
+   public static final int GET = 1;
+   public static final int POST = 2;
+   public static final int HEAD = 3;
+   public static final int OPTIONS = 4;
+   public static final int PUT = 5;
+   public static final int DELETE = 6;
+   public static final int TRACE = 7;
+   
+   public static String getBaseURL()
+   {
+      return baseURL;
+   }
+   public static String getBaseURL(String username, String password)
+   {
+      String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
+         + Integer.getInteger("web.port", 8080) + "/";
+      return url;
+   }
+   public static String getBaseURLNoAuth()
+   {
+      return baseURLNoAuth;
+   }
+
+   /** Perform a get on the indicated URL and assert an HTTP_OK response code
+    *
+    * @param url
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url) throws Exception
+   {
+      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
+   }
+   /** Perform a get on the indicated URL and assert that the response code
+    * matches the expectedHttpCode argument.
+    *
+    * @param url
+    * @param expectedHttpCode the http response code expected
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, int type)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null, type);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs, int type)
+      throws Exception
+   {
+      HttpClient httpConn = new HttpClient();
+      HttpMethodBase request = createMethod(url, type);
+
+      int hdrCount = hdrs != null ? hdrs.length : 0;
+      for(int n = 0; n < hdrCount; n ++)
+         request.addRequestHeader(hdrs[n]);
+      try
+      {
+         log.debug("Connecting to: "+url);
+         String userInfo = url.getUserInfo();
+
+         if( userInfo != null )
+         {
+            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
+            httpConn.getState().setCredentials(realm, url.getHost(), auth);
+         }
+         log.debug("RequestURI: "+request.getURI());
+         int responseCode = httpConn.executeMethod(request);
+         String response = request.getStatusText();
+         log.debug("responseCode="+responseCode+", response="+response);
+         String content = request.getResponseBodyAsString();
+         log.debug(content);
+         // Validate that we are seeing the requested response code
+         if( responseCode != expectedHttpCode )
+         {
+            throw new IOException("Expected reply code:"+expectedHttpCode
+               +", actual="+responseCode);
+         }
+      }
+      catch(IOException e)
+      {
+         throw e;
+      }
+      return request;
+   }
+
+   public static HttpMethodBase createMethod(URL url, int type)
+   {
+      HttpMethodBase request = null;
+      switch( type )
+      {
+         case GET:
+            request = new GetMethod(url.toString());
+            break;
+         case POST:
+            request = new PostMethod(url.toString());
+            break;
+         case HEAD:
+            request = new HeadMethod(url.toString());
+            break;
+         case OPTIONS:
+            request = new OptionsMethod(url.toString());
+            break;
+         case PUT:
+            request = new PutMethod(url.toString());
+            break;
+         case DELETE:
+            request = new DeleteMethod(url.toString());
+            break;
+         case TRACE:
+            request = new TraceMethod(url.toString());
+            break;
+      }
+      return request;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/HttpUtils.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,94 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredservice.unit;
-
-import java.net.URL;
-
-import javax.management.Attribute;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/** 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ServiceTestCase extends JBossTestCase
-{
-   private static String REALM = "JBossTest Servlets";
-   private String node1URL = "http://jduke:theduke@localhost:8080/"; 
-   private String node2URL = "http://jduke:theduke@localhost:8180/"; 
-  
-   private static final String USE_JBOSS = "UseJBossWebLoader";
-   
-   public ServiceTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEJBServlet() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
-      
-      try {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
-         
-         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
-         
-         try 
-         {
-            URL url = new URL(node1URL+"clusteredservice/EJBServlet");
-            HttpUtils.accessURL(url);
-            HttpUtils.accessURL(url);
-         } catch (Exception e)
-         {
-         }
-         
-         try 
-         {
-            URL url = new URL(node2URL+"clusteredservice/EJBServlet");
-            HttpUtils.accessURL(url);
-            HttpUtils.accessURL(url);
-         } catch (Exception e)
-         {
-         }
-      }
-      finally
-      {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
-      }
-   }
-   
-   /**
-    * Setup the test suite.
-    */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ServiceTestCase.class, "");
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredservice.unit;
+
+import java.net.URL;
+
+import javax.management.Attribute;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/** 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ServiceTestCase extends JBossTestCase
+{
+   private static String REALM = "JBossTest Servlets";
+   private String node1URL = "http://jduke:theduke@localhost:8080/"; 
+   private String node2URL = "http://jduke:theduke@localhost:8180/"; 
+  
+   private static final String USE_JBOSS = "UseJBossWebLoader";
+   
+   public ServiceTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEJBServlet() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
+      
+      try {
+         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
+         
+         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
+         
+         try 
+         {
+            URL url = new URL(node1URL+"clusteredservice/EJBServlet");
+            HttpUtils.accessURL(url);
+            HttpUtils.accessURL(url);
+         } catch (Exception e)
+         {
+         }
+         
+         try 
+         {
+            URL url = new URL(node2URL+"clusteredservice/EJBServlet");
+            HttpUtils.accessURL(url);
+            HttpUtils.accessURL(url);
+         } catch (Exception e)
+         {
+         }
+      }
+      finally
+      {
+         server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
+      }
+   }
+   
+   /**
+    * Setup the test suite.
+    */
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ServiceTestCase.class, "");
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/unit/ServiceTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
-import org.jboss.ha.framework.interfaces.HARMIClient;
-import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
-
-import org.jboss.invocation.Invocation;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class BogusPolicy implements LoadBalancePolicy
-{
-   public void init (HARMIClient father)
-   {
-      throw new RuntimeException("Bogus implementation!");
-   }
-
-   public Object chooseTarget (FamilyClusterInfo clusterFamily)
-   {
-      throw new RuntimeException("Bogus implementation!");
-   }
-   public Object chooseTarget (FamilyClusterInfo clusterFamily, Invocation routingDecision)
-   {
-      throw new RuntimeException("Bogus implementation!");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
+import org.jboss.ha.framework.interfaces.HARMIClient;
+import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
+
+import org.jboss.invocation.Invocation;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class BogusPolicy implements LoadBalancePolicy
+{
+   public void init (HARMIClient father)
+   {
+      throw new RuntimeException("Bogus implementation!");
+   }
+
+   public Object chooseTarget (FamilyClusterInfo clusterFamily)
+   {
+      throw new RuntimeException("Bogus implementation!");
+   }
+   public Object chooseTarget (FamilyClusterInfo clusterFamily, Invocation routingDecision)
+   {
+      throw new RuntimeException("Bogus implementation!");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-/**
- * comment
- *
- * @author Ben Wang
- */
-public interface ClusteredStatelessRemote
-{
-   NodeAnswer getNodeState();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession;
+
+/**
+ * comment
+ *
+ * @author Ben Wang
+ */
+public interface ClusteredStatelessRemote
+{
+   NodeAnswer getNodeState();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.ha.framework.interfaces.RoundRobin;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import java.rmi.dgc.VMID;
-
-/**
- * Simple statless bean
- *
- * @author Ben Wang
- */
- at Stateless(name="clusteredStateless")
- at Clustered(loadBalancePolicy = RoundRobin.class)
- at Remote(ClusteredStatelessRemote.class)
-public class ClusteredStatelessSessionBean implements ClusteredStatelessRemote
-{
-   public transient VMID myId = null;
-   public NodeAnswer getNodeState() {
-      if(myId == null)
-      {
-         myId = new VMID();
-      }
-      return new NodeAnswer(this.myId, "test");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession;
+
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ha.framework.interfaces.RoundRobin;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import java.rmi.dgc.VMID;
+
+/**
+ * Simple statless bean
+ *
+ * @author Ben Wang
+ */
+ at Stateless(name="clusteredStateless")
+ at Clustered(loadBalancePolicy = RoundRobin.class)
+ at Remote(ClusteredStatelessRemote.class)
+public class ClusteredStatelessSessionBean implements ClusteredStatelessRemote
+{
+   public transient VMID myId = null;
+   public NodeAnswer getNodeState() {
+      if(myId == null)
+      {
+         myId = new VMID();
+      }
+      return new NodeAnswer(this.myId, "test");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.clusteredsession;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface Contained
-{
-   Customer find(long id);
-
-   void setCustomer(long id);
-
-   Customer getCustomer();
-
-   void updateCustomer();
-
-   boolean isActivated();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface Contained
+{
+   Customer find(long id);
+
+   void setCustomer(long id);
+
+   Customer getCustomer();
+
+   void updateCustomer();
+
+   boolean isActivated();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Contained.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,102 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
-import javax.annotation.PreDestroy;
-import javax.ejb.Stateful;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.annotation.ejb.Clustered;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateful
- at Clustered
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 2)
-public class ContainedBean implements Contained
-{
-   @PersistenceContext(type= PersistenceContextType.EXTENDED) EntityManager em;
-
-   Customer customer;
-
-   public Customer find(long id)
-   {
-      return em.find(Customer.class, id);
-   }
-
-   public void setCustomer(long id)
-   {
-      customer = find(id);
-   }
-
-   public Customer getCustomer()
-   {
-      return customer;
-   }
-
-   public void updateCustomer()
-   {
-      customer.setName("contained modified");
-   }
-
-   public boolean isActivated()
-   {
-      return activated;
-   }
-
-   public static boolean destroyed = false;
-   public static boolean passivated = false;
-   public static boolean activate = false;
-   private boolean activated = false;
-
-   @PrePassivate
-   public void passivate()
-   {
-      passivated = true;
-   }
-
-   @PostActivate
-   public void activate()
-   {
-      System.out.println("*********** ACTIVATED *****************");
-      if (activated) throw new RuntimeException("ACTIVATED TWICE");
-      activated = true;
-      if (activate) throw new RuntimeException("ACTIVATED TWICE IN TWO DIFFERENT INSTANCES");
-      activate = true;
-
-   }
-
-   @PreDestroy
-   public void destroy()
-   {
-      destroyed = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.EntityManager;
+import javax.annotation.PreDestroy;
+import javax.ejb.Stateful;
+import javax.ejb.PrePassivate;
+import javax.ejb.PostActivate;
+
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.Clustered;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateful
+ at Clustered
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 2)
+public class ContainedBean implements Contained
+{
+   @PersistenceContext(type= PersistenceContextType.EXTENDED) EntityManager em;
+
+   Customer customer;
+
+   public Customer find(long id)
+   {
+      return em.find(Customer.class, id);
+   }
+
+   public void setCustomer(long id)
+   {
+      customer = find(id);
+   }
+
+   public Customer getCustomer()
+   {
+      return customer;
+   }
+
+   public void updateCustomer()
+   {
+      customer.setName("contained modified");
+   }
+
+   public boolean isActivated()
+   {
+      return activated;
+   }
+
+   public static boolean destroyed = false;
+   public static boolean passivated = false;
+   public static boolean activate = false;
+   private boolean activated = false;
+
+   @PrePassivate
+   public void passivate()
+   {
+      passivated = true;
+   }
+
+   @PostActivate
+   public void activate()
+   {
+      System.out.println("*********** ACTIVATED *****************");
+      if (activated) throw new RuntimeException("ACTIVATED TWICE");
+      activated = true;
+      if (activate) throw new RuntimeException("ACTIVATED TWICE IN TWO DIFFERENT INSTANCES");
+      activate = true;
+
+   }
+
+   @PreDestroy
+   public void destroy()
+   {
+      destroyed = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ContainedBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Company customer
- *
- * @author Ben Wang
- */
- at Entity
-public class Customer implements java.io.Serializable
-{
-   long id;
-   String name;
-
-   public
-   Customer()
-   {
-   }
-
-   @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
-   public
-   long getId()
-   {
-      return id;
-   }
-
-   public
-   String getName()
-   {
-      return name;
-   }
-
-   public
-   void setId(long long1)
-   {
-      id = long1;
-   }
-
-   public
-   void setName(String string)
-   {
-      name = string;
-   }
-
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Company customer
+ *
+ * @author Ben Wang
+ */
+ at Entity
+public class Customer implements java.io.Serializable
+{
+   long id;
+   String name;
+
+   public
+   Customer()
+   {
+   }
+
+   @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
+   public
+   long getId()
+   {
+      return id;
+   }
+
+   public
+   String getName()
+   {
+      return name;
+   }
+
+   public
+   void setId(long long1)
+   {
+      id = long1;
+   }
+
+   public
+   void setName(String string)
+   {
+      name = string;
+   }
+
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import org.jboss.ha.framework.interfaces.GenericClusteringException;
-import org.jboss.logging.Logger;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * Used for testing clustering: allows to explicitly makes a call to node fail
- * This will mimic a dead server. This is used as a ejb3 interceptor now.
- * @author Ben Wang
- *
- */
-public class ExplicitFailoverInterceptor
-{
-   private Logger log = Logger.getLogger(ExplicitFailoverInterceptor.class);
-
-   @AroundInvoke
-   public Object invoke(InvocationContext ctx)
-      throws Exception
-   {
-      checkFailoverNeed (ctx);
-      return ctx.proceed();
-   }
-
-   protected void checkFailoverNeed (InvocationContext ctx)
-      throws Exception
-   {
-      if(ctx.getMethod().getName().equals("setUpFailover"))
-      {
-         return;
-      }
-
-      String failover = (String)System.getProperty ("JBossCluster-DoFail");
-      boolean doFail = false;
-
-      if (failover != null)
-      {
-         String strFailover = failover;
-         if (strFailover.equalsIgnoreCase ("true"))
-         {
-            doFail = true;
-         }
-         else if (strFailover.equalsIgnoreCase ("once"))
-         {
-            doFail = true;
-            System.setProperty ("JBossCluster-DoFail", "false");
-         }
-      }
-
-      if (doFail)
-      {
-         log.debug ("WE FAILOVER IN EJB INTERCEPTOR (explicit failover)!");
-
-         throw new GenericClusteringException
-            (GenericClusteringException.COMPLETED_NO, "Test failover from ejb interceptor", false);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession;
+
+import org.jboss.ha.framework.interfaces.GenericClusteringException;
+import org.jboss.logging.Logger;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Used for testing clustering: allows to explicitly makes a call to node fail
+ * This will mimic a dead server. This is used as a ejb3 interceptor now.
+ * @author Ben Wang
+ *
+ */
+public class ExplicitFailoverInterceptor
+{
+   private Logger log = Logger.getLogger(ExplicitFailoverInterceptor.class);
+
+   @AroundInvoke
+   public Object invoke(InvocationContext ctx)
+      throws Exception
+   {
+      checkFailoverNeed (ctx);
+      return ctx.proceed();
+   }
+
+   protected void checkFailoverNeed (InvocationContext ctx)
+      throws Exception
+   {
+      if(ctx.getMethod().getName().equals("setUpFailover"))
+      {
+         return;
+      }
+
+      String failover = (String)System.getProperty ("JBossCluster-DoFail");
+      boolean doFail = false;
+
+      if (failover != null)
+      {
+         String strFailover = failover;
+         if (strFailover.equalsIgnoreCase ("true"))
+         {
+            doFail = true;
+         }
+         else if (strFailover.equalsIgnoreCase ("once"))
+         {
+            doFail = true;
+            System.setProperty ("JBossCluster-DoFail", "false");
+         }
+      }
+
+      if (doFail)
+      {
+         log.debug ("WE FAILOVER IN EJB INTERCEPTOR (explicit failover)!");
+
+         throw new GenericClusteringException
+            (GenericClusteringException.COMPLETED_NO, "Test failover from ejb interceptor", false);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.io.Serializable;
-import java.rmi.dgc.VMID;
-
-/** A data class used to track the identity of the cluster node.
- *
- * @author Ben Wang
- */
-public class NodeAnswer implements Serializable
-{
-   public VMID nodeId = null;
-   public Object answer = null;
-
-   public NodeAnswer (VMID node, Object answer)
-   {
-      this.nodeId = node;
-      this.answer = answer;
-   }
-
-   public VMID getNodeId ()
-   {
-      return this.nodeId;
-   }
-
-   public Object getAnswer()
-   {
-      return this.answer;
-   }
-
-   @Override
-   public boolean equals(Object obj)
-   {
-      boolean same = (this == obj);
-      
-      if (!same && obj instanceof NodeAnswer)
-      {
-         NodeAnswer other = (NodeAnswer) obj;
-         same = this.nodeId.equals(other.nodeId)
-                && this.answer.equals(other.answer);
-      }
-      return same;
-   }
-
-   @Override
-   public int hashCode()
-   {
-      int result = 17;
-      result = result * 29 + nodeId.hashCode();
-      result = result * 29 + answer.hashCode();
-      return result;
-   }
-
-   public String toString ()
-   {
-      return "{ " + this.nodeId + " ; " + this.answer + " }";
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession;
+
+import java.io.Serializable;
+import java.rmi.dgc.VMID;
+
+/** A data class used to track the identity of the cluster node.
+ *
+ * @author Ben Wang
+ */
+public class NodeAnswer implements Serializable
+{
+   public VMID nodeId = null;
+   public Object answer = null;
+
+   public NodeAnswer (VMID node, Object answer)
+   {
+      this.nodeId = node;
+      this.answer = answer;
+   }
+
+   public VMID getNodeId ()
+   {
+      return this.nodeId;
+   }
+
+   public Object getAnswer()
+   {
+      return this.answer;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      boolean same = (this == obj);
+      
+      if (!same && obj instanceof NodeAnswer)
+      {
+         NodeAnswer other = (NodeAnswer) obj;
+         same = this.nodeId.equals(other.nodeId)
+                && this.answer.equals(other.answer);
+      }
+      return same;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      int result = 17;
+      result = result * 29 + nodeId.hashCode();
+      result = result * 29 + answer.hashCode();
+      return result;
+   }
+
+   public String toString ()
+   {
+      return "{ " + this.nodeId + " ; " + this.answer + " }";
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NodeAnswer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,182 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.rmi.dgc.VMID;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.EJBException;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remove;
-import javax.interceptor.Interceptors;
-
-import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
-
-/**
- * Base class for various configs of a SFSB.  No class-level clustering 
- * annotations applied so it can serve as a bean class that doesn't use 
- * annotations, or be subclassed by a bean that adds annotations. 
- *
- * @see StatefulBean
- * 
- * @author Ben Wang
- * @author Brian Stansberry
- * 
- * @version $Revision: 57207 $
- */
-public class NonAnnotationStatefulBean implements java.io.Serializable, StatefulRemote
-{
-   private Logger log = Logger.getLogger(getClass());
-   private int counter = 0;
-   private String state;
-   public transient VMID myId = null;
-   public String name;
-
-   public int increment()
-   {
-      System.out.println("INCREMENT - counter: " + (counter++));
-      return counter;
-   }
-
-   public String getHostAddress()
-   {
-      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
-   }
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   /**
-    * Sleep to test
-    * @throws Exception
-    */
-   public void longRunning() throws Exception
-   {
-      log.debug("+++ longRunning() enter ");
-      Thread.sleep(20000); // 20000 will break the passivation test now.
-      log.debug("+++ longRunning() leave ");
-   }
-
-   public int getPostActivate()
-   {
-      return postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return prePassivateCalled;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-
-   public String getState()
-   {
-      log.debug("getState(): entering ...");
-      return this.state;
-   }
-
-   public void reset()
-   {
-      state = null;
-      postActivateCalled = 0;
-      prePassivateCalled = 0;
-   }
-
-   public void resetActivationCounter() {
-      postActivateCalled = 0;
-      prePassivateCalled = 0;
-   }
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++postActivateCalled;
-      if (this.myId == null)
-      {
-         //it is a failover: we need to assign ourself an id
-         this.myId = new VMID();
-      }
-      log.debug("Activate. My ID: " + this.myId + " name: " + this.name);
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++prePassivateCalled;
-      log.debug("Passivate. My ID: " + this.myId + " name: " + this.name);
-   }
-
-   @Remove
-   public void remove()
-   {
-   }
-
-   @PostConstruct
-   public void ejbCreate()
-   {
-      this.myId = new VMID();
-      log.debug("My ID: " + this.myId);
-   }
-
-   // Remote Interface implementation ----------------------------------------------
-   
-   // Mimic explict failover
-   @Interceptors({ExplicitFailoverInterceptor.class})
-   public NodeAnswer getNodeState()
-   {
-      if (this.myId == null)
-      {
-         //it is a failover: we need to assign ourself an id because of transient nature
-         this.myId = new VMID();
-      }
-
-      NodeAnswer state = new NodeAnswer(this.myId, this.name);
-      log.debug("getNodeState, " + state);
-      return state;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-      log.debug("Name set to " + name);
-   }
-
-   public void setNameOnlyOnNode(String name, VMID node)
-   {
-      if (node.equals(this.myId))
-         this.setName(name);
-      else
-         throw new EJBException("Trying to assign value on node " + this.myId + " but this node expected: " + node);
-   }
-
-   public void setUpFailover(String failover) {
-      // To setup the failover property
-      log.debug("Setting up failover property: " +failover);
-      System.setProperty ("JBossCluster-DoFail", failover);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,182 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import java.rmi.dgc.VMID;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.EJBException;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remove;
+import javax.interceptor.Interceptors;
+
+import org.jboss.logging.Logger;
+import org.jboss.system.server.ServerConfig;
+
+/**
+ * Base class for various configs of a SFSB.  No class-level clustering 
+ * annotations applied so it can serve as a bean class that doesn't use 
+ * annotations, or be subclassed by a bean that adds annotations. 
+ *
+ * @see StatefulBean
+ * 
+ * @author Ben Wang
+ * @author Brian Stansberry
+ * 
+ * @version $Revision: 57207 $
+ */
+public class NonAnnotationStatefulBean implements java.io.Serializable, StatefulRemote
+{
+   private Logger log = Logger.getLogger(getClass());
+   private int counter = 0;
+   private String state;
+   public transient VMID myId = null;
+   public String name;
+
+   public int increment()
+   {
+      System.out.println("INCREMENT - counter: " + (counter++));
+      return counter;
+   }
+
+   public String getHostAddress()
+   {
+      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
+   }
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   /**
+    * Sleep to test
+    * @throws Exception
+    */
+   public void longRunning() throws Exception
+   {
+      log.debug("+++ longRunning() enter ");
+      Thread.sleep(20000); // 20000 will break the passivation test now.
+      log.debug("+++ longRunning() leave ");
+   }
+
+   public int getPostActivate()
+   {
+      return postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return prePassivateCalled;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+
+   public String getState()
+   {
+      log.debug("getState(): entering ...");
+      return this.state;
+   }
+
+   public void reset()
+   {
+      state = null;
+      postActivateCalled = 0;
+      prePassivateCalled = 0;
+   }
+
+   public void resetActivationCounter() {
+      postActivateCalled = 0;
+      prePassivateCalled = 0;
+   }
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++postActivateCalled;
+      if (this.myId == null)
+      {
+         //it is a failover: we need to assign ourself an id
+         this.myId = new VMID();
+      }
+      log.debug("Activate. My ID: " + this.myId + " name: " + this.name);
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++prePassivateCalled;
+      log.debug("Passivate. My ID: " + this.myId + " name: " + this.name);
+   }
+
+   @Remove
+   public void remove()
+   {
+   }
+
+   @PostConstruct
+   public void ejbCreate()
+   {
+      this.myId = new VMID();
+      log.debug("My ID: " + this.myId);
+   }
+
+   // Remote Interface implementation ----------------------------------------------
+   
+   // Mimic explict failover
+   @Interceptors({ExplicitFailoverInterceptor.class})
+   public NodeAnswer getNodeState()
+   {
+      if (this.myId == null)
+      {
+         //it is a failover: we need to assign ourself an id because of transient nature
+         this.myId = new VMID();
+      }
+
+      NodeAnswer state = new NodeAnswer(this.myId, this.name);
+      log.debug("getNodeState, " + state);
+      return state;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+      log.debug("Name set to " + name);
+   }
+
+   public void setNameOnlyOnNode(String name, VMID node)
+   {
+      if (node.equals(this.myId))
+         this.setName(name);
+      else
+         throw new EJBException("Trying to assign value on node " + this.myId + " but this node expected: " + node);
+   }
+
+   public void setUpFailover(String failover) {
+      // To setup the failover property
+      log.debug("Setting up failover property: " +failover);
+      System.setProperty ("JBossCluster-DoFail", failover);
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.Clustered;
-
-/**
- * SFSB whose clustering annotations are overridden in xml.
- *
- * @author Brian Stansberry
- * @version $Revision: 57207 $
- */
- at Stateful(name="OverrideAnnotationStateful")
- at Clustered(partition="BogusPartition")
- at Remote(StatefulRemote.class)
-public class OverrideAnnotationStatefulBean extends NonAnnotationStatefulBean
-{
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.Clustered;
+
+/**
+ * SFSB whose clustering annotations are overridden in xml.
+ *
+ * @author Brian Stansberry
+ * @version $Revision: 57207 $
+ */
+ at Stateful(name="OverrideAnnotationStateful")
+ at Clustered(partition="BogusPartition")
+ at Remote(StatefulRemote.class)
+public class OverrideAnnotationStatefulBean extends NonAnnotationStatefulBean
+{
+   
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateful(name="OverrideStateful")
- at Clustered(partition="BogusPartition", loadBalancePolicy=org.jboss.ejb3.test.clusteredsession.BogusPolicy.class)
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=2)
- at Remote(OverrideStatefulRemote.class)
-public class OverrideStatefulBean implements OverrideStatefulRemote
-{
-   private static final Logger log = Logger.getLogger(OverrideStatefulBean.class);
-   
-   private int state = 0;
-
-   public int increment()
-   {
-      log.info("INCREMENT - counter: " + (state++));
-      return state;
-   }
-   
-   public String getHostAddress()
-   {
-      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.logging.Logger;
+import org.jboss.system.server.ServerConfig;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateful(name="OverrideStateful")
+ at Clustered(partition="BogusPartition", loadBalancePolicy=org.jboss.ejb3.test.clusteredsession.BogusPolicy.class)
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=2)
+ at Remote(OverrideStatefulRemote.class)
+public class OverrideStatefulBean implements OverrideStatefulRemote
+{
+   private static final Logger log = Logger.getLogger(OverrideStatefulBean.class);
+   
+   private int state = 0;
+
+   public int increment()
+   {
+      log.info("INCREMENT - counter: " + (state++));
+      return state;
+   }
+   
+   public String getHostAddress()
+   {
+      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface OverrideStatefulRemote
-{
-   int increment();
-   String getHostAddress();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface OverrideStatefulRemote
+{
+   int increment();
+   String getHostAddress();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-
-
-/**
- * SLSB interface
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface Session
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+
+
+/**
+ * SLSB interface
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface Session
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Clustered;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateless(name="testStateless")
- at Clustered
- at Remote(Session.class)
-public class SessionBean implements Session
-{
-   public void test()
-   {
-      System.out.println("hello!!!");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import org.jboss.annotation.ejb.Clustered;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateless(name="testStateless")
+ at Clustered
+ at Remote(Session.class)
+public class SessionBean implements Session
+{
+   public void test()
+   {
+      System.out.println("hello!!!");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.rmi.dgc.VMID;
-
-import javax.ejb.Remove;
-
-/**
- * comment
- *
- * @author Ben Wang
- */
-public interface ShoppingCart
-{
-   VMID getVMID();
-   
-   long createCustomer();
-
-   void update();
-
-   Customer find(long id);
-
-   @Remove void checkout();
-
-   void update2();
-
-   void update3();
-
-   void never();
-
-   void setContainedCustomer();
-
-   void updateContained();
-
-   void findAndUpdateStateless();
-
-   void checkContainedCustomer();
-
-   boolean isContainedActivated();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import java.rmi.dgc.VMID;
+
+import javax.ejb.Remove;
+
+/**
+ * comment
+ *
+ * @author Ben Wang
+ */
+public interface ShoppingCart
+{
+   VMID getVMID();
+   
+   long createCustomer();
+
+   void update();
+
+   Customer find(long id);
+
+   @Remove void checkout();
+
+   void update2();
+
+   void update3();
+
+   void never();
+
+   void setContainedCustomer();
+
+   void updateContained();
+
+   void findAndUpdateStateless();
+
+   void checkContainedCustomer();
+
+   boolean isContainedActivated();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCart.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,138 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.io.Serializable;
-import java.rmi.dgc.VMID;
-
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.PostActivate;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-import org.jboss.annotation.ejb.Clustered;
-
-/**
- * comment
- *
- * @author Ben Wang
- */
- at Stateful
- at Clustered
- at Remote(ShoppingCart.class)
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 2)
-public class ShoppingCartBean implements ShoppingCart, Serializable
-{
-   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
-
-   @EJB StatelessLocal stateless;
-   
-   private Customer customer;
-
-   @EJB private Contained contained;
-
-   public VMID getVMID()
-   {
-      return stateless.getVMID();
-   }
-   
-   public long createCustomer()
-   {
-      customer = new Customer();
-      customer.setName("William");
-      em.persist(customer);
-      System.out.println("********* created *****");
-      return customer.getId();
-   }
-
-   public void setContainedCustomer()
-   {
-      contained.setCustomer(customer.getId());
-   }
-
-   public void checkContainedCustomer()
-   {
-      if (contained.getCustomer() != customer) throw new RuntimeException("not same customer");
-   }
-
-   public boolean isContainedActivated()
-   {
-      return contained.isActivated();
-   }
-
-   public void updateContained()
-   {
-      contained.updateCustomer();
-   }
-
-   public void update()
-   {
-      System.out.println("********* update() *****");
-      customer.setName("Bill");
-   }
-   public void update2()
-   {
-      customer.setName("Billy");
-   }
-
-   public void update3()
-   {
-      stateless.update(customer);
-   }
-
-   public void findAndUpdateStateless()
-   {
-      stateless.findAndUpdate(customer.getId());
-      if (!customer.getName().equals("stateless modified")) throw new RuntimeException("stateless didn't get propagated pc");
-   }
-
-   public Customer find(long id)
-   {
-      return em.find(Customer.class, id);
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never()
-   {
-      customer.setName("Bob");
-   }
-
-   @PostActivate
-   public void activate()
-   {
-      System.out.println("*********** ACTIVATED *****************");
-   }
-
-
-   @Remove
-   public void checkout() 
-   {
-      if (customer != null)
-         em.remove(customer);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import java.io.Serializable;
+import java.rmi.dgc.VMID;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.PostActivate;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.Clustered;
+
+/**
+ * comment
+ *
+ * @author Ben Wang
+ */
+ at Stateful
+ at Clustered
+ at Remote(ShoppingCart.class)
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 2)
+public class ShoppingCartBean implements ShoppingCart, Serializable
+{
+   @PersistenceContext(type=PersistenceContextType.EXTENDED) EntityManager em;
+
+   @EJB StatelessLocal stateless;
+   
+   private Customer customer;
+
+   @EJB private Contained contained;
+
+   public VMID getVMID()
+   {
+      return stateless.getVMID();
+   }
+   
+   public long createCustomer()
+   {
+      customer = new Customer();
+      customer.setName("William");
+      em.persist(customer);
+      System.out.println("********* created *****");
+      return customer.getId();
+   }
+
+   public void setContainedCustomer()
+   {
+      contained.setCustomer(customer.getId());
+   }
+
+   public void checkContainedCustomer()
+   {
+      if (contained.getCustomer() != customer) throw new RuntimeException("not same customer");
+   }
+
+   public boolean isContainedActivated()
+   {
+      return contained.isActivated();
+   }
+
+   public void updateContained()
+   {
+      contained.updateCustomer();
+   }
+
+   public void update()
+   {
+      System.out.println("********* update() *****");
+      customer.setName("Bill");
+   }
+   public void update2()
+   {
+      customer.setName("Billy");
+   }
+
+   public void update3()
+   {
+      stateless.update(customer);
+   }
+
+   public void findAndUpdateStateless()
+   {
+      stateless.findAndUpdate(customer.getId());
+      if (!customer.getName().equals("stateless modified")) throw new RuntimeException("stateless didn't get propagated pc");
+   }
+
+   public Customer find(long id)
+   {
+      return em.find(Customer.class, id);
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never()
+   {
+      customer.setName("Bob");
+   }
+
+   @PostActivate
+   public void activate()
+   {
+      System.out.println("*********** ACTIVATED *****************");
+   }
+
+
+   @Remove
+   public void checkout() 
+   {
+      if (customer != null)
+         em.remove(customer);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ShoppingCartBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-
-/**
- * Stateful bean that configures clustering via annotations.
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateful(name="testStateful")
- at Clustered
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=3)   // this will get evicted the second time eviction thread wakes up
- at Remote(StatefulRemote.class)
-public class StatefulBean extends NonAnnotationStatefulBean
-{   
-   // Only difference from superclass is the added class-level annotations
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.clusteredsession;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+
+/**
+ * Stateful bean that configures clustering via annotations.
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateful(name="testStateful")
+ at Clustered
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=3)   // this will get evicted the second time eviction thread wakes up
+ at Remote(StatefulRemote.class)
+public class StatefulBean extends NonAnnotationStatefulBean
+{   
+   // Only difference from superclass is the added class-level annotations
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.rmi.dgc.VMID;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface StatefulRemote
-{
-   int increment();
-   String getHostAddress();
-
-   int getPostActivate();
-
-   int getPrePassivate();
-
-   void setState(String state);
-
-   String getState();
-
-   void reset();
-
-   void resetActivationCounter();
-
-   void longRunning() throws Exception;
-
-   void remove();
-
-   public NodeAnswer getNodeState();
-
-   public void setName(String name);
-
-   public void setNameOnlyOnNode(String name, VMID node);
-
-   public void setUpFailover(String failover);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import java.rmi.dgc.VMID;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface StatefulRemote
+{
+   int increment();
+   String getHostAddress();
+
+   int getPostActivate();
+
+   int getPrePassivate();
+
+   void setState(String state);
+
+   String getState();
+
+   void reset();
+
+   void resetActivationCounter();
+
+   void longRunning() throws Exception;
+
+   void remove();
+
+   public NodeAnswer getNodeState();
+
+   public void setName(String name);
+
+   public void setNameOnlyOnNode(String name, VMID node);
+
+   public void setUpFailover(String failover);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.rmi.dgc.VMID;
-
-
-/**
- * comment
- *
- * @author Ben Wang
- */
-public interface StatelessLocal
-{
-   VMID getVMID();
-   
-   void update(Customer c);
-
-   void findAndUpdate(long id);
-
-   boolean isDestroyed();
-
-   void clearDestroyed();
-
-   boolean isPassivated();
-
-   void clearPassivated();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import java.rmi.dgc.VMID;
+
+
+/**
+ * comment
+ *
+ * @author Ben Wang
+ */
+public interface StatelessLocal
+{
+   VMID getVMID();
+   
+   void update(Customer c);
+
+   void findAndUpdate(long id);
+
+   boolean isDestroyed();
+
+   void clearDestroyed();
+
+   boolean isPassivated();
+
+   void clearPassivated();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.rmi.dgc.VMID;
-
-
-
-/**
- * comment
- *
- * @author Ben Wang
- */
-public interface StatelessRemote
-{
-   VMID getVMID();
-   
-   Customer find(long id);
-
-   void findAndUpdate(long id);
-
-   boolean isDestroyed();
-   void clearDestroyed();
-   boolean isPassivated();
-
-   void clearPassivated();   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import java.rmi.dgc.VMID;
+
+
+
+/**
+ * comment
+ *
+ * @author Ben Wang
+ */
+public interface StatelessRemote
+{
+   VMID getVMID();
+   
+   Customer find(long id);
+
+   void findAndUpdate(long id);
+
+   boolean isDestroyed();
+   void clearDestroyed();
+   boolean isPassivated();
+
+   void clearPassivated();   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.rmi.dgc.VMID;
-
-/**
- * comment
- *
- * @author Ben Wang
- */
- at Stateless
- at Remote(StatelessRemote.class)
- at Local(StatelessLocal.class)
-public class StatelessSessionBean implements StatelessLocal, StatelessRemote
-{
-   @PersistenceContext EntityManager em;
-
-   public transient VMID myId = null;
-
-   public VMID getVMID()
-   {
-      if(myId == null)
-      {
-         myId = new VMID();
-      }
-      return myId;
-   }
-   
-   public void update(Customer c)
-   {
-      c.setName("Bill Jr.");
-   }
-
-   public void findAndUpdate(long id)
-   {
-      Customer cust = find(id);
-      cust.setName("stateless modified");
-   }
-
-   public Customer find(long id)
-   {
-      return em.find(Customer.class, id);
-   }
-
-   public boolean isDestroyed()
-   {
-      return ContainedBean.destroyed;
-   }
-
-   public void clearDestroyed()
-   {
-      ContainedBean.destroyed = false;
-   }
-
-   public boolean isPassivated()
-   {
-      return ContainedBean.passivated;
-   }
-
-   public void clearPassivated()
-   {
-      ContainedBean.passivated = false;
-   }
-
-   public NodeAnswer getNodeState() {
-      return new NodeAnswer(getVMID(), "test");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.rmi.dgc.VMID;
+
+/**
+ * comment
+ *
+ * @author Ben Wang
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+ at Local(StatelessLocal.class)
+public class StatelessSessionBean implements StatelessLocal, StatelessRemote
+{
+   @PersistenceContext EntityManager em;
+
+   public transient VMID myId = null;
+
+   public VMID getVMID()
+   {
+      if(myId == null)
+      {
+         myId = new VMID();
+      }
+      return myId;
+   }
+   
+   public void update(Customer c)
+   {
+      c.setName("Bill Jr.");
+   }
+
+   public void findAndUpdate(long id)
+   {
+      Customer cust = find(id);
+      cust.setName("stateless modified");
+   }
+
+   public Customer find(long id)
+   {
+      return em.find(Customer.class, id);
+   }
+
+   public boolean isDestroyed()
+   {
+      return ContainedBean.destroyed;
+   }
+
+   public void clearDestroyed()
+   {
+      ContainedBean.destroyed = false;
+   }
+
+   public boolean isPassivated()
+   {
+      return ContainedBean.passivated;
+   }
+
+   public void clearPassivated()
+   {
+      ContainedBean.passivated = false;
+   }
+
+   public NodeAnswer getNodeState() {
+      return new NodeAnswer(getVMID(), "test");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatelessSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,25 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-
-import java.rmi.dgc.VMID;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface NestedStateful
-{
-   int increment();   
-   void reset();   
-   void remove();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested;
+
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+
+import java.rmi.dgc.VMID;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface NestedStateful
+{
+   int increment();   
+   void reset();   
+   void remove();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.logging.Logger;
-
-import javax.ejb.*;
-
-/**
- * Nested SFSB
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateful(name="testNestedStateful")
- at Clustered
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=3)   // this will get evicted the second time eviction thread wakes up
-public class NestedStatefulBean implements java.io.Serializable, NestedStateful
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-   
-   private static Logger log = Logger.getLogger(NestedStatefulBean.class);
-   private int counter = 0;
-
-   public int increment()
-   {
-      counter++;
-      log.debug("INCREMENT - nested counter: " + counter);
-      return counter;
-   }
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   public int getPostActivate()
-   {
-      return postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return prePassivateCalled;
-   }
-
-   public void reset()
-   {
-      counter = 0;
-      NestedStatefulBean.postActivateCalled = 0;
-      NestedStatefulBean.prePassivateCalled = 0;
-   }
-   
-   @Remove
-   public void remove() 
-   {
-      log.debug("Being removed");
-   }
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++NestedStatefulBean.postActivateCalled;
-      log.debug("postActivate: - counter: " + counter + 
-            " -- activate count:" + postActivateCalled);
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++NestedStatefulBean.prePassivateCalled;
-      log.debug("prePassivate: - counter: " + counter + 
-            " -- passivate count:" + prePassivateCalled);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested;
+
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.logging.Logger;
+
+import javax.ejb.*;
+
+/**
+ * Nested SFSB
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateful(name="testNestedStateful")
+ at Clustered
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=3)   // this will get evicted the second time eviction thread wakes up
+public class NestedStatefulBean implements java.io.Serializable, NestedStateful
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+   
+   private static Logger log = Logger.getLogger(NestedStatefulBean.class);
+   private int counter = 0;
+
+   public int increment()
+   {
+      counter++;
+      log.debug("INCREMENT - nested counter: " + counter);
+      return counter;
+   }
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   public int getPostActivate()
+   {
+      return postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return prePassivateCalled;
+   }
+
+   public void reset()
+   {
+      counter = 0;
+      NestedStatefulBean.postActivateCalled = 0;
+      NestedStatefulBean.prePassivateCalled = 0;
+   }
+   
+   @Remove
+   public void remove() 
+   {
+      log.debug("Being removed");
+   }
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++NestedStatefulBean.postActivateCalled;
+      log.debug("postActivate: - counter: " + counter + 
+            " -- activate count:" + postActivateCalled);
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++NestedStatefulBean.prePassivateCalled;
+      log.debug("prePassivate: - counter: " + counter + 
+            " -- passivate count:" + prePassivateCalled);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/NestedStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,206 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-import org.jboss.ejb3.test.clusteredsession.ClusteredStatelessRemote;
-
-import javax.interceptor.Interceptors;
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remove;
-import javax.ejb.EJBException;
-import java.rmi.dgc.VMID;
-
-/**
- * SFSB with nested bean
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateful(name="testParentStateful")
- at Clustered
-// Mimic explict failover
- at Interceptors({ExplicitFailoverInterceptor.class})
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=3)   // this will get evicted the second time eviction thread wakes up
- at Remote(ParentStatefulRemote.class)
-public class ParentStatefulBean implements java.io.Serializable, ParentStatefulRemote
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-   
-   private static Logger log = Logger.getLogger(ParentStatefulBean.class);
-   private int counter = 0;
-   private String state;
-   public transient VMID myId = null;
-   public String name;
-
-   @EJB
-   private NestedStateful nested;
-
-   @EJB
-   private ClusteredStatelessRemote slsb;
-
-   public int increment()
-   {
-      counter = nested.increment();
-
-      log.debug("INCREMENT - parent counter: " + counter);
-      return counter;
-   }
-
-   public String getHostAddress()
-   {
-      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
-   }
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   /**
-    * Sleep to test
-    * @throws Exception
-    */
-   public void longRunning() throws Exception
-   {
-      log.debug("+++ longRunning() enter ");
-      Thread.sleep(10000);
-      log.debug("+++ longRunning() leave ");
-   }
-
-   public int getPostActivate()
-   {
-      return ParentStatefulBean.postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return ParentStatefulBean.prePassivateCalled;
-   }
-
-   public int getNestedPostActivate()
-   {
-      return NestedStatefulBean.postActivateCalled;
-   }
-
-   public int getNestedPrePassivate()
-   {
-      return NestedStatefulBean.prePassivateCalled;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-
-   public String getState()
-   {
-      log.debug("getState(): entering ...");
-      return this.state;
-   }
-
-   public NodeAnswer getStatelessState() {
-      return slsb.getNodeState();
-   }
-
-   public void reset()
-   {
-      state = null;
-      counter = 0;
-      ParentStatefulBean.postActivateCalled = 0;
-      ParentStatefulBean.prePassivateCalled = 0;
-      NestedStatefulBean.postActivateCalled = 0;
-      NestedStatefulBean.prePassivateCalled = 0;
-   }
-
-   public void resetActivationCounter()
-   {
-      ParentStatefulBean.postActivateCalled = 0;
-      ParentStatefulBean.prePassivateCalled = 0;
-      NestedStatefulBean.postActivateCalled = 0;
-      NestedStatefulBean.prePassivateCalled = 0;
-   }
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++ParentStatefulBean.postActivateCalled;
-      if (this.myId == null)
-      {
-         //it is a failover: we need to assign ourself an id
-         this.myId = new VMID();
-      }
-      log.debug("Activate. My ID: " + this.myId + " name: " + this.name +
-            " activate count: " + postActivateCalled);
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++ParentStatefulBean.prePassivateCalled;
-      log.debug("Passivate. My ID: " + this.myId + " name: " + this.name +
-                " passivate count: " + prePassivateCalled);
-   }
-
-   @Remove
-   public void remove()
-   {
-      log.debug("Being removed");
-   }
-
-   @PostConstruct
-   public void ejbCreate()
-   {
-      this.myId = new VMID();
-      log.debug("My ID: " + this.myId);
-   }
-
-   // Remote Interface implementation ----------------------------------------------
-
-   public NodeAnswer getNodeState()
-   {
-      if (this.myId == null)
-      {
-         //it is a failover: we need to assign ourself an id
-         this.myId = new VMID();
-      }
-
-      NodeAnswer state = new NodeAnswer(this.myId, this.name);
-      log.debug("getNodeState, " + state);
-      return state;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-      log.debug("Name set to " + name);
-   }
-
-   public void setNameOnlyOnNode(String name, VMID node)
-   {
-      if (node.equals(this.myId))
-         this.setName(name);
-      else
-         throw new EJBException("Trying to assign value on node " + this.myId + " but this node expected: " + node);
-   }
-
-   public void setUpFailover(String failover) {
-      // To setup the failover property
-      log.debug("Setting up failover property: " +failover);
-      System.setProperty ("JBossCluster-DoFail", failover);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,206 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested;
+
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.logging.Logger;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+import org.jboss.ejb3.test.clusteredsession.ClusteredStatelessRemote;
+
+import javax.interceptor.Interceptors;
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+import javax.ejb.Stateful;
+import javax.ejb.Remote;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remove;
+import javax.ejb.EJBException;
+import java.rmi.dgc.VMID;
+
+/**
+ * SFSB with nested bean
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateful(name="testParentStateful")
+ at Clustered
+// Mimic explict failover
+ at Interceptors({ExplicitFailoverInterceptor.class})
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=3)   // this will get evicted the second time eviction thread wakes up
+ at Remote(ParentStatefulRemote.class)
+public class ParentStatefulBean implements java.io.Serializable, ParentStatefulRemote
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+   
+   private static Logger log = Logger.getLogger(ParentStatefulBean.class);
+   private int counter = 0;
+   private String state;
+   public transient VMID myId = null;
+   public String name;
+
+   @EJB
+   private NestedStateful nested;
+
+   @EJB
+   private ClusteredStatelessRemote slsb;
+
+   public int increment()
+   {
+      counter = nested.increment();
+
+      log.debug("INCREMENT - parent counter: " + counter);
+      return counter;
+   }
+
+   public String getHostAddress()
+   {
+      return System.getProperty(ServerConfig.SERVER_BIND_ADDRESS);
+   }
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   /**
+    * Sleep to test
+    * @throws Exception
+    */
+   public void longRunning() throws Exception
+   {
+      log.debug("+++ longRunning() enter ");
+      Thread.sleep(10000);
+      log.debug("+++ longRunning() leave ");
+   }
+
+   public int getPostActivate()
+   {
+      return ParentStatefulBean.postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return ParentStatefulBean.prePassivateCalled;
+   }
+
+   public int getNestedPostActivate()
+   {
+      return NestedStatefulBean.postActivateCalled;
+   }
+
+   public int getNestedPrePassivate()
+   {
+      return NestedStatefulBean.prePassivateCalled;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+
+   public String getState()
+   {
+      log.debug("getState(): entering ...");
+      return this.state;
+   }
+
+   public NodeAnswer getStatelessState() {
+      return slsb.getNodeState();
+   }
+
+   public void reset()
+   {
+      state = null;
+      counter = 0;
+      ParentStatefulBean.postActivateCalled = 0;
+      ParentStatefulBean.prePassivateCalled = 0;
+      NestedStatefulBean.postActivateCalled = 0;
+      NestedStatefulBean.prePassivateCalled = 0;
+   }
+
+   public void resetActivationCounter()
+   {
+      ParentStatefulBean.postActivateCalled = 0;
+      ParentStatefulBean.prePassivateCalled = 0;
+      NestedStatefulBean.postActivateCalled = 0;
+      NestedStatefulBean.prePassivateCalled = 0;
+   }
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++ParentStatefulBean.postActivateCalled;
+      if (this.myId == null)
+      {
+         //it is a failover: we need to assign ourself an id
+         this.myId = new VMID();
+      }
+      log.debug("Activate. My ID: " + this.myId + " name: " + this.name +
+            " activate count: " + postActivateCalled);
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++ParentStatefulBean.prePassivateCalled;
+      log.debug("Passivate. My ID: " + this.myId + " name: " + this.name +
+                " passivate count: " + prePassivateCalled);
+   }
+
+   @Remove
+   public void remove()
+   {
+      log.debug("Being removed");
+   }
+
+   @PostConstruct
+   public void ejbCreate()
+   {
+      this.myId = new VMID();
+      log.debug("My ID: " + this.myId);
+   }
+
+   // Remote Interface implementation ----------------------------------------------
+
+   public NodeAnswer getNodeState()
+   {
+      if (this.myId == null)
+      {
+         //it is a failover: we need to assign ourself an id
+         this.myId = new VMID();
+      }
+
+      NodeAnswer state = new NodeAnswer(this.myId, this.name);
+      log.debug("getNodeState, " + state);
+      return state;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+      log.debug("Name set to " + name);
+   }
+
+   public void setNameOnlyOnNode(String name, VMID node)
+   {
+      if (node.equals(this.myId))
+         this.setName(name);
+      else
+         throw new EJBException("Trying to assign value on node " + this.myId + " but this node expected: " + node);
+   }
+
+   public void setUpFailover(String failover) {
+      // To setup the failover property
+      log.debug("Setting up failover property: " +failover);
+      System.setProperty ("JBossCluster-DoFail", failover);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-
-import java.rmi.dgc.VMID;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface ParentStatefulRemote
-{
-   int increment();
-   String getHostAddress();
-
-   int getPostActivate();
-
-   int getPrePassivate();
-
-   int getNestedPostActivate();
-
-   int getNestedPrePassivate();
-
-   void setState(String state);
-
-   String getState();
-
-   NodeAnswer getStatelessState();
-
-   void reset();
-
-   void resetActivationCounter();
-
-   void longRunning() throws Exception;
-
-   void remove();
-
-   public NodeAnswer getNodeState();
-
-   public void setName(String name);
-
-   public void setNameOnlyOnNode(String name, VMID node);
-
-   public void setUpFailover(String failover);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested;
+
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+
+import java.rmi.dgc.VMID;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface ParentStatefulRemote
+{
+   int increment();
+   String getHostAddress();
+
+   int getPostActivate();
+
+   int getPrePassivate();
+
+   int getNestedPostActivate();
+
+   int getNestedPrePassivate();
+
+   void setState(String state);
+
+   String getState();
+
+   NodeAnswer getStatelessState();
+
+   void reset();
+
+   void resetActivationCounter();
+
+   void longRunning() throws Exception;
+
+   void remove();
+
+   public NodeAnswer getNodeState();
+
+   public void setName(String name);
+
+   public void setNameOnlyOnNode(String name, VMID node);
+
+   public void setUpFailover(String failover);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ParentStatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,279 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.unit;
-
-import org.jboss.test.JBossClusteredTestCase;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-import junit.framework.Test;
-import org.jboss.ejb3.test.clusteredsession.StatefulRemote;
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-
-/**
- * Test SFSB for load-balancing and failover behaviour
- *
- * @author  Ben.Wang at jboss.org
- * @author  Brian Stansberry
- * @version $Revision$
- */
-public class BeanUnitTestCase extends JBossClusteredTestCase
-{
-   static boolean deployed = false;
-   public static int test = 0;
-   static Date startDate = new Date();
-
-   protected final String namingFactory =
-   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-
-   protected final String providerURL =
-   System.getProperty(Context.PROVIDER_URL);
-
-   public BeanUnitTestCase (String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      final String jarName = "clusteredsession-test.jar";
-      Test t1 = JBossClusteredTestCase.getDeploySetup(BeanUnitTestCase.class,
-              jarName);
-      return t1;
-   }
-
-   protected InitialContext getInitialContext(int node) throws Exception {
-      // Connect to the server0 JNDI
-      String[] urls = getNamingURLs();
-      Properties env1 = new Properties();
-      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
-         "org.jnp.interfaces.NamingContextFactory");
-      env1.setProperty(Context.PROVIDER_URL, urls[node]);
-      return new InitialContext(env1);
-   }
-
-   public void testBasic()
-   throws Exception
-   {
-      basicTest("testStateful/remote");
-   }
-
-   public void testBasicWithoutAnnotation()
-   throws Exception
-   {
-      basicTest("NonAnnotationStateful/remote");
-   }
-
-   public void testBasicWithXMLOverride()
-   throws Exception
-   {
-      basicTest("OverrideAnnotationStateful/remote");
-   }
-
-   public void testBasicWithEjbJarXMLOverride()
-   throws Exception
-   {
-      basicTest("EjbJarOverrideAnnotationStateful/remote");
-   }
-   
-   private void basicTest(String jndiBinding) throws Exception
-   {
-      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
-              +"Trying the context...");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("Basic Test with " + jndiBinding);
-      getLog().debug("==================================");
-      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
-            +"Looking up " + jndiBinding + "...");
-      StatefulRemote stateful = (StatefulRemote) ctx.lookup(jndiBinding);
-
-      stateful.setName("The Code");
-      _sleep(300);
-
-      NodeAnswer node1 = stateful.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   public void testStatefulBeanCounterFailover()
-   throws Exception
-   {
-      statefulBeanCounterFailoverTest("testStateful/remote");
-   }
-
-   public void testStatefulBeanCounterFailoverWithoutAnnotation()
-   throws Exception
-   {
-      statefulBeanCounterFailoverTest("NonAnnotationStateful/remote");
-   }
-
-   public void testStatefulBeanCounterFailoverWithXMLOverride()
-   throws Exception
-   {
-      statefulBeanCounterFailoverTest("OverrideAnnotationStateful/remote");
-   }
-
-   public void testStatefulBeanCounterFailoverWithEjbJarXMLOverride()
-   throws Exception
-   {
-      statefulBeanCounterFailoverTest("EjbJarOverrideAnnotationStateful/remote");
-   }
-   
-   private void statefulBeanCounterFailoverTest(String jndiBinding) 
-   throws Exception
-   {  
-      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "+"Trying the context...");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("Test Stateful Bean Counter Failover with " + jndiBinding);
-      getLog().debug("=========================================================");
-      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
-              +"Looking up " + jndiBinding + "...");
-      StatefulRemote stateful = (StatefulRemote) ctx.lookup(jndiBinding);
-
-      stateful.setName("The Code");
-      NodeAnswer node1 = stateful.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-      _sleep(300);
-
-      // Now we switch to the other node, simulating a failure on node 1
-      //
-      stateful.setUpFailover("once");
-      NodeAnswer node2 = stateful.getNodeState ();
-      assertNotNull("State node: ", node2);
-      getLog ().debug ("Node 2 ID : " +node2);
-
-      assertFalse("Failover has occured", node1.nodeId.equals(node2.nodeId));
-
-      assertEquals ("Node 1: ", "The Code", node1.answer);
-      assertEquals ("Node 2: ", "The Code", node2.answer);
-
-      assertEquals("Counter: ", 3, stateful.increment());
-      assertEquals("Counter: ", 4, stateful.increment());
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   public void testStatefulBeanFailover()
-   throws Exception
-   {
-      statefulBeanFailoverTest("testStateful/remote");
-   }
-
-   public void testStatefulBeanFailoverWithoutAnnotation()
-   throws Exception
-   {
-      statefulBeanCounterFailoverTest("NonAnnotationStateful/remote");
-   }
-
-   public void testStatefulBeanFailoverWithXMLOverride()
-   throws Exception
-   {
-      statefulBeanCounterFailoverTest("OverrideAnnotationStateful/remote");
-   }
-
-   public void testStatefulBeanFailoverWithEjbJarXMLOverride()
-   throws Exception
-   {
-      statefulBeanCounterFailoverTest("EjbJarOverrideAnnotationStateful/remote");
-   }
-   
-   private void statefulBeanFailoverTest(String jndiBinding) 
-   throws Exception
-   {  
-      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "+"Trying the context...");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("Test Stateful Bean Failover with " + jndiBinding);
-      getLog().debug("================================================");
-      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
-            +"Looking up " + jndiBinding + "...");
-      StatefulRemote stateful = (StatefulRemote) ctx.lookup(jndiBinding);
-
-      stateful.setName("Bupple-Dupple");
-      _sleep(300);
-
-      NodeAnswer node1 = stateful.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-
-      // Now we switch to the other node, simulating a failure on node 1
-      //
-      stateful.setUpFailover("once");
-      NodeAnswer node2 = stateful.getNodeState ();
-      assertNotNull("State node: ", node2);
-      getLog ().debug ("Node 2 ID : " +node2);
-
-      assertFalse("Failover has occured", node1.nodeId.equals(node2.nodeId));
-
-      assertEquals ("Node 1: ", "Bupple-Dupple", node1.answer);
-      assertEquals ("Node 2: ", "Bupple-Dupple", node2.answer);
-
-      // we change our name to see if it replicates to node 1
-      //
-      stateful.setName ("Changed");
-      _sleep(300);
-
-      // now we travel back on node 1
-      //
-      stateful.setUpFailover("once");
-      node1 = stateful.getNodeState ();
-      assertNotNull("State node id should not be null: ", node1.nodeId);
-      getLog ().debug (node1);
-
-      _sleep(300);
-      assertNotSame ("No failover has occured!", node1.nodeId, node2.nodeId);
-
-      assertEquals ("Value is not identical on replicated node", "Changed", node1.answer );
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   protected void _sleep(long time)
-   {
-      try {
-         Thread.sleep(time);
-      } catch (InterruptedException e) {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,279 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.unit;
+
+import org.jboss.test.JBossClusteredTestCase;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Date;
+import java.util.Properties;
+
+import junit.framework.Test;
+import org.jboss.ejb3.test.clusteredsession.StatefulRemote;
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+
+/**
+ * Test SFSB for load-balancing and failover behaviour
+ *
+ * @author  Ben.Wang at jboss.org
+ * @author  Brian Stansberry
+ * @version $Revision$
+ */
+public class BeanUnitTestCase extends JBossClusteredTestCase
+{
+   static boolean deployed = false;
+   public static int test = 0;
+   static Date startDate = new Date();
+
+   protected final String namingFactory =
+   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+
+   protected final String providerURL =
+   System.getProperty(Context.PROVIDER_URL);
+
+   public BeanUnitTestCase (String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      final String jarName = "clusteredsession-test.jar";
+      Test t1 = JBossClusteredTestCase.getDeploySetup(BeanUnitTestCase.class,
+              jarName);
+      return t1;
+   }
+
+   protected InitialContext getInitialContext(int node) throws Exception {
+      // Connect to the server0 JNDI
+      String[] urls = getNamingURLs();
+      Properties env1 = new Properties();
+      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+         "org.jnp.interfaces.NamingContextFactory");
+      env1.setProperty(Context.PROVIDER_URL, urls[node]);
+      return new InitialContext(env1);
+   }
+
+   public void testBasic()
+   throws Exception
+   {
+      basicTest("testStateful/remote");
+   }
+
+   public void testBasicWithoutAnnotation()
+   throws Exception
+   {
+      basicTest("NonAnnotationStateful/remote");
+   }
+
+   public void testBasicWithXMLOverride()
+   throws Exception
+   {
+      basicTest("OverrideAnnotationStateful/remote");
+   }
+
+   public void testBasicWithEjbJarXMLOverride()
+   throws Exception
+   {
+      basicTest("EjbJarOverrideAnnotationStateful/remote");
+   }
+   
+   private void basicTest(String jndiBinding) throws Exception
+   {
+      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
+              +"Trying the context...");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("Basic Test with " + jndiBinding);
+      getLog().debug("==================================");
+      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
+            +"Looking up " + jndiBinding + "...");
+      StatefulRemote stateful = (StatefulRemote) ctx.lookup(jndiBinding);
+
+      stateful.setName("The Code");
+      _sleep(300);
+
+      NodeAnswer node1 = stateful.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+
+      stateful.remove();
+      getLog().debug("ok");
+   }
+
+   public void testStatefulBeanCounterFailover()
+   throws Exception
+   {
+      statefulBeanCounterFailoverTest("testStateful/remote");
+   }
+
+   public void testStatefulBeanCounterFailoverWithoutAnnotation()
+   throws Exception
+   {
+      statefulBeanCounterFailoverTest("NonAnnotationStateful/remote");
+   }
+
+   public void testStatefulBeanCounterFailoverWithXMLOverride()
+   throws Exception
+   {
+      statefulBeanCounterFailoverTest("OverrideAnnotationStateful/remote");
+   }
+
+   public void testStatefulBeanCounterFailoverWithEjbJarXMLOverride()
+   throws Exception
+   {
+      statefulBeanCounterFailoverTest("EjbJarOverrideAnnotationStateful/remote");
+   }
+   
+   private void statefulBeanCounterFailoverTest(String jndiBinding) 
+   throws Exception
+   {  
+      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "+"Trying the context...");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("Test Stateful Bean Counter Failover with " + jndiBinding);
+      getLog().debug("=========================================================");
+      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
+              +"Looking up " + jndiBinding + "...");
+      StatefulRemote stateful = (StatefulRemote) ctx.lookup(jndiBinding);
+
+      stateful.setName("The Code");
+      NodeAnswer node1 = stateful.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+      _sleep(300);
+
+      // Now we switch to the other node, simulating a failure on node 1
+      //
+      stateful.setUpFailover("once");
+      NodeAnswer node2 = stateful.getNodeState ();
+      assertNotNull("State node: ", node2);
+      getLog ().debug ("Node 2 ID : " +node2);
+
+      assertFalse("Failover has occured", node1.nodeId.equals(node2.nodeId));
+
+      assertEquals ("Node 1: ", "The Code", node1.answer);
+      assertEquals ("Node 2: ", "The Code", node2.answer);
+
+      assertEquals("Counter: ", 3, stateful.increment());
+      assertEquals("Counter: ", 4, stateful.increment());
+
+      stateful.remove();
+      getLog().debug("ok");
+   }
+
+   public void testStatefulBeanFailover()
+   throws Exception
+   {
+      statefulBeanFailoverTest("testStateful/remote");
+   }
+
+   public void testStatefulBeanFailoverWithoutAnnotation()
+   throws Exception
+   {
+      statefulBeanCounterFailoverTest("NonAnnotationStateful/remote");
+   }
+
+   public void testStatefulBeanFailoverWithXMLOverride()
+   throws Exception
+   {
+      statefulBeanCounterFailoverTest("OverrideAnnotationStateful/remote");
+   }
+
+   public void testStatefulBeanFailoverWithEjbJarXMLOverride()
+   throws Exception
+   {
+      statefulBeanCounterFailoverTest("EjbJarOverrideAnnotationStateful/remote");
+   }
+   
+   private void statefulBeanFailoverTest(String jndiBinding) 
+   throws Exception
+   {  
+      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "+"Trying the context...");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("Test Stateful Bean Failover with " + jndiBinding);
+      getLog().debug("================================================");
+      getLog().debug(++org.jboss.ejb3.test.clusteredsession.unit.BeanUnitTestCase.test +"- "
+            +"Looking up " + jndiBinding + "...");
+      StatefulRemote stateful = (StatefulRemote) ctx.lookup(jndiBinding);
+
+      stateful.setName("Bupple-Dupple");
+      _sleep(300);
+
+      NodeAnswer node1 = stateful.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+
+      // Now we switch to the other node, simulating a failure on node 1
+      //
+      stateful.setUpFailover("once");
+      NodeAnswer node2 = stateful.getNodeState ();
+      assertNotNull("State node: ", node2);
+      getLog ().debug ("Node 2 ID : " +node2);
+
+      assertFalse("Failover has occured", node1.nodeId.equals(node2.nodeId));
+
+      assertEquals ("Node 1: ", "Bupple-Dupple", node1.answer);
+      assertEquals ("Node 2: ", "Bupple-Dupple", node2.answer);
+
+      // we change our name to see if it replicates to node 1
+      //
+      stateful.setName ("Changed");
+      _sleep(300);
+
+      // now we travel back on node 1
+      //
+      stateful.setUpFailover("once");
+      node1 = stateful.getNodeState ();
+      assertNotNull("State node id should not be null: ", node1.nodeId);
+      getLog ().debug (node1);
+
+      _sleep(300);
+      assertNotSame ("No failover has occured!", node1.nodeId, node2.nodeId);
+
+      assertEquals ("Value is not identical on replicated node", "Changed", node1.answer );
+
+      stateful.remove();
+      getLog().debug("ok");
+   }
+
+   protected void _sleep(long time)
+   {
+      try {
+         Thread.sleep(time);
+      } catch (InterruptedException e) {
+         e.printStackTrace();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/BeanUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,170 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.clusteredsession.unit;
-
-import org.jboss.ejb3.test.clusteredentity.unit.DBSetup;
-import org.jboss.ejb3.test.clusteredsession.Customer;
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-import org.jboss.ejb3.test.clusteredsession.ShoppingCart;
-import org.jboss.ejb3.test.clusteredsession.StatelessRemote;
-import org.jboss.test.JBossClusteredTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import javax.naming.InitialContext;
-import javax.naming.Context;
-
-import java.rmi.dgc.VMID;
-import java.util.Properties;
-
-/**
- * Tests for extended persistence under clustering.
- *
- * @author Ben Wang
- * @version $Id$
- */
-
-public class ExtendedPersistenceUnitTestCase extends JBossClusteredTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public ExtendedPersistenceUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   protected InitialContext getInitialContext(int node) throws Exception {
-      // Connect to the server0 JNDI
-      String[] urls = getNamingURLs();
-      Properties env1 = new Properties();
-      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
-         "org.jnp.interfaces.NamingContextFactory");
-      env1.setProperty(Context.PROVIDER_URL, urls[node]);
-      return new InitialContext(env1);
-   }
-
-   public void testBasic() throws Exception
-   {
-      ShoppingCart cart = (ShoppingCart) getInitialContext(0).lookup("ShoppingCartBean/remote");
-      StatelessRemote stateless = (StatelessRemote) getInitialContext(0).lookup("StatelessSessionBean/remote");
-      Customer customer;
-
-      long id = cart.createCustomer();
-      customer = stateless.find(id);
-      assertEquals("William", customer.getName());
-      customer = cart.find(id);
-      assertEquals("William", customer.getName());
-      cart.update();
-      customer = stateless.find(id);
-      assertEquals("Bill", customer.getName());
-      customer = cart.find(id);
-      assertEquals("Bill", customer.getName());
-      cart.update2();
-      customer = stateless.find(id);
-      assertEquals("Billy", customer.getName());
-      customer = cart.find(id);
-      assertEquals("Billy", customer.getName());
-      cart.update3();
-      customer = stateless.find(id);
-      assertEquals("Bill Jr.", customer.getName());
-      customer = cart.find(id);
-      assertEquals("Bill Jr.", customer.getName());
-      cart.setContainedCustomer();
-      cart.checkout();
-   }
-
-   public void testPassivation() throws Exception
-   {
-      // We want a colocated SLSB and SFSB to test passivation/destruction
-      // StatelessRemoteBean is not clustered, so once we have it's VMID
-      // we can keep creating SFSBs until we get one we want
-      StatelessRemote stateless = (StatelessRemote) getInitialContext(0).lookup("StatelessSessionBean/remote");
-      VMID statelessVM = stateless.getVMID();
-      
-      ShoppingCart cart = null;      
-      boolean vmMatch = false;
-      for (int i = 0; i < 10 && !vmMatch; i++)
-      {
-         cart = (ShoppingCart) getInitialContext(0).lookup("ShoppingCartBean/remote");
-         vmMatch = statelessVM.equals(cart.getVMID());
-         if (!vmMatch)
-            cart.checkout();
-      }
-      
-      assertTrue("SLSB and SFSB in same VM", vmMatch);
-      
-      Customer customer;
-      
-      long id = cart.createCustomer();
-      customer = stateless.find(id);
-      assertEquals("William", customer.getName());
-      customer = cart.find(id);
-      assertEquals("William", customer.getName());
-      cart.update();
-      customer = stateless.find(id);
-      assertEquals("Bill", customer.getName());
-      customer = cart.find(id);
-      assertEquals("Bill", customer.getName());
-      cart.update2();
-      customer = stateless.find(id);
-      assertEquals("Billy", customer.getName());
-      customer = cart.find(id);
-      assertEquals("Billy", customer.getName());
-      cart.update3();
-      customer = stateless.find(id);
-      assertEquals("Bill Jr.", customer.getName());
-      customer = cart.find(id);
-      assertEquals("Bill Jr.", customer.getName());
-      cart.setContainedCustomer();
-      
-      Thread.sleep(11000); // passivation      
-      assertTrue("Contained bean was passivated", stateless.isPassivated());
-      
-      cart.checkContainedCustomer();
-      cart.findAndUpdateStateless();
-      cart.updateContained();
-      
-      stateless.clearDestroyed();
-      assertTrue(cart.isContainedActivated());      
-      cart.checkout();
-      assertTrue("Contained bean was destroyed", stateless.isDestroyed());
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      Test t1 = getDeploySetup(ExtendedPersistenceUnitTestCase.class,
-                               "clusteredsession-test.jar");
-
-      suite.addTest(t1);
-
-      // Create an initializer for the test suite
-      DBSetup wrapper = new DBSetup(suite);
-      return wrapper;     
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.clusteredsession.unit;
+
+import org.jboss.ejb3.test.clusteredentity.unit.DBSetup;
+import org.jboss.ejb3.test.clusteredsession.Customer;
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+import org.jboss.ejb3.test.clusteredsession.ShoppingCart;
+import org.jboss.ejb3.test.clusteredsession.StatelessRemote;
+import org.jboss.test.JBossClusteredTestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import javax.naming.InitialContext;
+import javax.naming.Context;
+
+import java.rmi.dgc.VMID;
+import java.util.Properties;
+
+/**
+ * Tests for extended persistence under clustering.
+ *
+ * @author Ben Wang
+ * @version $Id$
+ */
+
+public class ExtendedPersistenceUnitTestCase extends JBossClusteredTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public ExtendedPersistenceUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   protected InitialContext getInitialContext(int node) throws Exception {
+      // Connect to the server0 JNDI
+      String[] urls = getNamingURLs();
+      Properties env1 = new Properties();
+      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+         "org.jnp.interfaces.NamingContextFactory");
+      env1.setProperty(Context.PROVIDER_URL, urls[node]);
+      return new InitialContext(env1);
+   }
+
+   public void testBasic() throws Exception
+   {
+      ShoppingCart cart = (ShoppingCart) getInitialContext(0).lookup("ShoppingCartBean/remote");
+      StatelessRemote stateless = (StatelessRemote) getInitialContext(0).lookup("StatelessSessionBean/remote");
+      Customer customer;
+
+      long id = cart.createCustomer();
+      customer = stateless.find(id);
+      assertEquals("William", customer.getName());
+      customer = cart.find(id);
+      assertEquals("William", customer.getName());
+      cart.update();
+      customer = stateless.find(id);
+      assertEquals("Bill", customer.getName());
+      customer = cart.find(id);
+      assertEquals("Bill", customer.getName());
+      cart.update2();
+      customer = stateless.find(id);
+      assertEquals("Billy", customer.getName());
+      customer = cart.find(id);
+      assertEquals("Billy", customer.getName());
+      cart.update3();
+      customer = stateless.find(id);
+      assertEquals("Bill Jr.", customer.getName());
+      customer = cart.find(id);
+      assertEquals("Bill Jr.", customer.getName());
+      cart.setContainedCustomer();
+      cart.checkout();
+   }
+
+   public void testPassivation() throws Exception
+   {
+      // We want a colocated SLSB and SFSB to test passivation/destruction
+      // StatelessRemoteBean is not clustered, so once we have it's VMID
+      // we can keep creating SFSBs until we get one we want
+      StatelessRemote stateless = (StatelessRemote) getInitialContext(0).lookup("StatelessSessionBean/remote");
+      VMID statelessVM = stateless.getVMID();
+      
+      ShoppingCart cart = null;      
+      boolean vmMatch = false;
+      for (int i = 0; i < 10 && !vmMatch; i++)
+      {
+         cart = (ShoppingCart) getInitialContext(0).lookup("ShoppingCartBean/remote");
+         vmMatch = statelessVM.equals(cart.getVMID());
+         if (!vmMatch)
+            cart.checkout();
+      }
+      
+      assertTrue("SLSB and SFSB in same VM", vmMatch);
+      
+      Customer customer;
+      
+      long id = cart.createCustomer();
+      customer = stateless.find(id);
+      assertEquals("William", customer.getName());
+      customer = cart.find(id);
+      assertEquals("William", customer.getName());
+      cart.update();
+      customer = stateless.find(id);
+      assertEquals("Bill", customer.getName());
+      customer = cart.find(id);
+      assertEquals("Bill", customer.getName());
+      cart.update2();
+      customer = stateless.find(id);
+      assertEquals("Billy", customer.getName());
+      customer = cart.find(id);
+      assertEquals("Billy", customer.getName());
+      cart.update3();
+      customer = stateless.find(id);
+      assertEquals("Bill Jr.", customer.getName());
+      customer = cart.find(id);
+      assertEquals("Bill Jr.", customer.getName());
+      cart.setContainedCustomer();
+      
+      Thread.sleep(11000); // passivation      
+      assertTrue("Contained bean was passivated", stateless.isPassivated());
+      
+      cart.checkContainedCustomer();
+      cart.findAndUpdateStateless();
+      cart.updateContained();
+      
+      stateless.clearDestroyed();
+      assertTrue(cart.isContainedActivated());      
+      cart.checkout();
+      assertTrue("Contained bean was destroyed", stateless.isDestroyed());
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      Test t1 = getDeploySetup(ExtendedPersistenceUnitTestCase.class,
+                               "clusteredsession-test.jar");
+
+      suite.addTest(t1);
+
+      // Create an initializer for the test suite
+      DBSetup wrapper = new DBSetup(suite);
+      return wrapper;     
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,180 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.unit;
-
-import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-import org.jboss.ejb3.test.clusteredsession.nested.ParentStatefulRemote;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-import junit.framework.Test;
-
-/**
- * Test nested SFSB for load-balancing and failover behaviour
- *
- * @author  Ben.Wang at jboss.org
- * @version $Revision$
- */
-public class NestedBeanUnitTestCase extends JBossClusteredTestCase
-{
-   static boolean deployed = false;
-   public static int test = 0;
-   static Date startDate = new Date();
-
-   protected final String namingFactory =
-   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-
-   protected final String providerURL =
-   System.getProperty(Context.PROVIDER_URL);
-
-   public NestedBeanUnitTestCase (String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      final String jarName = "clusteredsession-test.jar";
-      Test t1 = JBossClusteredTestCase.getDeploySetup(NestedBeanUnitTestCase.class,
-              jarName);
-      return t1;
-   }
-
-   protected InitialContext getInitialContext(int node) throws Exception {
-      // Connect to the server0 JNDI
-      String[] urls = getNamingURLs();
-      Properties env1 = new Properties();
-      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
-         "org.jnp.interfaces.NamingContextFactory");
-      env1.setProperty(Context.PROVIDER_URL, urls[node]);
-      return new InitialContext(env1);
-   }
-
-
-   public void testBasic()
-   throws Exception
-   {
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Trying the context...");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("Test Nested Stateful Bean");
-      getLog().debug("==================================");
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Looking up testBasic...");
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-
-      stateful.reset();
-      stateful.setName("The Code");
-      _sleep(300);
-
-      NodeAnswer node1 = stateful.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-
-      stateful.remove();
-      getLog().debug("ok");
-      _sleep(11000);
-   }
-
-   public void testPassivation()
-   throws Exception
-   {
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Trying the context...");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("Test Nested Stateful Bean");
-      getLog().debug("==================================");
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Looking up remote...");
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-
-      stateful.setName("The Code");
-      _sleep(300);
-
-      NodeAnswer node1 = stateful.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-//      _sleep(300000);
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-      assertEquals("SLSB state: ", "test", stateful.getStatelessState().getAnswer());
-      stateful.reset();
-      _sleep(11000);
-      assertEquals("Counter: ", 3, stateful.increment());
-      assertEquals("SLSB state: ", "test", stateful.getStatelessState().getAnswer());
-      assertEquals(1, stateful.getPrePassivate());
-      assertEquals(1, stateful.getPostActivate());
-      assertEquals(1, stateful.getNestedPrePassivate());
-      assertEquals(1, stateful.getNestedPostActivate());
-
-      stateful.remove();
-      getLog().debug("ok: done");
-      _sleep(12000);
-   }
-
-   public void testStatefulBeanCounterFailover()
-   throws Exception
-   {
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "+"Trying the context...");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("Test Stateful Bean Failover");
-      getLog().debug("==================================");
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Looking up testParentStateful...");
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-
-      stateful.setName("The Code");
-      NodeAnswer node1 = stateful.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-      _sleep(300);
-
-      // Now we switch to the other node, simulating a failure on node 1
-      //
-      stateful.setUpFailover("once");
-      NodeAnswer node2 = stateful.getNodeState();
-      assertNotNull("State node: ", node2);
-      getLog ().debug ("Node 2 ID : " +node2);
-
-      assertFalse("Failover has occured", node1.nodeId.equals(node2.nodeId));
-
-      assertEquals ("Node 1: ", "The Code", node1.answer);
-      assertEquals ("Node 2: ", "The Code", node2.answer);
-
-      assertEquals("Counter: ", 3, stateful.increment());
-      assertEquals("Counter: ", 4, stateful.increment());
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   protected void _sleep(long time)
-   {
-      try {
-         Thread.sleep(time);
-      } catch (InterruptedException e) {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,180 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.unit;
+
+import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+import org.jboss.ejb3.test.clusteredsession.nested.ParentStatefulRemote;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Date;
+import java.util.Properties;
+
+import junit.framework.Test;
+
+/**
+ * Test nested SFSB for load-balancing and failover behaviour
+ *
+ * @author  Ben.Wang at jboss.org
+ * @version $Revision$
+ */
+public class NestedBeanUnitTestCase extends JBossClusteredTestCase
+{
+   static boolean deployed = false;
+   public static int test = 0;
+   static Date startDate = new Date();
+
+   protected final String namingFactory =
+   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+
+   protected final String providerURL =
+   System.getProperty(Context.PROVIDER_URL);
+
+   public NestedBeanUnitTestCase (String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      final String jarName = "clusteredsession-test.jar";
+      Test t1 = JBossClusteredTestCase.getDeploySetup(NestedBeanUnitTestCase.class,
+              jarName);
+      return t1;
+   }
+
+   protected InitialContext getInitialContext(int node) throws Exception {
+      // Connect to the server0 JNDI
+      String[] urls = getNamingURLs();
+      Properties env1 = new Properties();
+      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+         "org.jnp.interfaces.NamingContextFactory");
+      env1.setProperty(Context.PROVIDER_URL, urls[node]);
+      return new InitialContext(env1);
+   }
+
+
+   public void testBasic()
+   throws Exception
+   {
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "
+              +"Trying the context...");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("Test Nested Stateful Bean");
+      getLog().debug("==================================");
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "
+              +"Looking up testBasic...");
+      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
+
+      stateful.reset();
+      stateful.setName("The Code");
+      _sleep(300);
+
+      NodeAnswer node1 = stateful.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+
+      stateful.remove();
+      getLog().debug("ok");
+      _sleep(11000);
+   }
+
+   public void testPassivation()
+   throws Exception
+   {
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "
+              +"Trying the context...");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("Test Nested Stateful Bean");
+      getLog().debug("==================================");
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "
+              +"Looking up remote...");
+      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
+
+      stateful.setName("The Code");
+      _sleep(300);
+
+      NodeAnswer node1 = stateful.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+//      _sleep(300000);
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+      assertEquals("SLSB state: ", "test", stateful.getStatelessState().getAnswer());
+      stateful.reset();
+      _sleep(11000);
+      assertEquals("Counter: ", 3, stateful.increment());
+      assertEquals("SLSB state: ", "test", stateful.getStatelessState().getAnswer());
+      assertEquals(1, stateful.getPrePassivate());
+      assertEquals(1, stateful.getPostActivate());
+      assertEquals(1, stateful.getNestedPrePassivate());
+      assertEquals(1, stateful.getNestedPostActivate());
+
+      stateful.remove();
+      getLog().debug("ok: done");
+      _sleep(12000);
+   }
+
+   public void testStatefulBeanCounterFailover()
+   throws Exception
+   {
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "+"Trying the context...");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("Test Stateful Bean Failover");
+      getLog().debug("==================================");
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "
+              +"Looking up testParentStateful...");
+      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
+
+      stateful.setName("The Code");
+      NodeAnswer node1 = stateful.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+      _sleep(300);
+
+      // Now we switch to the other node, simulating a failure on node 1
+      //
+      stateful.setUpFailover("once");
+      NodeAnswer node2 = stateful.getNodeState();
+      assertNotNull("State node: ", node2);
+      getLog ().debug ("Node 2 ID : " +node2);
+
+      assertFalse("Failover has occured", node1.nodeId.equals(node2.nodeId));
+
+      assertEquals ("Node 1: ", "The Code", node1.answer);
+      assertEquals ("Node 2: ", "The Code", node2.answer);
+
+      assertEquals("Counter: ", 3, stateful.increment());
+      assertEquals("Counter: ", 4, stateful.increment());
+
+      stateful.remove();
+      getLog().debug("ok");
+   }
+
+   protected void _sleep(long time)
+   {
+      try {
+         Thread.sleep(time);
+      } catch (InterruptedException e) {
+         e.printStackTrace();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.unit;
-
-import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.ejb3.test.clusteredsession.StatefulRemote;
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-import junit.framework.Test;
-
-/**
- * Test SFSB for load-balancing and failover behaviour
- *
- * @author  Ben.Wang at jboss.org
- * @version $Revision$
- */
-public class PassivationUnitTestCase extends JBossClusteredTestCase
-{
-   static boolean deployed = false;
-   public static int test = 0;
-   static Date startDate = new Date();
-
-   protected final String namingFactory =
-   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-
-   protected final String providerURL =
-   System.getProperty(Context.PROVIDER_URL);
-
-   public PassivationUnitTestCase (String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      final String jarName = "clusteredsession-test.jar";
-      Test t1 = JBossClusteredTestCase.getDeploySetup(PassivationUnitTestCase.class,
-              jarName);
-      return t1;
-   }
-
-   protected InitialContext getInitialContext(int node) throws Exception {
-      // Connect to the server0 JNDI
-      String[] urls = getNamingURLs();
-      Properties env1 = new Properties();
-      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
-         "org.jnp.interfaces.NamingContextFactory");
-      env1.setProperty(Context.PROVIDER_URL, urls[node]);
-      return new InitialContext(env1);
-   }
-
-   /**
-    */
-   public void testStatefulPassivation()
-      throws Exception
-   {
-      log.info("+++ testStatefulPassivation");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("==================================");
-      getLog().debug(++PassivationUnitTestCase.test +"- "
-              +"Looking up testStateful...");
-      StatefulRemote remote = (StatefulRemote) ctx.lookup("testStateful/remote");
-
-      remote.reset();
-      remote.setState("hello");
-      sleep_(11000);
-      assertEquals("hello", remote.getState());
-      assertEquals(1, remote.getPrePassivate());
-      assertEquals(1, remote.getPostActivate());
-
-      sleep_(11000);
-      remote.remove();
-
-   }
-
-   /** This is to test failover with passivation
-    */
-   public void XtestFailoverStatefulPassivation()
-      throws Exception
-   {
-      log.info("+++ testFiloverStatefulPassivation");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("==================================");
-      getLog().debug(++PassivationUnitTestCase.test +"- "
-              +"Looking up testStateful...");
-      StatefulRemote stateful = (StatefulRemote) ctx.lookup("testStateful/remote");
-      stateful.reset();
-
-      stateful.setName("The Code");
-      NodeAnswer node1 = stateful.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-      sleep_(10000);
-
-      // Now we switch to the other node, simulating a failure on node 1
-      //
-      stateful.setUpFailover("once");
-      NodeAnswer node2 = stateful.getNodeState ();
-      assertNotNull("State node: ", node2);
-      getLog ().debug ("Node 2 ID : " +node2);
-
-      assertNotSame ("No failover has occured!", node1.nodeId, node2.nodeId);
-
-      assertEquals ("Node 1: ", "The Code", node1.answer);
-      assertEquals ("Node 2: ", "The Code", node2.answer);
-
-      stateful.resetActivationCounter(); // This will activate the bean.
-      sleep_(10000); // let it get passivated again.
-      assertEquals("Counter: ", 3, stateful.increment());
-      assertEquals("Counter: ", 4, stateful.increment());
-      assertEquals(1, stateful.getPostActivate());
-      assertEquals(1, stateful.getPrePassivate());
-
-      stateful.remove();
-   }
-
-   protected void sleep_(long msec)
-   {
-      try {
-         Thread.sleep(msec);
-      } catch (InterruptedException e) {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.unit;
+
+import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.ejb3.test.clusteredsession.StatefulRemote;
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Date;
+import java.util.Properties;
+
+import junit.framework.Test;
+
+/**
+ * Test SFSB for load-balancing and failover behaviour
+ *
+ * @author  Ben.Wang at jboss.org
+ * @version $Revision$
+ */
+public class PassivationUnitTestCase extends JBossClusteredTestCase
+{
+   static boolean deployed = false;
+   public static int test = 0;
+   static Date startDate = new Date();
+
+   protected final String namingFactory =
+   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+
+   protected final String providerURL =
+   System.getProperty(Context.PROVIDER_URL);
+
+   public PassivationUnitTestCase (String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      final String jarName = "clusteredsession-test.jar";
+      Test t1 = JBossClusteredTestCase.getDeploySetup(PassivationUnitTestCase.class,
+              jarName);
+      return t1;
+   }
+
+   protected InitialContext getInitialContext(int node) throws Exception {
+      // Connect to the server0 JNDI
+      String[] urls = getNamingURLs();
+      Properties env1 = new Properties();
+      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+         "org.jnp.interfaces.NamingContextFactory");
+      env1.setProperty(Context.PROVIDER_URL, urls[node]);
+      return new InitialContext(env1);
+   }
+
+   /**
+    */
+   public void testStatefulPassivation()
+      throws Exception
+   {
+      log.info("+++ testStatefulPassivation");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("==================================");
+      getLog().debug(++PassivationUnitTestCase.test +"- "
+              +"Looking up testStateful...");
+      StatefulRemote remote = (StatefulRemote) ctx.lookup("testStateful/remote");
+
+      remote.reset();
+      remote.setState("hello");
+      sleep_(11000);
+      assertEquals("hello", remote.getState());
+      assertEquals(1, remote.getPrePassivate());
+      assertEquals(1, remote.getPostActivate());
+
+      sleep_(11000);
+      remote.remove();
+
+   }
+
+   /** This is to test failover with passivation
+    */
+   public void XtestFailoverStatefulPassivation()
+      throws Exception
+   {
+      log.info("+++ testFiloverStatefulPassivation");
+
+      // Connect to the server0 JNDI
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("==================================");
+      getLog().debug(++PassivationUnitTestCase.test +"- "
+              +"Looking up testStateful...");
+      StatefulRemote stateful = (StatefulRemote) ctx.lookup("testStateful/remote");
+      stateful.reset();
+
+      stateful.setName("The Code");
+      NodeAnswer node1 = stateful.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+      sleep_(10000);
+
+      // Now we switch to the other node, simulating a failure on node 1
+      //
+      stateful.setUpFailover("once");
+      NodeAnswer node2 = stateful.getNodeState ();
+      assertNotNull("State node: ", node2);
+      getLog ().debug ("Node 2 ID : " +node2);
+
+      assertNotSame ("No failover has occured!", node1.nodeId, node2.nodeId);
+
+      assertEquals ("Node 1: ", "The Code", node1.answer);
+      assertEquals ("Node 2: ", "The Code", node2.answer);
+
+      stateful.resetActivationCounter(); // This will activate the bean.
+      sleep_(10000); // let it get passivated again.
+      assertEquals("Counter: ", 3, stateful.increment());
+      assertEquals("Counter: ", 4, stateful.increment());
+      assertEquals(1, stateful.getPostActivate());
+      assertEquals(1, stateful.getPrePassivate());
+
+      stateful.remove();
+   }
+
+   protected void sleep_(long msec)
+   {
+      try {
+         Thread.sleep(msec);
+      } catch (InterruptedException e) {
+         e.printStackTrace();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/PassivationUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.unit;
-
-import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
-import org.jboss.ejb3.test.clusteredsession.ClusteredStatelessRemote;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-import junit.framework.Test;
-
-/**
- * Test slsb for load-balancing behaviour and others.
- *
- * @author  Ben.Wang at jboss.org
- * @version $Revision$
- */
-public class StatelessUnitTestCase extends JBossClusteredTestCase
-{
-   static boolean deployed = false;
-   public static int test = 0;
-   static Date startDate = new Date();
-
-   protected final String namingFactory =
-   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-
-   protected final String providerURL =
-   System.getProperty(Context.PROVIDER_URL);
-
-   public StatelessUnitTestCase (String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      final String jarName = "clusteredsession-test.jar";
-      return JBossClusteredTestCase.getDeploySetup(StatelessUnitTestCase.class,
-              jarName);
-   }
-
-   protected InitialContext getInitialContext(int node) throws Exception {
-      // Connect to the server0 JNDI
-      String[] urls = getNamingURLs();
-      Properties env1 = new Properties();
-      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
-         "org.jnp.interfaces.NamingContextFactory");
-      env1.setProperty(Context.PROVIDER_URL, urls[node]);
-      return new InitialContext(env1);
-   }
-
-   public void testLoadbalance()
-   throws Exception
-   {
-      getLog().debug(++StatelessUnitTestCase.test +"- "+"Trying the context...");
-
-      InitialContext ctx = getInitialContext(0);
-
-      getLog().debug("Test Stateless Bean loadbalancing");
-      getLog().debug("==================================");
-      getLog().debug(++StatelessUnitTestCase.test +"- "
-              +"Looking up clusteredStateless/remote...");
-      ClusteredStatelessRemote stateless = (ClusteredStatelessRemote) ctx.lookup("clusteredStateless/remote");
-
-      NodeAnswer node1 = stateless.getNodeState ();
-      getLog ().debug ("Node 1 ID: " +node1);
-
-      stateless = (ClusteredStatelessRemote) ctx.lookup("clusteredStateless/remote");
-      NodeAnswer node2 = stateless.getNodeState ();
-      getLog ().debug ("Node 2 ID : " +node2);
-
-      assertFalse(node1.nodeId.equals(node2.nodeId));
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.unit;
+
+import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
+import org.jboss.ejb3.test.clusteredsession.ClusteredStatelessRemote;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Date;
+import java.util.Properties;
+
+import junit.framework.Test;
+
+/**
+ * Test slsb for load-balancing behaviour and others.
+ *
+ * @author  Ben.Wang at jboss.org
+ * @version $Revision$
+ */
+public class StatelessUnitTestCase extends JBossClusteredTestCase
+{
+   static boolean deployed = false;
+   public static int test = 0;
+   static Date startDate = new Date();
+
+   protected final String namingFactory =
+   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+
+   protected final String providerURL =
+   System.getProperty(Context.PROVIDER_URL);
+
+   public StatelessUnitTestCase (String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      final String jarName = "clusteredsession-test.jar";
+      return JBossClusteredTestCase.getDeploySetup(StatelessUnitTestCase.class,
+              jarName);
+   }
+
+   protected InitialContext getInitialContext(int node) throws Exception {
+      // Connect to the server0 JNDI
+      String[] urls = getNamingURLs();
+      Properties env1 = new Properties();
+      env1.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+         "org.jnp.interfaces.NamingContextFactory");
+      env1.setProperty(Context.PROVIDER_URL, urls[node]);
+      return new InitialContext(env1);
+   }
+
+   public void testLoadbalance()
+   throws Exception
+   {
+      getLog().debug(++StatelessUnitTestCase.test +"- "+"Trying the context...");
+
+      InitialContext ctx = getInitialContext(0);
+
+      getLog().debug("Test Stateless Bean loadbalancing");
+      getLog().debug("==================================");
+      getLog().debug(++StatelessUnitTestCase.test +"- "
+              +"Looking up clusteredStateless/remote...");
+      ClusteredStatelessRemote stateless = (ClusteredStatelessRemote) ctx.lookup("clusteredStateless/remote");
+
+      NodeAnswer node1 = stateless.getNodeState ();
+      getLog ().debug ("Node 1 ID: " +node1);
+
+      stateless = (ClusteredStatelessRemote) ctx.lookup("clusteredStateless/remote");
+      NodeAnswer node2 = stateless.getNodeState ();
+      getLog ().debug ("Node 2 ID : " +node2);
+
+      assertFalse(node1.nodeId.equals(node2.nodeId));
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/StatelessUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -42,7 +42,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite2/unit/CompositeUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite2/unit/CompositeUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/composite2/unit/CompositeUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 public class CompositeUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.concurrent;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStateful
-{
-   void doNothing();
-   
-   void waitAndSee();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.concurrent;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStateful
+{
+   void doNothing();
+   
+   void waitAndSee();
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.concurrent;
-
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateful
- at Remote(MyStateful.class)
-public class MyStatefulBean
-{
-   public void doNothing()
-   {
-      
-   }
-   
-   public void waitAndSee()
-   {
-      try
-      {
-         System.out.println("sleep " + this);
-         Thread.sleep(1000);
-         System.out.println("done");
-      }
-      catch(InterruptedException e)
-      {
-         throw new EJBException("I was interrupted");
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/MyStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.concurrent;
+
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateful
+ at Remote(MyStateful.class)
+public class MyStatefulBean
+{
+   public void doNothing()
+   {
+      
+   }
+   
+   public void waitAndSee()
+   {
+      try
+      {
+         System.out.println("sleep " + this);
+         Thread.sleep(1000);
+         System.out.println("done");
+      }
+      catch(InterruptedException e)
+      {
+         throw new EJBException("I was interrupted");
+      }
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,137 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.concurrent.unit;
-
-import java.lang.Thread.UncaughtExceptionHandler;
-
-import javax.ejb.ConcurrentAccessException;
-
-import org.jboss.ejb3.test.concurrent.MyStateful;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Test concurrent access on a stateful bean (EJB3 4.3.13 3rd paragraph / EJBTHREE-666)
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ConcurrentUnitTestCase
-   extends JBossTestCase
-{
-   public ConcurrentUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   private static class MyUncaughtExceptionHandler implements UncaughtExceptionHandler
-   {
-      private Throwable uncaught;
-      
-      Throwable getUncaughtException()
-      {
-         return uncaught;
-      }
-      
-      public void uncaughtException(Thread t, Throwable e)
-      {
-         this.uncaught = e;
-      }
-   }
-   
-   public void testConcurrentAccess() throws Exception
-   {
-      final MyStateful session = (MyStateful) getInitialContext().lookup("MyStatefulBean/remote");
-      
-      Runnable r = new Runnable()
-      {
-         public void run()
-         {
-            session.waitAndSee();
-         }
-      };
-
-      // do a call first (see EJBTHREE-697)
-      session.doNothing();
-      
-      // just use one 1 handler, the exception will be in there.
-      MyUncaughtExceptionHandler eh = new MyUncaughtExceptionHandler();
-      
-      Thread t1 = new Thread(r);
-      t1.setUncaughtExceptionHandler(eh);
-      Thread t2 = new Thread(r);
-      t2.setUncaughtExceptionHandler(eh);
-      
-      t1.start();
-      t2.start();
-      
-      t1.join();
-      t2.join();
-      
-      Throwable t = eh.getUncaughtException();
-      assertNotNull(t);
-      assertTrue("Expected a javax.ejb.ConcurrentAccessException", t instanceof ConcurrentAccessException);
-   }
-   
-   /**
-    * EJBTHREE-697: concurrency on proxies doesn't work
-    */
-   public void testConcurrentProxyAccess() throws Exception
-   {
-      final MyStateful session = (MyStateful) getInitialContext().lookup("MyStatefulBean/remote");
-      
-      Runnable r = new Runnable()
-      {
-         public void run()
-         {
-            session.waitAndSee();
-         }
-      };
-
-      // don't call proxy yet
-      //session.doNothing();
-      
-      // just use one 1 handler, the exception will be in there.
-      MyUncaughtExceptionHandler eh = new MyUncaughtExceptionHandler();
-      
-      Thread t1 = new Thread(r);
-      t1.setUncaughtExceptionHandler(eh);
-      Thread t2 = new Thread(r);
-      t2.setUncaughtExceptionHandler(eh);
-      
-      t1.start();
-      t2.start();
-      
-      t1.join();
-      t2.join();
-  
-      Throwable t = eh.getUncaughtException();
-      assertNotNull("No exception occured during a concurrent call", t);
-      fail("never comes here");
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ConcurrentUnitTestCase.class, "concurrent.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/concurrent/unit/ConcurrentUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.concurrent.unit;
+
+import java.lang.Thread.UncaughtExceptionHandler;
+
+import javax.ejb.ConcurrentAccessException;
+
+import org.jboss.ejb3.test.concurrent.MyStateful;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Test concurrent access on a stateful bean (EJB3 4.3.13 3rd paragraph / EJBTHREE-666)
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ConcurrentUnitTestCase
+   extends JBossTestCase
+{
+   public ConcurrentUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   private static class MyUncaughtExceptionHandler implements UncaughtExceptionHandler
+   {
+      private Throwable uncaught;
+      
+      Throwable getUncaughtException()
+      {
+         return uncaught;
+      }
+      
+      public void uncaughtException(Thread t, Throwable e)
+      {
+         this.uncaught = e;
+      }
+   }
+   
+   public void testConcurrentAccess() throws Exception
+   {
+      final MyStateful session = (MyStateful) getInitialContext().lookup("MyStatefulBean/remote");
+      
+      Runnable r = new Runnable()
+      {
+         public void run()
+         {
+            session.waitAndSee();
+         }
+      };
+
+      // do a call first (see EJBTHREE-697)
+      session.doNothing();
+      
+      // just use one 1 handler, the exception will be in there.
+      MyUncaughtExceptionHandler eh = new MyUncaughtExceptionHandler();
+      
+      Thread t1 = new Thread(r);
+      t1.setUncaughtExceptionHandler(eh);
+      Thread t2 = new Thread(r);
+      t2.setUncaughtExceptionHandler(eh);
+      
+      t1.start();
+      t2.start();
+      
+      t1.join();
+      t2.join();
+      
+      Throwable t = eh.getUncaughtException();
+      assertNotNull(t);
+      assertTrue("Expected a javax.ejb.ConcurrentAccessException", t instanceof ConcurrentAccessException);
+   }
+   
+   /**
+    * EJBTHREE-697: concurrency on proxies doesn't work
+    */
+   public void testConcurrentProxyAccess() throws Exception
+   {
+      final MyStateful session = (MyStateful) getInitialContext().lookup("MyStatefulBean/remote");
+      
+      Runnable r = new Runnable()
+      {
+         public void run()
+         {
+            session.waitAndSee();
+         }
+      };
+
+      // don't call proxy yet
+      //session.doNothing();
+      
+      // just use one 1 handler, the exception will be in there.
+      MyUncaughtExceptionHandler eh = new MyUncaughtExceptionHandler();
+      
+      Thread t1 = new Thread(r);
+      t1.setUncaughtExceptionHandler(eh);
+      Thread t2 = new Thread(r);
+      t2.setUncaughtExceptionHandler(eh);
+      
+      t1.start();
+      t2.start();
+      
+      t1.join();
+      t2.join();
+  
+      Throwable t = eh.getUncaughtException();
+      assertNotNull("No exception occured during a concurrent call", t);
+      fail("never comes here");
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ConcurrentUnitTestCase.class, "concurrent.jar");
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,116 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.consumer;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.jms.Message;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DeploymentDescriptorQueueTestConsumer implements DeploymentDescriptorQueueTestRemote, DeploymentDescriptorQueueTestXA, DeploymentDescriptorQueueTestLocal
-{
-   private static final Logger log = Logger.getLogger(DeploymentDescriptorQueueTestConsumer.class);
-   
-   Message currentMessage;
-
-   private Message setterMessage;
-   
-   StatelessRemote stateless;
-   StatelessLocal statelessLocal;
-   DataSource testDatasource;
-   
-   public void setStatelessLocal(StatelessLocal statelessLocal)
-   {
-      this.statelessLocal = statelessLocal;
-   }
-
-   void setMessage(Message msg)
-   {
-      setterMessage = msg;
-   }
-   
-   private void testInjections() throws Exception
-   {
-      stateless.test();
-      statelessLocal.testLocal();
-      testDatasource.getConnection();
-      
-      Context initCtx = new InitialContext();
-      Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
-      Object obj = myEnv.lookup("res/aQueue");
-      if ((obj instanceof javax.jms.Queue) == false)
-         throw new NamingException("res/aQueue is not a javax.jms.Queue");
-   }
-   
-   public void method1(String msg, int num) throws Exception
-   {
-      testInjections();
-      
-      TestStatusBean.queueRan = "method1";
-      TestStatusBean.fieldMessage = currentMessage != null;
-      TestStatusBean.setterMessage = setterMessage != null;
-
-      System.out.println("method1(" + msg + ", " + num + ")");
-   }
-
-   public void method2(String msg, float num)
-   {
-      TestStatusBean.queueRan = "method2";
-
-      TestStatusBean.fieldMessage = currentMessage != null;
-      TestStatusBean.setterMessage = setterMessage != null;
-
-      System.out.println("method2(" + msg + ", " + num + ")");
-   }
-
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("**** intercepted ****" + ctx.getMethod().getName());
-      TestStatusBean.interceptedQueue = ctx.getMethod().getName();
-      return ctx.proceed();
-   }
-
-   @PostConstruct
-   public void postConstruct()
-   {
-      TestStatusBean.postConstruct = true;
-   }
-
-   @PreDestroy
-   public void preDestroy()
-   {
-      TestStatusBean.preDestroy = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.consumer;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.jms.Message;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DeploymentDescriptorQueueTestConsumer implements DeploymentDescriptorQueueTestRemote, DeploymentDescriptorQueueTestXA, DeploymentDescriptorQueueTestLocal
+{
+   private static final Logger log = Logger.getLogger(DeploymentDescriptorQueueTestConsumer.class);
+   
+   Message currentMessage;
+
+   private Message setterMessage;
+   
+   StatelessRemote stateless;
+   StatelessLocal statelessLocal;
+   DataSource testDatasource;
+   
+   public void setStatelessLocal(StatelessLocal statelessLocal)
+   {
+      this.statelessLocal = statelessLocal;
+   }
+
+   void setMessage(Message msg)
+   {
+      setterMessage = msg;
+   }
+   
+   private void testInjections() throws Exception
+   {
+      stateless.test();
+      statelessLocal.testLocal();
+      testDatasource.getConnection();
+      
+      Context initCtx = new InitialContext();
+      Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
+      Object obj = myEnv.lookup("res/aQueue");
+      if ((obj instanceof javax.jms.Queue) == false)
+         throw new NamingException("res/aQueue is not a javax.jms.Queue");
+   }
+   
+   public void method1(String msg, int num) throws Exception
+   {
+      testInjections();
+      
+      TestStatusBean.queueRan = "method1";
+      TestStatusBean.fieldMessage = currentMessage != null;
+      TestStatusBean.setterMessage = setterMessage != null;
+
+      System.out.println("method1(" + msg + ", " + num + ")");
+   }
+
+   public void method2(String msg, float num)
+   {
+      TestStatusBean.queueRan = "method2";
+
+      TestStatusBean.fieldMessage = currentMessage != null;
+      TestStatusBean.setterMessage = setterMessage != null;
+
+      System.out.println("method2(" + msg + ", " + num + ")");
+   }
+
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("**** intercepted ****" + ctx.getMethod().getName());
+      TestStatusBean.interceptedQueue = ctx.getMethod().getName();
+      return ctx.proceed();
+   }
+
+   @PostConstruct
+   public void postConstruct()
+   {
+      TestStatusBean.postConstruct = true;
+   }
+
+   @PreDestroy
+   public void preDestroy()
+   {
+      TestStatusBean.preDestroy = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.consumer;
-
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.Producer;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface DeploymentDescriptorQueueTestRemote
-{
-   void method1(String msg, int num) throws Exception;
-
-   void method2(String msg, float num);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.consumer;
+
+import org.jboss.annotation.ejb.DeliveryMode;
+import org.jboss.annotation.ejb.MessageProperties;
+import org.jboss.annotation.ejb.Producer;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface DeploymentDescriptorQueueTestRemote
+{
+   void method1(String msg, int num) throws Exception;
+
+   void method2(String msg, float num);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.consumer;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless
- at Remote(StatelessRemote.class)
- at Local(StatelessLocal.class)
-public class StatelessBean implements StatelessRemote, StatelessLocal
-{
-   public void test()
-   {
-   }
-   
-   public void testLocal()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.consumer;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+ at Local(StatelessLocal.class)
+public class StatelessBean implements StatelessRemote, StatelessLocal
+{
+   public void test()
+   {
+   }
+   
+   public void testLocal()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.consumer;
-
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface StatelessLocal
-{
-   void testLocal();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.consumer;
+
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface StatelessLocal
+{
+   void testLocal();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.consumer;
-
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface StatelessRemote
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.consumer;
+
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface StatelessRemote
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -39,7 +39,7 @@
 public class ConsumerUnitTestCase
         extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/container)

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/container/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,105 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.container.unit;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
-import org.jboss.ejb3.test.reference21_30.Test2;
-import org.jboss.ejb3.test.reference21_30.Test2Home;
-import org.jboss.ejb3.test.reference21_30.Test3;
-import org.jboss.ejb3.test.service.ServiceSixRemote;
-import org.jboss.ejb3.test.stateful.ProxyFactoryInterface;
-import org.jboss.ejb3.test.stateful.Stateful;
-import org.jboss.ejb3.statistics.InvocationStatistics;
-import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ContainerTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(ContainerTestCase.class);
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public ContainerTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testInvocationStatistics() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      Test3 test3 = (Test3)jndiContext.lookup("Test3");
-      assertNotNull(test3);
-      test3.testAccess();
-      
-      Test2Home home = (Test2Home)jndiContext.lookup("Test2");
-      assertNotNull(home);
-      Test2 test2 = home.create();
-      assertNotNull(test2);
-      test2.testAccess();
-      
-      MBeanServerConnection server = getServer();
-      
-      ObjectName objectName = new ObjectName("jboss.j2ee:jar=multideploy-ejb3.jar,name=Test3,service=EJB3");
-      InvocationStatistics stats = (InvocationStatistics)server.getAttribute(objectName, "InvokeStats");
-      System.out.println("Stats \n" + stats);
-      assertTrue(stats.toString().contains("testAccess"));
-      
-      ServiceSixRemote test = (ServiceSixRemote) getInitialContext().lookup("serviceSix/remote");
-      test.setCalled(false);
-      
-      objectName = new ObjectName("jboss.j2ee:jar=service-test.jar,name=ServiceSix,service=EJB3");
-      stats = (InvocationStatistics)server.getAttribute(objectName, "InvokeStats");
-      System.out.println("Stats \n" + stats);
-      assertTrue(stats.toString().contains("setCalled"));
-      
-      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-      SecurityAssociation.setCredential("password".toCharArray());
-      
-      Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
-      assertNotNull(stateful);
-      stateful.getState();
-      
-      objectName = new ObjectName("jboss.j2ee:jar=stateful-test.jar,name=StatefulBean,service=EJB3");
-      stats = (InvocationStatistics)server.getAttribute(objectName, "InvokeStats");
-      System.out.println("Stats \n" + stats);
-      assertTrue(stats.toString().contains("getState"));
-      
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ContainerTestCase.class, "multideploy.jar, multideploy-ejb3.jar, service-test.sar, service-test.jar, stateful-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/container/unit/ContainerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,105 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.container.unit;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import org.jboss.ejb3.test.reference21_30.Test2;
+import org.jboss.ejb3.test.reference21_30.Test2Home;
+import org.jboss.ejb3.test.reference21_30.Test3;
+import org.jboss.ejb3.test.service.ServiceSixRemote;
+import org.jboss.ejb3.test.stateful.ProxyFactoryInterface;
+import org.jboss.ejb3.test.stateful.Stateful;
+import org.jboss.ejb3.statistics.InvocationStatistics;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ContainerTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(ContainerTestCase.class);
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public ContainerTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testInvocationStatistics() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      Test3 test3 = (Test3)jndiContext.lookup("Test3");
+      assertNotNull(test3);
+      test3.testAccess();
+      
+      Test2Home home = (Test2Home)jndiContext.lookup("Test2");
+      assertNotNull(home);
+      Test2 test2 = home.create();
+      assertNotNull(test2);
+      test2.testAccess();
+      
+      MBeanServerConnection server = getServer();
+      
+      ObjectName objectName = new ObjectName("jboss.j2ee:jar=multideploy-ejb3.jar,name=Test3,service=EJB3");
+      InvocationStatistics stats = (InvocationStatistics)server.getAttribute(objectName, "InvokeStats");
+      System.out.println("Stats \n" + stats);
+      assertTrue(stats.toString().contains("testAccess"));
+      
+      ServiceSixRemote test = (ServiceSixRemote) getInitialContext().lookup("serviceSix/remote");
+      test.setCalled(false);
+      
+      objectName = new ObjectName("jboss.j2ee:jar=service-test.jar,name=ServiceSix,service=EJB3");
+      stats = (InvocationStatistics)server.getAttribute(objectName, "InvokeStats");
+      System.out.println("Stats \n" + stats);
+      assertTrue(stats.toString().contains("setCalled"));
+      
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+      
+      Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
+      assertNotNull(stateful);
+      stateful.getState();
+      
+      objectName = new ObjectName("jboss.j2ee:jar=stateful-test.jar,name=StatefulBean,service=EJB3");
+      stats = (InvocationStatistics)server.getAttribute(objectName, "InvokeStats");
+      System.out.println("Stats \n" + stats);
+      assertTrue(stats.toString().contains("getState"));
+      
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ContainerTestCase.class, "multideploy.jar, multideploy-ejb3.jar, service-test.sar, service-test.jar, stateful-test.jar");
+   }
+
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/BMPBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/BMPBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/BMPBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 import javax.transaction.xa.XAResource;
 
 public class BMPBean implements MessageDrivenBean, MessageListener{
-   org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+   org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
    
     private MessageDrivenContext ctx = null;
     public BMPBean() {

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ExQueueBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ExQueueBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ExQueueBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -43,7 +43,7 @@
 public class ExQueueBean implements MessageDrivenBean, MessageListener
 {
 
-   org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+   org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
 
    private MessageDrivenContext ctx = null;
 

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ObjectMessageBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ObjectMessageBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/ObjectMessageBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -40,7 +40,7 @@
 
 public class ObjectMessageBean implements MessageDrivenBean, MessageListener
 {
-   org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+   org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
 
    private MessageDrivenContext ctx = null;
 

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.mdb;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless
- at Remote(StatelessRemote.class)
- at Local(StatelessLocal.class)
-public class StatelessBean implements StatelessRemote, StatelessLocal
-{
-   public void test()
-   {
-   }
-   
-   public void testLocal()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dd.mdb;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+ at Local(StatelessLocal.class)
+public class StatelessBean implements StatelessRemote, StatelessLocal
+{
+   public void test()
+   {
+   }
+   
+   public void testLocal()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.mdb;
-
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface StatelessLocal
-{
-   void testLocal();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dd.mdb;
+
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface StatelessLocal
+{
+   void testLocal();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.mdb;
-
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface StatelessRemote
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dd.mdb;
+
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface StatelessRemote
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TXTimeOutBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TXTimeOutBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TXTimeOutBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -41,7 +41,7 @@
 public class TXTimeOutBean implements MessageDrivenBean, MessageListener
 {
 
-   org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+   org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
 
    long PROCESSING_DELAY = 10; // simulate 10 seconds of processing
 

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.mdb;
-
-import java.util.ArrayList;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface TestStatus
-{
-   public void clear();
-   
-   public ArrayList getDestinations();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.dd.mdb;
+
+import java.util.ArrayList;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface TestStatus
+{
+   public void clear();
+   
+   public ArrayList getDestinations();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatus.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.mdb;
-
-import java.util.ArrayList;
-
-import javax.jms.Destination;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Service
-public class TestStatusBean implements TestStatus
-{
-   private static ArrayList destinations = new ArrayList();
-   
-   public void clear()
-   {
-      destinations.clear();
-   }
-   
-   public static void addDestination(Destination dest)
-   {
-      destinations.add(dest.toString());
-   }
-   
-   public ArrayList getDestinations()
-   {
-      return destinations; 
-   }
-   
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.dd.mdb;
+
+import java.util.ArrayList;
+
+import javax.jms.Destination;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Service
+public class TestStatusBean implements TestStatus
+{
+   private static ArrayList destinations = new ArrayList();
+   
+   public void clear()
+   {
+      destinations.clear();
+   }
+   
+   public static void addDestination(Destination dest)
+   {
+      destinations.add(dest.toString());
+   }
+   
+   public ArrayList getDestinations()
+   {
+      return destinations; 
+   }
+   
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TopicBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TopicBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TopicBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -30,7 +30,7 @@
 import javax.jms.MessageListener;
 import javax.jms.Message;
 
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
 
 /**
  * MessageBeanImpl.java
@@ -44,7 +44,7 @@
 
 public class TopicBean implements MessageDrivenBean, MessageListener
 {
-   private static final Category log = Category.getInstance(TopicBean.class);
+   private static final Logger log = Logger.getLogger(TopicBean.class);
 
    private MessageDrivenContext ctx = null;
 

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -285,7 +285,7 @@
       suite.addTest(new MDBUnitTestCase("testWaitForCompletion",""));
       suite.addTest(new MDBUnitTestCase("testQueue","queue/B"));
 
-     return new JBossTestSetup(getDeploySetup(suite, "dd-mdb-service.xml, dd-mdb.jar"));
+     return new JBossTestSetup(getDeploySetup(suite, "dd-mdb-jbossmq-destinations-service.xml, dd-mdb-service.xml, dd-mdb.jar"));
 
    }
 }

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/unit/ApplicationClientXmlTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/unit/ApplicationClientXmlTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/unit/ApplicationClientXmlTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/unit/ApplicationClientXmlTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dd.unit;
+
+import java.net.URL;
+import java.util.Iterator;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
+import org.jboss.ejb3.metamodel.LifecycleCallback;
+import org.jboss.metamodel.descriptor.EnvEntry;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ApplicationClientXmlTestCase extends TestCase
+{
+   public void testUnmarshalDDXsd() throws Exception
+   {
+      URL xmlUrl = getResourceUrl("dd/application-client-test1.xml");
+      assertNotNull(xmlUrl);
+      ApplicationClientDD dd = ApplicationClientDDObjectFactory.parse(xmlUrl);
+      assertNotNull(dd);
+      
+      assertEquals("Test1", dd.getDisplayName());
+      //assertEquals("application client dd test", dd.getDescription());
+      
+      assertEquals(1, dd.getEnvEntries().size());
+      
+      {
+         Iterator<EnvEntry> i = dd.getEnvEntries().iterator();
+         
+         EnvEntry ee = i.next();
+         assertEquals("envTest", ee.getEnvEntryName());
+         assertEquals("java.lang.String", ee.getEnvEntryType());
+         assertEquals("Hello world", ee.getEnvEntryValue());
+      }
+      
+      assertEquals(1, dd.getPostConstructs().size());
+      
+      {
+         Iterator<LifecycleCallback> i = dd.getPostConstructs().iterator();
+         LifecycleCallback lc = i.next();
+         assertNull(lc.getLifecycleCallbackClass());
+         assertEquals("postConstruct", lc.getLifecycleCallbackMethod());
+      }
+      
+      assertEquals(1, dd.getPreDestroys().size());
+      
+      {
+         Iterator<LifecycleCallback> i = dd.getPreDestroys().iterator();
+         LifecycleCallback lc = i.next();
+         assertNull(lc.getLifecycleCallbackClass());
+         assertEquals("preDestroy", lc.getLifecycleCallbackMethod());
+      }
+   }
+   
+   private static URL getResourceUrl(String name)
+   {
+      URL url = Thread.currentThread().getContextClassLoader().getResource(name);
+      if (url == null)
+      {
+         throw new IllegalStateException("Resource not found: " + name);
+      }
+      return url;
+   }
+
+   public static Test suite() throws Exception
+   {
+      return new TestSuite(ApplicationClientXmlTestCase.class);
+   }
+   
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.web.ejb;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
- at Table(name = "EJB3TEST_ADDRESS")
-public class Address implements java.io.Serializable
-{
-   private Long id;
-   private String street;
-   private String city;
-   private String state;
-   private String zip;
-
-   @Id
-   @GeneratedValue(strategy= GenerationType.IDENTITY)
-   public Long getId()
-   {
-      return id;
-   }
-
-   public void setId(Long id)
-   {
-      this.id = id;
-   }
-
-   public String getStreet()
-   {
-      return street;
-   }
-
-   public void setStreet(String street)
-   {
-      this.street = street;
-   }
-
-   public String getCity()
-   {
-      return city;
-   }
-
-   public void setCity(String city)
-   {
-      this.city = city;
-   }
-
-   public String getState()
-   {
-      return state;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-
-   public String getZip()
-   {
-      return zip;
-   }
-
-   public void setZip(String zip)
-   {
-      this.zip = zip;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dd.web.ejb;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+ at Table(name = "EJB3TEST_ADDRESS")
+public class Address implements java.io.Serializable
+{
+   private Long id;
+   private String street;
+   private String city;
+   private String state;
+   private String zip;
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.IDENTITY)
+   public Long getId()
+   {
+      return id;
+   }
+
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+
+   public String getStreet()
+   {
+      return street;
+   }
+
+   public void setStreet(String street)
+   {
+      this.street = street;
+   }
+
+   public String getCity()
+   {
+      return city;
+   }
+
+   public void setCity(String city)
+   {
+      this.city = city;
+   }
+
+   public String getState()
+   {
+      return state;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+
+   public String getZip()
+   {
+      return zip;
+   }
+
+   public void setZip(String zip)
+   {
+      this.zip = zip;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Address.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.web.ejb;
-
-
-import javax.naming.*;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-import org.jboss.ejb3.test.dd.web.interfaces.Session30;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="Session30")
- at Remote(Session30.class)
- at RemoteBinding(jndiBinding = "Session30")
-public class Session30Bean implements Session30
-{
-   private static final Logger log = Logger.getLogger(Session30Bean.class);
-   
-   public String access()
-   {
-      return "Session30";
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dd.web.ejb;
+
+
+import javax.naming.*;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+import org.jboss.ejb3.test.dd.web.interfaces.Session30;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="Session30")
+ at Remote(Session30.class)
+ at RemoteBinding(jndiBinding = "Session30")
+public class Session30Bean implements Session30
+{
+   private static final Logger log = Logger.getLogger(Session30Bean.class);
+   
+   public String access()
+   {
+      return "Session30";
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.dd.web.interfaces;
-
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30 
-{
-   public String access();
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dd.web.interfaces;
+
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30 
+{
+   public String access();
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/interfaces/Session30.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-<%@ page import="java.util.Hashtable,
-                 javax.naming.*" %>
-<%@ page import="java.lang.reflect.Proxy"%>
-<%@ page import="org.jboss.ejb3.Ejb3Registry"%>
-<%@ page import="org.jboss.ejb3.Container"%>
-<%@ page import="java.util.Iterator"%>
-<%@ page import="javax.ejb.EJB"%>
-<%@ page import="org.jboss.ejb3.test.dd.web.interfaces.Session30"%>
-<%@ page import="javax.persistence.PersistenceContext"%>
-<%@ page import="javax.persistence.EntityManager"%>
-<%@ page import="javax.persistence.PersistenceUnit"%>
-<%@ page import="javax.persistence.EntityManagerFactory"%>
-<%@ page import="javax.annotation.Resource"%>
-<%@ page import="javax.transaction.UserTransaction"%>
-<%@ page import="org.jboss.ejb3.test.dd.web.ejb.Address"%>
-
-<%!
-
-   @EJB Session30 injectedSession30;
-   @PersistenceContext(unitName="../dd-web-ejbs.jar#tempdb") EntityManager injectedEntityManager;
-   @PersistenceUnit(unitName="../dd-web-ejbs.jar#tempdb") EntityManagerFactory injectedEntityManagerFactory;
-   @Resource int nonOverridentConstant = 5;
-   @Resource(name="overridenConstant") int overridenConstant = 1;
-   @Resource UserTransaction tx;
-
-%>
-
-<html>
-<body>
-<%
-   System.out.println("HERE!!!!!!!!!!!!!!!!!!!!!!!!");
-   String access = injectedSession30.access();
-   System.out.println("After injectSession30.access() HERE!!!!!!!!!!!!!!!!!!!!!!!!");
-
-   Address address = new Address();
-   address.setStreet("Clarendon Street");
-   address.setCity("Boston");
-   address.setState("MA");
-   address.setZip("02116");
-
-   Address address2 = new Address();
-   address.setStreet("Clarendon Street");
-   address.setCity("Boston");
-   address.setState("MA");
-   address.setZip("02116");
-
-   Address address3 = new Address();
-   address.setStreet("Clarendon Street");
-   address.setCity("Boston");
-   address.setState("MA");
-   address.setZip("02116");
-
-   //tx = (UserTransaction)ctx.lookup("UserTransaction");
-   EntityManager em = injectedEntityManagerFactory.createEntityManager();
-   tx.begin();
-   injectedEntityManager.persist(address2);
-   em.persist(address3);
-   tx.commit();
-   em.close();
-%>
-<h1>Test passed!</h1>
-</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+<%@ page import="java.util.Hashtable,
+                 javax.naming.*" %>
+<%@ page import="java.lang.reflect.Proxy"%>
+<%@ page import="org.jboss.ejb3.Ejb3Registry"%>
+<%@ page import="org.jboss.ejb3.Container"%>
+<%@ page import="java.util.Iterator"%>
+<%@ page import="javax.ejb.EJB"%>
+<%@ page import="org.jboss.ejb3.test.dd.web.interfaces.Session30"%>
+<%@ page import="javax.persistence.PersistenceContext"%>
+<%@ page import="javax.persistence.EntityManager"%>
+<%@ page import="javax.persistence.PersistenceUnit"%>
+<%@ page import="javax.persistence.EntityManagerFactory"%>
+<%@ page import="javax.annotation.Resource"%>
+<%@ page import="javax.transaction.UserTransaction"%>
+<%@ page import="org.jboss.ejb3.test.dd.web.ejb.Address"%>
+
+<%!
+
+   @EJB Session30 injectedSession30;
+   @PersistenceContext(unitName="../dd-web-ejbs.jar#tempdb") EntityManager injectedEntityManager;
+   @PersistenceUnit(unitName="../dd-web-ejbs.jar#tempdb") EntityManagerFactory injectedEntityManagerFactory;
+   @Resource int nonOverridentConstant = 5;
+   @Resource(name="overridenConstant") int overridenConstant = 1;
+   @Resource UserTransaction tx;
+
+%>
+
+<html>
+<body>
+<%
+   System.out.println("HERE!!!!!!!!!!!!!!!!!!!!!!!!");
+   String access = injectedSession30.access();
+   System.out.println("After injectSession30.access() HERE!!!!!!!!!!!!!!!!!!!!!!!!");
+
+   Address address = new Address();
+   address.setStreet("Clarendon Street");
+   address.setCity("Boston");
+   address.setState("MA");
+   address.setZip("02116");
+
+   Address address2 = new Address();
+   address.setStreet("Clarendon Street");
+   address.setCity("Boston");
+   address.setState("MA");
+   address.setZip("02116");
+
+   Address address3 = new Address();
+   address.setStreet("Clarendon Street");
+   address.setCity("Boston");
+   address.setState("MA");
+   address.setZip("02116");
+
+   //tx = (UserTransaction)ctx.lookup("UserTransaction");
+   EntityManager em = injectedEntityManagerFactory.createEntityManager();
+   tx.begin();
+   injectedEntityManager.persist(address2);
+   em.persist(address3);
+   tx.commit();
+   em.close();
+%>
+<h1>Test passed!</h1>
+</body>
+</html>
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/ClasspathServlet.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/ClasspathServlet.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/ClasspathServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
 
 import org.jboss.ejb3.test.dd.web.util.EJBManifestClass;
 import org.jboss.ejb3.test.dd.web.util.EarLibUser;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -49,7 +49,7 @@
 */
 public class EJBOnStartupServlet extends HttpServlet
 {
-   org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+   org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
    
     public void init(ServletConfig config) throws ServletException
     {

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -60,6 +60,13 @@
 {
    private static final Logger log = Logger.getLogger(EJBServlet.class);
 
+   @EJB Session30 injectedSession30;
+   @PersistenceContext(unitName="../dd-web-ejbs.jar#tempdb") EntityManager injectedEntityManager;
+   @PersistenceUnit(unitName="../dd-web-ejbs.jar#tempdb") EntityManagerFactory injectedEntityManagerFactory;
+   @Resource int nonOverridentConstant = 5;
+   @Resource(name="overridenConstant") int overridenConstant = 1;
+   @Resource UserTransaction tx;
+
    public void init(ServletConfig config) throws ServletException
    {
        String param = config.getInitParameter("failOnError");
@@ -107,7 +114,8 @@
          
          Session30 session30 = (Session30)ctx.lookup("java:comp/env/ejb/Session30");
          String access = session30.access();
-
+         access = injectedSession30.access();
+               
          //TODO EMPTYSTRING can't be right - correct lookup when fixed
          EntityManager entityManager = (EntityManager)ctx.lookup("java:/WebDDEntityManager");
          
@@ -129,11 +137,29 @@
          address.setState("MA");
          address.setZip("02116");
 
+         //tx = (UserTransaction)ctx.lookup("UserTransaction");
+         EntityManager em = injectedEntityManagerFactory.createEntityManager();
+         tx.begin();
+         entityManager.persist(address);
+         injectedEntityManager.persist(address2);
+         em.persist(address3);
+         tx.commit();
+         em.close();
       }
       catch (Exception e)
       {
+         if (tx != null)
+         {
+            try {
+               tx.rollback();
+            } catch (Exception e1){
+              
+            }
+         }
          throw new ServletException("Failed to call OptimizedEJB/Session30 through remote and local interfaces", e);
       }
+      if (overridenConstant != 42) throw new RuntimeException("@Resource constant not overriden by XML");
+      if (nonOverridentConstant != 5) throw new RuntimeException("@Resource constant should not have been overriden");
       response.setContentType("text/html");
       PrintWriter out = response.getWriter();
       out.println("<html>");

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/SecureEJBServletMT.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/SecureEJBServletMT.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/SecureEJBServletMT.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -45,7 +45,7 @@
 */
 public class SecureEJBServletMT extends HttpServlet
 {
-   static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(SecureEJBServletMT.class);
+   static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SecureEJBServletMT.class);
    
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -34,7 +34,7 @@
 import javax.servlet.http.HttpSessionActivationListener;
 import javax.servlet.http.HttpSessionEvent;
 
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
 import org.jboss.ejb3.test.dd.web.interfaces.StatelessSession;
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/Util.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/Util.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/Util.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -25,7 +25,6 @@
 import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.Date;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -33,7 +32,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.NameClassPair;
-import javax.naming.NameParser;
 
 /** A trivial utility class that is placed into the lib/util.jar directory
  * of the war archive and used by servlets in the war to test access to the
@@ -44,8 +42,8 @@
  */
 public class Util
 {
-   static org.apache.log4j.Category log =
-   org.apache.log4j.Category.getInstance(Util.class);
+   static org.apache.log4j.Logger log =
+   org.apache.log4j.Logger.getLogger(Util.class);
    
    public static String getTime()
    {

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class AnotherDependedOn extends ServiceMBeanSupport implements AnotherDependedOnMBean
-{
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class AnotherDependedOn extends ServiceMBeanSupport implements AnotherDependedOnMBean
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOn.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface AnotherDependedOnMBean extends ServiceMBean
-{
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface AnotherDependedOnMBean extends ServiceMBean
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer
-{
-   private int id;
-   private String name;
-
-   @Id
-   @GeneratedValue
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer
+{
+   private int id;
+   private String name;
+
+   @Id
+   @GeneratedValue
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer2
-{
-   private int id;
-   private String name;
-
-   @Id
-   @GeneratedValue
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer2
+{
+   private int id;
+   private String name;
+
+   @Id
+   @GeneratedValue
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Customer2.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class DependedOn extends ServiceMBeanSupport implements DependedOnMBean
-{
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class DependedOn extends ServiceMBeanSupport implements DependedOnMBean
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOn.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface DependedOnMBean extends ServiceMBean
-{
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface DependedOnMBean extends ServiceMBean
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/DependedOnMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface HasMBeanDependency
-{
-   void testNotNull();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface HasMBeanDependency
+{
+   void testNotNull();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependency.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Depends;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Depends("jboss.test:service=DependedOn")
-public class HasMBeanDependencyBean implements HasMBeanDependency
-{
-   @Depends("jboss.test:service=AnotherDependedOn") AnotherDependedOnMBean mbean;
-
-   public void testNotNull()
-   {
-      if (mbean == null) throw new RuntimeException("mbean field was not injected");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Stateless;
+import org.jboss.annotation.ejb.Depends;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Depends("jboss.test:service=DependedOn")
+public class HasMBeanDependencyBean implements HasMBeanDependency
+{
+   @Depends("jboss.test:service=AnotherDependedOn") AnotherDependedOnMBean mbean;
+
+   public void testNotNull()
+   {
+      if (mbean == null) throw new RuntimeException("mbean field was not injected");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface HasXmlMBeanDependency
-{
-   void noop();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface HasXmlMBeanDependency
+{
+   void noop();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependency.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class HasXmlMBeanDependencyBean implements HasXmlMBeanDependency
-{
-   public void noop()
-   {
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class HasXmlMBeanDependencyBean implements HasXmlMBeanDependency
+{
+   public void noop()
+   {
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/HasXmlMBeanDependencyBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface NoDependencies
-{
-   void noop();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface NoDependencies
+{
+   void noop();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependencies.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class NoDependenciesBean implements NoDependencies
-{
-   public void noop()
-   {
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class NoDependenciesBean implements NoDependencies
+{
+   public void noop()
+   {
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/NoDependenciesBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface Stateless
-{
-   void createCustomer();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface Stateless
+{
+   void createCustomer();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface Stateless2
-{
-   void createCustomer();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface Stateless2
+{
+   void createCustomer();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at javax.ejb.Stateless
-public class Stateless2Bean implements Stateless2
-{
-   @PersistenceContext EntityManager manager;
-
-   public void createCustomer()
-   {
-      Customer2 cust = new Customer2();
-      cust.setName("Bill");
-      manager.persist(cust);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at javax.ejb.Stateless
+public class Stateless2Bean implements Stateless2
+{
+   @PersistenceContext EntityManager manager;
+
+   public void createCustomer()
+   {
+      Customer2 cust = new Customer2();
+      cust.setName("Bill");
+      manager.persist(cust);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/Stateless2Bean.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.dependency;
-
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at javax.ejb.Stateless
-public class StatelessBean implements Stateless
-{
-   @PersistenceContext EntityManager manager;
-
-   public void createCustomer()
-   {
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      manager.persist(cust);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency;
+
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at javax.ejb.Stateless
+public class StatelessBean implements Stateless
+{
+   @PersistenceContext EntityManager manager;
+
+   public void createCustomer()
+   {
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      manager.persist(cust);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,172 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.dependency.unit;
-
-import org.jboss.ejb3.test.dependency.NoDependencies;
-import org.jboss.ejb3.test.dependency.Stateless;
-import org.jboss.ejb3.test.dependency.HasMBeanDependency;
-import org.jboss.ejb3.test.dependency.HasXmlMBeanDependency;
-import org.jboss.ejb3.test.dependency.Stateless2;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class DependencyUnitTestCase
-        extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public DependencyUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testNonDependencies() throws Exception
-   {
-      NoDependencies nada = (NoDependencies) getInitialContext().lookup("dependency-test/NoDependenciesBean/remote");
-      nada.noop();
-   }
-
-   public void testDatasourceDependencies() throws Exception
-   {
-      Stateless test = null;
-      test = (Stateless) getInitialContext().lookup("dependency-test/StatelessBean/remote");
-      test.createCustomer();
-   }
-
-   public void testPUDependencies() throws Exception
-   {
-      try
-      {
-         super.deploy("ejbdepends.jar");
-      }
-      catch (Exception e)
-      {
-         // ignored
-      }
-      try
-      {
-         Stateless2 test = null;
-         boolean exceptionThrown = false;
-         try
-         {
-            test = (Stateless2) getInitialContext().lookup("Stateless2Bean/remote");
-            test.createCustomer();
-         }
-         catch (Exception ex)
-         {
-            exceptionThrown = true;
-         }
-         assertTrue(exceptionThrown);
-
-         super.deploy("yetanother.sar");
-         try
-         {
-            test = (Stateless2) getInitialContext().lookup("Stateless2Bean/remote");
-            test.createCustomer();
-         }
-         finally
-         {
-            super.undeploy("yetanother.sar");
-         }
-      }
-      finally
-      {
-         super.undeploy("ejbdepends.jar");
-      }
-
-   }
-
-   public void testDepends() throws Exception
-   {
-      boolean exceptionThrown = false;
-      try
-      {
-         HasMBeanDependency dependency = (HasMBeanDependency) getInitialContext().lookup("dependency-test/HasMBeanDependencyBean/remote");
-      }
-      catch (Exception e)
-      {
-         exceptionThrown = true;
-      }
-      assertTrue(exceptionThrown);
-      exceptionThrown = false;
-      try
-      {
-         HasXmlMBeanDependency dependency = (HasXmlMBeanDependency) getInitialContext().lookup("dependency-test/HasXmlMBeanDependencyBean/remote");
-      }
-      catch (Exception e)
-      {
-         exceptionThrown = true;
-      }
-      assertTrue(exceptionThrown);
-      exceptionThrown = false;
-      super.deploy("dependedon.sar");
-      try
-      {
-         try
-         {
-            HasMBeanDependency dependency = (HasMBeanDependency) getInitialContext().lookup("dependency-test/HasMBeanDependencyBean/remote");
-         }
-         catch (Exception e)
-         {
-            exceptionThrown = true;
-         }
-         assertTrue(exceptionThrown);
-
-         // should pass now
-         HasXmlMBeanDependency dependency = (HasXmlMBeanDependency) getInitialContext().lookup("dependency-test/HasXmlMBeanDependencyBean/remote");
-         dependency.noop();
-
-         super.deploy("anotherdependedon.sar");
-         try
-         {
-            HasMBeanDependency dependency2 = (HasMBeanDependency) getInitialContext().lookup("dependency-test/HasMBeanDependencyBean/remote");
-            dependency2.testNotNull();
-         }
-         finally
-         {
-            super.undeploy("anotherdependedon.sar");
-         }
-      }
-      finally
-      {
-         super.undeploy("dependedon.sar");
-      }
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(DependencyUnitTestCase.class, "dependency-test.ear");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,172 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.dependency.unit;
+
+import org.jboss.ejb3.test.dependency.NoDependencies;
+import org.jboss.ejb3.test.dependency.Stateless;
+import org.jboss.ejb3.test.dependency.HasMBeanDependency;
+import org.jboss.ejb3.test.dependency.HasXmlMBeanDependency;
+import org.jboss.ejb3.test.dependency.Stateless2;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class DependencyUnitTestCase
+        extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public DependencyUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testNonDependencies() throws Exception
+   {
+      NoDependencies nada = (NoDependencies) getInitialContext().lookup("dependency-test/NoDependenciesBean/remote");
+      nada.noop();
+   }
+
+   public void testDatasourceDependencies() throws Exception
+   {
+      Stateless test = null;
+      test = (Stateless) getInitialContext().lookup("dependency-test/StatelessBean/remote");
+      test.createCustomer();
+   }
+
+   public void testPUDependencies() throws Exception
+   {
+      try
+      {
+         super.deploy("ejbdepends.jar");
+      }
+      catch (Exception e)
+      {
+         // ignored
+      }
+      try
+      {
+         Stateless2 test = null;
+         boolean exceptionThrown = false;
+         try
+         {
+            test = (Stateless2) getInitialContext().lookup("Stateless2Bean/remote");
+            test.createCustomer();
+         }
+         catch (Exception ex)
+         {
+            exceptionThrown = true;
+         }
+         assertTrue(exceptionThrown);
+
+         super.deploy("yetanother.sar");
+         try
+         {
+            test = (Stateless2) getInitialContext().lookup("Stateless2Bean/remote");
+            test.createCustomer();
+         }
+         finally
+         {
+            super.undeploy("yetanother.sar");
+         }
+      }
+      finally
+      {
+         super.undeploy("ejbdepends.jar");
+      }
+
+   }
+
+   public void testDepends() throws Exception
+   {
+      boolean exceptionThrown = false;
+      try
+      {
+         HasMBeanDependency dependency = (HasMBeanDependency) getInitialContext().lookup("dependency-test/HasMBeanDependencyBean/remote");
+      }
+      catch (Exception e)
+      {
+         exceptionThrown = true;
+      }
+      assertTrue(exceptionThrown);
+      exceptionThrown = false;
+      try
+      {
+         HasXmlMBeanDependency dependency = (HasXmlMBeanDependency) getInitialContext().lookup("dependency-test/HasXmlMBeanDependencyBean/remote");
+      }
+      catch (Exception e)
+      {
+         exceptionThrown = true;
+      }
+      assertTrue(exceptionThrown);
+      exceptionThrown = false;
+      super.deploy("dependedon.sar");
+      try
+      {
+         try
+         {
+            HasMBeanDependency dependency = (HasMBeanDependency) getInitialContext().lookup("dependency-test/HasMBeanDependencyBean/remote");
+         }
+         catch (Exception e)
+         {
+            exceptionThrown = true;
+         }
+         assertTrue(exceptionThrown);
+
+         // should pass now
+         HasXmlMBeanDependency dependency = (HasXmlMBeanDependency) getInitialContext().lookup("dependency-test/HasXmlMBeanDependencyBean/remote");
+         dependency.noop();
+
+         super.deploy("anotherdependedon.sar");
+         try
+         {
+            HasMBeanDependency dependency2 = (HasMBeanDependency) getInitialContext().lookup("dependency-test/HasMBeanDependencyBean/remote");
+            dependency2.testNotNull();
+         }
+         finally
+         {
+            super.undeploy("anotherdependedon.sar");
+         }
+      }
+      finally
+      {
+         super.undeploy("dependedon.sar");
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(DependencyUnitTestCase.class, "dependency-test.ear");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependency/unit/DependencyUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependent/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependent/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/dependent/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.ear;
-
-import javax.ejb.Remote;
-
-/**
- * comment
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
- at Remote
-public interface Facade
-{
-   void testEarLib();
-
-   void testReferencedEntity();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.ear;
+
+import javax.ejb.Remote;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+ at Remote
+public interface Facade
+{
+   void testEarLib();
+
+   void testReferencedEntity();
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.ear;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * comment
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
- at Stateless
-public class FacadeBean implements Facade
-{
-   @PersistenceContext(unitName="earlib")
-   EntityManager earlib;
-
-   @PersistenceContext(unitName="ejbref")
-   EntityManager ejbref;
-
-   public void testEarLib()
-   {
-      LibEntity entity = new LibEntity();
-      earlib.persist(entity);
-   }
-
-   public void testReferencedEntity()
-   {
-      ReferencedEntity ref = new ReferencedEntity();
-      ejbref.persist(ref);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.ear;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class FacadeBean implements Facade
+{
+   @PersistenceContext(unitName="earlib")
+   EntityManager earlib;
+
+   @PersistenceContext(unitName="ejbref")
+   EntityManager ejbref;
+
+   public void testEarLib()
+   {
+      LibEntity entity = new LibEntity();
+      earlib.persist(entity);
+   }
+
+   public void testReferencedEntity()
+   {
+      ReferencedEntity ref = new ReferencedEntity();
+      ejbref.persist(ref);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.ear;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-
-/**
- * entity in ear/lib/.jar file
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
- at Entity
-public class LibEntity
-{
-   private int id;
-
-   @Id @GeneratedValue
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/LibEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.ear;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * entity in ear/lib/.jar file
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+ at Entity
+public class LibEntity
+{
+   private int id;
+
+   @Id @GeneratedValue
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.ear;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-
-/**
- * in EAR/lib directory and referenced by another PU
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
- at Entity
-public class ReferencedEntity
-{
-   private int id;
-
-   @Id
-   @GeneratedValue
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/ReferencedEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.ear;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * in EAR/lib directory and referenced by another PU
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+ at Entity
+public class ReferencedEntity
+{
+   private int id;
+
+   @Id
+   @GeneratedValue
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.ear.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.factory.Session1;
-import org.jboss.ejb3.test.factory.Session2;
-import org.jboss.ejb3.test.factory.MyService;
-import org.jboss.ejb3.test.factory.Util;
-import org.jboss.ejb3.test.factory.Stateful1;
-import org.jboss.ejb3.test.factory.Entity1;
-import org.jboss.ejb3.test.factory.Entity2;
-import org.jboss.ejb3.test.factory.unit.FactoryUnitTestCase;
-import org.jboss.ejb3.test.ear.Facade;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: FactoryUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
- */
-
-public class EarUnitTestCase
-        extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public EarUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testEarLib() throws Exception
-   {
-      Facade facade = (Facade)getInitialContext().lookup("ear-test/FacadeBean/remote");
-      facade.testEarLib();
-   }
-
-   public void testReferencedEntity() throws Exception
-   {
-      Facade facade = (Facade)getInitialContext().lookup("ear-test/FacadeBean/remote");
-      facade.testReferencedEntity();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EarUnitTestCase.class, "ear-test.ear");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.ear.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.factory.Session1;
+import org.jboss.ejb3.test.factory.Session2;
+import org.jboss.ejb3.test.factory.MyService;
+import org.jboss.ejb3.test.factory.Util;
+import org.jboss.ejb3.test.factory.Stateful1;
+import org.jboss.ejb3.test.factory.Entity1;
+import org.jboss.ejb3.test.factory.Entity2;
+import org.jboss.ejb3.test.factory.unit.FactoryUnitTestCase;
+import org.jboss.ejb3.test.ear.Facade;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: FactoryUnitTestCase.java 58110 2006-11-04 08:34:21Z scott.stark at jboss.org $
+ */
+
+public class EarUnitTestCase
+        extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public EarUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testEarLib() throws Exception
+   {
+      Facade facade = (Facade)getInitialContext().lookup("ear-test/FacadeBean/remote");
+      facade.testEarLib();
+   }
+
+   public void testReferencedEntity() throws Exception
+   {
+      Facade facade = (Facade)getInitialContext().lookup("ear-test/FacadeBean/remote");
+      facade.testReferencedEntity();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EarUnitTestCase.class, "ear-test.ear");
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.ejbcontext;
-
-import javax.ejb.Remote;
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Remote
-public interface Stateful
-{
-   public void testEjbContext() throws Exception;
-
-   public void test();
-
-   public Class testInvokedBusinessInterface() throws Exception;
-
-   public Class testLocalInvokedBusinessInterface() throws Exception;
-
-   public Object getBusinessObject() throws Exception;
-
-
-   String getState();
-
-   void setState(String state);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbcontext;
+
+import javax.ejb.Remote;
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface Stateful
+{
+   public void testEjbContext() throws Exception;
+
+   public void test();
+
+   public Class testInvokedBusinessInterface() throws Exception;
+
+   public Class testLocalInvokedBusinessInterface() throws Exception;
+
+   public Object getBusinessObject() throws Exception;
+
+
+   String getState();
+
+   void setState(String state);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.ejbcontext;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
-
-import javax.naming.InitialContext;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="Stateful")
- at RemoteBindings({@RemoteBinding(jndiBinding = "Stateful"), @RemoteBinding(jndiBinding = "StatefulRemote")})
-public class StatefulBean
-   implements org.jboss.ejb3.test.ejbcontext.Stateful, StatefulRemote
-{
-   private static final Logger log = Logger.getLogger(StatefulBean.class);
-   
-   @Resource
-   SessionContext sessionContext;
-   
-   @EJB(mappedName="StatefulRemote")
-   StatefulRemote statefulRemote = null;
-
-   String state = "";
-   
-   public void testEjbContext() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      EJBContext ejbContext = (EJBContext)jndiContext.lookup("java:comp.ejb3/EJBContext");
-      log.info("EJBContext " + ejbContext);
-   }
-   
-   public void test()
-   {
-      
-   }
-
-   public String getState()
-   {
-      return state;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-
-   public Object getBusinessObject() throws Exception
-   {
-      return sessionContext.getBusinessObject(org.jboss.ejb3.test.ejbcontext.Stateful.class);
-   }
-
-
-   public Class testInvokedBusinessInterface() throws Exception
-   {
-      return sessionContext.getInvokedBusinessInterface();
-   }
-   
-   public Class testInvokedBusinessInterface2() throws Exception
-   {
-      return sessionContext.getInvokedBusinessInterface();
-   }
-   
-   public Class testLocalInvokedBusinessInterface() throws Exception
-   {
-      return statefulRemote.testInvokedBusinessInterface2();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbcontext;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.ejb.EJBContext;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+
+import javax.naming.InitialContext;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="Stateful")
+ at RemoteBindings({@RemoteBinding(jndiBinding = "Stateful"), @RemoteBinding(jndiBinding = "StatefulRemote")})
+public class StatefulBean
+   implements org.jboss.ejb3.test.ejbcontext.Stateful, StatefulRemote
+{
+   private static final Logger log = Logger.getLogger(StatefulBean.class);
+   
+   @Resource
+   SessionContext sessionContext;
+   
+   @EJB(mappedName="StatefulRemote")
+   StatefulRemote statefulRemote = null;
+
+   String state = "";
+   
+   public void testEjbContext() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      EJBContext ejbContext = (EJBContext)jndiContext.lookup("java:comp.ejb3/EJBContext");
+      log.info("EJBContext " + ejbContext);
+   }
+   
+   public void test()
+   {
+      
+   }
+
+   public String getState()
+   {
+      return state;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+
+   public Object getBusinessObject() throws Exception
+   {
+      return sessionContext.getBusinessObject(org.jboss.ejb3.test.ejbcontext.Stateful.class);
+   }
+
+
+   public Class testInvokedBusinessInterface() throws Exception
+   {
+      return sessionContext.getInvokedBusinessInterface();
+   }
+   
+   public Class testInvokedBusinessInterface2() throws Exception
+   {
+      return sessionContext.getInvokedBusinessInterface();
+   }
+   
+   public Class testLocalInvokedBusinessInterface() throws Exception
+   {
+      return statefulRemote.testInvokedBusinessInterface2();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.ejbcontext;
-
-import javax.ejb.Remote;
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Remote
-public interface StatefulRemote
-{
-   public Class testInvokedBusinessInterface2() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbcontext;
+
+import javax.ejb.Remote;
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatefulRemote
+{
+   public Class testInvokedBusinessInterface2() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.ejbcontext;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface Stateless
-{
-   public void testEjbContextLookup() throws Exception;
-   
-   public Class testInvokedBusinessInterface() throws Exception;
-   
-   public Object testBusinessObject(Class businessInterface) throws Exception;
-   
-   public void testEjbObject() throws Exception;
-
-   public void testEjbLocalObject() throws Exception;
-
-   public void noop();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbcontext;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface Stateless
+{
+   public void testEjbContextLookup() throws Exception;
+   
+   public Class testInvokedBusinessInterface() throws Exception;
+   
+   public Object testBusinessObject(Class businessInterface) throws Exception;
+   
+   public void testEjbObject() throws Exception;
+
+   public void testEjbLocalObject() throws Exception;
+
+   public void noop();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,85 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.ejbcontext;
-
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless(name="Stateless")
- at Local(StatelessLocal.class)
- at Remote(org.jboss.ejb3.test.ejbcontext.Stateless.class)
- at LocalBinding(jndiBinding = "StatelessLocal")
- at RemoteBinding(jndiBinding = "Stateless")
-public class StatelessBean
-   implements org.jboss.ejb3.test.ejbcontext.Stateless, StatelessLocal
-{
-   private static final Logger log = Logger.getLogger(StatelessBean.class);
-   
-   @Resource
-   SessionContext sessionContext;
-
-   public void noop()
-   {
-      
-   }
-   
-   public void testEjbContextLookup() throws Exception
-   {
-      Stateful stateful = (Stateful)sessionContext.lookup("Stateful");
-      stateful.test();
-   }
-   
-   public Class testInvokedBusinessInterface() throws Exception
-   {
-      return sessionContext.getInvokedBusinessInterface();
-   }
-   
-   public Object testBusinessObject(Class businessInterface) throws Exception
-   {
-      return sessionContext.getBusinessObject(businessInterface);
-   }
-   
-   public void testEjbObject() throws Exception
-   {
-      javax.ejb.EJBObject ejbObject = sessionContext.getEJBObject();
-      ejbObject.getHandle();
-   }
-   
-   public void testEjbLocalObject() throws Exception
-   {
-      javax.ejb.EJBLocalObject ejbObject = sessionContext.getEJBLocalObject();
-      ejbObject.getClass();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbcontext;
+
+import javax.annotation.Resource;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless(name="Stateless")
+ at Local(StatelessLocal.class)
+ at Remote(org.jboss.ejb3.test.ejbcontext.Stateless.class)
+ at LocalBinding(jndiBinding = "StatelessLocal")
+ at RemoteBinding(jndiBinding = "Stateless")
+public class StatelessBean
+   implements org.jboss.ejb3.test.ejbcontext.Stateless, StatelessLocal
+{
+   private static final Logger log = Logger.getLogger(StatelessBean.class);
+   
+   @Resource
+   SessionContext sessionContext;
+
+   public void noop()
+   {
+      
+   }
+   
+   public void testEjbContextLookup() throws Exception
+   {
+      Stateful stateful = (Stateful)sessionContext.lookup("Stateful");
+      stateful.test();
+   }
+   
+   public Class testInvokedBusinessInterface() throws Exception
+   {
+      return sessionContext.getInvokedBusinessInterface();
+   }
+   
+   public Object testBusinessObject(Class businessInterface) throws Exception
+   {
+      return sessionContext.getBusinessObject(businessInterface);
+   }
+   
+   public void testEjbObject() throws Exception
+   {
+      javax.ejb.EJBObject ejbObject = sessionContext.getEJBObject();
+      ejbObject.getHandle();
+   }
+   
+   public void testEjbLocalObject() throws Exception
+   {
+      javax.ejb.EJBLocalObject ejbObject = sessionContext.getEJBLocalObject();
+      ejbObject.getClass();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.ejbcontext;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatelessLocal
-{
-   public void testEjbContextLookup() throws Exception;
-
-   public Class testInvokedBusinessInterface() throws Exception;
-
-   public Object testBusinessObject(Class businessInterface) throws Exception;
-
-   public void testEjbObject() throws Exception;
-
-   public void testEjbLocalObject() throws Exception;
-
-   public void noop();
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbcontext;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatelessLocal
+{
+   public void testEjbContextLookup() throws Exception;
+
+   public Class testInvokedBusinessInterface() throws Exception;
+
+   public Object testBusinessObject(Class businessInterface) throws Exception;
+
+   public void testEjbObject() throws Exception;
+
+   public void testEjbLocalObject() throws Exception;
+
+   public void noop();
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,116 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.ejbcontext.unit;
-
-import org.jboss.ejb3.test.ejbcontext.Stateful;
-import org.jboss.ejb3.test.ejbcontext.StatefulRemote;
-import org.jboss.ejb3.test.ejbcontext.Stateless;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class EjbContextUnitTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(EjbContextUnitTestCase.class);
-
-   public EjbContextUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEjbContextJndi() throws Exception
-   {
-     Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
-     stateful.testEjbContext();
-   }
-   
-   public void testEjbContextLookup() throws Exception
-   {
-     Stateless stateless = (Stateless)getInitialContext().lookup("Stateless");
-     stateless.testEjbContextLookup();
-   }
-   
-   public void testStatelessInvokedBusinessInterface() throws Exception
-   {
-      Stateless stateless1 = (Stateless)getInitialContext().lookup("Stateless");
-      Stateless stateless2 = (Stateless)getInitialContext().lookup("Stateless");
-      
-      Class interfc = stateless1.testInvokedBusinessInterface();
-      assertEquals(interfc, Stateless.class);
-      
-      interfc = stateless2.testInvokedBusinessInterface();
-      assertEquals(interfc, Stateless.class);
-      
-      Stateless stateless = (Stateless)stateless1.testBusinessObject(Stateless.class);
-      stateless.noop();
-
-      assertEquals(interfc, Stateless.class);
-      
-      try{
-         stateless1.testBusinessObject(Stateful.class);
-         fail("IllegalStateException not thrown");
-      }
-      catch (javax.ejb.EJBException e)
-      {
-         if (!(e.getCause() instanceof IllegalStateException)) throw e;
-         assertEquals(IllegalStateException.class, e.getCause().getClass());
-      }
-      
-      stateless1.testEjbObject();
-      
-      stateless1.testEjbLocalObject();
-   }
-   
-   public void testStatefulInvokedBusinessInterface() throws Exception
-   {
-      Stateful stateful1 = (Stateful)getInitialContext().lookup("Stateful");
-      StatefulRemote stateful2 = (StatefulRemote)getInitialContext().lookup("StatefulRemote");
-      
-      Class interfc = stateful1.testInvokedBusinessInterface();
-      assertEquals(interfc, Stateful.class);
-      
-      interfc = stateful2.testInvokedBusinessInterface2();
-      assertEquals(interfc, StatefulRemote.class);
-      
-      interfc = stateful1.testLocalInvokedBusinessInterface();
-      assertEquals(interfc, StatefulRemote.class);
-      
-      stateful1.setState("same");
-      Stateful stateful3 = (Stateful)stateful1.getBusinessObject();
-      assertEquals("same", stateful3.getState());
-
-      
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EjbContextUnitTestCase.class, "ejbcontext.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbcontext.unit;
+
+import org.jboss.ejb3.test.ejbcontext.Stateful;
+import org.jboss.ejb3.test.ejbcontext.StatefulRemote;
+import org.jboss.ejb3.test.ejbcontext.Stateless;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class EjbContextUnitTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(EjbContextUnitTestCase.class);
+
+   public EjbContextUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEjbContextJndi() throws Exception
+   {
+     Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
+     stateful.testEjbContext();
+   }
+   
+   public void testEjbContextLookup() throws Exception
+   {
+     Stateless stateless = (Stateless)getInitialContext().lookup("Stateless");
+     stateless.testEjbContextLookup();
+   }
+   
+   public void testStatelessInvokedBusinessInterface() throws Exception
+   {
+      Stateless stateless1 = (Stateless)getInitialContext().lookup("Stateless");
+      Stateless stateless2 = (Stateless)getInitialContext().lookup("Stateless");
+      
+      Class interfc = stateless1.testInvokedBusinessInterface();
+      assertEquals(interfc, Stateless.class);
+      
+      interfc = stateless2.testInvokedBusinessInterface();
+      assertEquals(interfc, Stateless.class);
+      
+      Stateless stateless = (Stateless)stateless1.testBusinessObject(Stateless.class);
+      stateless.noop();
+
+      assertEquals(interfc, Stateless.class);
+      
+      try{
+         stateless1.testBusinessObject(Stateful.class);
+         fail("IllegalStateException not thrown");
+      }
+      catch (javax.ejb.EJBException e)
+      {
+         if (!(e.getCause() instanceof IllegalStateException)) throw e;
+         assertEquals(IllegalStateException.class, e.getCause().getClass());
+      }
+      
+      stateless1.testEjbObject();
+      
+      stateless1.testEjbLocalObject();
+   }
+   
+   public void testStatefulInvokedBusinessInterface() throws Exception
+   {
+      Stateful stateful1 = (Stateful)getInitialContext().lookup("Stateful");
+      StatefulRemote stateful2 = (StatefulRemote)getInitialContext().lookup("StatefulRemote");
+      
+      Class interfc = stateful1.testInvokedBusinessInterface();
+      assertEquals(interfc, Stateful.class);
+      
+      interfc = stateful2.testInvokedBusinessInterface2();
+      assertEquals(interfc, StatefulRemote.class);
+      
+      interfc = stateful1.testLocalInvokedBusinessInterface();
+      assertEquals(interfc, StatefulRemote.class);
+      
+      stateful1.setState("same");
+      Stateful stateful3 = (Stateful)stateful1.getBusinessObject();
+      assertEquals("same", stateful3.getState());
+
+      
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EjbContextUnitTestCase.class, "ejbcontext.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree655;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- * 
- * FIXME: This is thing might be useless because all the lifecycle methods are optional.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class AbstractStateChecker
-{
-   private static final Logger log = Logger.getLogger(AbstractStateChecker.class);
-   
-   public static enum State { INITIATED, CREATED, STARTED, STOPPED, DESTROYED };
-   
-   private State currentState = State.INITIATED;
-   
-   public void create()
-   {
-      log.info("create called on " + this);
-      
-      setState(State.INITIATED, State.CREATED);
-   }
-   
-   public void destroy()
-   {
-      log.info("destroy called on " + this);
-      
-      setState(State.STOPPED, State.DESTROYED);
-   }
-   
-   public State getState()
-   {
-      return currentState;
-   }
-   
-   private void setState(State expectedState, State newState)
-   {
-      //log.info("setState expected = " + expectedState + ", current = " + getState() + ", new = " + newState);
-      if(!this.currentState.equals(expectedState))
-      {
-         // the exception is gobled up somewhere
-         log.warn("state should be " + expectedState + ", not " + currentState);
-         throw new IllegalStateException("state should be " + expectedState + ", not " + currentState);
-      }
-      
-      this.currentState = newState;
-   }
-   
-   public void start()
-   {
-      log.info("start called on " + this);
-      
-      if(currentState.equals(State.STOPPED))
-         setState(State.STOPPED, State.STARTED);
-      else
-         setState(State.CREATED, State.STARTED);
-   }
-   
-   public void stop()
-   {
-      //new Throwable().printStackTrace();
-      log.info("stop called on " + this);
-      
-      setState(State.STARTED, State.STOPPED);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/AbstractStateChecker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree655;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ * 
+ * FIXME: This is thing might be useless because all the lifecycle methods are optional.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public abstract class AbstractStateChecker
+{
+   private static final Logger log = Logger.getLogger(AbstractStateChecker.class);
+   
+   public static enum State { INITIATED, CREATED, STARTED, STOPPED, DESTROYED };
+   
+   private State currentState = State.INITIATED;
+   
+   public void create()
+   {
+      log.info("create called on " + this);
+      
+      setState(State.INITIATED, State.CREATED);
+   }
+   
+   public void destroy()
+   {
+      log.info("destroy called on " + this);
+      
+      setState(State.STOPPED, State.DESTROYED);
+   }
+   
+   public State getState()
+   {
+      return currentState;
+   }
+   
+   private void setState(State expectedState, State newState)
+   {
+      //log.info("setState expected = " + expectedState + ", current = " + getState() + ", new = " + newState);
+      if(!this.currentState.equals(expectedState))
+      {
+         // the exception is gobled up somewhere
+         log.warn("state should be " + expectedState + ", not " + currentState);
+         throw new IllegalStateException("state should be " + expectedState + ", not " + currentState);
+      }
+      
+      this.currentState = newState;
+   }
+   
+   public void start()
+   {
+      log.info("start called on " + this);
+      
+      if(currentState.equals(State.STOPPED))
+         setState(State.STOPPED, State.STARTED);
+      else
+         setState(State.CREATED, State.STARTED);
+   }
+   
+   public void stop()
+   {
+      //new Throwable().printStackTrace();
+      log.info("stop called on " + this);
+      
+      setState(State.STARTED, State.STOPPED);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree655;
-
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Service
- at Remote(MyService.class)
- at Management(MyServiceManagement.class)
-public class MyManagedServiceBean extends AbstractStateChecker implements MyServiceManagement
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(MyManagedServiceBean.class);
-   
-//   public void create()
-//   {
-//      log.info("create called");
-//   }
-//   
-//   public void destroy()
-//   {
-//      log.info("destroy called");
-//   }
-   
-   public String sayHelloTo(String name)
-   {
-      return "Hi " + name;
-   }
-   
-//   public void start()
-//   {
-//      log.info("start called");
-//   }
-//   
-//   public void stop()
-//   {
-//      log.info("stop called");
-//   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree655;
+
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Service
+ at Remote(MyService.class)
+ at Management(MyServiceManagement.class)
+public class MyManagedServiceBean extends AbstractStateChecker implements MyServiceManagement
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(MyManagedServiceBean.class);
+   
+//   public void create()
+//   {
+//      log.info("create called");
+//   }
+//   
+//   public void destroy()
+//   {
+//      log.info("destroy called");
+//   }
+   
+   public String sayHelloTo(String name)
+   {
+      return "Hi " + name;
+   }
+   
+//   public void start()
+//   {
+//      log.info("start called");
+//   }
+//   
+//   public void stop()
+//   {
+//      log.info("stop called");
+//   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree655;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyService
-{
-   AbstractStateChecker.State getState();
-   
-   String sayHelloTo(String name);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree655;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyService
+{
+   AbstractStateChecker.State getState();
+   
+   String sayHelloTo(String name);
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree655;
-
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.Service;
-import org.jboss.logging.Logger;
-
-/**
- * This service bean tests the magic lifecycle methods. (EJBTHREE-655)
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Service
- at Remote(MyService.class)
-public class MyServiceBean extends AbstractStateChecker
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(MyServiceBean.class);
-   
-//   public void create()
-//   {
-//      log.info("create called");
-//   }
-//   
-//   public void destroy()
-//   {
-//      log.info("destroy called");
-//   }
-   
-   public String sayHelloTo(String name)
-   {
-      return "Hi " + name;
-   }
-   
-//   public void start()
-//   {
-//      log.info("start called");
-//   }
-//   
-//   public void stop()
-//   {
-//      log.info("stop called");
-//   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree655;
+
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.Service;
+import org.jboss.logging.Logger;
+
+/**
+ * This service bean tests the magic lifecycle methods. (EJBTHREE-655)
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Service
+ at Remote(MyService.class)
+public class MyServiceBean extends AbstractStateChecker
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(MyServiceBean.class);
+   
+//   public void create()
+//   {
+//      log.info("create called");
+//   }
+//   
+//   public void destroy()
+//   {
+//      log.info("destroy called");
+//   }
+   
+   public String sayHelloTo(String name)
+   {
+      return "Hi " + name;
+   }
+   
+//   public void start()
+//   {
+//      log.info("start called");
+//   }
+//   
+//   public void stop()
+//   {
+//      log.info("stop called");
+//   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree655;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyServiceManagement
-{
-   void create();
-   void start();
-   void stop();
-   void destroy();
-   
-   AbstractStateChecker.State getState();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree655;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyServiceManagement
+{
+   void create();
+   void start();
+   void stop();
+   void destroy();
+   
+   AbstractStateChecker.State getState();
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree655.unit;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.NameNotFoundException;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.ejbthree655.AbstractStateChecker;
-import org.jboss.ejb3.test.ejbthree655.MyService;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ServiceManagementUnitTestCase extends JBossTestCase
-{
-   public ServiceManagementUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testHasCreateBeenCalled() throws Exception
-   {
-      MyService session = (MyService) getInitialContext().lookup("MyServiceBean/remote");
-      session.sayHelloTo("me");
-      
-      AbstractStateChecker.State expected = AbstractStateChecker.State.STARTED;
-      assertEquals(expected, session.getState());
-   }
-   
-   public void test2() throws Exception
-   {
-      MyService session = (MyService) getInitialContext().lookup("MyManagedServiceBean/remote");
-      session.sayHelloTo("me");
-      
-      AbstractStateChecker.State expected = AbstractStateChecker.State.STARTED;
-      assertEquals(expected, session.getState());
-   }
-   
-   public void testRestartContainer() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName name = new ObjectName("jboss.j2ee:jar=ejbthree655.jar,name=MyManagedServiceBean,service=EJB3,type=ManagementInterface");
-      Object params[] = { };
-      String signature[] = { };
-      server.invoke(name, "stop", params, signature);
-      
-      {
-         AbstractStateChecker.State expected = AbstractStateChecker.State.STOPPED;
-         assertEquals(expected, server.getAttribute(name, "State"));
-      }
-      
-      try
-      {
-         MyService session = (MyService) getInitialContext().lookup("MyManagedServiceBean/remote");
-         session.sayHelloTo("me");
-         
-         fail("should have failed");
-      }
-      catch(NameNotFoundException e)
-      {
-         String expected = "MyManagedServiceBean not bound";
-         assertEquals(expected, e.getMessage());
-      }
-      
-      server.invoke(name, "start", params, signature);
-      
-      {
-         AbstractStateChecker.State expected = AbstractStateChecker.State.STARTED;
-         assertEquals(expected, server.getAttribute(name, "State"));
-      }
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ServiceManagementUnitTestCase.class, "ejbthree655.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/unit/ServiceManagementUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree655.unit;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.NameNotFoundException;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.ejbthree655.AbstractStateChecker;
+import org.jboss.ejb3.test.ejbthree655.MyService;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ServiceManagementUnitTestCase extends JBossTestCase
+{
+   public ServiceManagementUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testHasCreateBeenCalled() throws Exception
+   {
+      MyService session = (MyService) getInitialContext().lookup("MyServiceBean/remote");
+      session.sayHelloTo("me");
+      
+      AbstractStateChecker.State expected = AbstractStateChecker.State.STARTED;
+      assertEquals(expected, session.getState());
+   }
+   
+   public void test2() throws Exception
+   {
+      MyService session = (MyService) getInitialContext().lookup("MyManagedServiceBean/remote");
+      session.sayHelloTo("me");
+      
+      AbstractStateChecker.State expected = AbstractStateChecker.State.STARTED;
+      assertEquals(expected, session.getState());
+   }
+   
+   public void testRestartContainer() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName name = new ObjectName("jboss.j2ee:jar=ejbthree655.jar,name=MyManagedServiceBean,service=EJB3,type=ManagementInterface");
+      Object params[] = { };
+      String signature[] = { };
+      server.invoke(name, "stop", params, signature);
+      
+      {
+         AbstractStateChecker.State expected = AbstractStateChecker.State.STOPPED;
+         assertEquals(expected, server.getAttribute(name, "State"));
+      }
+      
+      try
+      {
+         MyService session = (MyService) getInitialContext().lookup("MyManagedServiceBean/remote");
+         session.sayHelloTo("me");
+         
+         fail("should have failed");
+      }
+      catch(NameNotFoundException e)
+      {
+         String expected = "MyManagedServiceBean not bound";
+         assertEquals(expected, e.getMessage());
+      }
+      
+      server.invoke(name, "start", params, signature);
+      
+      {
+         AbstractStateChecker.State expected = AbstractStateChecker.State.STARTED;
+         assertEquals(expected, server.getAttribute(name, "State"));
+      }
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ServiceManagementUnitTestCase.class, "ejbthree655.jar");
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree712;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-//@Remote
-public interface InjectionTester
-{
-   void checkInjection() throws FailedException;
-   
-   @SuppressWarnings("serial")
-   static class FailedException extends Exception
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree712;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+//@Remote
+public interface InjectionTester
+{
+   void checkInjection() throws FailedException;
+   
+   @SuppressWarnings("serial")
+   static class FailedException extends Exception
+   {
+      
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree712;
-
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-/**
- * Checks whether injection via ejb-jar.xml of a SessionContext works.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-//@Stateless
-public class InjectionTesterBean implements InjectionTester
-{
-   // injected from ejb-jar.xml
-   private SessionContext ctx;
-   
-   public void checkInjection() throws FailedException
-   {
-      if(ctx == null)
-         throw new FailedException();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/InjectionTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree712;
+
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+/**
+ * Checks whether injection via ejb-jar.xml of a SessionContext works.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+//@Stateless
+public class InjectionTesterBean implements InjectionTester
+{
+   // injected from ejb-jar.xml
+   private SessionContext ctx;
+   
+   public void checkInjection() throws FailedException
+   {
+      if(ctx == null)
+         throw new FailedException();
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree712.unit;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.ejbthree712.InjectionTester;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class InjectionTesterUnitTestCase extends JBossTestCase
-{
-
-   public InjectionTesterUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testInjection() throws Exception
-   {
-      InjectionTester session = (InjectionTester) getInitialContext().lookup("InjectionTesterBean/remote");
-      try
-      {
-         session.checkInjection();
-      }
-      catch(InjectionTester.FailedException e)
-      {
-         fail("SessionContext not injected");
-      }
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(InjectionTesterUnitTestCase.class, "ejbthree712.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree712/unit/InjectionTesterUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree712.unit;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.ejbthree712.InjectionTester;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class InjectionTesterUnitTestCase extends JBossTestCase
+{
+
+   public InjectionTesterUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testInjection() throws Exception
+   {
+      InjectionTester session = (InjectionTester) getInitialContext().lookup("InjectionTesterBean/remote");
+      try
+      {
+         session.checkInjection();
+      }
+      catch(InjectionTester.FailedException e)
+      {
+         fail("SessionContext not injected");
+      }
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(InjectionTesterUnitTestCase.class, "ejbthree712.jar");
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751)

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree751.fail;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-
-/**
- * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
- * @version $Revision: $
- */
- at Local
- at Remote
-public interface FailLocalRemoteSameInterface {
-
-	public void test();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree751.fail;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+
+/**
+ * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
+ * @version $Revision: $
+ */
+ at Local
+ at Remote
+public interface FailLocalRemoteSameInterface {
+
+	public void test();
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree751.fail;
-
-import javax.ejb.Stateless;
-
-/**
- * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
- * @version $Revision: $
- */
- at Stateless
-public class FailLocalRemoteSameInterfaceBean implements
-		FailLocalRemoteSameInterface {
-
-	public void test() {
-		System.out.println("Invoked.");
-	}
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/fail/FailLocalRemoteSameInterfaceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree751.fail;
+
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
+ * @version $Revision: $
+ */
+ at Stateless
+public class FailLocalRemoteSameInterfaceBean implements
+		FailLocalRemoteSameInterface {
+
+	public void test() {
+		System.out.println("Invoked.");
+	}
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree751.pass;
-
-import javax.ejb.Local;
-
-/**
- * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
- * @version $Revision: $
- */
- at Local
-public interface PassLocalInterface {
-
-	public void test();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree751.pass;
+
+import javax.ejb.Local;
+
+/**
+ * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
+ * @version $Revision: $
+ */
+ at Local
+public interface PassLocalInterface {
+
+	public void test();
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree751.pass;
-
-import javax.ejb.Stateless;
-
-/**
- * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
- * @version $Revision: $
- */
- at Stateless
-public class PassLocalRemoteDifferentInterfacesBean implements
-		PassLocalInterface, PassRemoteInterface {
-
-	public void test() {
-		System.out.println("Invoked.");
-	}
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassLocalRemoteDifferentInterfacesBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree751.pass;
+
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
+ * @version $Revision: $
+ */
+ at Stateless
+public class PassLocalRemoteDifferentInterfacesBean implements
+		PassLocalInterface, PassRemoteInterface {
+
+	public void test() {
+		System.out.println("Invoked.");
+	}
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree751.pass;
-
-import javax.ejb.Remote;
-
-/**
- * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
- * @version $Revision: $
- */
- at Remote
-public interface PassRemoteInterface {
-
-	public void test();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/pass/PassRemoteInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree751.pass;
+
+import javax.ejb.Remote;
+
+/**
+ * @author <a href="mailto:alr at alrubinger.com">Andrew Rubinger</a>
+ * @version $Revision: $
+ */
+ at Remote
+public interface PassRemoteInterface {
+
+	public void test();
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree751.unit;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class FailLocalRemoteSameInterfaceUnitTestCase extends JBossTestCase
-{
-   public FailLocalRemoteSameInterfaceUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      // do not deploy any jars
-      return getDeploySetup(FailLocalRemoteSameInterfaceUnitTestCase.class, null);
-   }
-   
-   @Override
-   protected void tearDown() throws Exception
-   {
-      undeploy("ejbthree751-fail.jar");
-      super.tearDown();
-   }
-   
-   public void testDeploymentFailure() throws Exception
-   {
-      redeploy("ejbthree751-fail.jar");
-      fail("should throw an exception");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/FailLocalRemoteSameInterfaceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree751.unit;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class FailLocalRemoteSameInterfaceUnitTestCase extends JBossTestCase
+{
+   public FailLocalRemoteSameInterfaceUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      // do not deploy any jars
+      return getDeploySetup(FailLocalRemoteSameInterfaceUnitTestCase.class, null);
+   }
+   
+   @Override
+   protected void tearDown() throws Exception
+   {
+      undeploy("ejbthree751-fail.jar");
+      super.tearDown();
+   }
+   
+   public void testDeploymentFailure() throws Exception
+   {
+      redeploy("ejbthree751-fail.jar");
+      fail("should throw an exception");
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree751.unit;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class PassLocalRemoteDifferentInterfacesUnitTestCase extends JBossTestCase
-{
-   public PassLocalRemoteDifferentInterfacesUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      // do not deploy any jars
-      return getDeploySetup(PassLocalRemoteDifferentInterfacesUnitTestCase.class, null);
-   }
-   
-   @Override
-   protected void tearDown() throws Exception
-   {
-      undeploy("ejbthree751-pass.jar");
-      super.tearDown();
-   }
-   
-   public void testDeploymentSuccess() throws Exception
-   {
-      deploy("ejbthree751-pass.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree751/unit/PassLocalRemoteDifferentInterfacesUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree751.unit;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class PassLocalRemoteDifferentInterfacesUnitTestCase extends JBossTestCase
+{
+   public PassLocalRemoteDifferentInterfacesUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      // do not deploy any jars
+      return getDeploySetup(PassLocalRemoteDifferentInterfacesUnitTestCase.class, null);
+   }
+   
+   @Override
+   protected void tearDown() throws Exception
+   {
+      undeploy("ejbthree751-pass.jar");
+      super.tearDown();
+   }
+   
+   public void testDeploymentSuccess() throws Exception
+   {
+      deploy("ejbthree751-pass.jar");
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree832;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Remote
-public interface EntityTest
-{
-   void test1();
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree832;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Remote
+public interface EntityTest
+{
+   void test1();
+}
\ No newline at end of file

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree832;
-
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateless
-public class EntityTestBean implements EntityTest
-{
-   @PersistenceContext
-   private EntityManager em;
-   
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.test.ejbthree832.EntityTest#test1()
-    */
-   public void test1()
-   {
-      Person person = new Person("Emmanuel");
-      em.persist(person);
-      
-      person = new Person("Gavin");
-      em.persist(person);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree832;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateless
+public class EntityTestBean implements EntityTest
+{
+   @PersistenceContext
+   private EntityManager em;
+   
+   /* (non-Javadoc)
+    * @see org.jboss.ejb3.test.ejbthree832.EntityTest#test1()
+    */
+   public void test1()
+   {
+      Person person = new Person("Emmanuel");
+      em.persist(person);
+      
+      person = new Person("Gavin");
+      em.persist(person);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree832;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Entity
-public class Person
-{
-   private Long id;
-   private String name;
-   
-   public Person()
-   {
-      
-   }
-   
-   public Person(String name)
-   {
-      setName(name);
-   }
-   
-   @Id
-   public Long getId()
-   {
-      return id;
-   }
-   
-   public void setId(Long id)
-   {
-      this.id = id;
-   }
-   
-   public String getName()
-   {
-      return name;
-   }
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/Person.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree832;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Entity
+public class Person
+{
+   private Long id;
+   private String name;
+   
+   public Person()
+   {
+      
+   }
+   
+   public Person(String name)
+   {
+      setName(name);
+   }
+   
+   @Id
+   public Long getId()
+   {
+      return id;
+   }
+   
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+   
+   public String getName()
+   {
+      return name;
+   }
+   
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ejbthree832.unit;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.ejbthree832.EntityTest;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class EntityTestCase extends JBossTestCase
-{
-
-   public EntityTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void test1() throws Exception
-   {
-      EntityTest test = (EntityTest) this.getInitialContext().lookup("EntityTestBean/remote");
-      test.test1();
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EntityTestCase.class, "ejbthree832.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.ejbthree832.unit;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.ejbthree832.EntityTest;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class EntityTestCase extends JBossTestCase
+{
+
+   public EntityTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void test1() throws Exception
+   {
+      EntityTest test = (EntityTest) this.getInitialContext().lookup("EntityTestBean/remote");
+      test.test1();
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EntityTestCase.class, "ejbthree832.jar");
+   }
+
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,8 +36,8 @@
  */
 @Entity
 @NamedQueries (
-      {@NamedQuery(name="allAirports", query="select a from Airport a"),
-      @NamedQuery(name="airportById", query="select a from Airport a where a.id=:id")})
+      {@NamedQuery(name="allAirports", query="from Airport"),
+      @NamedQuery(name="airportById", query="from Airport a where a.id=:id")})
 public class Airport
 {
 

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -75,7 +75,7 @@
       Query q = manager.createQuery("SELECT c FROM Customer c");
       List l = q.getResultList();
       if (l.size() == 0) throw new RuntimeException("failed");
-      org.hibernate.Query q2 = session.createQuery("Select c FROM Customer c");
+      org.hibernate.Query q2 = session.createQuery("FROM Customer c");
       l = q2.list();
       if (l.size() == 0) throw new RuntimeException("failed");
 

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -34,7 +34,7 @@
  * @version $Revision$
  */
 @Entity
- at NamedQuery(name="airportByCode", query="select a from FieldAirport a where a.code=:code")
+ at NamedQuery(name="airportByCode", query="from FieldAirport a where a.code=:code")
 public class FieldAirport
 {
 

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/MyResource.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/MyResource.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/MyResource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.entity;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-/**
- * This demonstrates entity inheritance.
- *
- * @author Ortwin Glück - Forum user
- * @author Clebert Suconic - Isolating problem
- */
- at Entity
- at Table(name="TBRESOURCE2")
- at Inheritance
- at DiscriminatorValue("M")
- at PrimaryKeyJoinColumn(name="resource_id")
-public class MyResource extends Resource {
-  private String myField;
-
-  public MyResource() {
-    super();
-  }
-
-  public String getMyField() {
-    return myField;
-  }
-
-  public void setMyField(String myField) {
-    this.myField = myField;
-  }
-
-}
-

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Resource.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Resource.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/Resource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Version;
-
- at Entity
- at Table(name="TBRESOURCE")
- at Inheritance(strategy=InheritanceType.JOINED)
- at DiscriminatorValue("R")
- at DiscriminatorColumn(name="inhtype", length=2)
-public class  Resource implements Serializable{
-  private int id;
-  private String description;
-  private User user;
-
-  @Column(name="description")
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  @Id
-  public int getId() {
-    return id;
-  }
-
-  public void setId(int id) {
-    this.id = id;
-  }
-
-
-
-  @ManyToOne(fetch=FetchType.LAZY)
-  public User getUser() {
-    return user;
-  }
-
-  public void setUser(User user) {
-    this.user = user;
-  }
-
-}
-

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/User.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/User.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/User.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.entity;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Version;
-
- at Entity
- at Table(name="TBUSER")
-public class  User implements Serializable {
-  private int id;
-  private String name;
-
-  @Id
-  public int getId() {
-    return id;
-  }
-
-  public void setId(int id) {
-    this.id = id;
-  }
-
-
-  @Column(name="username")
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -46,7 +46,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entitycallback/unit/EntityCallbackUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entitycallback/unit/EntityCallbackUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entitycallback/unit/EntityCallbackUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -40,7 +40,7 @@
 public class EntityCallbackUnitTestCase
       extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -253,7 +253,7 @@
       createEntry(new Person(12, "B"));
       createEntry(new Person(13, "C"));
       
-      Query query = manager.createQuery("select p from Person p");
+      Query query = manager.createQuery("from Person");
       try
       {
          query.getSingleResult();
@@ -263,7 +263,7 @@
       {
       }
       
-      Query query2 = manager.createQuery("select p from Person p where id=999");
+      Query query2 = manager.createQuery("from Person where id=999");
       try
       {
          query2.getSingleResult();
@@ -279,7 +279,7 @@
       
       try
       {
-         Query query = manager.createQuery("select p from Person p");
+         Query query = manager.createQuery("from Person");
          query.setHint("org.hibernate.timeout", "Not an integer");
          throw new RuntimeException("IllegalArgumentException not thrown for setHint");
       }
@@ -287,7 +287,7 @@
       {
       }
       
-      Query query = manager.createQuery("select p from Person p where id=:id and name=:name");
+      Query query = manager.createQuery("from Person where id=:id and name=:name");
       try
       {
          query.setParameter("nosuchparam", "Whateverrrr");
@@ -307,7 +307,7 @@
       {
       }
       
-      query = manager.createQuery("select p from Person p where id=? and name=?");
+      query = manager.createQuery("from Person where id=? and name=?");
       query.setParameter(0, 1);
       query.setParameter(1, "XXX");
       try

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/unit/EntityExceptionTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/unit/EntityExceptionTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/unit/EntityExceptionTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -28,7 +28,7 @@
 
 public class EntityExceptionTestCase extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
    
    Person kabir;
    

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.enventry;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless(name="ExtendedTestEnvEntry")
- at Remote(TestEnvEntry.class)
- at RemoteBinding(jndiBinding="ExtendedTestEnvEntry")
-public class ExtendedTestEnvEntryBean
-   extends TestEnvEntryBean
-{
-   private static final Logger log = Logger.getLogger(ExtendedTestEnvEntryBean.class);
-   
-   @Resource(name="maxExceptions") private int maxExceptions = 3;
-   
-   @Resource private int numExceptions = 2;
-   
-   private int minExceptions = 0;
-   
-   public int getMaxExceptions()
-   {
-      return maxExceptions;
-   }
-   
-   public int getNumExceptions()
-   {
-      return numExceptions;
-   }
-   
-   public int getMinExceptions()
-   {
-      return minExceptions;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.enventry;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless(name="ExtendedTestEnvEntry")
+ at Remote(TestEnvEntry.class)
+ at RemoteBinding(jndiBinding="ExtendedTestEnvEntry")
+public class ExtendedTestEnvEntryBean
+   extends TestEnvEntryBean
+{
+   private static final Logger log = Logger.getLogger(ExtendedTestEnvEntryBean.class);
+   
+   @Resource(name="maxExceptions") private int maxExceptions = 3;
+   
+   @Resource private int numExceptions = 2;
+   
+   private int minExceptions = 0;
+   
+   public int getMaxExceptions()
+   {
+      return maxExceptions;
+   }
+   
+   public int getNumExceptions()
+   {
+      return numExceptions;
+   }
+   
+   public int getMinExceptions()
+   {
+      return minExceptions;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.enventry;
-
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface TestEnvEntry
-{
-   int checkJNDI() throws NamingException;
-   
-   int getMaxExceptions();
-   
-   int getMinExceptions();
-   
-   int getNumExceptions();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.enventry;
+
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface TestEnvEntry
+{
+   int checkJNDI() throws NamingException;
+   
+   int getMaxExceptions();
+   
+   int getMinExceptions();
+   
+   int getNumExceptions();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntry.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.enventry;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless(name="TestEnvEntry")
- at Remote(TestEnvEntry.class)
- at RemoteBinding(jndiBinding="TestEnvEntry")
-public class TestEnvEntryBean
-   implements TestEnvEntry
-{
-   private static final Logger log = Logger.getLogger(TestEnvEntryBean.class);
-   
-   @Resource(name="maxExceptions") private int maxExceptions = 4;
-   
-   @Resource private int numExceptions = 3;
-
-   @Resource
-   SessionContext sessionCtx;
-   
-   private int minExceptions = 1;
-   
-   public int checkJNDI() throws NamingException
-   {
-      InitialContext ctx = new InitialContext();
-      int rtn = (Integer) ctx.lookup("java:comp/env/maxExceptions");
-      if (rtn != (Integer)sessionCtx.lookup("maxExceptions")) throw new RuntimeException("Failed to match env lookup");
-      return rtn;
-   }
-   
-   public int getMaxExceptions()
-   {
-      return maxExceptions;
-   }
-   
-   public int getNumExceptions()
-   {
-      return numExceptions;
-   }
-   
-   public int getMinExceptions()
-   {
-      return minExceptions;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.enventry;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless(name="TestEnvEntry")
+ at Remote(TestEnvEntry.class)
+ at RemoteBinding(jndiBinding="TestEnvEntry")
+public class TestEnvEntryBean
+   implements TestEnvEntry
+{
+   private static final Logger log = Logger.getLogger(TestEnvEntryBean.class);
+   
+   @Resource(name="maxExceptions") private int maxExceptions = 4;
+   
+   @Resource private int numExceptions = 3;
+
+   @Resource
+   SessionContext sessionCtx;
+   
+   private int minExceptions = 1;
+   
+   public int checkJNDI() throws NamingException
+   {
+      InitialContext ctx = new InitialContext();
+      int rtn = (Integer) ctx.lookup("java:comp/env/maxExceptions");
+      if (rtn != (Integer)sessionCtx.lookup("maxExceptions")) throw new RuntimeException("Failed to match env lookup");
+      return rtn;
+   }
+   
+   public int getMaxExceptions()
+   {
+      return maxExceptions;
+   }
+   
+   public int getNumExceptions()
+   {
+      return numExceptions;
+   }
+   
+   public int getMinExceptions()
+   {
+      return minExceptions;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.enventry;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version <tt>$Revision$</tt>
- */
- at MessageDriven(name="TestEnvEntryMD",
-   activationConfig = {
-      @ActivationConfigProperty(
-         propertyName = "destinationType", 
-         propertyValue = "javax.jms.Queue"),
-      @ActivationConfigProperty(
-         propertyName = "destination", 
-         propertyValue = "queue/testEnvEntry") })
-public class TestEnvEntryMDBean implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(TestEnvEntryMDBean.class);
-   
-   @Resource(mappedName="java:/JmsXA")
-   private ConnectionFactory connectionFactory;
-
-   @Resource(name="maxExceptions") private int maxExceptions = 4;
-   
-   @Resource private int numExceptions = 3;
-   
-   private int minExceptions = 1;
-   
-   public void onMessage(Message msg) {
-      try {
-         Destination destination = msg.getJMSReplyTo();
-         Connection conn = connectionFactory.createConnection();
-         try {
-            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            MessageProducer replyProducer = session.createProducer(destination);
-            MapMessage replyMsg = session.createMapMessage();
-            replyMsg.setJMSCorrelationID(msg.getJMSMessageID());
-
-            replyMsg.setInt("maxExceptions", maxExceptions);
-            replyMsg.setInt("numExceptions", numExceptions);
-            replyMsg.setInt("minExceptions", minExceptions);
-
-//          System.err.println("reply to: " + destination);
-//          System.err.println("maxExceptions: " + maxExceptions);
-//          System.err.println("numExceptions: " + numExceptions);
-//          System.err.println("minExceptions: " + minExceptions);
-
-            replyProducer.send(replyMsg);
-         }
-         finally {
-            conn.close();
-         }
-      }
-      catch(JMSException e) {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.enventry;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at MessageDriven(name="TestEnvEntryMD",
+   activationConfig = {
+      @ActivationConfigProperty(
+         propertyName = "destinationType", 
+         propertyValue = "javax.jms.Queue"),
+      @ActivationConfigProperty(
+         propertyName = "destination", 
+         propertyValue = "queue/testEnvEntry") })
+public class TestEnvEntryMDBean implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(TestEnvEntryMDBean.class);
+   
+   @Resource(mappedName="java:/JmsXA")
+   private ConnectionFactory connectionFactory;
+
+   @Resource(name="maxExceptions") private int maxExceptions = 4;
+   
+   @Resource private int numExceptions = 3;
+   
+   private int minExceptions = 1;
+   
+   public void onMessage(Message msg) {
+      try {
+         Destination destination = msg.getJMSReplyTo();
+         Connection conn = connectionFactory.createConnection();
+         try {
+            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            MessageProducer replyProducer = session.createProducer(destination);
+            MapMessage replyMsg = session.createMapMessage();
+            replyMsg.setJMSCorrelationID(msg.getJMSMessageID());
+
+            replyMsg.setInt("maxExceptions", maxExceptions);
+            replyMsg.setInt("numExceptions", numExceptions);
+            replyMsg.setInt("minExceptions", minExceptions);
+
+//          System.err.println("reply to: " + destination);
+//          System.err.println("maxExceptions: " + maxExceptions);
+//          System.err.println("numExceptions: " + numExceptions);
+//          System.err.println("minExceptions: " + minExceptions);
+
+            replyProducer.send(replyMsg);
+         }
+         finally {
+            conn.close();
+         }
+      }
+      catch(JMSException e) {
+         throw new RuntimeException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.enventry.unit;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.MapMessage;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-
-import org.jboss.ejb3.test.enventry.TestEnvEntry;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EnvEntryTestCase extends JBossTestCase
-{
-  
-   public EnvEntryTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testEnvEntries() throws Exception
-   {
-      TestEnvEntry test = (TestEnvEntry)getInitialContext().lookup("TestEnvEntry");
-      assertNotNull(test);
-      
-      int maxExceptions = test.getMaxExceptions();
-      assertEquals(15, maxExceptions);
-      
-      int minExceptions = test.getMinExceptions();
-      assertEquals(5, minExceptions);
-      
-      int numExceptions = test.getNumExceptions();
-      assertEquals(10, numExceptions);
-      
-      TestEnvEntry etest = (TestEnvEntry)getInitialContext().lookup("ExtendedTestEnvEntry");
-      assertNotNull(etest);
-      
-      maxExceptions = etest.getMaxExceptions();
-      assertEquals(14, maxExceptions);
-      
-      minExceptions = etest.getMinExceptions();
-      assertEquals(6, minExceptions);
-      
-      numExceptions = etest.getNumExceptions();
-      assertEquals(11, numExceptions);
-   }
-
-   public void testEnvEntriesMDB() throws Exception {
-      InitialContext ctx = getInitialContext();
-
-      ConnectionFactory factory = (ConnectionFactory)ctx.lookup("ConnectionFactory");
-      Connection con = factory.createConnection();
-      try {
-         Destination dest = (Destination) ctx.lookup("queue/testEnvEntry");
-         
-         Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         MessageProducer producer = session.createProducer(dest);
-         
-         Queue replyQueue = session.createTemporaryQueue();
-         MessageConsumer consumer = session.createConsumer(replyQueue);
-         
-         con.start();
-         
-         TextMessage msg = session.createTextMessage();
-         msg.setJMSReplyTo(replyQueue);
-         msg.setText("This is message one");
-         producer.send(msg);
-         
-         MapMessage replyMsg = (MapMessage) consumer.receive(5000);
-         assertNotNull(replyMsg);
-         assertEquals(16, replyMsg.getInt("maxExceptions"));
-         assertEquals(12, replyMsg.getInt("numExceptions"));
-         assertEquals(7, replyMsg.getInt("minExceptions"));
-      }
-      finally {
-         con.close();
-      }
-   }
-
-   public void testJNDI() throws Exception
-   {
-      TestEnvEntry test = (TestEnvEntry)getInitialContext().lookup("TestEnvEntry");
-      assertNotNull(test);
-      
-      assertEquals(15, test.checkJNDI());
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EnvEntryTestCase.class, "enventry.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.enventry.unit;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MapMessage;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import org.jboss.ejb3.test.enventry.TestEnvEntry;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EnvEntryTestCase extends JBossTestCase
+{
+  
+   public EnvEntryTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testEnvEntries() throws Exception
+   {
+      TestEnvEntry test = (TestEnvEntry)getInitialContext().lookup("TestEnvEntry");
+      assertNotNull(test);
+      
+      int maxExceptions = test.getMaxExceptions();
+      assertEquals(15, maxExceptions);
+      
+      int minExceptions = test.getMinExceptions();
+      assertEquals(5, minExceptions);
+      
+      int numExceptions = test.getNumExceptions();
+      assertEquals(10, numExceptions);
+      
+      TestEnvEntry etest = (TestEnvEntry)getInitialContext().lookup("ExtendedTestEnvEntry");
+      assertNotNull(etest);
+      
+      maxExceptions = etest.getMaxExceptions();
+      assertEquals(14, maxExceptions);
+      
+      minExceptions = etest.getMinExceptions();
+      assertEquals(6, minExceptions);
+      
+      numExceptions = etest.getNumExceptions();
+      assertEquals(11, numExceptions);
+   }
+
+   public void testEnvEntriesMDB() throws Exception {
+      InitialContext ctx = getInitialContext();
+
+      ConnectionFactory factory = (ConnectionFactory)ctx.lookup("ConnectionFactory");
+      Connection con = factory.createConnection();
+      try {
+         Destination dest = (Destination) ctx.lookup("queue/testEnvEntry");
+         
+         Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         MessageProducer producer = session.createProducer(dest);
+         
+         Queue replyQueue = session.createTemporaryQueue();
+         MessageConsumer consumer = session.createConsumer(replyQueue);
+         
+         con.start();
+         
+         TextMessage msg = session.createTextMessage();
+         msg.setJMSReplyTo(replyQueue);
+         msg.setText("This is message one");
+         producer.send(msg);
+         
+         MapMessage replyMsg = (MapMessage) consumer.receive(5000);
+         assertNotNull(replyMsg);
+         assertEquals(16, replyMsg.getInt("maxExceptions"));
+         assertEquals(12, replyMsg.getInt("numExceptions"));
+         assertEquals(7, replyMsg.getInt("minExceptions"));
+      }
+      finally {
+         con.close();
+      }
+   }
+
+   public void testJNDI() throws Exception
+   {
+      TestEnvEntry test = (TestEnvEntry)getInitialContext().lookup("TestEnvEntry");
+      assertNotNull(test);
+      
+      assertEquals(15, test.checkJNDI());
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EnvEntryTestCase.class, "enventry.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.factory;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface MyService
-{
-   Entity2 find2FromManager(int id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factory;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MyService
+{
+   Entity2 find2FromManager(int id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.factory;
-
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import org.jboss.annotation.ejb.Service;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Service
-public class MyServiceBean implements MyService
-{
-   @PersistenceContext(unitName="manager2") EntityManager manager2;
-
-   public Entity2 find2FromManager(int id)
-   {
-      return manager2.find(Entity2.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factory;
+
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Service
+public class MyServiceBean implements MyService
+{
+   @PersistenceContext(unitName="manager2") EntityManager manager2;
+
+   public Entity2 find2FromManager(int id)
+   {
+      return manager2.find(Entity2.class, id);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.factory;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Util implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factory;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Util implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/Util.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/unit/FactoryUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/unit/FactoryUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factory/unit/FactoryUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -41,7 +41,7 @@
 public class FactoryUnitTestCase
         extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Entity1 implements Serializable
-{
-   private int id;
-   private String string;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getString()
-   {
-      return string;
-   }
-
-   public void setString(String string)
-   {
-      this.string = string;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Entity1 implements Serializable
+{
+   private int id;
+   private String string;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getString()
+   {
+      return string;
+   }
+
+   public void setString(String string)
+   {
+      this.string = string;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity1.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Entity2 implements Serializable
-{
-   private int id;
-   private String string;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getString()
-   {
-      return string;
-   }
-
-   public void setString(String string)
-   {
-      this.string = string;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Entity2 implements Serializable
+{
+   private int id;
+   private String string;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getString()
+   {
+      return string;
+   }
+
+   public void setString(String string)
+   {
+      this.string = string;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Entity2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface MyService
-{
-   Entity2 find2FromManager(int id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MyService
+{
+   Entity2 find2FromManager(int id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import org.jboss.annotation.ejb.Service;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Service
-public class MyServiceBean implements MyService
-{
-   @PersistenceContext(unitName="manager2") EntityManager manager2;
-
-   public Entity2 find2FromManager(int id)
-   {
-      return manager2.find(Entity2.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Service
+public class MyServiceBean implements MyService
+{
+   @PersistenceContext(unitName="manager2") EntityManager manager2;
+
+   public Entity2 find2FromManager(int id)
+   {
+      return manager2.find(Entity2.class, id);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Session1
-{
-   int create1FromManager();
-
-   int create1FromFactory();
-
-   int create2FromManager();
-
-   int create2FromFactory();
-
-   void doUtil(Util u);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Session1
+{
+   int create1FromManager();
+
+   int create1FromFactory();
+
+   int create2FromManager();
+
+   int create2FromFactory();
+
+   void doUtil(Util u);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Session1Bean implements Session1
-{
-   Session manager1;
-   @PersistenceContext(name="manager2") EntityManager manager2;
-   SessionFactory factory1;
-   @PersistenceUnit(name="factory2") EntityManagerFactory factory2;
-   Session2 session2;
-
-   public int create1FromManager()
-   {
-      Entity1 one = new Entity1();
-      one.setString("oneManager");
-      manager1.save(one);
-      return one.getId();
-   }
-   public int create1FromFactory()
-   {
-      Entity1 one = new Entity1();
-      Session m = factory1.openSession();
-      m.save(one);
-      // leak m.close();
-      return one.getId();
-   }
-
-   public int create2FromManager()
-   {
-      Entity2 two = new Entity2();
-      two.setString("twoManager");
-      manager2.persist(two);
-      return two.getId();
-   }
-   public int create2FromFactory()
-   {
-      Entity2 two = new Entity2();
-      EntityManager m = factory2.createEntityManager();
-      m.persist(two);
-      // leak m.close();
-      return two.getId();
-   }
-
-   public void doUtil(Util ux)
-   {
-      Util u = new Util();
-      u.setId(1);
-      u.setName("one");
-      manager1.persist(u);
-
-      u = new Util();
-      u.setId(2);
-      u.setName("two");
-      manager2.persist(u);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Session1Bean implements Session1
+{
+   Session manager1;
+   @PersistenceContext(name="manager2") EntityManager manager2;
+   SessionFactory factory1;
+   @PersistenceUnit(name="factory2") EntityManagerFactory factory2;
+   Session2 session2;
+
+   public int create1FromManager()
+   {
+      Entity1 one = new Entity1();
+      one.setString("oneManager");
+      manager1.save(one);
+      return one.getId();
+   }
+   public int create1FromFactory()
+   {
+      Entity1 one = new Entity1();
+      Session m = factory1.openSession();
+      m.save(one);
+      // leak m.close();
+      return one.getId();
+   }
+
+   public int create2FromManager()
+   {
+      Entity2 two = new Entity2();
+      two.setString("twoManager");
+      manager2.persist(two);
+      return two.getId();
+   }
+   public int create2FromFactory()
+   {
+      Entity2 two = new Entity2();
+      EntityManager m = factory2.createEntityManager();
+      m.persist(two);
+      // leak m.close();
+      return two.getId();
+   }
+
+   public void doUtil(Util ux)
+   {
+      Util u = new Util();
+      u.setId(1);
+      u.setName("one");
+      manager1.persist(u);
+
+      u = new Util();
+      u.setId(2);
+      u.setName("two");
+      manager2.persist(u);
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session1Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Session2
-{
-   Entity1 find1FromManager(int id);
-
-   void find1FromFactory(int id);
-
-   Entity2 find2FromManager(int id);
-
-   void find2FromFactory(int id);
-
-   Util findUtil1FromManager(int id);
-
-   Util findUtil2FromManager(int id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Session2
+{
+   Entity1 find1FromManager(int id);
+
+   void find1FromFactory(int id);
+
+   Entity2 find2FromManager(int id);
+
+   void find2FromFactory(int id);
+
+   Util findUtil1FromManager(int id);
+
+   Util findUtil2FromManager(int id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,117 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Session2Bean implements Session2
-{
-   EntityManager manager2;
-   @PersistenceContext(name="manager1") EntityManager manager1;
-   EntityManagerFactory factory2;
-   @PersistenceUnit(name="factory1") EntityManagerFactory factory1;
-   Session1 session1;
-
-   //@Resource SessionContext ctx;
-
-   public Entity1 find1FromManager(int id)
-   {
-      EntityManager m1 = null;
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         m1 = (EntityManager)ctx.lookup("java:/Manager1");
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      if (m1.find(Entity1.class, id) == null) throw new RuntimeException("failed to find");
-      return manager1.find(Entity1.class, id);
-   }
-   public void find1FromFactory(int id)
-   {
-      EntityManagerFactory f1 = null;
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         f1 = (EntityManagerFactory)ctx.lookup("java:/Manager1Factory");
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      EntityManager m1 = f1.createEntityManager();
-      try
-      {
-         if (m1.find(Entity1.class, id) == null) throw new RuntimeException("failed to find");
-      }
-      finally
-      {
-         m1.close();
-      }
-
-      EntityManager m = factory1.createEntityManager();
-      Entity1 one = m.find(Entity1.class, id);
-      try
-      {
-         if (one == null) throw new RuntimeException("NOT FOUND");
-      }
-      finally
-      {
-         m.close();
-      }
-
-   }
-   public Entity2 find2FromManager(int id)
-   {
-      return manager2.find(Entity2.class, id);
-   }
-   public void find2FromFactory(int id)
-   {
-      EntityManager m = factory2.createEntityManager();
-      Entity2 two = m.find(Entity2.class, id);
-      if (two == null) throw new RuntimeException("NOT FOUND");
-      //m.close();
-   }
-
-   public Util findUtil1FromManager(int id)
-   {
-      return manager1.find(Util.class, id);
-   }
-
-   public Util findUtil2FromManager(int id)
-   {
-      return manager2.find(Util.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Session2Bean implements Session2
+{
+   EntityManager manager2;
+   @PersistenceContext(name="manager1") EntityManager manager1;
+   EntityManagerFactory factory2;
+   @PersistenceUnit(name="factory1") EntityManagerFactory factory1;
+   Session1 session1;
+
+   //@Resource SessionContext ctx;
+
+   public Entity1 find1FromManager(int id)
+   {
+      EntityManager m1 = null;
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         m1 = (EntityManager)ctx.lookup("java:/Manager1");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      if (m1.find(Entity1.class, id) == null) throw new RuntimeException("failed to find");
+      return manager1.find(Entity1.class, id);
+   }
+   public void find1FromFactory(int id)
+   {
+      EntityManagerFactory f1 = null;
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         f1 = (EntityManagerFactory)ctx.lookup("java:/Manager1Factory");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      EntityManager m1 = f1.createEntityManager();
+      try
+      {
+         if (m1.find(Entity1.class, id) == null) throw new RuntimeException("failed to find");
+      }
+      finally
+      {
+         m1.close();
+      }
+
+      EntityManager m = factory1.createEntityManager();
+      Entity1 one = m.find(Entity1.class, id);
+      try
+      {
+         if (one == null) throw new RuntimeException("NOT FOUND");
+      }
+      finally
+      {
+         m.close();
+      }
+
+   }
+   public Entity2 find2FromManager(int id)
+   {
+      return manager2.find(Entity2.class, id);
+   }
+   public void find2FromFactory(int id)
+   {
+      EntityManager m = factory2.createEntityManager();
+      Entity2 two = m.find(Entity2.class, id);
+      if (two == null) throw new RuntimeException("NOT FOUND");
+      //m.close();
+   }
+
+   public Util findUtil1FromManager(int id)
+   {
+      return manager1.find(Util.class, id);
+   }
+
+   public Util findUtil2FromManager(int id)
+   {
+      return manager2.find(Util.class, id);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Session2Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Stateful1
-{
-   int create1();
-
-   int create2();
-
-   void update1();
-
-   void update2();
-
-   void never();
-
-   void checkout();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Stateful1
+{
+   int create1();
+
+   int create2();
+
+   void update1();
+
+   void update2();
+
+   void never();
+
+   void checkout();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import javax.ejb.Remove;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Stateful1Bean implements Stateful1
-{
-   EntityManager manager1;
-   @PersistenceContext(name="manager2") EntityManager manager2;
-
-   Entity1 one;
-   Entity2 two;
-
-   public int create1()
-   {
-      one = new Entity1();
-      one.setString("oneManager");
-      manager1.persist(one);
-      return one.getId();
-   }
-
-   public int create2()
-   {
-      two = new Entity2();
-      two.setString("twoManager");
-      manager2.persist(two);
-      return two.getId();
-   }
-
-   public void update1()
-   {
-      one.setString("changed");
-   }
-
-   public void update2()
-   {
-      two.setString("changed");
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never()
-   {
-      one.setString("never");
-      two.setString("never");
-   }
-
-   @Remove
-   public void checkout() {}
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import javax.ejb.Remove;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Stateful1Bean implements Stateful1
+{
+   EntityManager manager1;
+   @PersistenceContext(name="manager2") EntityManager manager2;
+
+   Entity1 one;
+   Entity2 two;
+
+   public int create1()
+   {
+      one = new Entity1();
+      one.setString("oneManager");
+      manager1.persist(one);
+      return one.getId();
+   }
+
+   public int create2()
+   {
+      two = new Entity2();
+      two.setString("twoManager");
+      manager2.persist(two);
+      return two.getId();
+   }
+
+   public void update1()
+   {
+      one.setString("changed");
+   }
+
+   public void update2()
+   {
+      two.setString("changed");
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never()
+   {
+      one.setString("never");
+      two.setString("never");
+   }
+
+   @Remove
+   public void checkout() {}
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Stateful1Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Util implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Util implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/Util.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,124 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.factoryxml.unit;
-
-import org.jboss.ejb3.test.factoryxml.Entity1;
-import org.jboss.ejb3.test.factoryxml.Entity2;
-import org.jboss.ejb3.test.factoryxml.MyService;
-import org.jboss.ejb3.test.factoryxml.Session1;
-import org.jboss.ejb3.test.factoryxml.Session2;
-import org.jboss.ejb3.test.factoryxml.Stateful1;
-import org.jboss.ejb3.test.factoryxml.Util;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class FactoryUnitTestCase
-        extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public FactoryUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testMe() throws Exception
-   {
-      Session1 session1 = (Session1) this.getInitialContext().lookup("factoryxml-test/Session1Bean/remote");
-      Session2 session2 = (Session2) this.getInitialContext().lookup("factoryxml-test/Session2Bean/remote");
-      MyService service = (MyService) this.getInitialContext().lookup("factoryxml-test/MyServiceBean/remote");
-      assertNotNull(service);
-
-      int oneF = session1.create1FromFactory();
-      int oneM = session1.create1FromManager();
-      int twoF = session1.create2FromFactory();
-      int twoM = session1.create2FromManager();
-      session1.doUtil(new Util());
-
-      session2.find1FromFactory(oneF);
-      assertNotNull(session2.find1FromManager(oneM));
-      session2.find2FromFactory(twoF);
-      assertNotNull(session2.find2FromManager(twoM));
-      assertNotNull(service.find2FromManager(twoM));
-      assertNotNull(session2.findUtil1FromManager(1));
-      assertNotNull(session2.findUtil2FromManager(2));
-
-   }
-
-   public void testExtended() throws Exception
-   {
-      Stateful1 stateful1 = (Stateful1) this.getInitialContext().lookup("factoryxml-test/Stateful1Bean/remote");
-      Session2 session2 = (Session2) this.getInitialContext().lookup("factoryxml-test/Session2Bean/remote");
-
-      int oneId = stateful1.create1();
-      int twoId = stateful1.create2();
-
-      stateful1.update1();
-      stateful1.update2();
-
-      {
-         Entity1 one = session2.find1FromManager(oneId);
-         assertEquals(one.getString(), "changed");
-
-         Entity2 two = session2.find2FromManager(twoId);
-         assertEquals(two.getString(), "changed");
-      }
-
-      stateful1.never();
-
-      {
-         Entity1 one = session2.find1FromManager(oneId);
-         assertEquals(one.getString(), "changed");
-
-         Entity2 two = session2.find2FromManager(twoId);
-         assertEquals(two.getString(), "changed");
-      }
-
-      stateful1.checkout();
-
-      {
-         Entity1 one = session2.find1FromManager(oneId);
-         assertEquals(one.getString(), "never");
-
-         Entity2 two = session2.find2FromManager(twoId);
-         assertEquals(two.getString(), "never");
-      }
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(FactoryUnitTestCase.class, "factoryxml-test.ear");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.factoryxml.unit;
+
+import org.jboss.ejb3.test.factoryxml.Entity1;
+import org.jboss.ejb3.test.factoryxml.Entity2;
+import org.jboss.ejb3.test.factoryxml.MyService;
+import org.jboss.ejb3.test.factoryxml.Session1;
+import org.jboss.ejb3.test.factoryxml.Session2;
+import org.jboss.ejb3.test.factoryxml.Stateful1;
+import org.jboss.ejb3.test.factoryxml.Util;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class FactoryUnitTestCase
+        extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public FactoryUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testMe() throws Exception
+   {
+      Session1 session1 = (Session1) this.getInitialContext().lookup("factoryxml-test/Session1Bean/remote");
+      Session2 session2 = (Session2) this.getInitialContext().lookup("factoryxml-test/Session2Bean/remote");
+      MyService service = (MyService) this.getInitialContext().lookup("factoryxml-test/MyServiceBean/remote");
+      assertNotNull(service);
+
+      int oneF = session1.create1FromFactory();
+      int oneM = session1.create1FromManager();
+      int twoF = session1.create2FromFactory();
+      int twoM = session1.create2FromManager();
+      session1.doUtil(new Util());
+
+      session2.find1FromFactory(oneF);
+      assertNotNull(session2.find1FromManager(oneM));
+      session2.find2FromFactory(twoF);
+      assertNotNull(session2.find2FromManager(twoM));
+      assertNotNull(service.find2FromManager(twoM));
+      assertNotNull(session2.findUtil1FromManager(1));
+      assertNotNull(session2.findUtil2FromManager(2));
+
+   }
+
+   public void testExtended() throws Exception
+   {
+      Stateful1 stateful1 = (Stateful1) this.getInitialContext().lookup("factoryxml-test/Stateful1Bean/remote");
+      Session2 session2 = (Session2) this.getInitialContext().lookup("factoryxml-test/Session2Bean/remote");
+
+      int oneId = stateful1.create1();
+      int twoId = stateful1.create2();
+
+      stateful1.update1();
+      stateful1.update2();
+
+      {
+         Entity1 one = session2.find1FromManager(oneId);
+         assertEquals(one.getString(), "changed");
+
+         Entity2 two = session2.find2FromManager(twoId);
+         assertEquals(two.getString(), "changed");
+      }
+
+      stateful1.never();
+
+      {
+         Entity1 one = session2.find1FromManager(oneId);
+         assertEquals(one.getString(), "changed");
+
+         Entity2 two = session2.find2FromManager(twoId);
+         assertEquals(two.getString(), "changed");
+      }
+
+      stateful1.checkout();
+
+      {
+         Entity1 one = session2.find1FromManager(oneId);
+         assertEquals(one.getString(), "never");
+
+         Entity2 two = session2.find2FromManager(twoId);
+         assertEquals(two.getString(), "never");
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(FactoryUnitTestCase.class, "factoryxml-test.ear");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/factoryxml/unit/FactoryUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -58,11 +58,11 @@
 
    public List findAnnotated()
    {
-      return em.createQuery("select an from Annotated an").getResultList();
+      return em.createQuery("from Annotated an").getResultList();
    }
 
    public List findHBM()
    {
-      return em.createQuery("select hbm from HBM hbm").getResultList();
+      return em.createQuery("from HBM hbm").getResultList();
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/hbm/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -38,7 +38,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.iiop.IORFactory;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(MySession.class)
- at RemoteHome(HomedStatelessHome.class)
- at RemoteBinding(factory=IORFactory.class)
-public class HomedStatelessBean
-{
-   @Resource SessionContext ctx;
-   
-   @RolesAllowed({"user"})
-   public String getWhoAmI()
-   {
-      return ctx.getCallerPrincipal().getName();
-   }
-   
-   public String sayHelloTo(String name)
-   {
-      return "Hi " + name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.iiop.IORFactory;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateless
+ at Remote(MySession.class)
+ at RemoteHome(HomedStatelessHome.class)
+ at RemoteBinding(factory=IORFactory.class)
+public class HomedStatelessBean
+{
+   @Resource SessionContext ctx;
+   
+   @RolesAllowed({"user"})
+   public String getWhoAmI()
+   {
+      return ctx.getCallerPrincipal().getName();
+   }
+   
+   public String sayHelloTo(String name)
+   {
+      return "Hi " + name;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface HomedStatelessHome extends EJBHome
-{
-   MySession create() throws CreateException, RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface HomedStatelessHome extends EJBHome
+{
+   MySession create() throws CreateException, RemoteException;
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.ejb3.iiop.IORFactory;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Service
- at Remote(MyStateful.class)
- at RemoteBinding(factory=IORFactory.class)
-public class MyServiceBean
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(MyServiceBean.class);
-   
-   private String name;
-   
-   public String getName()
-   {
-      return name;
-   }
-   
-   public String sayHello()
-   {
-      return "Hello " + name;
-   }
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.iiop.IORFactory;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Service
+ at Remote(MyStateful.class)
+ at RemoteBinding(factory=IORFactory.class)
+public class MyServiceBean
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(MyServiceBean.class);
+   
+   private String name;
+   
+   public String getName()
+   {
+      return name;
+   }
+   
+   public String sayHello()
+   {
+      return "Hello " + name;
+   }
+   
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.iiop;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-//@Remote
-public interface MySession extends EJBObject
-{
-   String getWhoAmI() throws RemoteException;
-   
-   String sayHelloTo(String name) throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+//@Remote
+public interface MySession extends EJBObject
+{
+   String getWhoAmI() throws RemoteException;
+   
+   String sayHelloTo(String name) throws RemoteException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySession.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.iiop;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.IIOP;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.iiop.IORFactory;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(MySession.class)
- at RemoteBinding(factory=IORFactory.class)
- at IIOP(interfaceRepositorySupported=false)
- at SecurityDomain("other")
-public class MySessionBean
-{
-   @Resource SessionContext ctx;
-   
-   @RolesAllowed({"allowed"})
-   public String getWhoAmI()
-   {
-      return ctx.getCallerPrincipal().getName();
-   }
-   
-   public String sayHelloTo(String name)
-   {
-      return "Hi " + name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.IIOP;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.iiop.IORFactory;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(MySession.class)
+ at RemoteBinding(factory=IORFactory.class)
+ at IIOP(interfaceRepositorySupported=false)
+ at SecurityDomain("other")
+public class MySessionBean
+{
+   @Resource SessionContext ctx;
+   
+   @RolesAllowed({"allowed"})
+   public String getWhoAmI()
+   {
+      return ctx.getCallerPrincipal().getName();
+   }
+   
+   public String sayHelloTo(String name)
+   {
+      return "Hi " + name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public interface MyStateful extends EJBObject
-{
-   String getName() throws RemoteException;
-   
-   String sayHello() throws RemoteException;
-   
-   void setName(String name) throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public interface MyStateful extends EJBObject
+{
+   String getName() throws RemoteException;
+   
+   String sayHello() throws RemoteException;
+   
+   void setName(String name) throws RemoteException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import java.rmi.RemoteException;
-
-import javax.annotation.PreDestroy;
-import javax.ejb.CreateException;
-import javax.ejb.Init;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.Remove;
-import javax.ejb.RemoveException;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.iiop.IORFactory;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Stateful
- at Remote(MyStateful.class)
- at RemoteHome(MyStatefulHome.class)
- at RemoteBinding(factory=IORFactory.class)
-public class MyStatefulBean
-{
-   private static final Logger log = Logger.getLogger(MyStatefulBean.class);
-   
-   private String name;
-   
-   @Init
-   public void ejbCreate() throws CreateException, RemoteException
-   {
-      name = "anonymous";
-   }
-   
-   @Init
-   public void ejbCreate(String name) throws CreateException, RemoteException
-   {
-      this.name = name;
-   }
-   
-   @Remove
-   public void ejbRemove() throws RemoveException, RemoteException
-   {
-      log.info("remove bean");
-   }
-   
-   public String getName() throws RemoteException
-   {
-      return name;
-   }
-   
-   @PreDestroy
-   public void preDestroy()
-   {
-      log.info("pre destroy");
-   }
-   
-   public String sayHello() throws RemoteException
-   {
-      return "Hello " + name;
-   }
-   
-   public void setName(String name) throws RemoteException
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import java.rmi.RemoteException;
+
+import javax.annotation.PreDestroy;
+import javax.ejb.CreateException;
+import javax.ejb.Init;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.Remove;
+import javax.ejb.RemoveException;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.iiop.IORFactory;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at Remote(MyStateful.class)
+ at RemoteHome(MyStatefulHome.class)
+ at RemoteBinding(factory=IORFactory.class)
+public class MyStatefulBean
+{
+   private static final Logger log = Logger.getLogger(MyStatefulBean.class);
+   
+   private String name;
+   
+   @Init
+   public void ejbCreate() throws CreateException, RemoteException
+   {
+      name = "anonymous";
+   }
+   
+   @Init
+   public void ejbCreate(String name) throws CreateException, RemoteException
+   {
+      this.name = name;
+   }
+   
+   @Remove
+   public void ejbRemove() throws RemoveException, RemoteException
+   {
+      log.info("remove bean");
+   }
+   
+   public String getName() throws RemoteException
+   {
+      return name;
+   }
+   
+   @PreDestroy
+   public void preDestroy()
+   {
+      log.info("pre destroy");
+   }
+   
+   public String sayHello() throws RemoteException
+   {
+      return "Hello " + name;
+   }
+   
+   public void setName(String name) throws RemoteException
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public interface MyStatefulHome extends EJBHome
-{
-   MyStateful create() throws CreateException, RemoteException;
-   MyStateful create(String name) throws CreateException, RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public interface MyStatefulHome extends EJBHome
+{
+   MyStateful create() throws CreateException, RemoteException;
+   MyStateful create(String name) throws CreateException, RemoteException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulHome.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public interface TxTester extends EJBObject
-{
-   void txMandatoryMethod() throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public interface TxTester extends EJBObject
+{
+   void txMandatoryMethod() throws RemoteException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTester.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.iiop;
-
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.iiop.IORFactory;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(TxTester.class)
- at RemoteBinding(factory=IORFactory.class)
- at TransactionManagement(TransactionManagementType.CONTAINER)
-public class TxTesterBean
-{
-   private static final Logger log = Logger.getLogger(TxTesterBean.class);
-   
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-   
-   @TransactionAttribute(TransactionAttributeType.MANDATORY)
-   public void txMandatoryMethod()
-   {
-      try
-      {
-         log.info("currentThread = " + Thread.currentThread());
-         log.info("currentTransaction = " + tm.getTransaction());
-         log.info("tm = " + tm);
-         
-         Transaction tx = tm.getTransaction();
-         if(tx == null)
-            throw new EJBException("no tx");
-         
-         if(tx.getStatus() != Status.STATUS_ACTIVE)
-            throw new EJBException("tx not active");
-      }
-      catch(SystemException e)
-      {
-         throw new EJBException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop;
+
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.JndiInject;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.iiop.IORFactory;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(TxTester.class)
+ at RemoteBinding(factory=IORFactory.class)
+ at TransactionManagement(TransactionManagementType.CONTAINER)
+public class TxTesterBean
+{
+   private static final Logger log = Logger.getLogger(TxTesterBean.class);
+   
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+   
+   @TransactionAttribute(TransactionAttributeType.MANDATORY)
+   public void txMandatoryMethod()
+   {
+      try
+      {
+         log.info("currentThread = " + Thread.currentThread());
+         log.info("currentTransaction = " + tm.getTransaction());
+         log.info("tm = " + tm);
+         
+         Transaction tx = tm.getTransaction();
+         if(tx == null)
+            throw new EJBException("no tx");
+         
+         if(tx.getStatus() != Status.STATUS_ACTIVE)
+            throw new EJBException("tx not active");
+      }
+      catch(SystemException e)
+      {
+         throw new EJBException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,296 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.iiop.unit;
-
-import java.rmi.MarshalledObject;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.ejb.Handle;
-import javax.ejb.HomeHandle;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-import javax.transaction.UserTransaction;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.CustomJNDIJBossTestCase;
-import org.jboss.ejb3.test.iiop.HomedStatelessHome;
-import org.jboss.ejb3.test.iiop.MySession;
-import org.jboss.ejb3.test.iiop.MyStateful;
-import org.jboss.ejb3.test.iiop.MyStatefulHome;
-import org.jboss.ejb3.test.iiop.TxTester;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-/**
- * TODO: use JBossIIOPTestCase
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class IiopRemoteUnitTestCase extends CustomJNDIJBossTestCase
-{
-
-   public IiopRemoteUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   @Override
-   public InitialContext getInitialContext() throws NamingException
-   {
-      return new InitialContext(getJndiProperties());
-   }
-   
-   private Properties getJndiProperties()
-   {
-      Properties props = new Properties();
-      props.put("java.naming.factory.initial", "com.sun.jndi.cosnaming.CNCtxFactory");
-      props.put("java.naming.provider.url", "corbaloc::localhost:3528/NameService");
-      props.put("java.naming.factory.object", "org.jboss.tm.iiop.client.IIOPClientUserTransactionObjectFactory");
-      props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client:org.jnp.interfaces");
-      props.put("j2ee.clientName", "iiop-unit-test");
-      
-//      props.put(InitialContext.SECURITY_PRINCIPAL, "somebody");
-//      props.put(InitialContext.SECURITY_CREDENTIALS, "password");
-      
-      return props;
-//      return null;
-   }
-   
-   public void test0() throws Exception
-   {
-      System.out.println("java: " + getInitialContext().lookup("java:comp/HandleDelegate"));
-   }
-   
-   public void test1() throws Exception
-   {
-      SimplePrincipal principal = new SimplePrincipal("somebody");
-      SecurityAssociation.setPrincipal(principal);
-      SecurityAssociation.setCredential("password".toCharArray());
-      
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("MySessionBean/remote");
-      System.err.println(obj.getClass());
-      MySession session = (MySession) PortableRemoteObject.narrow(obj, MySession.class);
-      assertNotNull(session);
-      String me = new Date().toString();
-      String response = session.sayHelloTo(me);
-      assertEquals("Hi " + me, response);
-   }
-   
-   public void test2() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
-      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
-      //MyStateful bean1 = (MyStateful) PortableRemoteObject.narrow(obj, MyStateful.class);
-      MyStateful bean1 = home.create();
-      bean1.setName("bean1");
-      String response = bean1.sayHello();
-      assertEquals("Hello bean1", response);
-      bean1.remove();
-   }
-   
-   public void testGetEJBHome() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
-      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
-      MySession session = home.create();
-      Object o = session.getEJBHome();
-      HomedStatelessHome home2 = (HomedStatelessHome) PortableRemoteObject.narrow(o, HomedStatelessHome.class);
-      // TODO: check home2
-   }
-   
-   public void testGetHandle() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
-      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
-      MySession session = home.create();
-      Handle h = session.getHandle();
-      MarshalledObject mo = new MarshalledObject(h);
-      Handle h2 = (Handle) mo.get();
-      Object o = h2.getEJBObject();
-      MySession session2 = (MySession) PortableRemoteObject.narrow(o, MySession.class);
-      String me = new Date().toString();
-      String response = session2.sayHelloTo(me);
-      assertEquals("Hi " + me, response);
-   }
-   
-   public void testGetHomeHandle() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
-      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
-      HomeHandle h = home.getHomeHandle();
-      MarshalledObject mo = new MarshalledObject(h);
-      HomeHandle h2 = (HomeHandle) mo.get();
-      Object o = h2.getEJBHome();
-      HomedStatelessHome home2 = (HomedStatelessHome) PortableRemoteObject.narrow(o, HomedStatelessHome.class);
-      // TODO: check home2
-   }
-   
-   public void testGetPrimaryKeyAndRemove() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
-      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
-      MyStateful session = home.create();
-      Object primaryKey = session.getPrimaryKey();
-      assertNotNull(primaryKey);
-      
-      home.remove(primaryKey);
-      try
-      {
-         session.sayHello();
-         fail("should throw an exception");
-      }
-      catch(Exception e)
-      {
-         // TODO: check exception (NoSuchEJBException)
-      }
-   }
-   
-   public void testHomedStateless() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
-      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
-      MySession session = home.create();
-      String me = new Date().toString();
-      String response = session.sayHelloTo(me);
-      assertEquals("Hi " + me, response);
-   }
-   
-   public void testIsIdentical() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
-      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
-      MyStateful session = home.create();
-      Handle h = session.getHandle();
-      MarshalledObject mo = new MarshalledObject(h);
-      Handle h2 = (Handle) mo.get();
-      Object o = h2.getEJBObject();
-      MyStateful session2 = (MyStateful) PortableRemoteObject.narrow(o, MyStateful.class);
-      assertTrue(session.isIdentical(session2));
-   }
-   
-   public void testRemoveByHandle() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
-      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
-      MyStateful session = home.create();
-      session.setName("Me");
-      home.remove(session.getHandle());
-      try
-      {
-         session.sayHello();
-         fail("should throw an exception");
-      }
-      catch(Exception e)
-      {
-         // TODO: check exception (NoSuchEJBException)
-      }
-   }
-   
-   public void testSecurity() throws Exception
-   {
-      SimplePrincipal principal = new SimplePrincipal("somebody");
-      SecurityAssociation.setPrincipal(principal);
-      
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("MySessionBean/remote");
-      System.err.println(obj.getClass());
-      MySession session = (MySession) PortableRemoteObject.narrow(obj, MySession.class);
-      assertNotNull(session);
-      String actual = session.getWhoAmI();
-      System.err.println("whoAmI = " + actual);
-   }
-   
-   public void testService() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("MyServiceBean/remote");
-      MyStateful bean1 = (MyStateful) PortableRemoteObject.narrow(obj, MyStateful.class);
-      bean1.setName("bean1");
-      String response = bean1.sayHello();
-      assertEquals("Hello bean1", response);
-   }
-   
-   public void testTxPropegation() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("TxTesterBean/remote");
-      TxTester session = (TxTester) PortableRemoteObject.narrow(obj, TxTester.class);
-      assertNotNull(session);
-      UserTransaction tx = (UserTransaction) PortableRemoteObject.narrow(ctx.lookup("UserTransaction"), UserTransaction.class);
-      tx.begin();
-      try
-      {
-         session.txMandatoryMethod();
-      }
-      finally
-      {
-         tx.rollback();
-      }
-      // If it doesn't throw an exception everything is fine.
-   }
-
-   public void testTxRequired() throws Exception
-   {
-      InitialContext ctx = getInitialContext();
-      Object obj = ctx.lookup("TxTesterBean/remote");
-      TxTester session = (TxTester) PortableRemoteObject.narrow(obj, TxTester.class);
-      assertNotNull(session);
-      try
-      {
-         session.txMandatoryMethod();
-         fail("Expected an exception");
-      }
-      catch(Exception e)
-      {
-         //fail("TODO: check exception");
-      }
-      // TODO: throws an ugly exception, needs assertions to check
-   }
-   
-   public static Test suite() throws Exception
-   {
-      try
-      {
-         System.err.println(IiopRemoteUnitTestCase.class.getClassLoader().getResource("jacorb.properties"));
-      }
-      catch(Throwable t)
-      {
-         t.printStackTrace();
-      }
-      return getDeploySetup(IiopRemoteUnitTestCase.class, "iiop.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,296 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.iiop.unit;
+
+import java.rmi.MarshalledObject;
+import java.util.Date;
+import java.util.Properties;
+
+import javax.ejb.Handle;
+import javax.ejb.HomeHandle;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.rmi.PortableRemoteObject;
+import javax.transaction.UserTransaction;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.CustomJNDIJBossTestCase;
+import org.jboss.ejb3.test.iiop.HomedStatelessHome;
+import org.jboss.ejb3.test.iiop.MySession;
+import org.jboss.ejb3.test.iiop.MyStateful;
+import org.jboss.ejb3.test.iiop.MyStatefulHome;
+import org.jboss.ejb3.test.iiop.TxTester;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+/**
+ * TODO: use JBossIIOPTestCase
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class IiopRemoteUnitTestCase extends CustomJNDIJBossTestCase
+{
+
+   public IiopRemoteUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   @Override
+   public InitialContext getInitialContext() throws NamingException
+   {
+      return new InitialContext(getJndiProperties());
+   }
+   
+   private Properties getJndiProperties()
+   {
+      Properties props = new Properties();
+      props.put("java.naming.factory.initial", "com.sun.jndi.cosnaming.CNCtxFactory");
+      props.put("java.naming.provider.url", "corbaloc::localhost:3528/NameService");
+      props.put("java.naming.factory.object", "org.jboss.tm.iiop.client.IIOPClientUserTransactionObjectFactory");
+      props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client:org.jnp.interfaces");
+      props.put("j2ee.clientName", "iiop-unit-test");
+      
+//      props.put(InitialContext.SECURITY_PRINCIPAL, "somebody");
+//      props.put(InitialContext.SECURITY_CREDENTIALS, "password");
+      
+      return props;
+//      return null;
+   }
+   
+   public void test0() throws Exception
+   {
+      System.out.println("java: " + getInitialContext().lookup("java:comp/HandleDelegate"));
+   }
+   
+   public void test1() throws Exception
+   {
+      SimplePrincipal principal = new SimplePrincipal("somebody");
+      SecurityAssociation.setPrincipal(principal);
+      SecurityAssociation.setCredential("password".toCharArray());
+      
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("MySessionBean/remote");
+      System.err.println(obj.getClass());
+      MySession session = (MySession) PortableRemoteObject.narrow(obj, MySession.class);
+      assertNotNull(session);
+      String me = new Date().toString();
+      String response = session.sayHelloTo(me);
+      assertEquals("Hi " + me, response);
+   }
+   
+   public void test2() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
+      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
+      //MyStateful bean1 = (MyStateful) PortableRemoteObject.narrow(obj, MyStateful.class);
+      MyStateful bean1 = home.create();
+      bean1.setName("bean1");
+      String response = bean1.sayHello();
+      assertEquals("Hello bean1", response);
+      bean1.remove();
+   }
+   
+   public void testGetEJBHome() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
+      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
+      MySession session = home.create();
+      Object o = session.getEJBHome();
+      HomedStatelessHome home2 = (HomedStatelessHome) PortableRemoteObject.narrow(o, HomedStatelessHome.class);
+      // TODO: check home2
+   }
+   
+   public void testGetHandle() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
+      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
+      MySession session = home.create();
+      Handle h = session.getHandle();
+      MarshalledObject mo = new MarshalledObject(h);
+      Handle h2 = (Handle) mo.get();
+      Object o = h2.getEJBObject();
+      MySession session2 = (MySession) PortableRemoteObject.narrow(o, MySession.class);
+      String me = new Date().toString();
+      String response = session2.sayHelloTo(me);
+      assertEquals("Hi " + me, response);
+   }
+   
+   public void testGetHomeHandle() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
+      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
+      HomeHandle h = home.getHomeHandle();
+      MarshalledObject mo = new MarshalledObject(h);
+      HomeHandle h2 = (HomeHandle) mo.get();
+      Object o = h2.getEJBHome();
+      HomedStatelessHome home2 = (HomedStatelessHome) PortableRemoteObject.narrow(o, HomedStatelessHome.class);
+      // TODO: check home2
+   }
+   
+   public void testGetPrimaryKeyAndRemove() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
+      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
+      MyStateful session = home.create();
+      Object primaryKey = session.getPrimaryKey();
+      assertNotNull(primaryKey);
+      
+      home.remove(primaryKey);
+      try
+      {
+         session.sayHello();
+         fail("should throw an exception");
+      }
+      catch(Exception e)
+      {
+         // TODO: check exception (NoSuchEJBException)
+      }
+   }
+   
+   public void testHomedStateless() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("HomedStatelessBean/remoteHome");
+      HomedStatelessHome home = (HomedStatelessHome) PortableRemoteObject.narrow(obj, HomedStatelessHome.class);
+      MySession session = home.create();
+      String me = new Date().toString();
+      String response = session.sayHelloTo(me);
+      assertEquals("Hi " + me, response);
+   }
+   
+   public void testIsIdentical() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
+      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
+      MyStateful session = home.create();
+      Handle h = session.getHandle();
+      MarshalledObject mo = new MarshalledObject(h);
+      Handle h2 = (Handle) mo.get();
+      Object o = h2.getEJBObject();
+      MyStateful session2 = (MyStateful) PortableRemoteObject.narrow(o, MyStateful.class);
+      assertTrue(session.isIdentical(session2));
+   }
+   
+   public void testRemoveByHandle() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("MyStatefulBean/remoteHome");
+      MyStatefulHome home = (MyStatefulHome) PortableRemoteObject.narrow(obj, MyStatefulHome.class);
+      MyStateful session = home.create();
+      session.setName("Me");
+      home.remove(session.getHandle());
+      try
+      {
+         session.sayHello();
+         fail("should throw an exception");
+      }
+      catch(Exception e)
+      {
+         // TODO: check exception (NoSuchEJBException)
+      }
+   }
+   
+   public void testSecurity() throws Exception
+   {
+      SimplePrincipal principal = new SimplePrincipal("somebody");
+      SecurityAssociation.setPrincipal(principal);
+      
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("MySessionBean/remote");
+      System.err.println(obj.getClass());
+      MySession session = (MySession) PortableRemoteObject.narrow(obj, MySession.class);
+      assertNotNull(session);
+      String actual = session.getWhoAmI();
+      System.err.println("whoAmI = " + actual);
+   }
+   
+   public void testService() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("MyServiceBean/remote");
+      MyStateful bean1 = (MyStateful) PortableRemoteObject.narrow(obj, MyStateful.class);
+      bean1.setName("bean1");
+      String response = bean1.sayHello();
+      assertEquals("Hello bean1", response);
+   }
+   
+   public void testTxPropegation() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("TxTesterBean/remote");
+      TxTester session = (TxTester) PortableRemoteObject.narrow(obj, TxTester.class);
+      assertNotNull(session);
+      UserTransaction tx = (UserTransaction) PortableRemoteObject.narrow(ctx.lookup("UserTransaction"), UserTransaction.class);
+      tx.begin();
+      try
+      {
+         session.txMandatoryMethod();
+      }
+      finally
+      {
+         tx.rollback();
+      }
+      // If it doesn't throw an exception everything is fine.
+   }
+
+   public void testTxRequired() throws Exception
+   {
+      InitialContext ctx = getInitialContext();
+      Object obj = ctx.lookup("TxTesterBean/remote");
+      TxTester session = (TxTester) PortableRemoteObject.narrow(obj, TxTester.class);
+      assertNotNull(session);
+      try
+      {
+         session.txMandatoryMethod();
+         fail("Expected an exception");
+      }
+      catch(Exception e)
+      {
+         //fail("TODO: check exception");
+      }
+      // TODO: throws an ugly exception, needs assertions to check
+   }
+   
+   public static Test suite() throws Exception
+   {
+      try
+      {
+         System.err.println(IiopRemoteUnitTestCase.class.getClassLoader().getResource("jacorb.properties"));
+      }
+      catch(Throwable t)
+      {
+         t.printStackTrace();
+      }
+      return getDeploySetup(IiopRemoteUnitTestCase.class, "iiop.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitEmbeddedTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitEmbeddedTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitEmbeddedTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitEmbeddedTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.initial.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.logging.Logger;
+import org.jboss.embedded.junit.EmbeddedTestCase;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: LocalUnitTestCase.java 58418 2006-11-15 21:54:30Z anil.saldhana at jboss.com $
+ */
+
+public class LocalUnitEmbeddedTest
+        extends LocalUnitTestCase
+{
+   public LocalUnitEmbeddedTest(String name)
+   {
+
+      super(name);
+
+   }
+   public static Test suite() throws Exception
+   {
+      return EmbeddedTestCase.getAdaptedSetup(LocalUnitEmbeddedTest.class, "initial-ejb3-test.sar");
+   }
+
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/LocalUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -23,6 +23,8 @@
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
 import org.jboss.test.JBossTestCase;
 import junit.framework.Test;
 
@@ -36,7 +38,7 @@
 public class LocalUnitTestCase
         extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   private static Logger log = Logger.getLogger(LocalUnitTestCase.class);
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitEmbeddedTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitEmbeddedTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitEmbeddedTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitEmbeddedTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.initial.unit;
+
+import junit.framework.Test;
+import org.jboss.embedded.junit.EmbeddedTestCase;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public class RemoteUnitEmbeddedTest extends RemoteUnitTestCase
+{
+
+   public RemoteUnitEmbeddedTest(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return EmbeddedTestCase.getAdaptedSetup(RemoteUnitEmbeddedTest.class, "initial-ejb3-test.sar");
+   }
+
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -26,10 +26,10 @@
 import javax.transaction.UserTransaction;
 import org.jboss.ejb3.test.initial.ClassInjected;
 import org.jboss.ejb3.test.initial.InterceptedSFTest;
-import org.jboss.ejb3.test.initial.SecuredTest;
-import org.jboss.ejb3.test.initial.SecuredTestRemote;
+import org.jboss.ejb3.test.initial.SecuredTest; 
 import org.jboss.ejb3.test.initial.StatefulTestRemote;
 import org.jboss.ejb3.test.initial.TestRemote;
+import org.jboss.logging.Logger;
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
 import org.jboss.test.JBossTestCase;
@@ -45,7 +45,7 @@
 public class RemoteUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   private static Logger log = Logger.getLogger(RemoteUnitTestCase.class);
 
    static boolean deployed = false;
    static int test = 0;
@@ -112,6 +112,7 @@
       }
       catch (EJBAccessException ignored)
       {
+         System.out.println("log="+log+":ignored:"+ignored);
          log.info(ignored.getMessage());
          securityFailure = false;
       }

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.interceptors;
-
-import java.util.ArrayList;
-
-import javax.ejb.EJB;
-import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.jboss.annotation.JndiInject;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class MyBaseInterceptor
-{
-   @EJB MySession2 baseSession2;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager baseTm;
-   @Resource(name="DefaultDS", mappedName="java:DefaultDS") DataSource baseDs;
-   @PersistenceContext(unitName="interceptors-test") EntityManager baseEm;
-   @PersistenceContext(unitName="interceptors-test") Session baseSession;
-   @PersistenceUnit(unitName="interceptors-test") EntityManagerFactory baseFactory;
-   @PersistenceUnit(unitName="interceptors-test") SessionFactory baseSessionFactory;
-
-   MySession2 baseSession2Method;
-   TransactionManager baseTmMethod;
-   DataSource baseDsMethod;
-   EntityManager baseEmMethod;
-   Session baseSessionMethod;
-   EntityManagerFactory baseFactoryMethod;
-   SessionFactory baseSessionFactoryMethod;
-
-   @EJB
-   public void setBaseSession2Method(MySession2 session2Method)
-   {
-      this.baseSession2Method = session2Method;
-   }
-   @JndiInject(jndiName="java:/TransactionManager")
-   public void setBaseTmMethod(TransactionManager tmMethod)
-   {
-      this.baseTmMethod = tmMethod;
-   }
-   @Resource(name="DefaultDS", mappedName="java:DefaultDS")
-   public void setBaseDsMethod(DataSource dsMethod)
-   {
-      this.baseDsMethod = dsMethod;
-   }
-   @PersistenceContext(unitName="interceptors-test")
-   public void setBaseEmMethod(EntityManager emMethod)
-   {
-      this.baseEmMethod = emMethod;
-   }
-   @PersistenceContext(unitName="interceptors-test")
-   public void setBaseSessionMethod(Session sessionMethod)
-   {
-      this.baseSessionMethod = sessionMethod;
-   }
-   @PersistenceUnit(unitName="interceptors-test")
-   public void setBaseFactoryMethod(EntityManagerFactory factoryMethod)
-   {
-      this.baseFactoryMethod = factoryMethod;
-   }
-   @PersistenceUnit(unitName="interceptors-test")
-   public void setBaseSessionFactoryMethod(SessionFactory sessionFactoryMethod)
-   {
-      this.baseSessionFactoryMethod = sessionFactoryMethod;
-   }
-
-   @AroundInvoke
-   public Object baseInvoke(InvocationContext ctx) throws Exception
-   {
-      baseSession2.doit();
-      if (baseTm == null) throw new RuntimeException("tm was null");
-      if (baseDs == null) throw new RuntimeException("ds was null");
-      if (baseEm == null) throw new RuntimeException("em was null");
-      if (baseSession == null) throw new RuntimeException("session was null");
-      if (baseFactory == null) throw new RuntimeException("factory was null");
-      if (baseSessionFactory == null) throw new RuntimeException("sessionFactory was null");
-
-      baseSession2Method.doit();
-      if (baseTmMethod == null) throw new RuntimeException("tm was null");
-      if (baseDsMethod == null) throw new RuntimeException("ds was null");
-      if (baseEmMethod == null) throw new RuntimeException("em was null");
-      if (baseSessionMethod == null) throw new RuntimeException("session was null");
-      if (baseFactoryMethod == null) throw new RuntimeException("factory was null");
-      if (baseSessionFactoryMethod == null) throw new RuntimeException("sessionFactory was null");
-      ArrayList list = (ArrayList)ctx.proceed();
-      list.add(0, "MyBaseInterceptor");
-      return list;
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors;
+
+import java.util.ArrayList;
+
+import javax.ejb.EJB;
+import javax.annotation.Resource;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.jboss.annotation.JndiInject;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class MyBaseInterceptor
+{
+   @EJB MySession2 baseSession2;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager baseTm;
+   @Resource(name="DefaultDS", mappedName="java:DefaultDS") DataSource baseDs;
+   @PersistenceContext(unitName="interceptors-test") EntityManager baseEm;
+   @PersistenceContext(unitName="interceptors-test") Session baseSession;
+   @PersistenceUnit(unitName="interceptors-test") EntityManagerFactory baseFactory;
+   @PersistenceUnit(unitName="interceptors-test") SessionFactory baseSessionFactory;
+
+   MySession2 baseSession2Method;
+   TransactionManager baseTmMethod;
+   DataSource baseDsMethod;
+   EntityManager baseEmMethod;
+   Session baseSessionMethod;
+   EntityManagerFactory baseFactoryMethod;
+   SessionFactory baseSessionFactoryMethod;
+
+   @EJB
+   public void setBaseSession2Method(MySession2 session2Method)
+   {
+      this.baseSession2Method = session2Method;
+   }
+   @JndiInject(jndiName="java:/TransactionManager")
+   public void setBaseTmMethod(TransactionManager tmMethod)
+   {
+      this.baseTmMethod = tmMethod;
+   }
+   @Resource(name="DefaultDS", mappedName="java:DefaultDS")
+   public void setBaseDsMethod(DataSource dsMethod)
+   {
+      this.baseDsMethod = dsMethod;
+   }
+   @PersistenceContext(unitName="interceptors-test")
+   public void setBaseEmMethod(EntityManager emMethod)
+   {
+      this.baseEmMethod = emMethod;
+   }
+   @PersistenceContext(unitName="interceptors-test")
+   public void setBaseSessionMethod(Session sessionMethod)
+   {
+      this.baseSessionMethod = sessionMethod;
+   }
+   @PersistenceUnit(unitName="interceptors-test")
+   public void setBaseFactoryMethod(EntityManagerFactory factoryMethod)
+   {
+      this.baseFactoryMethod = factoryMethod;
+   }
+   @PersistenceUnit(unitName="interceptors-test")
+   public void setBaseSessionFactoryMethod(SessionFactory sessionFactoryMethod)
+   {
+      this.baseSessionFactoryMethod = sessionFactoryMethod;
+   }
+
+   @AroundInvoke
+   public Object baseInvoke(InvocationContext ctx) throws Exception
+   {
+      baseSession2.doit();
+      if (baseTm == null) throw new RuntimeException("tm was null");
+      if (baseDs == null) throw new RuntimeException("ds was null");
+      if (baseEm == null) throw new RuntimeException("em was null");
+      if (baseSession == null) throw new RuntimeException("session was null");
+      if (baseFactory == null) throw new RuntimeException("factory was null");
+      if (baseSessionFactory == null) throw new RuntimeException("sessionFactory was null");
+
+      baseSession2Method.doit();
+      if (baseTmMethod == null) throw new RuntimeException("tm was null");
+      if (baseDsMethod == null) throw new RuntimeException("ds was null");
+      if (baseEmMethod == null) throw new RuntimeException("em was null");
+      if (baseSessionMethod == null) throw new RuntimeException("session was null");
+      if (baseFactoryMethod == null) throw new RuntimeException("factory was null");
+      if (baseSessionFactoryMethod == null) throw new RuntimeException("sessionFactory was null");
+      ArrayList list = (ArrayList)ctx.proceed();
+      list.add(0, "MyBaseInterceptor");
+      return list;
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,119 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.interceptors;
-
-import javax.ejb.EJB;
-import javax.annotation.Resource;
-import javax.transaction.TransactionManager;
-import javax.sql.DataSource;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.EntityManagerFactory;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-import org.jboss.annotation.JndiInject;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class MyInterceptor extends MyBaseInterceptor
-{
-   @EJB MySession2 session2;
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-   @Resource(name="DefaultDS", mappedName="java:DefaultDS") DataSource ds;
-   @PersistenceContext(unitName="interceptors-test") EntityManager em;
-   @PersistenceContext(unitName="interceptors-test") Session session;
-   @PersistenceUnit(unitName="interceptors-test") EntityManagerFactory factory;
-   @PersistenceUnit(unitName="interceptors-test") SessionFactory sessionFactory;
-
-   MySession2 session2Method;
-   TransactionManager tmMethod;
-   DataSource dsMethod;
-   EntityManager emMethod;
-   Session sessionMethod;
-   EntityManagerFactory factoryMethod;
-   SessionFactory sessionFactoryMethod;
-
-   @EJB
-   public void setSession2Method(MySession2 session2Method)
-   {
-      this.session2Method = session2Method;
-   }
-   @JndiInject(jndiName="java:/TransactionManager")
-   public void setTmMethod(TransactionManager tmMethod)
-   {
-      this.tmMethod = tmMethod;
-   }
-   @Resource(name="DefaultDS", mappedName="java:DefaultDS")
-   public void setDsMethod(DataSource dsMethod)
-   {
-      this.dsMethod = dsMethod;
-   }
-   @PersistenceContext(unitName="interceptors-test")
-   public void setEmMethod(EntityManager emMethod)
-   {
-      this.emMethod = emMethod;
-   }
-   @PersistenceContext(unitName="interceptors-test")
-   public void setSessionMethod(Session sessionMethod)
-   {
-      this.sessionMethod = sessionMethod;
-   }
-   @PersistenceUnit(unitName="interceptors-test")
-   public void setFactoryMethod(EntityManagerFactory factoryMethod)
-   {
-      this.factoryMethod = factoryMethod;
-   }
-   @PersistenceUnit(unitName="interceptors-test")
-   public void setSessionFactoryMethod(SessionFactory sessionFactoryMethod)
-   {
-      this.sessionFactoryMethod = sessionFactoryMethod;
-   }
-
-   @AroundInvoke
-   public Object invoke(InvocationContext ctx) throws Exception
-   {
-      session2.doit();
-      if (tm == null) throw new RuntimeException("tm was null");
-      if (ds == null) throw new RuntimeException("ds was null");
-      if (em == null) throw new RuntimeException("em was null");
-      if (session == null) throw new RuntimeException("session was null");
-      if (factory == null) throw new RuntimeException("factory was null");
-      if (sessionFactory == null) throw new RuntimeException("sessionFactory was null");
-
-      session2Method.doit();
-      if (tmMethod == null) throw new RuntimeException("tm was null");
-      if (dsMethod == null) throw new RuntimeException("ds was null");
-      if (emMethod == null) throw new RuntimeException("em was null");
-      if (sessionMethod == null) throw new RuntimeException("session was null");
-      if (factoryMethod == null) throw new RuntimeException("factory was null");
-      if (sessionFactoryMethod == null) throw new RuntimeException("sessionFactory was null");
-      return ctx.proceed();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors;
+
+import javax.ejb.EJB;
+import javax.annotation.Resource;
+import javax.transaction.TransactionManager;
+import javax.sql.DataSource;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceUnit;
+import javax.persistence.EntityManagerFactory;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+import org.jboss.annotation.JndiInject;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class MyInterceptor extends MyBaseInterceptor
+{
+   @EJB MySession2 session2;
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+   @Resource(name="DefaultDS", mappedName="java:DefaultDS") DataSource ds;
+   @PersistenceContext(unitName="interceptors-test") EntityManager em;
+   @PersistenceContext(unitName="interceptors-test") Session session;
+   @PersistenceUnit(unitName="interceptors-test") EntityManagerFactory factory;
+   @PersistenceUnit(unitName="interceptors-test") SessionFactory sessionFactory;
+
+   MySession2 session2Method;
+   TransactionManager tmMethod;
+   DataSource dsMethod;
+   EntityManager emMethod;
+   Session sessionMethod;
+   EntityManagerFactory factoryMethod;
+   SessionFactory sessionFactoryMethod;
+
+   @EJB
+   public void setSession2Method(MySession2 session2Method)
+   {
+      this.session2Method = session2Method;
+   }
+   @JndiInject(jndiName="java:/TransactionManager")
+   public void setTmMethod(TransactionManager tmMethod)
+   {
+      this.tmMethod = tmMethod;
+   }
+   @Resource(name="DefaultDS", mappedName="java:DefaultDS")
+   public void setDsMethod(DataSource dsMethod)
+   {
+      this.dsMethod = dsMethod;
+   }
+   @PersistenceContext(unitName="interceptors-test")
+   public void setEmMethod(EntityManager emMethod)
+   {
+      this.emMethod = emMethod;
+   }
+   @PersistenceContext(unitName="interceptors-test")
+   public void setSessionMethod(Session sessionMethod)
+   {
+      this.sessionMethod = sessionMethod;
+   }
+   @PersistenceUnit(unitName="interceptors-test")
+   public void setFactoryMethod(EntityManagerFactory factoryMethod)
+   {
+      this.factoryMethod = factoryMethod;
+   }
+   @PersistenceUnit(unitName="interceptors-test")
+   public void setSessionFactoryMethod(SessionFactory sessionFactoryMethod)
+   {
+      this.sessionFactoryMethod = sessionFactoryMethod;
+   }
+
+   @AroundInvoke
+   public Object invoke(InvocationContext ctx) throws Exception
+   {
+      session2.doit();
+      if (tm == null) throw new RuntimeException("tm was null");
+      if (ds == null) throw new RuntimeException("ds was null");
+      if (em == null) throw new RuntimeException("em was null");
+      if (session == null) throw new RuntimeException("session was null");
+      if (factory == null) throw new RuntimeException("factory was null");
+      if (sessionFactory == null) throw new RuntimeException("sessionFactory was null");
+
+      session2Method.doit();
+      if (tmMethod == null) throw new RuntimeException("tm was null");
+      if (dsMethod == null) throw new RuntimeException("ds was null");
+      if (emMethod == null) throw new RuntimeException("em was null");
+      if (sessionMethod == null) throw new RuntimeException("session was null");
+      if (factoryMethod == null) throw new RuntimeException("factory was null");
+      if (sessionFactoryMethod == null) throw new RuntimeException("sessionFactory was null");
+      return ctx.proceed();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.interceptors;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface MySession2
-{
-   boolean doit();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MySession2
+{
+   boolean doit();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.interceptors;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class MySession2Bean implements MySession2, MySession2Local
-{
-   public boolean doit()
-   {
-      return true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class MySession2Bean implements MySession2, MySession2Local
+{
+   public boolean doit()
+   {
+      return true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.interceptors;
-
-import javax.ejb.Local;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Local
-public interface MySession2Local
-{
-   boolean doit();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors;
+
+import javax.ejb.Local;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Local
+public interface MySession2Local
+{
+   boolean doit();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySession2Local.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.interceptors;
-
-import java.util.ArrayList;
-
-import javax.interceptor.Interceptors;
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Interceptors(MyInterceptor.class)
-public class MySessionBean implements MySessionRemote
-{
-
-   public ArrayList doit()
-   {
-      throw new RuntimeException("SHOULD NEVER BE CALLED");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors;
+
+import java.util.ArrayList;
+
+import javax.interceptor.Interceptors;
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Interceptors(MyInterceptor.class)
+public class MySessionBean implements MySessionRemote
+{
+
+   public ArrayList doit()
+   {
+      throw new RuntimeException("SHOULD NEVER BE CALLED");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.interceptors;
-
-import java.util.ArrayList;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface MySessionRemote
-{
-   public ArrayList doit();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors;
+
+import java.util.ArrayList;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MySessionRemote
+{
+   public ArrayList doit();
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/MySessionRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.interceptors;
-
-import java.util.ArrayList;
-
-import javax.interceptor.InvocationContext;
-import javax.sql.DataSource;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class XMLInterceptor
-{
-   MySession2 session2;
-   DataSource ds;
-
-   MySession2Local session2Method;
-   DataSource dsMethod;
-
-   public void setSession2Method(MySession2Local session2Method)
-   {
-      this.session2Method = session2Method;
-   }
-   
-   public void setDsMethod(DataSource dsMethod)
-   {
-      this.dsMethod = dsMethod;
-   }
-   
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      session2.doit();
-      if (ds == null) throw new RuntimeException("ds was null");
-//
-      session2Method.doit();
-      if (dsMethod == null) throw new RuntimeException("ds was null");
-      ArrayList list = new ArrayList();
-      list.add("MyInterceptor");
-      return list;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors;
+
+import java.util.ArrayList;
+
+import javax.interceptor.InvocationContext;
+import javax.sql.DataSource;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class XMLInterceptor
+{
+   MySession2 session2;
+   DataSource ds;
+
+   MySession2Local session2Method;
+   DataSource dsMethod;
+
+   public void setSession2Method(MySession2Local session2Method)
+   {
+      this.session2Method = session2Method;
+   }
+   
+   public void setDsMethod(DataSource dsMethod)
+   {
+      this.dsMethod = dsMethod;
+   }
+   
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      session2.doit();
+      if (ds == null) throw new RuntimeException("ds was null");
+//
+      session2Method.doit();
+      if (dsMethod == null) throw new RuntimeException("ds was null");
+      ArrayList list = new ArrayList();
+      list.add("MyInterceptor");
+      return list;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/XMLInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.interceptors.unit;
-
-import java.util.ArrayList;
-
-import org.jboss.ejb3.test.interceptors.MySessionRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class RemoteUnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public RemoteUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testInjection() throws Exception
-   {
-      MySessionRemote test = (MySessionRemote) getInitialContext().lookup("MySessionBean/remote");
-      ArrayList list = test.doit();
-      assertEquals("MyBaseInterceptor", list.get(0));
-      assertEquals("MyInterceptor", list.get(1));
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(RemoteUnitTestCase.class, "interceptors-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors.unit;
+
+import java.util.ArrayList;
+
+import org.jboss.ejb3.test.interceptors.MySessionRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class RemoteUnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public RemoteUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testInjection() throws Exception
+   {
+      MySessionRemote test = (MySessionRemote) getInitialContext().lookup("MySessionBean/remote");
+      ArrayList list = test.doit();
+      assertEquals("MyBaseInterceptor", list.get(0));
+      assertEquals("MyInterceptor", list.get(1));
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(RemoteUnitTestCase.class, "interceptors-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors/unit/RemoteUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,152 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AnnotatedClassInterceptor extends AnnotatedClassInterceptor2
-{
-   @AroundInvoke
-   public Object intercept(InvocationContext inv) throws Exception
-   {
-      System.out.println("AnnotatedClassInterceptor intercepting!");
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      status.addInterception(new Interception(this, "intercept", instance));
-      return inv.proceed();
-   }
-
-   @PostConstruct
-   public void postConstruct(InvocationContext inv)
-   {
-      StatusRemote status = null;
-      status = findStatusRemote();
-      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct", instance));
-      try
-      {
-         inv.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PostActivate
-   public void postActivate(InvocationContext inv)
-   {
-      StatusRemote status = null;
-      status = findStatusRemote();
-      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate", instance));
-      try
-      {
-         inv.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   private StatusRemote findStatusRemote()
-   {
-      StatusRemote status;
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      return status;
-   }
-
-   @PrePassivate
-   public void prePassivate(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PreDestroy
-   public void preDestroy(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public Object intercept2(InvocationContext ctx) throws Exception
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void postConstruct2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void postActivate2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void prePassivate2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void preDestroy2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AnnotatedClassInterceptor extends AnnotatedClassInterceptor2
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext inv) throws Exception
+   {
+      System.out.println("AnnotatedClassInterceptor intercepting!");
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      status.addInterception(new Interception(this, "intercept", instance));
+      return inv.proceed();
+   }
+
+   @PostConstruct
+   public void postConstruct(InvocationContext inv)
+   {
+      StatusRemote status = null;
+      status = findStatusRemote();
+      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct", instance));
+      try
+      {
+         inv.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PostActivate
+   public void postActivate(InvocationContext inv)
+   {
+      StatusRemote status = null;
+      status = findStatusRemote();
+      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate", instance));
+      try
+      {
+         inv.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   private StatusRemote findStatusRemote()
+   {
+      StatusRemote status;
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      return status;
+   }
+
+   @PrePassivate
+   public void prePassivate(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PreDestroy
+   public void preDestroy(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public Object intercept2(InvocationContext ctx) throws Exception
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void postConstruct2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void postActivate2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void prePassivate2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void preDestroy2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AnnotatedClassInterceptor2 extends AnnotatedClassInterceptor3
-{
-   @AroundInvoke
-   public Object intercept2(InvocationContext ctx) throws Exception
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PostConstruct
-   public void postConstruct2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PostActivate
-   public void postActivate2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PrePassivate
-   public void prePassivate2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PreDestroy
-   public void preDestroy2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AnnotatedClassInterceptor2 extends AnnotatedClassInterceptor3
+{
+   @AroundInvoke
+   public Object intercept2(InvocationContext ctx) throws Exception
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PostConstruct
+   public void postConstruct2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PostActivate
+   public void postActivate2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PrePassivate
+   public void prePassivate2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PreDestroy
+   public void preDestroy2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,131 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import java.io.Serializable;
-
-import javax.annotation.Resource;
-import javax.annotation.PostConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBContext;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AnnotatedClassInterceptor3 implements Serializable
-{
-   @Resource
-   EJBContext ejbCtx;
-
-   static int currentInstance;
-   int instance = ++currentInstance;
-
-   @AroundInvoke
-   public Object intercept3(InvocationContext ctx) throws Exception
-   {
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept3", instance));
-      return ctx.proceed();
-   }
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PostConstruct
-   public void postConstruct3(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PostActivate
-   public void postActivate3(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PrePassivate
-   public void prePassivate3(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PreDestroy
-   public void preDestroy3(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import java.io.Serializable;
+
+import javax.annotation.Resource;
+import javax.annotation.PostConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.ejb.EJBContext;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AnnotatedClassInterceptor3 implements Serializable
+{
+   @Resource
+   EJBContext ejbCtx;
+
+   static int currentInstance;
+   int instance = ++currentInstance;
+
+   @AroundInvoke
+   public Object intercept3(InvocationContext ctx) throws Exception
+   {
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept3", instance));
+      return ctx.proceed();
+   }
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PostConstruct
+   public void postConstruct3(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PostActivate
+   public void postActivate3(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PrePassivate
+   public void prePassivate3(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PreDestroy
+   public void preDestroy3(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,128 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AnnotatedMethodInterceptor extends AnnotatedMethodInterceptor2
-{
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("AnnotatedMethodInterceptor intercepting!");
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public Object ignoredAround(InvocationContext ctx) throws Exception
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PostConstruct
-   public void postConstruct(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PostActivate
-   public void postActivate(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PrePassivate
-   public void prePassivate(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @PreDestroy
-   public void preDestroy(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,128 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AnnotatedMethodInterceptor extends AnnotatedMethodInterceptor2
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("AnnotatedMethodInterceptor intercepting!");
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public Object ignoredAround(InvocationContext ctx) throws Exception
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PostConstruct
+   public void postConstruct(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PostActivate
+   public void postActivate(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PrePassivate
+   public void prePassivate(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @PreDestroy
+   public void preDestroy(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AnnotatedMethodInterceptor2 extends AnnotatedMethodInterceptor3
-{
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   @AroundInvoke
-   public Object intercept2(InvocationContext ctx) throws Exception
-   {
-      System.out.println("AnnotatedMethodInterceptor intercepting!");
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept2"));
-      return ctx.proceed();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AnnotatedMethodInterceptor2 extends AnnotatedMethodInterceptor3
+{
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   @AroundInvoke
+   public Object intercept2(InvocationContext ctx) throws Exception
+   {
+      System.out.println("AnnotatedMethodInterceptor intercepting!");
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept2"));
+      return ctx.proceed();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AnnotatedMethodInterceptor3 extends AnnotatedMethodInterceptor4
-{
-
-   @AroundInvoke
-   public Object ignoredAround(InvocationContext ctx) throws Exception
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AnnotatedMethodInterceptor3 extends AnnotatedMethodInterceptor4
+{
+
+   @AroundInvoke
+   public Object ignoredAround(InvocationContext ctx) throws Exception
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor3.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBContext;
-import javax.interceptor.InvocationContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class AnnotatedMethodInterceptor4
-{
-   @Resource
-   EJBContext ejbCtx;
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-
-   @AroundInvoke
-   public Object intercept4(InvocationContext ctx) throws Exception
-   {
-      System.out.println("AnnotatedMethodInterceptor intercepting!");
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept4"));
-      return ctx.proceed();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.annotation.Resource;
+import javax.interceptor.AroundInvoke;
+import javax.ejb.EJBContext;
+import javax.interceptor.InvocationContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class AnnotatedMethodInterceptor4
+{
+   @Resource
+   EJBContext ejbCtx;
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+
+   @AroundInvoke
+   public Object intercept4(InvocationContext ctx) throws Exception
+   {
+      System.out.println("AnnotatedMethodInterceptor intercepting!");
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept4"));
+      return ctx.proceed();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedMethodInterceptor4.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.EJB;
-import javax.annotation.PostConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import javax.annotation.PreDestroy;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(AnnotatedOnlySLSBRemote.class)
- at Interceptors(AnnotatedClassInterceptor.class)
- at ExcludeDefaultInterceptors
-public class AnnotatedOnlySLSB implements AnnotatedOnlySLSBRemote
-{
-   @EJB
-   StatusRemote status;
-
-   public void methodWithClassLevel()
-   {
-      System.out.println("AnnotatedOnlySLSB.methodWithClassLevel");
-   }
-
-   @ExcludeClassInterceptors
-   public void methodExcludingClassInterceptors()
-   {
-      System.out.println("AnnotatedOnlySLSB.methodExcludingClassInterceptors");
-   }
-
-   @Interceptors(AnnotatedMethodInterceptor.class)
-   public void methodWithOwnInterceptors()
-   {
-      System.out.println("AnnotatedOnlySLSB.methodWithOwnInterceptors");
-   }
-
-   @Interceptors(AnnotatedMethodInterceptor.class)
-   @ExcludeClassInterceptors
-   public void methodWithOwnInterceptorsExcludeClass()
-   {
-      System.out.println("AnnotatedOnlySLSB.methodWithOwnInterceptors");
-   }
-
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("AnnotatedOnlySLSB intercepting!");
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-   @PostConstruct
-   void postConstruct()
-   {
-      System.out.println("AnnotatedOnlySLSB postConstruct");
-      StatusBean.addPostConstruct(new Interception(this, "postConstruct"));
-   }
-
-   @PreDestroy()
-   void preDestroy()
-   {
-      System.out.println("AnnotatedOnlySLSB preDestroy!");
-      StatusBean.addPreDestroy(new Interception(this, "preDestroy"));
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.ExcludeClassInterceptors;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+import javax.annotation.PreDestroy;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(AnnotatedOnlySLSBRemote.class)
+ at Interceptors(AnnotatedClassInterceptor.class)
+ at ExcludeDefaultInterceptors
+public class AnnotatedOnlySLSB implements AnnotatedOnlySLSBRemote
+{
+   @EJB
+   StatusRemote status;
+
+   public void methodWithClassLevel()
+   {
+      System.out.println("AnnotatedOnlySLSB.methodWithClassLevel");
+   }
+
+   @ExcludeClassInterceptors
+   public void methodExcludingClassInterceptors()
+   {
+      System.out.println("AnnotatedOnlySLSB.methodExcludingClassInterceptors");
+   }
+
+   @Interceptors(AnnotatedMethodInterceptor.class)
+   public void methodWithOwnInterceptors()
+   {
+      System.out.println("AnnotatedOnlySLSB.methodWithOwnInterceptors");
+   }
+
+   @Interceptors(AnnotatedMethodInterceptor.class)
+   @ExcludeClassInterceptors
+   public void methodWithOwnInterceptorsExcludeClass()
+   {
+      System.out.println("AnnotatedOnlySLSB.methodWithOwnInterceptors");
+   }
+
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("AnnotatedOnlySLSB intercepting!");
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+   @PostConstruct
+   void postConstruct()
+   {
+      System.out.println("AnnotatedOnlySLSB postConstruct");
+      StatusBean.addPostConstruct(new Interception(this, "postConstruct"));
+   }
+
+   @PreDestroy()
+   void preDestroy()
+   {
+      System.out.println("AnnotatedOnlySLSB preDestroy!");
+      StatusBean.addPreDestroy(new Interception(this, "preDestroy"));
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface AnnotatedOnlySLSBRemote
-{
-   void methodWithClassLevel();
-   void methodExcludingClassInterceptors();
-   void methodWithOwnInterceptors();
-   void methodWithOwnInterceptorsExcludeClass();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface AnnotatedOnlySLSBRemote
+{
+   void methodWithClassLevel();
+   void methodExcludingClassInterceptors();
+   void methodWithOwnInterceptors();
+   void methodWithOwnInterceptorsExcludeClass();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import java.io.Serializable;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.interceptor.InvocationContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class DefaultInterceptor implements Serializable
-{
-   @Resource
-   EJBContext ejbCtx;
-
-   static int currentInstance;
-   int instance = ++currentInstance;
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("DefaultInterceptor intercepting!");
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept", instance));
-      return ctx.proceed();
-   }
-
-   public void postConstruct(InvocationContext ctx)
-   {
-      System.out.println("DefaultInterceptor pc!");
-      StatusBean.addPostConstruct(new Interception(this, "postConstruct", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void postActivate(InvocationContext ctx) throws Exception
-   {
-      System.out.println("DefaultInterceptor pa!");
-      StatusBean.addPostActivate(new Interception(this, "postActivate", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void prePassivate(InvocationContext ctx)
-   {
-      System.out.println("DefaultInterceptor pp!");
-      StatusBean.addPrePassivate(new Interception(this, "prePassivate", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void preDestroy(InvocationContext ctx)
-   {
-      System.out.println("DefaultInterceptor pd!");
-      StatusBean.addPreDestroy(new Interception(this, "preDestroy", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import java.io.Serializable;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBContext;
+import javax.interceptor.InvocationContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class DefaultInterceptor implements Serializable
+{
+   @Resource
+   EJBContext ejbCtx;
+
+   static int currentInstance;
+   int instance = ++currentInstance;
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("DefaultInterceptor intercepting!");
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept", instance));
+      return ctx.proceed();
+   }
+
+   public void postConstruct(InvocationContext ctx)
+   {
+      System.out.println("DefaultInterceptor pc!");
+      StatusBean.addPostConstruct(new Interception(this, "postConstruct", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void postActivate(InvocationContext ctx) throws Exception
+   {
+      System.out.println("DefaultInterceptor pa!");
+      StatusBean.addPostActivate(new Interception(this, "postActivate", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void prePassivate(InvocationContext ctx)
+   {
+      System.out.println("DefaultInterceptor pp!");
+      StatusBean.addPrePassivate(new Interception(this, "prePassivate", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void preDestroy(InvocationContext ctx)
+   {
+      System.out.println("DefaultInterceptor pd!");
+      StatusBean.addPreDestroy(new Interception(this, "preDestroy", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.ActivationConfigProperty;
-
-import org.jboss.annotation.ejb.Consumer;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Consumer (
-      activationConfig={
-         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-         @ActivationConfigProperty(propertyName="destination", propertyValue="queue/defaultonlyqueue")
-      })
-public class DefaultOnlyConsumer implements DefaultOnlyProducer
-{
-   public void method()
-   {
-      System.out.println("DefaultOnlyConsumer method");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.ActivationConfigProperty;
+
+import org.jboss.annotation.ejb.Consumer;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Consumer (
+      activationConfig={
+         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+         @ActivationConfigProperty(propertyName="destination", propertyValue="queue/defaultonlyqueue")
+      })
+public class DefaultOnlyConsumer implements DefaultOnlyProducer
+{
+   public void method()
+   {
+      System.out.println("DefaultOnlyConsumer method");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import org.jboss.annotation.ejb.Producer;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Producer
-public interface DefaultOnlyProducer
-{
-   void method();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import org.jboss.annotation.ejb.Producer;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Producer
+public interface DefaultOnlyProducer
+{
+   void method();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Stateless;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
-public class DefaultOnlySLSB implements DefaultOnlySLSBRemote
-{
-   public void test()
-   {
-      System.out.println("DefaultOnlySLSB.test()");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Stateless;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class DefaultOnlySLSB implements DefaultOnlySLSBRemote
+{
+   public void test()
+   {
+      System.out.println("DefaultOnlySLSB.test()");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface DefaultOnlySLSBRemote
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface DefaultOnlySLSBRemote
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlySLSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Service (objectName="test:service=DefaultOnly")
- at Management (DefaultOnlyServiceManagement.class)
- at Remote (DefaultOnlyServiceRemote.class)
-public class DefaultOnlyService implements DefaultOnlyServiceManagement, DefaultOnlyServiceRemote
-{
-   public void method()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Service (objectName="test:service=DefaultOnly")
+ at Management (DefaultOnlyServiceManagement.class)
+ at Remote (DefaultOnlyServiceRemote.class)
+public class DefaultOnlyService implements DefaultOnlyServiceManagement, DefaultOnlyServiceRemote
+{
+   public void method()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface DefaultOnlyServiceManagement
-{
-   void method();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface DefaultOnlyServiceManagement
+{
+   void method();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface DefaultOnlyServiceRemote
-{
-   void method();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface DefaultOnlyServiceRemote
+{
+   void method();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyServiceRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InheritingBaseMiddle extends InheritingBaseTop
-{
-   @AroundInvoke
-   public Object intercept2(InvocationContext ctx) throws Exception
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PostConstruct
-   void postConstruct2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PostActivate
-   void postActivate2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PrePassivate()
-   void prePassivate2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   @PreDestroy()
-   void preDestroy2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InheritingBaseMiddle extends InheritingBaseTop
+{
+   @AroundInvoke
+   public Object intercept2(InvocationContext ctx) throws Exception
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PostConstruct
+   void postConstruct2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PostActivate
+   void postActivate2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PrePassivate()
+   void prePassivate2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   @PreDestroy()
+   void preDestroy2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseMiddle.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InheritingBaseTop
-{
-   @AroundInvoke
-   public Object intercept3(InvocationContext ctx) throws Exception
-   {
-      StatusBean.addInterceptionStatic(new Interception(this, "intercept3"));
-      return ctx.proceed();
-   }
-
-   @PostConstruct
-   void postConstruct3()
-   {
-      StatusBean.addPostConstruct(new Interception(this, "postConstruct3"));
-   }
-
-   @PostActivate
-   void postActivate3()
-   {
-      StatusBean.addPostActivate(new Interception(this, "postActivate3"));
-   }
-   
-   @PrePassivate()
-   void prePassivate3()
-   {
-      StatusBean.addPrePassivate(new Interception(this, "prePassivate3"));
-   }
-
-   @PreDestroy()
-   void preDestroy3()
-   {
-      StatusBean.addPreDestroy(new Interception(this, "preDestroy3"));
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InheritingBaseTop
+{
+   @AroundInvoke
+   public Object intercept3(InvocationContext ctx) throws Exception
+   {
+      StatusBean.addInterceptionStatic(new Interception(this, "intercept3"));
+      return ctx.proceed();
+   }
+
+   @PostConstruct
+   void postConstruct3()
+   {
+      StatusBean.addPostConstruct(new Interception(this, "postConstruct3"));
+   }
+
+   @PostActivate
+   void postActivate3()
+   {
+      StatusBean.addPostActivate(new Interception(this, "postActivate3"));
+   }
+   
+   @PrePassivate()
+   void prePassivate3()
+   {
+      StatusBean.addPrePassivate(new Interception(this, "prePassivate3"));
+   }
+
+   @PreDestroy()
+   void preDestroy3()
+   {
+      StatusBean.addPreDestroy(new Interception(this, "preDestroy3"));
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingBaseTop.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,122 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.EJB;
-import javax.annotation.PostConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateful
- at CacheConfig(maxSize = 1)
-public class InheritingSFSB extends InheritingBaseMiddle implements InheritingSFSBRemote
-{
-   @EJB
-   StatusRemote status;
-   
-   public void method()
-   {
-      System.out.println("method");
-   }
-   
-   @ExcludeDefaultInterceptors
-   public void methodNoDefault()
-   {
-      System.out.println("methodNoDefault");
-   }
-   
-   @Remove
-   public void kill()
-   {
-      System.out.println("kill");
-   }
-   
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-   
-   @PostConstruct
-   void postConstruct()
-   {
-      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct"));
-   }
-
-   @PostActivate
-   void postActivate()
-   {
-      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate"));
-   }
-   
-   @PrePassivate()
-   void prePassivate()
-   {
-      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate"));
-   }
-
-   @PreDestroy()
-   void preDestroy()
-   {
-      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy"));
-   }
-   
-   public Object intercept2(InvocationContext ctx) throws Exception
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   void postConstruct2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   void postActivate2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-   
-   void prePassivate2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   void preDestroy2()
-   {
-      throw new RuntimeException("Should not be called");
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,122 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at CacheConfig(maxSize = 1)
+public class InheritingSFSB extends InheritingBaseMiddle implements InheritingSFSBRemote
+{
+   @EJB
+   StatusRemote status;
+   
+   public void method()
+   {
+      System.out.println("method");
+   }
+   
+   @ExcludeDefaultInterceptors
+   public void methodNoDefault()
+   {
+      System.out.println("methodNoDefault");
+   }
+   
+   @Remove
+   public void kill()
+   {
+      System.out.println("kill");
+   }
+   
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+   
+   @PostConstruct
+   void postConstruct()
+   {
+      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct"));
+   }
+
+   @PostActivate
+   void postActivate()
+   {
+      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate"));
+   }
+   
+   @PrePassivate()
+   void prePassivate()
+   {
+      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate"));
+   }
+
+   @PreDestroy()
+   void preDestroy()
+   {
+      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy"));
+   }
+   
+   public Object intercept2(InvocationContext ctx) throws Exception
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   void postConstruct2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   void postActivate2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+   
+   void prePassivate2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   void preDestroy2()
+   {
+      throw new RuntimeException("Should not be called");
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface InheritingSFSBRemote
-{
-
-   void method();
-   
-   void methodNoDefault();
-
-   void kill();
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface InheritingSFSBRemote
+{
+
+   void method();
+   
+   void methodNoDefault();
+
+   void kill();
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import java.io.Serializable;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class Interception implements Serializable
-{
-   private String classname;
-   private String method;
-   private int instance = -1;
-   
-   public Interception(Object obj, String method)
-   {
-      if (obj instanceof Class)
-         this.classname = ((Class)obj).getName();
-      else
-         this.classname = obj.getClass().getName();
-      
-      this.method = method;
-   }
-   
-   public Interception(Object obj, String method, int instance)
-   {
-      this.classname = obj.getClass().getName();
-      this.method = method;
-      this.instance = instance;
-   }
-   
-   public String getClassname()
-   {
-      return classname;
-   }
-   
-   public int getInstance()
-   {
-      return instance;
-   }
-   
-   public String getMethod()
-   {
-      return method;
-   }
-   
-   public String toString()
-   {
-      return classname + "." + method + "-" + instance;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class Interception implements Serializable
+{
+   private String classname;
+   private String method;
+   private int instance = -1;
+   
+   public Interception(Object obj, String method)
+   {
+      if (obj instanceof Class)
+         this.classname = ((Class)obj).getName();
+      else
+         this.classname = obj.getClass().getName();
+      
+      this.method = method;
+   }
+   
+   public Interception(Object obj, String method, int instance)
+   {
+      this.classname = obj.getClass().getName();
+      this.method = method;
+      this.instance = instance;
+   }
+   
+   public String getClassname()
+   {
+      return classname;
+   }
+   
+   public int getInstance()
+   {
+      return instance;
+   }
+   
+   public String getMethod()
+   {
+      return method;
+   }
+   
+   public String toString()
+   {
+      return classname + "." + method + "-" + instance;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/Interception.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-
-import javax.interceptor.Interceptors;
-import javax.ejb.Stateless;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
-public class MethodOnlyInterceptedSLSB implements MethodOnlyInterceptedSLSBRemote
-{
-   @Interceptors({org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor4.class})
-   public void intercepted()
-   {
-
-   }
-
-   public void notintercepted()
-   {
-
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors2;
+
+
+import javax.interceptor.Interceptors;
+import javax.ejb.Stateless;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class MethodOnlyInterceptedSLSB implements MethodOnlyInterceptedSLSBRemote
+{
+   @Interceptors({org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor4.class})
+   public void intercepted()
+   {
+
+   }
+
+   public void notintercepted()
+   {
+
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface MethodOnlyInterceptedSLSBRemote
-{
-   public void intercepted();
-   
-   public void notintercepted();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MethodOnlyInterceptedSLSBRemote
+{
+   public void intercepted();
+   
+   public void notintercepted();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MethodOnlyInterceptedSLSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.EJB;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class MixedClassInterceptor
-{
-   @EJB
-   StatusRemote status;
-
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("MixedClassInterceptor intercepting!");
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.EJB;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class MixedClassInterceptor
+{
+   @EJB
+   StatusRemote status;
+
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("MixedClassInterceptor intercepting!");
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedClassInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBContext;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateful (name="MixedConfigSFSB")
- at Interceptors ({MixedClassInterceptor.class})
- at CacheConfig(maxSize = 1)
-public class MixedConfigSFSB implements MixedConfigSFSBRemote
-{
-   @Resource
-   EJBContext ejbCtx;
-
-   public void test()
-   {
-      System.out.println("MixedConfigSFSB.test()");
-   }
-   
-   @Interceptors ({MixedMethodInterceptor.class})
-   public void testWithMethodLevel()
-   {
-      System.out.println();
-   }
-   
-   @Interceptors ({MixedMethodInterceptor.class})
-   public void testWithMethodLevelB()
-   {
-      System.out.println();
-   }
-   
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("MixedConfigSFSB intercepting!");
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-   @Remove
-   public void kill()
-   {
-      
-   }
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.annotation.Resource;
+import javax.interceptor.AroundInvoke;
+import javax.ejb.EJBContext;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateful (name="MixedConfigSFSB")
+ at Interceptors ({MixedClassInterceptor.class})
+ at CacheConfig(maxSize = 1)
+public class MixedConfigSFSB implements MixedConfigSFSBRemote
+{
+   @Resource
+   EJBContext ejbCtx;
+
+   public void test()
+   {
+      System.out.println("MixedConfigSFSB.test()");
+   }
+   
+   @Interceptors ({MixedMethodInterceptor.class})
+   public void testWithMethodLevel()
+   {
+      System.out.println();
+   }
+   
+   @Interceptors ({MixedMethodInterceptor.class})
+   public void testWithMethodLevelB()
+   {
+      System.out.println();
+   }
+   
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("MixedConfigSFSB intercepting!");
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+   @Remove
+   public void kill()
+   {
+      
+   }
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface MixedConfigSFSBRemote
-{
-   void test();
-   
-   void testWithMethodLevel();
-   
-   void testWithMethodLevelB();
-   
-   void kill();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MixedConfigSFSBRemote
+{
+   void test();
+   
+   void testWithMethodLevel();
+   
+   void testWithMethodLevelB();
+   
+   void kill();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */ 
 package org.jboss.ejb3.test.interceptors2;
 
 import javax.ejb.ActivationConfigProperty;

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBContext;
-import javax.interceptor.InvocationContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class MixedMethodInterceptor
-{
-   @Resource
-   EJBContext ejbCtx;
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("MixedMethodInterceptor intercepting!");
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.annotation.Resource;
+import javax.interceptor.AroundInvoke;
+import javax.ejb.EJBContext;
+import javax.interceptor.InvocationContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class MixedMethodInterceptor
+{
+   @Resource
+   EJBContext ejbCtx;
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("MixedMethodInterceptor intercepting!");
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedMethodInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import org.jboss.annotation.ejb.Producer;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Producer
-public interface MixedProducer 
-{
-   void methodWithOwnOnly();
-   
-   void method();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import org.jboss.annotation.ejb.Producer;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Producer
+public interface MixedProducer 
+{
+   void methodWithOwnOnly();
+   
+   void method();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.Interceptors;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Interceptors({MixedClassInterceptor.class})
- at Service(objectName="test:service=mixed", name="MixedService")
- at Management(MixedServiceManagement.class)
-public class MixedServiceBean implements MixedServiceRemote, MixedServiceManagement
-{
-
-   @Interceptors({MixedMethodInterceptor.class})
-   public void managementMethod()
-   {
-   }
-
-   @Interceptors({MixedMethodInterceptor.class})
-   public void defaultMethod()
-   {
-   }
-
-   public void remoteMethod()
-   {
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.Interceptors;
+
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Interceptors({MixedClassInterceptor.class})
+ at Service(objectName="test:service=mixed", name="MixedService")
+ at Management(MixedServiceManagement.class)
+public class MixedServiceBean implements MixedServiceRemote, MixedServiceManagement
+{
+
+   @Interceptors({MixedMethodInterceptor.class})
+   public void managementMethod()
+   {
+   }
+
+   @Interceptors({MixedMethodInterceptor.class})
+   public void defaultMethod()
+   {
+   }
+
+   public void remoteMethod()
+   {
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface MixedServiceManagement
-{
-   void managementMethod();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface MixedServiceManagement
+{
+   void managementMethod();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface MixedServiceRemote
-{
-   void defaultMethod();
-   
-   void remoteMethod();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MixedServiceRemote
+{
+   void defaultMethod();
+   
+   void remoteMethod();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.ejb.Stateless;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
- at ExcludeDefaultInterceptors
-public class NoInterceptorsSLSB implements NoInterceptorsSLSBRemote
-{
-   public void test()
-   {
-      System.out.println("NoInterceptorsSLSB.test()");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.ejb.Stateless;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at ExcludeDefaultInterceptors
+public class NoInterceptorsSLSB implements NoInterceptorsSLSBRemote
+{
+   public void test()
+   {
+      System.out.println("NoInterceptorsSLSB.test()");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface NoInterceptorsSLSBRemote
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface NoInterceptorsSLSBRemote
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/NoInterceptorsSLSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.Interceptors;
-import javax.ejb.Stateless;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Interceptors({AnnotatedClassInterceptor3.class, XMLClassInterceptor3.class})
- at Stateless(name="OrderedSLSB")
-public class OrderedSLSB implements OrderedSLSBRemote
-{
-
-   public void methodWithClassLevel()
-   {
-      
-   }
-
-   @ExcludeClassInterceptors
-   @ExcludeDefaultInterceptors
-   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class})
-   public void methodWithOwn(String s, int i)
-   {
-      
-   }
-   
-   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class, MixedMethodInterceptor.class})
-   public void overLoadedMethod(String s)
-   {
-      
-   }
-   
-   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class, MixedMethodInterceptor.class})
-   public void overLoadedMethod(long l)
-   {
-      
-   }
-   
-   @ExcludeClassInterceptors
-   @Interceptors({MixedMethodInterceptor.class})
-   public void overLoadedMethod()
-   {
-      
-   }
-   
-   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class, MixedMethodInterceptor.class})
-   public void methodNotSpecifyingAll()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.ExcludeClassInterceptors;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.Interceptors;
+import javax.ejb.Stateless;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Interceptors({AnnotatedClassInterceptor3.class, XMLClassInterceptor3.class})
+ at Stateless(name="OrderedSLSB")
+public class OrderedSLSB implements OrderedSLSBRemote
+{
+
+   public void methodWithClassLevel()
+   {
+      
+   }
+
+   @ExcludeClassInterceptors
+   @ExcludeDefaultInterceptors
+   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class})
+   public void methodWithOwn(String s, int i)
+   {
+      
+   }
+   
+   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class, MixedMethodInterceptor.class})
+   public void overLoadedMethod(String s)
+   {
+      
+   }
+   
+   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class, MixedMethodInterceptor.class})
+   public void overLoadedMethod(long l)
+   {
+      
+   }
+   
+   @ExcludeClassInterceptors
+   @Interceptors({MixedMethodInterceptor.class})
+   public void overLoadedMethod()
+   {
+      
+   }
+   
+   @Interceptors({AnnotatedMethodInterceptor.class, XMLMethodInterceptor.class, MixedMethodInterceptor.class})
+   public void methodNotSpecifyingAll()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface OrderedSLSBRemote
-{
-   void methodWithClassLevel();
-
-   void methodWithOwn(String s, int i);
-   
-   void overLoadedMethod(String s);
-   
-   void overLoadedMethod(long l);
-   
-   void overLoadedMethod();
-   
-   void methodNotSpecifyingAll();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface OrderedSLSBRemote
+{
+   void methodWithClassLevel();
+
+   void methodWithOwn(String s, int i);
+   
+   void overLoadedMethod(String s);
+   
+   void overLoadedMethod(long l);
+   
+   void overLoadedMethod();
+   
+   void methodNotSpecifyingAll();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/OrderedSLSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import java.util.ArrayList;
-
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Service
- at ExcludeDefaultInterceptors
-public class StatusBean implements StatusRemote
-{
-   static ArrayList<Interception> interceptions = new ArrayList<Interception>();
-   static ArrayList<Interception> postConstructs = new ArrayList<Interception>();
-   static ArrayList<Interception> postActivates = new ArrayList<Interception>();
-   static ArrayList<Interception> prePassivates = new ArrayList<Interception>();
-   static ArrayList<Interception> preDestroys = new ArrayList<Interception>();
-   
-   public void clear()
-   {
-      System.out.println("Clearing interceptions");
-      interceptions.clear();
-      postConstructs.clear();
-      postActivates.clear();
-      prePassivates.clear();
-      preDestroys.clear();
-   }
-   
-   public ArrayList<Interception> getInterceptions()
-   {
-      System.out.println("Getting interceptions " + interceptions.size());
-      return interceptions;
-   }
-   
-   
-   public ArrayList<Interception> getPostActivates()
-   {
-      return postActivates;
-   }
-
-   public ArrayList<Interception> getPostConstructs()
-   {
-      return postConstructs;
-   }
-
-   public ArrayList<Interception> getPreDestroys()
-   {
-      return preDestroys;
-   }
-
-   public ArrayList<Interception> getPrePassivates()
-   {
-      return prePassivates;
-   }
-
-   public void addInterception(Interception intercepted)
-   {
-      interceptions.add(intercepted);
-      System.out.println("Adding interception (" + interceptions.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
-   }
-   
-   public static void addInterceptionStatic(Interception intercepted)
-   {
-      interceptions.add(intercepted);
-      System.out.println("Adding interception (" + interceptions.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod()  + " - " + intercepted.getInstance());
-   }
-   
-   public void addLifecycle(Class type, Interception intercepted)
-   {
-      if (type == PostConstruct.class)
-      {
-         addPostConstruct(intercepted);
-      }
-      else if (type == PostActivate.class)
-      {
-         addPostActivate(intercepted);
-      }
-      else if (type == PrePassivate.class)
-      {
-         addPrePassivate(intercepted);
-      }
-      else if (type == PreDestroy.class)
-      {
-         addPreDestroy(intercepted);
-      }
-   }
-   
-   public static void addPostConstruct(Interception intercepted)
-   {
-      postConstructs.add(intercepted);
-      System.out.println("Adding PostConstruct (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
-   }
-
-   public static void addPostActivate(Interception intercepted)
-   {
-      postActivates.add(intercepted);
-      System.out.println("Adding PostActivate (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
-   }
-
-   public static void addPrePassivate(Interception intercepted)
-   {
-      prePassivates.add(intercepted);
-      System.out.println("Adding PrePassivate (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
-   }
-
-   public static void addPreDestroy(Interception intercepted)
-   {
-      preDestroys.add(intercepted);
-      System.out.println("Adding PreDestroy (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
-   }
-
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import java.util.ArrayList;
+
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Service
+ at ExcludeDefaultInterceptors
+public class StatusBean implements StatusRemote
+{
+   static ArrayList<Interception> interceptions = new ArrayList<Interception>();
+   static ArrayList<Interception> postConstructs = new ArrayList<Interception>();
+   static ArrayList<Interception> postActivates = new ArrayList<Interception>();
+   static ArrayList<Interception> prePassivates = new ArrayList<Interception>();
+   static ArrayList<Interception> preDestroys = new ArrayList<Interception>();
+   
+   public void clear()
+   {
+      System.out.println("Clearing interceptions");
+      interceptions.clear();
+      postConstructs.clear();
+      postActivates.clear();
+      prePassivates.clear();
+      preDestroys.clear();
+   }
+   
+   public ArrayList<Interception> getInterceptions()
+   {
+      System.out.println("Getting interceptions " + interceptions.size());
+      return interceptions;
+   }
+   
+   
+   public ArrayList<Interception> getPostActivates()
+   {
+      return postActivates;
+   }
+
+   public ArrayList<Interception> getPostConstructs()
+   {
+      return postConstructs;
+   }
+
+   public ArrayList<Interception> getPreDestroys()
+   {
+      return preDestroys;
+   }
+
+   public ArrayList<Interception> getPrePassivates()
+   {
+      return prePassivates;
+   }
+
+   public void addInterception(Interception intercepted)
+   {
+      interceptions.add(intercepted);
+      System.out.println("Adding interception (" + interceptions.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
+   }
+   
+   public static void addInterceptionStatic(Interception intercepted)
+   {
+      interceptions.add(intercepted);
+      System.out.println("Adding interception (" + interceptions.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod()  + " - " + intercepted.getInstance());
+   }
+   
+   public void addLifecycle(Class type, Interception intercepted)
+   {
+      if (type == PostConstruct.class)
+      {
+         addPostConstruct(intercepted);
+      }
+      else if (type == PostActivate.class)
+      {
+         addPostActivate(intercepted);
+      }
+      else if (type == PrePassivate.class)
+      {
+         addPrePassivate(intercepted);
+      }
+      else if (type == PreDestroy.class)
+      {
+         addPreDestroy(intercepted);
+      }
+   }
+   
+   public static void addPostConstruct(Interception intercepted)
+   {
+      postConstructs.add(intercepted);
+      System.out.println("Adding PostConstruct (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
+   }
+
+   public static void addPostActivate(Interception intercepted)
+   {
+      postActivates.add(intercepted);
+      System.out.println("Adding PostActivate (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
+   }
+
+   public static void addPrePassivate(Interception intercepted)
+   {
+      prePassivates.add(intercepted);
+      System.out.println("Adding PrePassivate (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
+   }
+
+   public static void addPreDestroy(Interception intercepted)
+   {
+      preDestroys.add(intercepted);
+      System.out.println("Adding PreDestroy (" + postConstructs.size() + ")" + intercepted.getClassname() + "." + intercepted.getMethod() + " - " + intercepted.getInstance());
+   }
+
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import java.util.ArrayList;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface StatusRemote
-{
-   void clear();
-
-   ArrayList<Interception> getInterceptions();
-   
-   void addInterception(Interception intercepted);
-
-   void addLifecycle(Class type, Interception intercepted);
-   
-   public ArrayList<Interception> getPostActivates();
-
-   public ArrayList<Interception> getPostConstructs();
-
-   public ArrayList<Interception> getPreDestroys();
-
-   public ArrayList<Interception> getPrePassivates();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import java.util.ArrayList;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatusRemote
+{
+   void clear();
+
+   ArrayList<Interception> getInterceptions();
+   
+   void addInterception(Interception intercepted);
+
+   void addLifecycle(Class type, Interception intercepted);
+   
+   public ArrayList<Interception> getPostActivates();
+
+   public ArrayList<Interception> getPostConstructs();
+
+   public ArrayList<Interception> getPreDestroys();
+
+   public ArrayList<Interception> getPrePassivates();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,146 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.interceptor.InvocationContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class XMLClassInterceptor extends XMLClassInterceptor2
-{
-   @Resource
-   EJBContext ejbCtx;
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = findStatusRemote();
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-
-
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("XMLClassInterceptor intercepting!");
-  //    StatusRemote status = (StatusRemote)ejbCtx.lookup("StatusBean/remote");
-      StatusRemote status = (StatusRemote)new InitialContext().lookup("StatusBean/remote");
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-   public void postConstruct(InvocationContext ctx)
-   {
-      System.out.println("XMLClassInterceptor pc!");
-      StatusBean.addPostConstruct(new Interception(this, "postConstruct", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void postActivate(InvocationContext ctx)
-   {
-      System.out.println("XMLClassInterceptor pa!");
-      StatusBean.addPostActivate(new Interception(this, "postActivate", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void prePassivate(InvocationContext ctx)
-   {
-      System.out.println("XMLClassInterceptor pp!");
-      StatusBean.addPrePassivate(new Interception(this, "prePassivate", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void preDestroy(InvocationContext ctx)
-   {
-      System.out.println("XMLClassInterceptor pd!");
-      StatusBean.addPreDestroy(new Interception(this, "preDestroy", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public Object intercept2(InvocationContext ctx) throws Exception
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void postConstruct2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void postActivate2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void prePassivate2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-   public void preDestroy2(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should not be called");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBContext;
+import javax.interceptor.InvocationContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class XMLClassInterceptor extends XMLClassInterceptor2
+{
+   @Resource
+   EJBContext ejbCtx;
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = findStatusRemote();
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+
+
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("XMLClassInterceptor intercepting!");
+  //    StatusRemote status = (StatusRemote)ejbCtx.lookup("StatusBean/remote");
+      StatusRemote status = (StatusRemote)new InitialContext().lookup("StatusBean/remote");
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+   public void postConstruct(InvocationContext ctx)
+   {
+      System.out.println("XMLClassInterceptor pc!");
+      StatusBean.addPostConstruct(new Interception(this, "postConstruct", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void postActivate(InvocationContext ctx)
+   {
+      System.out.println("XMLClassInterceptor pa!");
+      StatusBean.addPostActivate(new Interception(this, "postActivate", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void prePassivate(InvocationContext ctx)
+   {
+      System.out.println("XMLClassInterceptor pp!");
+      StatusBean.addPrePassivate(new Interception(this, "prePassivate", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void preDestroy(InvocationContext ctx)
+   {
+      System.out.println("XMLClassInterceptor pd!");
+      StatusBean.addPreDestroy(new Interception(this, "preDestroy", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public Object intercept2(InvocationContext ctx) throws Exception
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void postConstruct2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void postActivate2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void prePassivate2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+   public void preDestroy2(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should not be called");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class XMLClassInterceptor2 extends XMLClassInterceptor3
-{
-   public Object intercept2(InvocationContext ctx) throws Exception
-   {
-      StatusBean.addInterceptionStatic(new Interception(this, "intercept2"));
-      return ctx.proceed();
-   }
-
-   public void postConstruct2(InvocationContext ctx)
-   {
-      StatusBean.addPostConstruct(new Interception(this, "postConstruct2", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void postActivate2(InvocationContext ctx)
-   {
-      StatusBean.addPostActivate(new Interception(this, "postActivate2", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void prePassivate2(InvocationContext ctx)
-   {
-      StatusBean.addPrePassivate(new Interception(this, "prePassivate2", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void preDestroy2(InvocationContext ctx)
-   {
-      System.out.println("XMLClassInterceptor pd!");
-      StatusBean.addPreDestroy(new Interception(this, "preDestroy2", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class XMLClassInterceptor2 extends XMLClassInterceptor3
+{
+   public Object intercept2(InvocationContext ctx) throws Exception
+   {
+      StatusBean.addInterceptionStatic(new Interception(this, "intercept2"));
+      return ctx.proceed();
+   }
+
+   public void postConstruct2(InvocationContext ctx)
+   {
+      StatusBean.addPostConstruct(new Interception(this, "postConstruct2", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void postActivate2(InvocationContext ctx)
+   {
+      StatusBean.addPostActivate(new Interception(this, "postActivate2", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void prePassivate2(InvocationContext ctx)
+   {
+      StatusBean.addPrePassivate(new Interception(this, "prePassivate2", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void preDestroy2(InvocationContext ctx)
+   {
+      System.out.println("XMLClassInterceptor pd!");
+      StatusBean.addPreDestroy(new Interception(this, "preDestroy2", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class XMLClassInterceptor3
-{
-   static int currentInstance;
-   int instance = ++currentInstance;
-
-   public Object intercept3(InvocationContext ctx) throws Exception
-   {
-      StatusBean.addInterceptionStatic(new Interception(this, "intercept3"));
-      return ctx.proceed();
-   }
-
-   public void postConstruct3(InvocationContext ctx)
-   {
-      StatusBean.addPostConstruct(new Interception(this, "postConstruct3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void postActivate3(InvocationContext ctx)
-   {
-      StatusBean.addPostActivate(new Interception(this, "postActivate3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void prePassivate3(InvocationContext ctx)
-   {
-      StatusBean.addPrePassivate(new Interception(this, "prePassivate3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void preDestroy3(InvocationContext ctx)
-   {
-      System.out.println("XMLClassInterceptor pd!");
-      StatusBean.addPreDestroy(new Interception(this, "preDestroy3", instance));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class XMLClassInterceptor3
+{
+   static int currentInstance;
+   int instance = ++currentInstance;
+
+   public Object intercept3(InvocationContext ctx) throws Exception
+   {
+      StatusBean.addInterceptionStatic(new Interception(this, "intercept3"));
+      return ctx.proceed();
+   }
+
+   public void postConstruct3(InvocationContext ctx)
+   {
+      StatusBean.addPostConstruct(new Interception(this, "postConstruct3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void postActivate3(InvocationContext ctx)
+   {
+      StatusBean.addPostActivate(new Interception(this, "postActivate3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void prePassivate3(InvocationContext ctx)
+   {
+      StatusBean.addPrePassivate(new Interception(this, "prePassivate3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void preDestroy3(InvocationContext ctx)
+   {
+      System.out.println("XMLClassInterceptor pd!");
+      StatusBean.addPreDestroy(new Interception(this, "preDestroy3", instance));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLClassInterceptor3.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PostActivate;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.PrePassivate;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class XMLMethodInterceptor
-{
-   @Resource
-   EJBContext ejbCtx;
-
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("XMLMethodInterceptor intercepting!");
-      StatusRemote status = findStatusRemote();
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-   private StatusRemote findStatusRemote()
-   {
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-         return status;
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void ignored(InvocationContext ctx)
-   {
-      throw new RuntimeException("Should be ignored!!!");
-   }
-
-   public void postConstruct(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void postActivate(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void prePassivate(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-   public void preDestroy(InvocationContext ctx)
-   {
-      StatusRemote status = findStatusRemote();
-      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy"));
-      try
-      {
-         ctx.proceed();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBContext;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PostActivate;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PrePassivate;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class XMLMethodInterceptor
+{
+   @Resource
+   EJBContext ejbCtx;
+
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("XMLMethodInterceptor intercepting!");
+      StatusRemote status = findStatusRemote();
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+   private StatusRemote findStatusRemote()
+   {
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+         return status;
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void ignored(InvocationContext ctx)
+   {
+      throw new RuntimeException("Should be ignored!!!");
+   }
+
+   public void postConstruct(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PostConstruct.class, new Interception(this, "postConstruct"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void postActivate(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PostActivate.class, new Interception(this, "postActivate"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void prePassivate(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PrePassivate.class, new Interception(this, "prePassivate"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public void preDestroy(InvocationContext ctx)
+   {
+      StatusRemote status = findStatusRemote();
+      status.addLifecycle(PreDestroy.class, new Interception(this, "preDestroy"));
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLMethodInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.interceptor.InvocationContext;
-import org.jboss.logging.Logger;
-
-import javax.naming.InitialContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class XMLOnlySLSB implements XMLOnlySLSBRemote
-{
-   private static final Logger log = Logger.getLogger(XMLOnlySLSB.class);
-   
-   @Resource
-   EJBContext ejbCtx;
-
-   public void methodWithClassLevel()
-   {
-      System.out.println("XMLOnlySLSB.methodWithClassLevel");
-   }
-
-   public void overloadedMethod(long l)
-   {
-      System.out.println("XMLOnlySLSB.overloadedMethod WithClassLevelExcludingDefault");
-   }
-
-   public void overloadedMethod(long l, String[][] s)
-   {
-      System.out.println("overloadedMethod (WithOwnInterceptors)");
-   }
-
-   public void overloadedMethod(int i)
-   {
-      System.out.println("overloadedMethod (WithOwnInterceptorsExcludeClass)");
-   }
-
-   public void overloadedMethod()
-   {
-      System.out.println("overloadedMethod (WithOwnInterceptorsExcludeClassAndDefault)");
-   }
-
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("XMLOnlySLSB intercepting!");
-      //TODO ejbCtx injection
- //     StatusRemote status = (StatusRemote)ejbCtx.lookup("StatusBean/remote");
-      StatusRemote status = (StatusRemote)new InitialContext().lookup("StatusBean/remote");
-      status.addInterception(new Interception(this, "intercept"));
-      return ctx.proceed();
-   }
-
-   void postConstruct()
-   {
-      System.out.println("XMLOnlySLSB postConstruct");
-      StatusBean.addPostConstruct(new Interception(this, "postConstruct"));
-   }
-
-   void preDestroy()
-   {
-      System.out.println("XMLOnlySLSB preDestroy!");
-      StatusBean.addPreDestroy(new Interception(this, "preDestroy"));
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBContext;
+import javax.interceptor.InvocationContext;
+import org.jboss.logging.Logger;
+
+import javax.naming.InitialContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class XMLOnlySLSB implements XMLOnlySLSBRemote
+{
+   private static final Logger log = Logger.getLogger(XMLOnlySLSB.class);
+   
+   @Resource
+   EJBContext ejbCtx;
+
+   public void methodWithClassLevel()
+   {
+      System.out.println("XMLOnlySLSB.methodWithClassLevel");
+   }
+
+   public void overloadedMethod(long l)
+   {
+      System.out.println("XMLOnlySLSB.overloadedMethod WithClassLevelExcludingDefault");
+   }
+
+   public void overloadedMethod(long l, String[][] s)
+   {
+      System.out.println("overloadedMethod (WithOwnInterceptors)");
+   }
+
+   public void overloadedMethod(int i)
+   {
+      System.out.println("overloadedMethod (WithOwnInterceptorsExcludeClass)");
+   }
+
+   public void overloadedMethod()
+   {
+      System.out.println("overloadedMethod (WithOwnInterceptorsExcludeClassAndDefault)");
+   }
+
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("XMLOnlySLSB intercepting!");
+      //TODO ejbCtx injection
+ //     StatusRemote status = (StatusRemote)ejbCtx.lookup("StatusBean/remote");
+      StatusRemote status = (StatusRemote)new InitialContext().lookup("StatusBean/remote");
+      status.addInterception(new Interception(this, "intercept"));
+      return ctx.proceed();
+   }
+
+   void postConstruct()
+   {
+      System.out.println("XMLOnlySLSB postConstruct");
+      StatusBean.addPostConstruct(new Interception(this, "postConstruct"));
+   }
+
+   void preDestroy()
+   {
+      System.out.println("XMLOnlySLSB preDestroy!");
+      StatusBean.addPreDestroy(new Interception(this, "preDestroy"));
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors2;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public interface XMLOnlySLSBRemote
-{
-   void methodWithClassLevel();
-   
-   void overloadedMethod(long l);
-   
-   void overloadedMethod(long l, String s[][]);
-   
-   void overloadedMethod(int i);
-   
-   void overloadedMethod();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface XMLOnlySLSBRemote
+{
+   void methodWithClassLevel();
+   
+   void overloadedMethod(long l);
+   
+   void overloadedMethod(long l, String s[][]);
+   
+   void overloadedMethod(int i);
+   
+   void overloadedMethod();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/XMLOnlySLSBRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,773 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.interceptors2.unit;
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.mdb.ProducerManager;
-import org.jboss.ejb3.mdb.ProducerObject;
-import org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3;
-import org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor4;
-import org.jboss.ejb3.test.interceptors2.AnnotatedOnlySLSB;
-import org.jboss.ejb3.test.interceptors2.AnnotatedOnlySLSBRemote;
-import org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor;
-import org.jboss.ejb3.test.interceptors2.DefaultInterceptor;
-import org.jboss.ejb3.test.interceptors2.DefaultOnlyProducer;
-import org.jboss.ejb3.test.interceptors2.DefaultOnlySLSBRemote;
-import org.jboss.ejb3.test.interceptors2.DefaultOnlyServiceRemote;
-import org.jboss.ejb3.test.interceptors2.InheritingSFSB;
-import org.jboss.ejb3.test.interceptors2.InheritingSFSBRemote;
-import org.jboss.ejb3.test.interceptors2.Interception;
-import org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor;
-import org.jboss.ejb3.test.interceptors2.MethodOnlyInterceptedSLSBRemote;
-import org.jboss.ejb3.test.interceptors2.MixedClassInterceptor;
-import org.jboss.ejb3.test.interceptors2.MixedConfigSFSB;
-import org.jboss.ejb3.test.interceptors2.MixedConfigSFSBRemote;
-import org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor;
-import org.jboss.ejb3.test.interceptors2.MixedProducer;
-import org.jboss.ejb3.test.interceptors2.MixedServiceRemote;
-import org.jboss.ejb3.test.interceptors2.NoInterceptorsSLSBRemote;
-import org.jboss.ejb3.test.interceptors2.OrderedSLSBRemote;
-import org.jboss.ejb3.test.interceptors2.StatusRemote;
-import org.jboss.ejb3.test.interceptors2.XMLClassInterceptor;
-import org.jboss.ejb3.test.interceptors2.XMLClassInterceptor2;
-import org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3;
-import org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor;
-import org.jboss.ejb3.test.interceptors2.XMLOnlySLSB;
-import org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote;
-import org.jboss.test.JBossTestCase;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class InterceptorsTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   public InterceptorsTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testAnnotatedOnlySLSB() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      AnnotatedOnlySLSBRemote slsb = (AnnotatedOnlySLSBRemote)ctx.lookup("AnnotatedOnlySLSB/remote");
-      
-      status.clear();
-      slsb.methodWithClassLevel();
-      ArrayList<Interception> interceptions = status.getInterceptions();
-      ArrayList<Interception> postConstructs = status.getPostConstructs();
-      compare(new Interception[] {
-            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
-            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
-            new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, true, false, false, false);
-      compareLifecycle(new Interception[] {
-            new Interception(AnnotatedClassInterceptor.class, "postConstruct3"),
-            new Interception(AnnotatedClassInterceptor.class, "postConstruct"),
-            new Interception(AnnotatedMethodInterceptor.class, "postConstruct"),
-            new Interception(AnnotatedOnlySLSB.class, "postConstruct")}, postConstructs);
-      
-
-      status.clear();
-      slsb.methodExcludingClassInterceptors();
-      interceptions = status.getInterceptions();
-      compare(new Interception[] {new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, false, false, false, false);
-      
-      status.clear();
-      slsb.methodWithOwnInterceptors();
-      interceptions = status.getInterceptions();
-      compare(new Interception[] {
-            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
-            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
-            new Interception(AnnotatedMethodInterceptor.class, "intercept4"), 
-            new Interception(AnnotatedMethodInterceptor.class, "intercept2"), 
-            new Interception(AnnotatedMethodInterceptor.class, "intercept"), 
-            new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, false, false, false, false);
-      
-      status.clear();
-      slsb.methodWithOwnInterceptorsExcludeClass();
-      interceptions = status.getInterceptions();
-      compare(new Interception[] {
-            new Interception(AnnotatedMethodInterceptor.class, "intercept4"), 
-            new Interception(AnnotatedMethodInterceptor.class, "intercept2"), 
-            new Interception(AnnotatedMethodInterceptor.class, "intercept"), 
-            new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, false, false, false, false);
-      
-   }
-
-   public void testXmlOnlySLSB() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      XMLOnlySLSBRemote slsb = (XMLOnlySLSBRemote)ctx.lookup("org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote");
-      
-      status.clear();
-      slsb.methodWithClassLevel();
-      ArrayList<Interception> interceptions = status.getInterceptions();
-      ArrayList<Interception> postConstructs = status.getPostConstructs();
-      compare(new Interception[] {
-            new Interception(DefaultInterceptor.class, "intercept"), 
-            new Interception(XMLClassInterceptor2.class, "intercept3"), 
-            new Interception(XMLClassInterceptor2.class, "intercept2"), 
-            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, true, false, false, false);
-      compareLifecycle(new Interception[] {
-            new Interception(DefaultInterceptor.class, "postConstruct"),
-            new Interception(XMLClassInterceptor2.class, "postConstruct3"),
-            new Interception(XMLClassInterceptor2.class, "postConstruct2"),
-            new Interception(XMLMethodInterceptor.class, "postConstruct"),
-            new Interception(XMLOnlySLSB.class, "postConstruct")}, postConstructs);
-      
-      status.clear();
-      long l = 10;
-      slsb.overloadedMethod(l);
-      interceptions = status.getInterceptions();
-      compare(new Interception[] {
-            new Interception(XMLClassInterceptor2.class, "intercept3"), 
-            new Interception(XMLClassInterceptor2.class, "intercept2"), 
-            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, false, false, false, false);
-
-      status.clear();
-      slsb.overloadedMethod(l, new String[][] {{"Hello"}, {"Whatever"}});
-      interceptions = status.getInterceptions();
-      compare(new Interception[] {
-            new Interception(DefaultInterceptor.class, "intercept"),
-            new Interception(XMLClassInterceptor2.class, "intercept3"),
-            new Interception(XMLClassInterceptor2.class, "intercept2"),
-            new Interception(XMLMethodInterceptor.class, "intercept"), 
-            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, false, false, false, false);
-      
-      status.clear();
-      int i = 5;
-      slsb.overloadedMethod(i);
-      interceptions = status.getInterceptions();
-      compare(new Interception[] {
-            new Interception(DefaultInterceptor.class, "intercept"),
-            new Interception(XMLMethodInterceptor.class, "intercept"),
-            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
-      checkLifecycle(status, false, false, false, false);
-      
-      status.clear();
-      slsb.overloadedMethod();
-      interceptions = status.getInterceptions();
-      compare(new Interception[] {
-            new Interception(XMLMethodInterceptor.class, "intercept"),
-            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
-   }
-   
-   public void testDefaultOnlySLSB() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      DefaultOnlySLSBRemote slsb = (DefaultOnlySLSBRemote)ctx.lookup("DefaultOnlySLSB/remote");
-      
-      status.clear();
-      slsb.test();
-      ArrayList<Interception> interceptions = status.getInterceptions();
-      compare(new Interception[] {new Interception(DefaultInterceptor.class, "intercept")}, interceptions);
-      checkLifecycle(status, true, false, false, false);
-      compareLifecycle(new Interception[] {new Interception(DefaultInterceptor.class, "postConstruct")}, status.getPostConstructs());
-   }
-   
-   public void testNoInterceptorsSLSB() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      NoInterceptorsSLSBRemote slsb = (NoInterceptorsSLSBRemote)ctx.lookup("NoInterceptorsSLSB/remote");
-      
-      status.clear();
-      slsb.test();
-      ArrayList<Interception> interceptions = status.getInterceptions();
-      compare(new Interception[0], interceptions);
-      checkLifecycle(status, false, false, false, false);
-   }
-
-   public void testMixedConfigSFSB() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      
-      MixedConfigSFSBRemote sfsb1 = (MixedConfigSFSBRemote)ctx.lookup("MixedConfigSFSB/remote");
-      MixedConfigSFSBRemote sfsb2 = (MixedConfigSFSBRemote)ctx.lookup("MixedConfigSFSB/remote");
-      
-      final Interception[] expectedTestInterceptions =
-         new Interception[] {
-            new Interception(DefaultInterceptor.class, "intercept"),
-            new Interception(MixedClassInterceptor.class, "intercept"),
-            new Interception(XMLClassInterceptor.class, "intercept3"),
-            new Interception(XMLClassInterceptor.class, "intercept"),
-            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
-            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
-            new Interception(MixedConfigSFSB.class, "intercept")};
-      
-      final Interception[] expectedTestWithMethodLevelInterceptions =
-         new Interception[] {
-            new Interception(DefaultInterceptor.class, "intercept"),
-            new Interception(MixedClassInterceptor.class, "intercept"),
-            new Interception(XMLClassInterceptor.class, "intercept3"),
-            new Interception(XMLClassInterceptor.class, "intercept"),
-            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
-            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
-            new Interception(MixedMethodInterceptor.class, "intercept"),
-            new Interception(XMLMethodInterceptor.class, "intercept"),
-            new Interception(AnnotatedMethodInterceptor.class, "intercept4"), 
-            new Interception(AnnotatedMethodInterceptor.class, "intercept2"), 
-            new Interception(AnnotatedMethodInterceptor.class, "intercept"),
-            new Interception(MixedConfigSFSB.class, "intercept")};
-      
-      final Interception[] expectedPostConstructInterceptors =
-         new Interception[] {
-            new Interception(DefaultInterceptor.class, "postConstruct"),
-            new Interception(XMLClassInterceptor.class, "postConstruct3"),
-            new Interception(XMLClassInterceptor.class, "postConstruct"),
-            new Interception(AnnotatedClassInterceptor.class, "postConstruct3"),
-            new Interception(AnnotatedClassInterceptor.class, "postConstruct"),
-            new Interception(XMLMethodInterceptor.class, "postConstruct"),
-            new Interception(AnnotatedMethodInterceptor.class, "postConstruct")};
-      
-      final Interception[] expectedPostActivateInterceptors =
-         new Interception[] {
-            new Interception(DefaultInterceptor.class, "postActivate"),
-            new Interception(XMLClassInterceptor.class, "postActivate3"),
-            new Interception(XMLClassInterceptor.class, "postActivate"),
-            new Interception(AnnotatedClassInterceptor.class, "postActivate3"),
-            new Interception(AnnotatedClassInterceptor.class, "postActivate"),
-            new Interception(XMLMethodInterceptor.class, "postActivate"),
-            new Interception(AnnotatedMethodInterceptor.class, "postActivate")};
-      
-      final Interception[] expectedPrePassivateInterceptors =
-         new Interception[] {
-            new Interception(DefaultInterceptor.class, "prePassivate"),
-            new Interception(XMLClassInterceptor.class, "prePassivate3"),
-            new Interception(XMLClassInterceptor.class, "prePassivate"),
-            new Interception(AnnotatedClassInterceptor.class, "prePassivate3"),
-            new Interception(AnnotatedClassInterceptor.class, "prePassivate"),
-            new Interception(XMLMethodInterceptor.class, "prePassivate"),
-            new Interception(AnnotatedMethodInterceptor.class, "prePassivate")};
-      
-      final Interception[] expectedPreDestroyInterceptors =
-         new Interception[] {
-            new Interception(DefaultInterceptor.class, "preDestroy"),
-            new Interception(XMLClassInterceptor.class, "preDestroy3"),
-            new Interception(XMLClassInterceptor.class, "preDestroy"),
-            new Interception(AnnotatedClassInterceptor.class, "preDestroy3"),
-            new Interception(AnnotatedClassInterceptor.class, "preDestroy"),
-            new Interception(XMLMethodInterceptor.class, "preDestroy"),
-            new Interception(AnnotatedMethodInterceptor.class, "preDestroy")};
-      
-      status.clear();
-      sfsb1.test();
-      ArrayList<Interception> bean1test = status.getInterceptions();
-      ArrayList<Interception> bean1pc = status.getPostConstructs();
-      compare(expectedTestInterceptions, bean1test);
-      checkLifecycle(status, true, false, false, false);
-      compareLifecycle(expectedPostConstructInterceptors, bean1pc);
-      
-      status.clear();
-      sfsb1.testWithMethodLevel();
-      ArrayList<Interception> bean1testml = status.getInterceptions();
-      compare(expectedTestWithMethodLevelInterceptions, bean1testml);
-      checkLifecycle(status, false, false, false, false);
-      
-      //Cache size is 1, so sfsb1 should get passivated and sfsb2 constructed
-      status.clear();
-      sfsb2.test();
-      ArrayList<Interception> bean2test = status.getInterceptions(); 
-      ArrayList<Interception> bean2pc = status.getPostConstructs(); 
-      ArrayList<Interception> bean2pp = status.getPrePassivates(); 
-      compare(expectedTestInterceptions, bean2test);
-      checkLifecycle(status, true, false, true, false);
-      compareLifecycle(expectedPostConstructInterceptors, bean2pc);
-      compareLifecycle(expectedPrePassivateInterceptors, bean2pp);
-      
-      status.clear();
-      sfsb2.testWithMethodLevel();
-      ArrayList<Interception> bean2testml = status.getInterceptions();
-      compare(expectedTestWithMethodLevelInterceptions, bean2testml);
-      checkLifecycle(status, false, false, false, false);
-      
-      status.clear();
-      sfsb2.testWithMethodLevelB();
-      ArrayList<Interception> bean2testmlb = status.getInterceptions();
-      compare(expectedTestWithMethodLevelInterceptions, bean2testmlb);
-      checkLifecycle(status, false, false, false, false);
-      
-      //Cache size is 1, so sfsb2 should get passivated and sfsb1 activated
-      status.clear();
-      sfsb1.test();
-      ArrayList<Interception> bean1test_2 = status.getInterceptions();
-      ArrayList<Interception> bean1pp_2 = status.getPrePassivates();
-      ArrayList<Interception> bean1pa_2 = status.getPostActivates();
-      compare(expectedTestInterceptions, bean1test_2);
-      checkLifecycle(status, false, true, true, false);
-      compareLifecycle(expectedPrePassivateInterceptors, bean1pp_2);
-      compareLifecycle(expectedPostActivateInterceptors, bean1pa_2);
-      
-      status.clear();
-      sfsb1.testWithMethodLevel();
-      ArrayList<Interception> bean1testml_2 = status.getInterceptions();
-      compare(expectedTestWithMethodLevelInterceptions, bean1testml_2);
-      checkLifecycle(status, false, false, false, false);
-      
-      status.clear();
-      sfsb1.testWithMethodLevelB();
-      ArrayList<Interception> bean1testmlb_2 = status.getInterceptions();
-      compare(expectedTestWithMethodLevelInterceptions, bean1testmlb_2);
-      checkLifecycle(status, false, false, false, false);
-      
-      //interceptor instances used for bean 1 should all be the same, and different from those for bean 2
-      //Need to check that we can remove
-      status.clear();
-      sfsb1.kill();
-      ArrayList<Interception> preDestroys = status.getPreDestroys();
-      checkLifecycle(status, false, false, false, true);
-      compareLifecycle(expectedPreDestroyInterceptors, preDestroys);
-
-      checkInstances(bean1test, bean1test_2, true);
-      checkInstances(bean1testml, bean1testml_2, true);
-      checkInstances(bean1testml, bean1testmlb_2, true);
-      checkInstances(bean2testml, bean2testmlb, true);
-      checkInstances(bean1test, bean2test, false);
-      checkInstances(bean1testml, bean2testml, false);
-      
-      
-      
-   }
-   
-   public void testBeanHierarchy() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      InheritingSFSBRemote bean1 = (InheritingSFSBRemote)ctx.lookup("InheritingSFSB/remote");
-      InheritingSFSBRemote bean2 = (InheritingSFSBRemote)ctx.lookup("InheritingSFSB/remote");
-      
-      status.clear();
-      bean1.method();
-      ArrayList<Interception> interceptions = status.getInterceptions();
-      ArrayList<Interception> postConstructs = status.getPostConstructs();
-      checkLifecycle(status, true, false, false, false);
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept"),
-                  new Interception(InheritingSFSB.class, "intercept3"),
-                  new Interception(InheritingSFSB.class, "intercept")}, interceptions);
-      compareLifecycle(            
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "postConstruct"),
-                  new Interception(InheritingSFSB.class, "postConstruct3"),
-                  new Interception(InheritingSFSB.class, "postConstruct")}, postConstructs);
-
-      status.clear();
-      bean2.methodNoDefault();
-      interceptions = status.getInterceptions();
-      postConstructs = status.getPostConstructs();
-      ArrayList<Interception> prePassivates = status.getPrePassivates();
-      checkLifecycle(status, true, false, true, false);
-      compare(
-            new Interception[] {
-                  new Interception(InheritingSFSB.class, "intercept3"),
-                  new Interception(InheritingSFSB.class, "intercept")}, interceptions);
-      compareLifecycle(            
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "postConstruct"),
-                  new Interception(InheritingSFSB.class, "postConstruct3"),
-                  new Interception(InheritingSFSB.class, "postConstruct")}, postConstructs);
-      compareLifecycle(            
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "prePassivate"),
-                  new Interception(InheritingSFSB.class, "prePassivate3"),
-                  new Interception(InheritingSFSB.class, "prePassivate")}, prePassivates);
-      
-      status.clear();
-      bean1.methodNoDefault();
-      interceptions = status.getInterceptions();
-      prePassivates = status.getPrePassivates();
-      ArrayList<Interception> postActivates = status.getPostActivates();
-      checkLifecycle(status, false, true, true, false);
-      compare(
-            new Interception[] {
-                  new Interception(InheritingSFSB.class, "intercept3"),
-                  new Interception(InheritingSFSB.class, "intercept")}, interceptions);
-      compareLifecycle(            
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "postActivate"),
-                  new Interception(InheritingSFSB.class, "postActivate3"),
-                  new Interception(InheritingSFSB.class, "postActivate")}, postActivates);
-      compareLifecycle(            
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "prePassivate"),
-                  new Interception(InheritingSFSB.class, "prePassivate3"),
-                  new Interception(InheritingSFSB.class, "prePassivate")}, prePassivates);
-      
-      
-      //Need to check that we can remove
-      status.clear();
-      bean1.kill();
-      ArrayList<Interception> preDestroys = status.getPreDestroys();
-      checkLifecycle(status, false, false, false, true);
-      compareLifecycle(            
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "preDestroy"),
-                  new Interception(InheritingSFSB.class, "preDestroy3"),
-                  new Interception(InheritingSFSB.class, "preDestroy")}, preDestroys);
-   }
-   
-   public void testOverrideOrdering() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      OrderedSLSBRemote slsb = (OrderedSLSBRemote)ctx.lookup("OrderedSLSB/remote");
-      
-      status.clear();
-      slsb.methodWithClassLevel();
-      checkLifecycle(status, true, false, false, false);
-      ArrayList<Interception> actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
-                  new Interception( XMLClassInterceptor3.class, "intercept3"),
-                  new Interception( DefaultInterceptor.class, "intercept")}, actual);
-      actual = status.getPostConstructs();
-      compareLifecycle(new Interception[] {
-            new Interception( AnnotatedClassInterceptor3.class, "postConstruct3"),
-            new Interception( XMLClassInterceptor3.class, "postConstruct3"),
-            new Interception( DefaultInterceptor.class, "postConstruct"),
-            new Interception( AnnotatedMethodInterceptor.class, "postConstruct"),
-            new Interception( XMLMethodInterceptor.class, "postConstruct")}, actual);
-
-      status.clear();
-      slsb.methodWithOwn("l", 5);
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception( XMLMethodInterceptor.class,"intercept"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept")}, actual);
-      
-      status.clear();
-      slsb.overLoadedMethod("x");
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
-                  new Interception( DefaultInterceptor.class, "intercept"),
-                  new Interception( XMLClassInterceptor3.class, "intercept3"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept"),
-                  new Interception( MixedMethodInterceptor.class,"intercept"),
-                  new Interception( XMLMethodInterceptor.class,"intercept")}, actual);
-      
-      status.clear();
-      slsb.overLoadedMethod(5);
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception( XMLClassInterceptor3.class, "intercept3"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept"),
-                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
-                  new Interception( DefaultInterceptor.class, "intercept"),
-                  new Interception( MixedMethodInterceptor.class,"intercept"),
-                  new Interception( XMLMethodInterceptor.class,"intercept"),
-            }, actual);
-      
-      status.clear();
-      slsb.overLoadedMethod();
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception( MixedMethodInterceptor.class,"intercept"),
-                  new Interception( DefaultInterceptor.class, "intercept")
-            }, actual);
-      
-      status.clear();
-      slsb.methodNotSpecifyingAll();
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception( XMLClassInterceptor3.class, "intercept3"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
-                  new Interception( AnnotatedMethodInterceptor.class,"intercept"),
-                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
-                  new Interception( DefaultInterceptor.class, "intercept"),
-                  new Interception( XMLMethodInterceptor.class,"intercept"),
-                  new Interception( MixedMethodInterceptor.class,"intercept")}, actual);
-      
-   }
-   
-   public void testService() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      MixedServiceRemote srv = (MixedServiceRemote)ctx.lookup("MixedService/remote");
-      
-      status.clear();
-      srv.defaultMethod();
-      ArrayList<Interception> actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept"),
-                  new Interception(MixedClassInterceptor.class, "intercept"),
-                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
-
-      
-      status.clear();
-      srv.remoteMethod();
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept"),
-                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
-      
-      status.clear();
-      MBeanServerConnection server = getServer();
-      ObjectName testerName = new ObjectName("test:service=mixed");
-      Object[] params = {};
-      String[] sig = {};
-      server.invoke(testerName, "managementMethod", params, sig);
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept"),
-                  new Interception(MixedClassInterceptor.class, "intercept"),
-                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
-   }
-   
-   public void testDefaultOnlyService() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      DefaultOnlyServiceRemote srv = (DefaultOnlyServiceRemote)ctx.lookup("DefaultOnlyService/remote");
-      
-      status.clear();
-      srv.method();
-      ArrayList<Interception> actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
-      
-      status.clear();
-      MBeanServerConnection server = getServer();
-      ObjectName testerName = new ObjectName("test:service=DefaultOnly");
-      Object[] params = {};
-      String[] sig = {};
-      server.invoke(testerName, "method", params, sig);
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
-   }
-   
-   public void testMixedConsumer() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      MixedProducer prod = (MixedProducer)ctx.lookup("org.jboss.ejb3.test.interceptors2.MixedProducer");
-      ProducerManager manager = ((ProducerObject) prod).getProducerManager();
-      manager.connect();
-
-      status.clear();
-      prod.method();
-      Thread.sleep(1000); //Give receiving end enough time to pick up interceptions
-      ArrayList<Interception> actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept"),
-                  new Interception(MixedClassInterceptor.class, "intercept"),
-                  new Interception(XMLMethodInterceptor.class, "intercept")}, actual);
-      
-      status.clear();
-      prod.methodWithOwnOnly();
-      Thread.sleep(1000); //Give receiving end enough time to pick up interceptions
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
-   }
-   
-   public void testDefaultOnlyConsumer() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      DefaultOnlyProducer prod = (DefaultOnlyProducer)ctx.lookup("org.jboss.ejb3.test.interceptors2.DefaultOnlyProducer");
-      ProducerManager manager = ((ProducerObject) prod).getProducerManager();
-      manager.connect();
-
-      status.clear();
-      prod.method();
-      Thread.sleep(1000); //Give receiving end enough time to pick up interceptions
-      ArrayList<Interception> actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
-   }
-   
-   public void testMethodOnlySLSB() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
-      MethodOnlyInterceptedSLSBRemote remote = (MethodOnlyInterceptedSLSBRemote)ctx.lookup("MethodOnlyInterceptedSLSB/remote");
-
-      status.clear();
-      remote.intercepted();
-      ArrayList<Interception> actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept"), 
-                  new Interception(AnnotatedMethodInterceptor4.class, "intercept4")}, actual);
-      
-      status.clear();
-      remote.notintercepted();
-      actual = status.getInterceptions();
-      compare(
-            new Interception[] {
-                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
-   }
-   
-   private void compare(Interception[] expected, ArrayList<Interception> interceptions)
-   {
-      assertEquals("Bad interceptions: " + interceptions, expected.length, interceptions.size());
-      
-      for (int i = 0 ; i < expected.length ; i++)
-      {
-         assertEquals(
-               "index " + i, 
-               expected[i].getClassname() + "." + expected[i].getMethod(), 
-               interceptions.get(i).getClassname() + "." + interceptions.get(i).getMethod());
-      }
-   }
-   
-   
-   private void checkLifecycle(StatusRemote status, 
-         boolean expectPostConstruct,
-         boolean expectPostActivate,
-         boolean expectPrePassivate,
-         boolean expectPreDestroy)
-   {
-      if (expectPostConstruct)
-      {
-         assertNotSame(0, status.getPostConstructs().size());
-      }
-      else
-      {
-         assertEquals(0, status.getPostConstructs().size());
-      }
-
-      if (expectPostActivate)
-      {
-         assertNotSame(0, status.getPostActivates().size());
-      }
-      else
-      {
-         assertEquals(0, status.getPostActivates().size());
-      }
-
-      if (expectPrePassivate)
-      {
-         assertNotSame(0, status.getPrePassivates().size());
-      }
-      else
-      {
-         assertEquals(0, status.getPrePassivates().size());
-      }
-
-      if (expectPreDestroy)
-      {
-         assertNotSame(0, status.getPreDestroys().size());
-      }
-      else
-      {
-         assertEquals(0, status.getPreDestroys().size());
-      }
-}
-   
-   private void compareLifecycle(Interception[] expected, ArrayList<Interception> interceptions)
-   {
-      assertEquals("\nExpected:\n" + toString(expected) + "\nHad interceptions\n" + interceptions, expected.length, interceptions.size());
-      
-      for (int i = 0 ; i < expected.length ; i++)
-      {
-         assertEquals(
-               "index " + i, 
-               expected[i].getClassname() + "." + expected[i].getMethod(), 
-               interceptions.get(i).getClassname() + "." + interceptions.get(i).getMethod());
-      }
-   }
-   
-   private void checkInstances(ArrayList<Interception> interceptionsA, ArrayList<Interception> interceptionsB, boolean same)
-   {
-      for (int i = 0 ; i < interceptionsA.size() ; i++)
-      {
-         if (interceptionsA.get(i).getInstance() >= 0 || interceptionsB.get(i).getInstance() >= 0)
-         if (same)
-         {
-            assertEquals("Instances should be the same (" + i + ")", interceptionsA.get(i).getInstance(), interceptionsB.get(i).getInstance());
-         }
-         else
-         {
-            assertNotSame("Instances should not be the same (" + i + ")", interceptionsA.get(i).getInstance(), interceptionsB.get(i).getInstance());
-         }
-      }
-   }
-   
-   private String toString(Object[] array)
-   {
-      StringBuffer buf = new StringBuffer("[");
-      
-      for (int i = 0 ; i < array.length ; i++)
-      {
-         if (i > 0) buf.append(", ");
-         
-         buf.append(array[i]);
-      }
-      
-      buf.append("]");
-      return buf.toString();
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(InterceptorsTestCase.class, "interceptors2test-service.xml, interceptors2-test.jar");
-   }
-
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,773 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.interceptors2.unit;
+
+import java.util.ArrayList;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.mdb.ProducerManager;
+import org.jboss.ejb3.mdb.ProducerObject;
+import org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3;
+import org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor4;
+import org.jboss.ejb3.test.interceptors2.AnnotatedOnlySLSB;
+import org.jboss.ejb3.test.interceptors2.AnnotatedOnlySLSBRemote;
+import org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor;
+import org.jboss.ejb3.test.interceptors2.DefaultInterceptor;
+import org.jboss.ejb3.test.interceptors2.DefaultOnlyProducer;
+import org.jboss.ejb3.test.interceptors2.DefaultOnlySLSBRemote;
+import org.jboss.ejb3.test.interceptors2.DefaultOnlyServiceRemote;
+import org.jboss.ejb3.test.interceptors2.InheritingSFSB;
+import org.jboss.ejb3.test.interceptors2.InheritingSFSBRemote;
+import org.jboss.ejb3.test.interceptors2.Interception;
+import org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor;
+import org.jboss.ejb3.test.interceptors2.MethodOnlyInterceptedSLSBRemote;
+import org.jboss.ejb3.test.interceptors2.MixedClassInterceptor;
+import org.jboss.ejb3.test.interceptors2.MixedConfigSFSB;
+import org.jboss.ejb3.test.interceptors2.MixedConfigSFSBRemote;
+import org.jboss.ejb3.test.interceptors2.MixedMethodInterceptor;
+import org.jboss.ejb3.test.interceptors2.MixedProducer;
+import org.jboss.ejb3.test.interceptors2.MixedServiceRemote;
+import org.jboss.ejb3.test.interceptors2.NoInterceptorsSLSBRemote;
+import org.jboss.ejb3.test.interceptors2.OrderedSLSBRemote;
+import org.jboss.ejb3.test.interceptors2.StatusRemote;
+import org.jboss.ejb3.test.interceptors2.XMLClassInterceptor;
+import org.jboss.ejb3.test.interceptors2.XMLClassInterceptor2;
+import org.jboss.ejb3.test.interceptors2.XMLClassInterceptor3;
+import org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor;
+import org.jboss.ejb3.test.interceptors2.XMLOnlySLSB;
+import org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class InterceptorsTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   public InterceptorsTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testAnnotatedOnlySLSB() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      AnnotatedOnlySLSBRemote slsb = (AnnotatedOnlySLSBRemote)ctx.lookup("AnnotatedOnlySLSB/remote");
+      
+      status.clear();
+      slsb.methodWithClassLevel();
+      ArrayList<Interception> interceptions = status.getInterceptions();
+      ArrayList<Interception> postConstructs = status.getPostConstructs();
+      compare(new Interception[] {
+            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
+            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
+            new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, true, false, false, false);
+      compareLifecycle(new Interception[] {
+            new Interception(AnnotatedClassInterceptor.class, "postConstruct3"),
+            new Interception(AnnotatedClassInterceptor.class, "postConstruct"),
+            new Interception(AnnotatedMethodInterceptor.class, "postConstruct"),
+            new Interception(AnnotatedOnlySLSB.class, "postConstruct")}, postConstructs);
+      
+
+      status.clear();
+      slsb.methodExcludingClassInterceptors();
+      interceptions = status.getInterceptions();
+      compare(new Interception[] {new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, false, false, false, false);
+      
+      status.clear();
+      slsb.methodWithOwnInterceptors();
+      interceptions = status.getInterceptions();
+      compare(new Interception[] {
+            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
+            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
+            new Interception(AnnotatedMethodInterceptor.class, "intercept4"), 
+            new Interception(AnnotatedMethodInterceptor.class, "intercept2"), 
+            new Interception(AnnotatedMethodInterceptor.class, "intercept"), 
+            new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, false, false, false, false);
+      
+      status.clear();
+      slsb.methodWithOwnInterceptorsExcludeClass();
+      interceptions = status.getInterceptions();
+      compare(new Interception[] {
+            new Interception(AnnotatedMethodInterceptor.class, "intercept4"), 
+            new Interception(AnnotatedMethodInterceptor.class, "intercept2"), 
+            new Interception(AnnotatedMethodInterceptor.class, "intercept"), 
+            new Interception(AnnotatedOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, false, false, false, false);
+      
+   }
+
+   public void testXmlOnlySLSB() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      XMLOnlySLSBRemote slsb = (XMLOnlySLSBRemote)ctx.lookup("org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote");
+      
+      status.clear();
+      slsb.methodWithClassLevel();
+      ArrayList<Interception> interceptions = status.getInterceptions();
+      ArrayList<Interception> postConstructs = status.getPostConstructs();
+      compare(new Interception[] {
+            new Interception(DefaultInterceptor.class, "intercept"), 
+            new Interception(XMLClassInterceptor2.class, "intercept3"), 
+            new Interception(XMLClassInterceptor2.class, "intercept2"), 
+            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, true, false, false, false);
+      compareLifecycle(new Interception[] {
+            new Interception(DefaultInterceptor.class, "postConstruct"),
+            new Interception(XMLClassInterceptor2.class, "postConstruct3"),
+            new Interception(XMLClassInterceptor2.class, "postConstruct2"),
+            new Interception(XMLMethodInterceptor.class, "postConstruct"),
+            new Interception(XMLOnlySLSB.class, "postConstruct")}, postConstructs);
+      
+      status.clear();
+      long l = 10;
+      slsb.overloadedMethod(l);
+      interceptions = status.getInterceptions();
+      compare(new Interception[] {
+            new Interception(XMLClassInterceptor2.class, "intercept3"), 
+            new Interception(XMLClassInterceptor2.class, "intercept2"), 
+            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, false, false, false, false);
+
+      status.clear();
+      slsb.overloadedMethod(l, new String[][] {{"Hello"}, {"Whatever"}});
+      interceptions = status.getInterceptions();
+      compare(new Interception[] {
+            new Interception(DefaultInterceptor.class, "intercept"),
+            new Interception(XMLClassInterceptor2.class, "intercept3"),
+            new Interception(XMLClassInterceptor2.class, "intercept2"),
+            new Interception(XMLMethodInterceptor.class, "intercept"), 
+            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, false, false, false, false);
+      
+      status.clear();
+      int i = 5;
+      slsb.overloadedMethod(i);
+      interceptions = status.getInterceptions();
+      compare(new Interception[] {
+            new Interception(DefaultInterceptor.class, "intercept"),
+            new Interception(XMLMethodInterceptor.class, "intercept"),
+            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
+      checkLifecycle(status, false, false, false, false);
+      
+      status.clear();
+      slsb.overloadedMethod();
+      interceptions = status.getInterceptions();
+      compare(new Interception[] {
+            new Interception(XMLMethodInterceptor.class, "intercept"),
+            new Interception(XMLOnlySLSB.class, "intercept")}, interceptions);
+   }
+   
+   public void testDefaultOnlySLSB() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      DefaultOnlySLSBRemote slsb = (DefaultOnlySLSBRemote)ctx.lookup("DefaultOnlySLSB/remote");
+      
+      status.clear();
+      slsb.test();
+      ArrayList<Interception> interceptions = status.getInterceptions();
+      compare(new Interception[] {new Interception(DefaultInterceptor.class, "intercept")}, interceptions);
+      checkLifecycle(status, true, false, false, false);
+      compareLifecycle(new Interception[] {new Interception(DefaultInterceptor.class, "postConstruct")}, status.getPostConstructs());
+   }
+   
+   public void testNoInterceptorsSLSB() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      NoInterceptorsSLSBRemote slsb = (NoInterceptorsSLSBRemote)ctx.lookup("NoInterceptorsSLSB/remote");
+      
+      status.clear();
+      slsb.test();
+      ArrayList<Interception> interceptions = status.getInterceptions();
+      compare(new Interception[0], interceptions);
+      checkLifecycle(status, false, false, false, false);
+   }
+
+   public void testMixedConfigSFSB() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      
+      MixedConfigSFSBRemote sfsb1 = (MixedConfigSFSBRemote)ctx.lookup("MixedConfigSFSB/remote");
+      MixedConfigSFSBRemote sfsb2 = (MixedConfigSFSBRemote)ctx.lookup("MixedConfigSFSB/remote");
+      
+      final Interception[] expectedTestInterceptions =
+         new Interception[] {
+            new Interception(DefaultInterceptor.class, "intercept"),
+            new Interception(MixedClassInterceptor.class, "intercept"),
+            new Interception(XMLClassInterceptor.class, "intercept3"),
+            new Interception(XMLClassInterceptor.class, "intercept"),
+            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
+            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
+            new Interception(MixedConfigSFSB.class, "intercept")};
+      
+      final Interception[] expectedTestWithMethodLevelInterceptions =
+         new Interception[] {
+            new Interception(DefaultInterceptor.class, "intercept"),
+            new Interception(MixedClassInterceptor.class, "intercept"),
+            new Interception(XMLClassInterceptor.class, "intercept3"),
+            new Interception(XMLClassInterceptor.class, "intercept"),
+            new Interception(AnnotatedClassInterceptor.class, "intercept3"), 
+            new Interception(AnnotatedClassInterceptor.class, "intercept"), 
+            new Interception(MixedMethodInterceptor.class, "intercept"),
+            new Interception(XMLMethodInterceptor.class, "intercept"),
+            new Interception(AnnotatedMethodInterceptor.class, "intercept4"), 
+            new Interception(AnnotatedMethodInterceptor.class, "intercept2"), 
+            new Interception(AnnotatedMethodInterceptor.class, "intercept"),
+            new Interception(MixedConfigSFSB.class, "intercept")};
+      
+      final Interception[] expectedPostConstructInterceptors =
+         new Interception[] {
+            new Interception(DefaultInterceptor.class, "postConstruct"),
+            new Interception(XMLClassInterceptor.class, "postConstruct3"),
+            new Interception(XMLClassInterceptor.class, "postConstruct"),
+            new Interception(AnnotatedClassInterceptor.class, "postConstruct3"),
+            new Interception(AnnotatedClassInterceptor.class, "postConstruct"),
+            new Interception(XMLMethodInterceptor.class, "postConstruct"),
+            new Interception(AnnotatedMethodInterceptor.class, "postConstruct")};
+      
+      final Interception[] expectedPostActivateInterceptors =
+         new Interception[] {
+            new Interception(DefaultInterceptor.class, "postActivate"),
+            new Interception(XMLClassInterceptor.class, "postActivate3"),
+            new Interception(XMLClassInterceptor.class, "postActivate"),
+            new Interception(AnnotatedClassInterceptor.class, "postActivate3"),
+            new Interception(AnnotatedClassInterceptor.class, "postActivate"),
+            new Interception(XMLMethodInterceptor.class, "postActivate"),
+            new Interception(AnnotatedMethodInterceptor.class, "postActivate")};
+      
+      final Interception[] expectedPrePassivateInterceptors =
+         new Interception[] {
+            new Interception(DefaultInterceptor.class, "prePassivate"),
+            new Interception(XMLClassInterceptor.class, "prePassivate3"),
+            new Interception(XMLClassInterceptor.class, "prePassivate"),
+            new Interception(AnnotatedClassInterceptor.class, "prePassivate3"),
+            new Interception(AnnotatedClassInterceptor.class, "prePassivate"),
+            new Interception(XMLMethodInterceptor.class, "prePassivate"),
+            new Interception(AnnotatedMethodInterceptor.class, "prePassivate")};
+      
+      final Interception[] expectedPreDestroyInterceptors =
+         new Interception[] {
+            new Interception(DefaultInterceptor.class, "preDestroy"),
+            new Interception(XMLClassInterceptor.class, "preDestroy3"),
+            new Interception(XMLClassInterceptor.class, "preDestroy"),
+            new Interception(AnnotatedClassInterceptor.class, "preDestroy3"),
+            new Interception(AnnotatedClassInterceptor.class, "preDestroy"),
+            new Interception(XMLMethodInterceptor.class, "preDestroy"),
+            new Interception(AnnotatedMethodInterceptor.class, "preDestroy")};
+      
+      status.clear();
+      sfsb1.test();
+      ArrayList<Interception> bean1test = status.getInterceptions();
+      ArrayList<Interception> bean1pc = status.getPostConstructs();
+      compare(expectedTestInterceptions, bean1test);
+      checkLifecycle(status, true, false, false, false);
+      compareLifecycle(expectedPostConstructInterceptors, bean1pc);
+      
+      status.clear();
+      sfsb1.testWithMethodLevel();
+      ArrayList<Interception> bean1testml = status.getInterceptions();
+      compare(expectedTestWithMethodLevelInterceptions, bean1testml);
+      checkLifecycle(status, false, false, false, false);
+      
+      //Cache size is 1, so sfsb1 should get passivated and sfsb2 constructed
+      status.clear();
+      sfsb2.test();
+      ArrayList<Interception> bean2test = status.getInterceptions(); 
+      ArrayList<Interception> bean2pc = status.getPostConstructs(); 
+      ArrayList<Interception> bean2pp = status.getPrePassivates(); 
+      compare(expectedTestInterceptions, bean2test);
+      checkLifecycle(status, true, false, true, false);
+      compareLifecycle(expectedPostConstructInterceptors, bean2pc);
+      compareLifecycle(expectedPrePassivateInterceptors, bean2pp);
+      
+      status.clear();
+      sfsb2.testWithMethodLevel();
+      ArrayList<Interception> bean2testml = status.getInterceptions();
+      compare(expectedTestWithMethodLevelInterceptions, bean2testml);
+      checkLifecycle(status, false, false, false, false);
+      
+      status.clear();
+      sfsb2.testWithMethodLevelB();
+      ArrayList<Interception> bean2testmlb = status.getInterceptions();
+      compare(expectedTestWithMethodLevelInterceptions, bean2testmlb);
+      checkLifecycle(status, false, false, false, false);
+      
+      //Cache size is 1, so sfsb2 should get passivated and sfsb1 activated
+      status.clear();
+      sfsb1.test();
+      ArrayList<Interception> bean1test_2 = status.getInterceptions();
+      ArrayList<Interception> bean1pp_2 = status.getPrePassivates();
+      ArrayList<Interception> bean1pa_2 = status.getPostActivates();
+      compare(expectedTestInterceptions, bean1test_2);
+      checkLifecycle(status, false, true, true, false);
+      compareLifecycle(expectedPrePassivateInterceptors, bean1pp_2);
+      compareLifecycle(expectedPostActivateInterceptors, bean1pa_2);
+      
+      status.clear();
+      sfsb1.testWithMethodLevel();
+      ArrayList<Interception> bean1testml_2 = status.getInterceptions();
+      compare(expectedTestWithMethodLevelInterceptions, bean1testml_2);
+      checkLifecycle(status, false, false, false, false);
+      
+      status.clear();
+      sfsb1.testWithMethodLevelB();
+      ArrayList<Interception> bean1testmlb_2 = status.getInterceptions();
+      compare(expectedTestWithMethodLevelInterceptions, bean1testmlb_2);
+      checkLifecycle(status, false, false, false, false);
+      
+      //interceptor instances used for bean 1 should all be the same, and different from those for bean 2
+      //Need to check that we can remove
+      status.clear();
+      sfsb1.kill();
+      ArrayList<Interception> preDestroys = status.getPreDestroys();
+      checkLifecycle(status, false, false, false, true);
+      compareLifecycle(expectedPreDestroyInterceptors, preDestroys);
+
+      checkInstances(bean1test, bean1test_2, true);
+      checkInstances(bean1testml, bean1testml_2, true);
+      checkInstances(bean1testml, bean1testmlb_2, true);
+      checkInstances(bean2testml, bean2testmlb, true);
+      checkInstances(bean1test, bean2test, false);
+      checkInstances(bean1testml, bean2testml, false);
+      
+      
+      
+   }
+   
+   public void testBeanHierarchy() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      InheritingSFSBRemote bean1 = (InheritingSFSBRemote)ctx.lookup("InheritingSFSB/remote");
+      InheritingSFSBRemote bean2 = (InheritingSFSBRemote)ctx.lookup("InheritingSFSB/remote");
+      
+      status.clear();
+      bean1.method();
+      ArrayList<Interception> interceptions = status.getInterceptions();
+      ArrayList<Interception> postConstructs = status.getPostConstructs();
+      checkLifecycle(status, true, false, false, false);
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept"),
+                  new Interception(InheritingSFSB.class, "intercept3"),
+                  new Interception(InheritingSFSB.class, "intercept")}, interceptions);
+      compareLifecycle(            
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "postConstruct"),
+                  new Interception(InheritingSFSB.class, "postConstruct3"),
+                  new Interception(InheritingSFSB.class, "postConstruct")}, postConstructs);
+
+      status.clear();
+      bean2.methodNoDefault();
+      interceptions = status.getInterceptions();
+      postConstructs = status.getPostConstructs();
+      ArrayList<Interception> prePassivates = status.getPrePassivates();
+      checkLifecycle(status, true, false, true, false);
+      compare(
+            new Interception[] {
+                  new Interception(InheritingSFSB.class, "intercept3"),
+                  new Interception(InheritingSFSB.class, "intercept")}, interceptions);
+      compareLifecycle(            
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "postConstruct"),
+                  new Interception(InheritingSFSB.class, "postConstruct3"),
+                  new Interception(InheritingSFSB.class, "postConstruct")}, postConstructs);
+      compareLifecycle(            
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "prePassivate"),
+                  new Interception(InheritingSFSB.class, "prePassivate3"),
+                  new Interception(InheritingSFSB.class, "prePassivate")}, prePassivates);
+      
+      status.clear();
+      bean1.methodNoDefault();
+      interceptions = status.getInterceptions();
+      prePassivates = status.getPrePassivates();
+      ArrayList<Interception> postActivates = status.getPostActivates();
+      checkLifecycle(status, false, true, true, false);
+      compare(
+            new Interception[] {
+                  new Interception(InheritingSFSB.class, "intercept3"),
+                  new Interception(InheritingSFSB.class, "intercept")}, interceptions);
+      compareLifecycle(            
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "postActivate"),
+                  new Interception(InheritingSFSB.class, "postActivate3"),
+                  new Interception(InheritingSFSB.class, "postActivate")}, postActivates);
+      compareLifecycle(            
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "prePassivate"),
+                  new Interception(InheritingSFSB.class, "prePassivate3"),
+                  new Interception(InheritingSFSB.class, "prePassivate")}, prePassivates);
+      
+      
+      //Need to check that we can remove
+      status.clear();
+      bean1.kill();
+      ArrayList<Interception> preDestroys = status.getPreDestroys();
+      checkLifecycle(status, false, false, false, true);
+      compareLifecycle(            
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "preDestroy"),
+                  new Interception(InheritingSFSB.class, "preDestroy3"),
+                  new Interception(InheritingSFSB.class, "preDestroy")}, preDestroys);
+   }
+   
+   public void testOverrideOrdering() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      OrderedSLSBRemote slsb = (OrderedSLSBRemote)ctx.lookup("OrderedSLSB/remote");
+      
+      status.clear();
+      slsb.methodWithClassLevel();
+      checkLifecycle(status, true, false, false, false);
+      ArrayList<Interception> actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
+                  new Interception( XMLClassInterceptor3.class, "intercept3"),
+                  new Interception( DefaultInterceptor.class, "intercept")}, actual);
+      actual = status.getPostConstructs();
+      compareLifecycle(new Interception[] {
+            new Interception( AnnotatedClassInterceptor3.class, "postConstruct3"),
+            new Interception( XMLClassInterceptor3.class, "postConstruct3"),
+            new Interception( DefaultInterceptor.class, "postConstruct"),
+            new Interception( AnnotatedMethodInterceptor.class, "postConstruct"),
+            new Interception( XMLMethodInterceptor.class, "postConstruct")}, actual);
+
+      status.clear();
+      slsb.methodWithOwn("l", 5);
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception( XMLMethodInterceptor.class,"intercept"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept")}, actual);
+      
+      status.clear();
+      slsb.overLoadedMethod("x");
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
+                  new Interception( DefaultInterceptor.class, "intercept"),
+                  new Interception( XMLClassInterceptor3.class, "intercept3"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept"),
+                  new Interception( MixedMethodInterceptor.class,"intercept"),
+                  new Interception( XMLMethodInterceptor.class,"intercept")}, actual);
+      
+      status.clear();
+      slsb.overLoadedMethod(5);
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception( XMLClassInterceptor3.class, "intercept3"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept"),
+                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
+                  new Interception( DefaultInterceptor.class, "intercept"),
+                  new Interception( MixedMethodInterceptor.class,"intercept"),
+                  new Interception( XMLMethodInterceptor.class,"intercept"),
+            }, actual);
+      
+      status.clear();
+      slsb.overLoadedMethod();
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception( MixedMethodInterceptor.class,"intercept"),
+                  new Interception( DefaultInterceptor.class, "intercept")
+            }, actual);
+      
+      status.clear();
+      slsb.methodNotSpecifyingAll();
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception( XMLClassInterceptor3.class, "intercept3"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept4"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept2"),
+                  new Interception( AnnotatedMethodInterceptor.class,"intercept"),
+                  new Interception( AnnotatedClassInterceptor3.class, "intercept3"),
+                  new Interception( DefaultInterceptor.class, "intercept"),
+                  new Interception( XMLMethodInterceptor.class,"intercept"),
+                  new Interception( MixedMethodInterceptor.class,"intercept")}, actual);
+      
+   }
+   
+   public void testService() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      MixedServiceRemote srv = (MixedServiceRemote)ctx.lookup("MixedService/remote");
+      
+      status.clear();
+      srv.defaultMethod();
+      ArrayList<Interception> actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept"),
+                  new Interception(MixedClassInterceptor.class, "intercept"),
+                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
+
+      
+      status.clear();
+      srv.remoteMethod();
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept"),
+                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
+      
+      status.clear();
+      MBeanServerConnection server = getServer();
+      ObjectName testerName = new ObjectName("test:service=mixed");
+      Object[] params = {};
+      String[] sig = {};
+      server.invoke(testerName, "managementMethod", params, sig);
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept"),
+                  new Interception(MixedClassInterceptor.class, "intercept"),
+                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
+   }
+   
+   public void testDefaultOnlyService() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      DefaultOnlyServiceRemote srv = (DefaultOnlyServiceRemote)ctx.lookup("DefaultOnlyService/remote");
+      
+      status.clear();
+      srv.method();
+      ArrayList<Interception> actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
+      
+      status.clear();
+      MBeanServerConnection server = getServer();
+      ObjectName testerName = new ObjectName("test:service=DefaultOnly");
+      Object[] params = {};
+      String[] sig = {};
+      server.invoke(testerName, "method", params, sig);
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
+   }
+   
+   public void testMixedConsumer() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      MixedProducer prod = (MixedProducer)ctx.lookup("org.jboss.ejb3.test.interceptors2.MixedProducer");
+      ProducerManager manager = ((ProducerObject) prod).getProducerManager();
+      manager.connect();
+
+      status.clear();
+      prod.method();
+      Thread.sleep(1000); //Give receiving end enough time to pick up interceptions
+      ArrayList<Interception> actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept"),
+                  new Interception(MixedClassInterceptor.class, "intercept"),
+                  new Interception(XMLMethodInterceptor.class, "intercept")}, actual);
+      
+      status.clear();
+      prod.methodWithOwnOnly();
+      Thread.sleep(1000); //Give receiving end enough time to pick up interceptions
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(MixedMethodInterceptor.class, "intercept")}, actual);
+   }
+   
+   public void testDefaultOnlyConsumer() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      DefaultOnlyProducer prod = (DefaultOnlyProducer)ctx.lookup("org.jboss.ejb3.test.interceptors2.DefaultOnlyProducer");
+      ProducerManager manager = ((ProducerObject) prod).getProducerManager();
+      manager.connect();
+
+      status.clear();
+      prod.method();
+      Thread.sleep(1000); //Give receiving end enough time to pick up interceptions
+      ArrayList<Interception> actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
+   }
+   
+   public void testMethodOnlySLSB() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatusRemote status = (StatusRemote)ctx.lookup("StatusBean/remote");
+      MethodOnlyInterceptedSLSBRemote remote = (MethodOnlyInterceptedSLSBRemote)ctx.lookup("MethodOnlyInterceptedSLSB/remote");
+
+      status.clear();
+      remote.intercepted();
+      ArrayList<Interception> actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept"), 
+                  new Interception(AnnotatedMethodInterceptor4.class, "intercept4")}, actual);
+      
+      status.clear();
+      remote.notintercepted();
+      actual = status.getInterceptions();
+      compare(
+            new Interception[] {
+                  new Interception(DefaultInterceptor.class, "intercept")}, actual);
+   }
+   
+   private void compare(Interception[] expected, ArrayList<Interception> interceptions)
+   {
+      assertEquals("Bad interceptions: " + interceptions, expected.length, interceptions.size());
+      
+      for (int i = 0 ; i < expected.length ; i++)
+      {
+         assertEquals(
+               "index " + i, 
+               expected[i].getClassname() + "." + expected[i].getMethod(), 
+               interceptions.get(i).getClassname() + "." + interceptions.get(i).getMethod());
+      }
+   }
+   
+   
+   private void checkLifecycle(StatusRemote status, 
+         boolean expectPostConstruct,
+         boolean expectPostActivate,
+         boolean expectPrePassivate,
+         boolean expectPreDestroy)
+   {
+      if (expectPostConstruct)
+      {
+         assertNotSame(0, status.getPostConstructs().size());
+      }
+      else
+      {
+         assertEquals(0, status.getPostConstructs().size());
+      }
+
+      if (expectPostActivate)
+      {
+         assertNotSame(0, status.getPostActivates().size());
+      }
+      else
+      {
+         assertEquals(0, status.getPostActivates().size());
+      }
+
+      if (expectPrePassivate)
+      {
+         assertNotSame(0, status.getPrePassivates().size());
+      }
+      else
+      {
+         assertEquals(0, status.getPrePassivates().size());
+      }
+
+      if (expectPreDestroy)
+      {
+         assertNotSame(0, status.getPreDestroys().size());
+      }
+      else
+      {
+         assertEquals(0, status.getPreDestroys().size());
+      }
+}
+   
+   private void compareLifecycle(Interception[] expected, ArrayList<Interception> interceptions)
+   {
+      assertEquals("\nExpected:\n" + toString(expected) + "\nHad interceptions\n" + interceptions, expected.length, interceptions.size());
+      
+      for (int i = 0 ; i < expected.length ; i++)
+      {
+         assertEquals(
+               "index " + i, 
+               expected[i].getClassname() + "." + expected[i].getMethod(), 
+               interceptions.get(i).getClassname() + "." + interceptions.get(i).getMethod());
+      }
+   }
+   
+   private void checkInstances(ArrayList<Interception> interceptionsA, ArrayList<Interception> interceptionsB, boolean same)
+   {
+      for (int i = 0 ; i < interceptionsA.size() ; i++)
+      {
+         if (interceptionsA.get(i).getInstance() >= 0 || interceptionsB.get(i).getInstance() >= 0)
+         if (same)
+         {
+            assertEquals("Instances should be the same (" + i + ")", interceptionsA.get(i).getInstance(), interceptionsB.get(i).getInstance());
+         }
+         else
+         {
+            assertNotSame("Instances should not be the same (" + i + ")", interceptionsA.get(i).getInstance(), interceptionsB.get(i).getInstance());
+         }
+      }
+   }
+   
+   private String toString(Object[] array)
+   {
+      StringBuffer buf = new StringBuffer("[");
+      
+      for (int i = 0 ; i < array.length ; i++)
+      {
+         if (i > 0) buf.append(", ");
+         
+         buf.append(array[i]);
+      }
+      
+      buf.append("]");
+      return buf.toString();
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(InterceptorsTestCase.class, "interceptors2test-service.xml, interceptors2-test.jar");
+   }
+
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.interceptors3;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.interceptor.Interceptors;
-
-/**
- * AssemblyBean subclass that uses an annotation to add the interceptor.
- * 
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Stateful
- at Remote(AssemblyRemoteIF.class)
- at Interceptors({AssemblyInterceptor.class})
-public class AnnotatedAssemblyBean extends AssemblyBean
-{
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AnnotatedAssemblyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.interceptors3;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.interceptor.Interceptors;
+
+/**
+ * AssemblyBean subclass that uses an annotation to add the interceptor.
+ * 
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful
+ at Remote(AssemblyRemoteIF.class)
+ at Interceptors({AssemblyInterceptor.class})
+public class AnnotatedAssemblyBean extends AssemblyBean
+{
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors3;
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-//@Interceptors({AssemblyInterceptor.class})    // this works, xml doesn't
-public class AssemblyBean implements AssemblyRemoteIF
-{
-   public int remoteAdd(int a, int b)
-   {
-      return a + b;
-   }
-   
-   public int remoteMultiply(int a, int b)
-   {
-      return a * b;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors3;
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+//@Interceptors({AssemblyInterceptor.class})    // this works, xml doesn't
+public class AssemblyBean implements AssemblyRemoteIF
+{
+   public int remoteAdd(int a, int b)
+   {
+      return a + b;
+   }
+   
+   public int remoteMultiply(int a, int b)
+   {
+      return a * b;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors3;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class AssemblyInterceptor
-{
-   @AroundInvoke
-   protected Object intercept(InvocationContext inv) throws Exception
-   {
-      Object params[] = inv.getParameters();
-      Object newParams[] = { (Integer) params[0] + 100, (Integer) params[1] + 100 };
-      inv.setParameters(newParams);
-      return inv.proceed();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors3;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class AssemblyInterceptor
+{
+   @AroundInvoke
+   protected Object intercept(InvocationContext inv) throws Exception
+   {
+      Object params[] = inv.getParameters();
+      Object newParams[] = { (Integer) params[0] + 100, (Integer) params[1] + 100 };
+      inv.setParameters(newParams);
+      return inv.proceed();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors3;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface AssemblyRemoteIF
-{
-   int remoteAdd(int a, int b);
-   int remoteMultiply(int a, int b);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors3;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface AssemblyRemoteIF
+{
+   int remoteAdd(int a, int b);
+   int remoteMultiply(int a, int b);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/AssemblyRemoteIF.java
___________________________________________________________________
Name: svn:executable
   + *

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.interceptors3.unit;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.interceptors3.AssemblyRemoteIF;
-import org.jboss.test.JBossTestCase;
-
-/**
- * From TCK: ejb30/assembly/librarydirectory/defaultname
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class InterceptorsTestCase extends JBossTestCase
-{
-   public InterceptorsTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testIntercept() throws Exception
-   {
-      interceptTest("AssemblyBean/remote");
-   }
-
-   public void testInterceptAnnotated() throws Exception
-   {
-      interceptTest("AnnotatedAssemblyBean/remote");
-   }
-   
-   private void interceptTest(String jndi) throws Exception
-   {
-      AssemblyRemoteIF bean = (AssemblyRemoteIF) getInitialContext().lookup(jndi);
-      int actual = bean.remoteAdd(1, 2);
-      assertEquals(203, actual);      
-   }
-
-   public void testInterceptDifferentMethods() throws Exception
-   {
-      interceptDifferentMethodsTest("AssemblyBean/remote");
-   }
-
-   public void testInterceptDifferentMethodsAnnotated() throws Exception
-   {
-      interceptDifferentMethodsTest("AnnotatedAssemblyBean/remote");
-   }
-   
-   private void interceptDifferentMethodsTest(String jndi) throws Exception
-   {
-      AssemblyRemoteIF bean = (AssemblyRemoteIF) getInitialContext().lookup(jndi);
-      int actual = bean.remoteAdd(1, 2);
-      assertEquals(203, actual);
-      
-      actual = bean.remoteMultiply(0, 0);
-      assertEquals(10000, actual);
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(InterceptorsTestCase.class, "interceptors3-test.jar");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors3/unit/InterceptorsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors3.unit;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.interceptors3.AssemblyRemoteIF;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * From TCK: ejb30/assembly/librarydirectory/defaultname
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class InterceptorsTestCase extends JBossTestCase
+{
+   public InterceptorsTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testIntercept() throws Exception
+   {
+      interceptTest("AssemblyBean/remote");
+   }
+
+   public void testInterceptAnnotated() throws Exception
+   {
+      interceptTest("AnnotatedAssemblyBean/remote");
+   }
+   
+   private void interceptTest(String jndi) throws Exception
+   {
+      AssemblyRemoteIF bean = (AssemblyRemoteIF) getInitialContext().lookup(jndi);
+      int actual = bean.remoteAdd(1, 2);
+      assertEquals(203, actual);      
+   }
+
+   public void testInterceptDifferentMethods() throws Exception
+   {
+      interceptDifferentMethodsTest("AssemblyBean/remote");
+   }
+
+   public void testInterceptDifferentMethodsAnnotated() throws Exception
+   {
+      interceptDifferentMethodsTest("AnnotatedAssemblyBean/remote");
+   }
+   
+   private void interceptDifferentMethodsTest(String jndi) throws Exception
+   {
+      AssemblyRemoteIF bean = (AssemblyRemoteIF) getInitialContext().lookup(jndi);
+      int actual = bean.remoteAdd(1, 2);
+      assertEquals(203, actual);
+      
+      actual = bean.remoteMultiply(0, 0);
+      assertEquals(10000, actual);
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(InterceptorsTestCase.class, "interceptors3-test.jar");
+   }
+}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.invoker;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at RemoteBindings({
-  @RemoteBinding(clientBindUrl="http://localhost:8080/servlet-invoker/ServerInvokerServlet", jndiBinding="StatelessHttp")
-})
- at Remote(StatelessRemote.class)
-public class StatelessBean implements StatelessRemote
-{
-   public String echo(String s)
-   {
-      return s;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.invoker;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.RemoteBindings;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at RemoteBindings({
+  @RemoteBinding(clientBindUrl="http://localhost:8080/servlet-invoker/ServerInvokerServlet", jndiBinding="StatelessHttp")
+})
+ at Remote(StatelessRemote.class)
+public class StatelessBean implements StatelessRemote
+{
+   public String echo(String s)
+   {
+      return s;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.invoker;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatelessRemote
-{
-   String echo(String s);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.invoker;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatelessRemote
+{
+   String echo(String s);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,69 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.invoker.unit;
-
-import java.util.Properties;
-import javax.naming.InitialContext;
-
-import org.jboss.ejb3.test.invoker.StatelessRemote;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class InvokerTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(InvokerTestCase.class);
-
-   public InvokerTestCase(String name)
-   {
-      super(name);
-   }
- 
-   public void testHttp() throws Exception
-   {
-      Properties props = new Properties();
-      props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
-      props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
-      InitialContext jndiContext = new InitialContext(props);
-      //InitialContext jndiContext = new InitialContext();
-      
-      StatelessRemote stateless = (StatelessRemote)jndiContext.lookup("StatelessHttp");
-      assertNotNull(stateless);
-      
-      try 
-      {
-      assertEquals("echo", stateless.echo("echo"));
-      } catch (Exception e){
-         e.printStackTrace();
-      }
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(InvokerTestCase.class, "invoker-test.jar");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.invoker.unit;
+
+import java.util.Properties;
+import javax.naming.InitialContext;
+
+import org.jboss.ejb3.test.invoker.StatelessRemote;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class InvokerTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(InvokerTestCase.class);
+
+   public InvokerTestCase(String name)
+   {
+      super(name);
+   }
+ 
+   public void testHttp() throws Exception
+   {
+      Properties props = new Properties();
+      props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
+      props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
+      InitialContext jndiContext = new InitialContext(props);
+      //InitialContext jndiContext = new InitialContext();
+      
+      StatelessRemote stateless = (StatelessRemote)jndiContext.lookup("StatelessHttp");
+      assertNotNull(stateless);
+      
+      try 
+      {
+      assertEquals("echo", stateless.echo("echo"));
+      } catch (Exception e){
+         e.printStackTrace();
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(InvokerTestCase.class, "invoker-test.jar");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jacc;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
- at Entity
-public class AllEntity implements Serializable
-{
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int id;
-   
-   public String val;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jacc;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+ at Entity
+public class AllEntity implements Serializable
+{
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int id;
+   
+   public String val;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/AllEntity.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jacc;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
- at Entity
-public class SomeEntity implements Serializable
-{
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int id;
-   
-   public String val;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jacc;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+ at Entity
+public class SomeEntity implements Serializable
+{
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int id;
+   
+   public String val;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/SomeEntity.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jacc;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
- at Entity
-public class StarEntity  implements Serializable
-{
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int id;
-   
-   public String val;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jacc;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+ at Entity
+public class StarEntity  implements Serializable
+{
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int id;
+   
+   public String val;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StarEntity.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.jacc;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface Stateful
-{
-   int unchecked(int i);
- 
-   int checked(int i);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.jacc;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface Stateful
+{
+   int unchecked(int i);
+ 
+   int checked(int i);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.jacc;
-
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Remote;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.ejb.AspectDomain;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at javax.ejb.Stateful
- at Remote (Stateful.class)
- at SecurityDomain ("other")
-//@AspectDomain("JACC Stateful Bean")
-public class StatefulBean implements Stateful, java.io.Serializable
-{
-   @PermitAll
-   public int unchecked(int i)
-   {
-      System.out.println("stateful unchecked");
-      return i;
-   }
-
-   @RolesAllowed ("allowed")
-   public int checked(int i)
-   {
-      System.out.println("stateful checked");
-      return i;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.jacc;
+
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.PermitAll;
+import javax.ejb.Remote;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.annotation.ejb.AspectDomain;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at javax.ejb.Stateful
+ at Remote (Stateful.class)
+ at SecurityDomain ("other")
+//@AspectDomain("JACC Stateful Bean")
+public class StatefulBean implements Stateful, java.io.Serializable
+{
+   @PermitAll
+   public int unchecked(int i)
+   {
+      System.out.println("stateful unchecked");
+      return i;
+   }
+
+   @RolesAllowed ("allowed")
+   public int checked(int i)
+   {
+      System.out.println("stateful checked");
+      return i;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.jacc;
-
-import javax.annotation.security.PermitAll;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface Stateless
-{
-   int unchecked(int i);
-
-   int checked(int i);
-   
-   AllEntity insertAllEntity();
-   
-   AllEntity readAllEntity(int key);
-   
-   void updateAllEntity(AllEntity e);
-   
-   void deleteAllEntity(AllEntity e);
-   
-   StarEntity insertStarEntity();
-   
-   StarEntity readStarEntity(int key);
-   
-   void updateStarEntity(StarEntity e);
-   
-   void deleteStarEntity(StarEntity e);
-   
-   SomeEntity insertSomeEntity();
-   
-   SomeEntity readSomeEntity(int key);
-   
-   void updateSomeEntity(SomeEntity e);
-   
-   void deleteSomeEntity(SomeEntity e);
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.jacc;
+
+import javax.annotation.security.PermitAll;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface Stateless
+{
+   int unchecked(int i);
+
+   int checked(int i);
+   
+   AllEntity insertAllEntity();
+   
+   AllEntity readAllEntity(int key);
+   
+   void updateAllEntity(AllEntity e);
+   
+   void deleteAllEntity(AllEntity e);
+   
+   StarEntity insertStarEntity();
+   
+   StarEntity readStarEntity(int key);
+   
+   void updateStarEntity(StarEntity e);
+   
+   void deleteStarEntity(StarEntity e);
+   
+   SomeEntity insertSomeEntity();
+   
+   SomeEntity readSomeEntity(int key);
+   
+   void updateSomeEntity(SomeEntity e);
+   
+   void deleteSomeEntity(SomeEntity e);
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/Stateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,148 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.jacc;
-
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Remote;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.ejb.AspectDomain;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at javax.ejb.Stateless
- at Remote (Stateless.class)
- at SecurityDomain ("other")
-//@AspectDomain("JACC Stateless Bean")
-public class StatelessBean implements Stateless
-{
-   //TODO: put this in again once we update the hibernate jars (changes already made to hibernate)
-   //@PersistenceContext(unitName="jacc-test")
-   @PersistenceContext
-   EntityManager em;
-
-   @PermitAll
-   public int unchecked(int i)
-   {
-      System.out.println("stateless unchecked");
-      return i;
-   }
-
-   @RolesAllowed ("allowed")
-   public int checked(int i)
-   {
-      System.out.println("stateless checked");
-      return i;
-   }
-
-   @PermitAll
-   public AllEntity insertAllEntity()
-   {
-      AllEntity e = new AllEntity();
-      e.val = "x";
-      em.persist(e);
-      return e;
-   }
-
-   @PermitAll
-   public AllEntity readAllEntity(int key)
-   {
-      AllEntity e = em.find(AllEntity.class, key);
-      return e;
-   }
-
-   @PermitAll
-   public void updateAllEntity(AllEntity e)
-   {
-      em.merge(e);
-   }
-
-   @PermitAll
-   public void deleteAllEntity(AllEntity e)
-   {
-      em.remove(e);
-   }
-
-   @PermitAll
-   public StarEntity insertStarEntity()
-   {
-      StarEntity e = new StarEntity();
-      e.val = "x";
-      em.persist(e);
-      return e;
-   }
-
-   @PermitAll
-   public StarEntity readStarEntity(int key)
-   {
-      StarEntity e = em.find(StarEntity.class, key);
-      return e;
-   }
-
-   @PermitAll
-   public void updateStarEntity(StarEntity e)
-   {
-      em.merge(e);
-   }
-
-   @PermitAll
-   public void deleteStarEntity(StarEntity e)
-   {
-      em.remove(e);
-   }
-
-
-   @PermitAll
-   public SomeEntity insertSomeEntity()
-   {
-      SomeEntity e = new SomeEntity();
-      e.val = "x";
-      em.persist(e);
-      return e;
-   }
-
-   @PermitAll
-   public SomeEntity readSomeEntity(int key)
-   {
-      SomeEntity e = em.find(SomeEntity.class, key);
-      return e;
-   }
-
-   @PermitAll
-   public void updateSomeEntity(SomeEntity e)
-   {
-      em.merge(e);
-   }
-
-   @PermitAll
-   public void deleteSomeEntity(SomeEntity e)
-   {
-      em.remove(e);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,148 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.jacc;
+
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.PermitAll;
+import javax.ejb.Remote;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.annotation.ejb.AspectDomain;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at javax.ejb.Stateless
+ at Remote (Stateless.class)
+ at SecurityDomain ("other")
+//@AspectDomain("JACC Stateless Bean")
+public class StatelessBean implements Stateless
+{
+   //TODO: put this in again once we update the hibernate jars (changes already made to hibernate)
+   //@PersistenceContext(unitName="jacc-test")
+   @PersistenceContext
+   EntityManager em;
+
+   @PermitAll
+   public int unchecked(int i)
+   {
+      System.out.println("stateless unchecked");
+      return i;
+   }
+
+   @RolesAllowed ("allowed")
+   public int checked(int i)
+   {
+      System.out.println("stateless checked");
+      return i;
+   }
+
+   @PermitAll
+   public AllEntity insertAllEntity()
+   {
+      AllEntity e = new AllEntity();
+      e.val = "x";
+      em.persist(e);
+      return e;
+   }
+
+   @PermitAll
+   public AllEntity readAllEntity(int key)
+   {
+      AllEntity e = em.find(AllEntity.class, key);
+      return e;
+   }
+
+   @PermitAll
+   public void updateAllEntity(AllEntity e)
+   {
+      em.merge(e);
+   }
+
+   @PermitAll
+   public void deleteAllEntity(AllEntity e)
+   {
+      em.remove(e);
+   }
+
+   @PermitAll
+   public StarEntity insertStarEntity()
+   {
+      StarEntity e = new StarEntity();
+      e.val = "x";
+      em.persist(e);
+      return e;
+   }
+
+   @PermitAll
+   public StarEntity readStarEntity(int key)
+   {
+      StarEntity e = em.find(StarEntity.class, key);
+      return e;
+   }
+
+   @PermitAll
+   public void updateStarEntity(StarEntity e)
+   {
+      em.merge(e);
+   }
+
+   @PermitAll
+   public void deleteStarEntity(StarEntity e)
+   {
+      em.remove(e);
+   }
+
+
+   @PermitAll
+   public SomeEntity insertSomeEntity()
+   {
+      SomeEntity e = new SomeEntity();
+      e.val = "x";
+      em.persist(e);
+      return e;
+   }
+
+   @PermitAll
+   public SomeEntity readSomeEntity(int key)
+   {
+      SomeEntity e = em.find(SomeEntity.class, key);
+      return e;
+   }
+
+   @PermitAll
+   public void updateSomeEntity(SomeEntity e)
+   {
+      em.merge(e);
+   }
+
+   @PermitAll
+   public void deleteSomeEntity(SomeEntity e)
+   {
+      em.remove(e);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,446 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.jacc.unit;
-
-import javax.ejb.EJBException;
-import org.jboss.ejb3.test.jacc.AllEntity;
-import org.jboss.ejb3.test.jacc.SomeEntity;
-import org.jboss.ejb3.test.jacc.StarEntity;
-import org.jboss.ejb3.test.jacc.Stateful;
-import org.jboss.ejb3.test.jacc.Stateless;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class JaccTestCase extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public JaccTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testUnchecked() throws Exception
-   {
-      Stateful stateful = (Stateful)getInitialContext().lookup("StatefulBean/remote");
-      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
-
-      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      int result = stateful.unchecked(1);
-      assertEquals(1,result);
-
-      result = stateless.unchecked(10);
-      assertEquals(10,result);
-
-      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      result = stateful.unchecked(100);
-      assertEquals(100,result);
-
-      result = stateless.unchecked(99);
-      assertEquals(99,result);
-
-   }
-
-
-   public void testChecked() throws Exception
-   {
-      Stateful stateful = (Stateful)getInitialContext().lookup("StatefulBean/remote");
-      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
-
-      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      int result = stateful.checked(5);
-      assertEquals(5,result);
-
-      result = stateless.checked(50);
-      assertEquals(50,result);
-
-      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      boolean securityException = false;
-      try
-      {
-         stateful.checked(500);
-      }
-      catch (SecurityException e){
-         securityException = true;
-      }
-
-      assertTrue(securityException);
-
-      try
-      {
-         stateless.checked(501);
-      }
-      catch (SecurityException e){
-         securityException = true;
-      }
-
-      assertTrue(securityException);
-   }
-
-   public void testAllEntity()throws Exception
-   {
-      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
-      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      System.out.println("Good role");
-      System.out.println("Inserting...");
-      AllEntity e = stateless.insertAllEntity();
-      System.out.println("Reading...");
-      e = stateless.readAllEntity(e.id);
-      e.val += "y";
-      System.out.println("Updating...");
-      stateless.updateAllEntity(e);
-      System.out.println("Deleting...");
-      stateless.deleteAllEntity(e);
-      System.out.println("Inserting...");
-      e = stateless.insertAllEntity();
-
-      System.out.println("Bad role");
-      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      AllEntity ae2 = null;
-      try
-      {
-         System.out.println("Inserting...");
-         ae2 = stateless.insertAllEntity();
-         throw new FailedException("Insert check not done for AllEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         System.out.println("Reading...");
-         ae2 = stateless.readAllEntity(e.id);
-         throw new FailedException("Read check not done for AllEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         e.val += "y";
-         stateless.updateAllEntity(e);
-         throw new FailedException("Update check not done for AllEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         stateless.deleteAllEntity(e);
-         throw new FailedException("Delete check not done for AllEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         e = stateless.insertAllEntity();
-         throw new FailedException("Insert check not done for AllEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-   }
-
-
-   public void testStarEntity()throws Exception
-   {
-      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
-      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      System.out.println("Good role");
-      System.out.println("Inserting...");
-      StarEntity e = stateless.insertStarEntity();
-      System.out.println("Reading...");
-      e = stateless.readStarEntity(e.id);
-      e.val += "y";
-      System.out.println("Updating...");
-      stateless.updateStarEntity(e);
-      System.out.println("Deleting...");
-      stateless.deleteStarEntity(e);
-      System.out.println("Inserting...");
-      e = stateless.insertStarEntity();
-
-      System.out.println("Bad role");
-      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      StarEntity ae2 = null;
-      try
-      {
-         System.out.println("Inserting...");
-         ae2 = stateless.insertStarEntity();
-         throw new FailedException("Insert check not done for StarEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         System.out.println("Reading...");
-         ae2 = stateless.readStarEntity(e.id);
-         throw new FailedException("Read check not done for StarEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         e.val += "y";
-         stateless.updateStarEntity(e);
-         throw new FailedException("Update check not done for StarEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         stateless.deleteStarEntity(e);
-         throw new FailedException("Delete check not done for StarEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         e = stateless.insertStarEntity();
-         throw new FailedException("Insert check not done for StarEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-   }
-
-   public void testSomeEntity()throws Exception
-   {
-      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
-      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      System.out.println("Good role");
-      System.out.println("Inserting...");
-      SomeEntity e = stateless.insertSomeEntity();
-
-      try
-      {
-         System.out.println("Reading...");
-         e = stateless.readSomeEntity(e.id);
-         throw new FailedException("Read check not done for SomeEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         e.val += "y";
-         System.out.println("Updating...");
-         stateless.updateSomeEntity(e);
-         throw new FailedException("Update check not done for SomeEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-
-      System.out.println("Deleting...");
-      stateless.deleteSomeEntity(e);
-      System.out.println("Inserting...");
-      e = stateless.insertSomeEntity();
-
-      System.out.println("Bad role");
-      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
-      SecurityAssociation.setCredential("password".toCharArray());
-
-      SomeEntity ae2 = null;
-      try
-      {
-         System.out.println("Inserting...");
-         ae2 = stateless.insertSomeEntity();
-         throw new FailedException("Insert check not done for SomeEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         stateless.deleteSomeEntity(e);
-         throw new FailedException("Delete check not done for SomeEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-
-      try
-      {
-         e = stateless.insertSomeEntity();
-         throw new FailedException("Insert check not done for SomeEntity");
-      }
-      catch(FailedException ex)
-      {
-         throw ex;
-      }
-      catch (Exception ex)
-      {
-         hasSecurityOrEJBException(ex);
-      }
-   }
-
-
-   private void hasSecurityOrEJBException(Exception e)throws FailedException
-   {
-      Throwable t = e;
-
-      while (t != null)
-      {
-         //System.out.println(t);
-         String classname = t.getClass().getName();
-         if (classname.equals(SecurityException.class.getName()) ||
-               classname.equals(EJBException.class.getName()) )
-         {
-            return;
-         }
-         t = t.getCause();
-      }
-
-      throw new FailedException("SecurityException not thrown");
-   }
-
-
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(JaccTestCase.class, "jacc-test.jar");
-   }
-
-   private class FailedException extends Exception
-   {
-      public FailedException(String msg)
-      {
-         super(msg);
-      }
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,446 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.jacc.unit;
+
+import javax.ejb.EJBException;
+import org.jboss.ejb3.test.jacc.AllEntity;
+import org.jboss.ejb3.test.jacc.SomeEntity;
+import org.jboss.ejb3.test.jacc.StarEntity;
+import org.jboss.ejb3.test.jacc.Stateful;
+import org.jboss.ejb3.test.jacc.Stateless;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class JaccTestCase extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public JaccTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testUnchecked() throws Exception
+   {
+      Stateful stateful = (Stateful)getInitialContext().lookup("StatefulBean/remote");
+      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
+
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      int result = stateful.unchecked(1);
+      assertEquals(1,result);
+
+      result = stateless.unchecked(10);
+      assertEquals(10,result);
+
+      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      result = stateful.unchecked(100);
+      assertEquals(100,result);
+
+      result = stateless.unchecked(99);
+      assertEquals(99,result);
+
+   }
+
+
+   public void testChecked() throws Exception
+   {
+      Stateful stateful = (Stateful)getInitialContext().lookup("StatefulBean/remote");
+      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
+
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      int result = stateful.checked(5);
+      assertEquals(5,result);
+
+      result = stateless.checked(50);
+      assertEquals(50,result);
+
+      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      boolean securityException = false;
+      try
+      {
+         stateful.checked(500);
+      }
+      catch (SecurityException e){
+         securityException = true;
+      }
+
+      assertTrue(securityException);
+
+      try
+      {
+         stateless.checked(501);
+      }
+      catch (SecurityException e){
+         securityException = true;
+      }
+
+      assertTrue(securityException);
+   }
+
+   public void testAllEntity()throws Exception
+   {
+      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      System.out.println("Good role");
+      System.out.println("Inserting...");
+      AllEntity e = stateless.insertAllEntity();
+      System.out.println("Reading...");
+      e = stateless.readAllEntity(e.id);
+      e.val += "y";
+      System.out.println("Updating...");
+      stateless.updateAllEntity(e);
+      System.out.println("Deleting...");
+      stateless.deleteAllEntity(e);
+      System.out.println("Inserting...");
+      e = stateless.insertAllEntity();
+
+      System.out.println("Bad role");
+      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      AllEntity ae2 = null;
+      try
+      {
+         System.out.println("Inserting...");
+         ae2 = stateless.insertAllEntity();
+         throw new FailedException("Insert check not done for AllEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         System.out.println("Reading...");
+         ae2 = stateless.readAllEntity(e.id);
+         throw new FailedException("Read check not done for AllEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         e.val += "y";
+         stateless.updateAllEntity(e);
+         throw new FailedException("Update check not done for AllEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         stateless.deleteAllEntity(e);
+         throw new FailedException("Delete check not done for AllEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         e = stateless.insertAllEntity();
+         throw new FailedException("Insert check not done for AllEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+   }
+
+
+   public void testStarEntity()throws Exception
+   {
+      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      System.out.println("Good role");
+      System.out.println("Inserting...");
+      StarEntity e = stateless.insertStarEntity();
+      System.out.println("Reading...");
+      e = stateless.readStarEntity(e.id);
+      e.val += "y";
+      System.out.println("Updating...");
+      stateless.updateStarEntity(e);
+      System.out.println("Deleting...");
+      stateless.deleteStarEntity(e);
+      System.out.println("Inserting...");
+      e = stateless.insertStarEntity();
+
+      System.out.println("Bad role");
+      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      StarEntity ae2 = null;
+      try
+      {
+         System.out.println("Inserting...");
+         ae2 = stateless.insertStarEntity();
+         throw new FailedException("Insert check not done for StarEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         System.out.println("Reading...");
+         ae2 = stateless.readStarEntity(e.id);
+         throw new FailedException("Read check not done for StarEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         e.val += "y";
+         stateless.updateStarEntity(e);
+         throw new FailedException("Update check not done for StarEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         stateless.deleteStarEntity(e);
+         throw new FailedException("Delete check not done for StarEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         e = stateless.insertStarEntity();
+         throw new FailedException("Insert check not done for StarEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+   }
+
+   public void testSomeEntity()throws Exception
+   {
+      Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      System.out.println("Good role");
+      System.out.println("Inserting...");
+      SomeEntity e = stateless.insertSomeEntity();
+
+      try
+      {
+         System.out.println("Reading...");
+         e = stateless.readSomeEntity(e.id);
+         throw new FailedException("Read check not done for SomeEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         e.val += "y";
+         System.out.println("Updating...");
+         stateless.updateSomeEntity(e);
+         throw new FailedException("Update check not done for SomeEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+
+      System.out.println("Deleting...");
+      stateless.deleteSomeEntity(e);
+      System.out.println("Inserting...");
+      e = stateless.insertSomeEntity();
+
+      System.out.println("Bad role");
+      SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+      SecurityAssociation.setCredential("password".toCharArray());
+
+      SomeEntity ae2 = null;
+      try
+      {
+         System.out.println("Inserting...");
+         ae2 = stateless.insertSomeEntity();
+         throw new FailedException("Insert check not done for SomeEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         stateless.deleteSomeEntity(e);
+         throw new FailedException("Delete check not done for SomeEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+
+      try
+      {
+         e = stateless.insertSomeEntity();
+         throw new FailedException("Insert check not done for SomeEntity");
+      }
+      catch(FailedException ex)
+      {
+         throw ex;
+      }
+      catch (Exception ex)
+      {
+         hasSecurityOrEJBException(ex);
+      }
+   }
+
+
+   private void hasSecurityOrEJBException(Exception e)throws FailedException
+   {
+      Throwable t = e;
+
+      while (t != null)
+      {
+         //System.out.println(t);
+         String classname = t.getClass().getName();
+         if (classname.equals(SecurityException.class.getName()) ||
+               classname.equals(EJBException.class.getName()) )
+         {
+            return;
+         }
+         t = t.getCause();
+      }
+
+      throw new FailedException("SecurityException not thrown");
+   }
+
+
+
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(JaccTestCase.class, "jacc-test.jar");
+   }
+
+   private class FailedException extends Exception
+   {
+      public FailedException(String msg)
+      {
+         super(msg);
+      }
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.jaxws;
-
-// $Id: EndpointEJB.java 1874 2007-01-09 14:28:41Z thomas.diesler at jboss.com $
-
-import javax.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-
- at WebService(endpointInterface = "org.jboss.ejb3.test.jaxws.EndpointInterface", serviceName = "TestService", targetNamespace = "http://org.jboss.ws/jaxws/context")
- at Stateless
-public class EndpointEJB
-{
-   @Resource
-   WebServiceContext wsCtx;
-
-   @Resource
-   SessionContext ejbCtx;
-
-   public String echo(String input)
-   {
-      try
-      {
-         String retValue = getValueJAXWS() + "/" + getValueJAXRPC();
-         return retValue;
-      }
-      catch (SOAPException ex)
-      {
-         throw new WebServiceException(ex);
-      }
-   }
-
-   private String getValueJAXWS() throws SOAPException
-   {
-      javax.xml.ws.handler.soap.SOAPMessageContext jaxwsContext = (javax.xml.ws.handler.soap.SOAPMessageContext)wsCtx.getMessageContext();
-      SOAPMessage soapMessage = jaxwsContext.getMessage();
-      SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
-      soapElement = (SOAPElement)soapElement.getChildElements().next();
-      return soapElement.getValue();
-   }
-
-   private String getValueJAXRPC() throws SOAPException
-   {
-      javax.xml.rpc.handler.soap.SOAPMessageContext jaxrpcContext = (javax.xml.rpc.handler.soap.SOAPMessageContext)ejbCtx.getMessageContext();
-      SOAPMessage soapMessage = jaxrpcContext.getMessage();
-      SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
-      soapElement = (SOAPElement)soapElement.getChildElements().next();
-      return soapElement.getValue();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jaxws;
+
+// $Id: EndpointEJB.java 1874 2007-01-09 14:28:41Z thomas.diesler at jboss.com $
+
+import javax.annotation.Resource;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+
+ at WebService(endpointInterface = "org.jboss.ejb3.test.jaxws.EndpointInterface", serviceName = "TestService", targetNamespace = "http://org.jboss.ws/jaxws/context")
+ at Stateless
+public class EndpointEJB
+{
+   @Resource
+   WebServiceContext wsCtx;
+
+   @Resource
+   SessionContext ejbCtx;
+
+   public String echo(String input)
+   {
+      try
+      {
+         String retValue = getValueJAXWS() + "/" + getValueJAXRPC();
+         return retValue;
+      }
+      catch (SOAPException ex)
+      {
+         throw new WebServiceException(ex);
+      }
+   }
+
+   private String getValueJAXWS() throws SOAPException
+   {
+      javax.xml.ws.handler.soap.SOAPMessageContext jaxwsContext = (javax.xml.ws.handler.soap.SOAPMessageContext)wsCtx.getMessageContext();
+      SOAPMessage soapMessage = jaxwsContext.getMessage();
+      SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
+      soapElement = (SOAPElement)soapElement.getChildElements().next();
+      return soapElement.getValue();
+   }
+
+   private String getValueJAXRPC() throws SOAPException
+   {
+      javax.xml.rpc.handler.soap.SOAPMessageContext jaxrpcContext = (javax.xml.rpc.handler.soap.SOAPMessageContext)ejbCtx.getMessageContext();
+      SOAPMessage soapMessage = jaxrpcContext.getMessage();
+      SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
+      soapElement = (SOAPElement)soapElement.getChildElements().next();
+      return soapElement.getValue();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jaxws;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
- at WebService(targetNamespace = "http://org.jboss.ws/jaxws/context")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface EndpointInterface extends Remote
-{
-   String echo(String input) throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jaxws;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService(targetNamespace = "http://org.jboss.ws/jaxws/context")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointInterface extends Remote
+{
+   String echo(String input) throws RemoteException;
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.jaxws.unit;
-
-// $Id: ContextEJBTestCase.java 1874 2007-01-09 14:28:41Z thomas.diesler at jboss.com $
-
-import junit.framework.Test;
-import org.jboss.ejb3.test.jaxws.EndpointInterface;
-import org.jboss.test.JBossTestCase;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import java.io.File;
-import java.net.URL;
-
-/**
- * Test JAXWS WebServiceContext
- *
- * @author Thomas.Diesler at jboss.org
- * @since 29-Apr-2005
- */
-public class ContextEJBTestCase extends JBossTestCase
-{
-   public ContextEJBTestCase(String name)
-   {
-      super(name);
-      // TODO Auto-generated constructor stub
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ContextEJBTestCase.class, "jaxws-context.jar");
-   }
-   
-   public void testClientAccess() throws Exception
-   {
-      log.info("In case of connection exception, there is a host name defined in the wsdl, which used to be '@jbosstest.host.name@'");
-      URL wsdlURL = new File("../src/resources/test/jaxws/TestService.wsdl").toURL();
-      QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestService");
-      Service service = Service.create(wsdlURL, qname);
-      EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
-      
-      String helloWorld = "Hello world!";
-      Object retObj = port.echo(helloWorld);
-      assertEquals(helloWorld + "/" + helloWorld, retObj);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jaxws.unit;
+
+// $Id: ContextEJBTestCase.java 1874 2007-01-09 14:28:41Z thomas.diesler at jboss.com $
+
+import junit.framework.Test;
+import org.jboss.ejb3.test.jaxws.EndpointInterface;
+import org.jboss.test.JBossTestCase;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.io.File;
+import java.net.URL;
+
+/**
+ * Test JAXWS WebServiceContext
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 29-Apr-2005
+ */
+public class ContextEJBTestCase extends JBossTestCase
+{
+   public ContextEJBTestCase(String name)
+   {
+      super(name);
+      // TODO Auto-generated constructor stub
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ContextEJBTestCase.class, "jaxws-context.jar");
+   }
+   
+   public void testClientAccess() throws Exception
+   {
+      log.info("In case of connection exception, there is a host name defined in the wsdl, which used to be '@jbosstest.host.name@'");
+      URL wsdlURL = new File("../src/resources/test/jaxws/TestService.wsdl").toURL();
+      QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestService");
+      Service service = Service.create(wsdlURL, qname);
+      EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
+      
+      String helloWorld = "Hello world!";
+      Object retObj = port.echo(helloWorld);
+      assertEquals(helloWorld + "/" + helloWorld, retObj);
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca)

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.io.Serializable;
-
-/**
- * A test result
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class Result implements Serializable
-{
-   private boolean passed = false;
-   private Throwable error;
-
-   public void pass()
-   {
-      passed = true;
-   }
-   
-   public void fail(Throwable t)
-   {
-      error = t;
-   }
-   
-   public void check() throws Throwable
-   {
-      if (passed == false)
-      {
-         if (error != null)
-            throw error;
-         else
-            throw new Exception("Failed");
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.io.Serializable;
+
+/**
+ * A test result
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class Result implements Serializable
+{
+   private boolean passed = false;
+   private Throwable error;
+
+   public void pass()
+   {
+      passed = true;
+   }
+   
+   public void fail(Throwable t)
+   {
+      error = t;
+   }
+   
+   public void check() throws Throwable
+   {
+      if (passed == false)
+      {
+         if (error != null)
+            throw error;
+         else
+            throw new Exception("Failed");
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/Result.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,130 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.net.InetAddress;
-import java.util.Properties;
-import javax.resource.ResourceException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.InvalidPropertyException;
-import javax.resource.spi.ResourceAdapter;
-
-/**
- * A TestActivationSpec that has non-string java bean properties.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestActivationSpec implements ActivationSpec
-{
-   private ResourceAdapter ra;
-   
-   private String name;
-   /** An int between 1-10 */
-   private int anInt;
-   /** An Integer between 50-100 */
-   private Integer anInteger;
-   /** The 127.0.0.1 address */
-   private InetAddress localhost;
-   /** Properties of the form key1=*;key2=*;... */
-   private Properties props;
-
-   /**
-    * 
-    * @throws InvalidPropertyException
-    */ 
-   public void validate() throws InvalidPropertyException
-   {
-      /** An int between 1-10 */
-      if( anInt <= 0 || anInt > 10 )
-         throw new InvalidPropertyException("anInt is not between 1-10");
-      /** An int between 50-100 */
-      if( anInteger.intValue() <= 49 || anInteger.intValue() > 100 )
-         throw new InvalidPropertyException("anInt is not between 50-100");
-      /** The 127.0.0.1 address */
-      if( localhost.getHostAddress().equals("127.0.0.1") == false )
-         throw new InvalidPropertyException("localhost is not 127.0.0.1");         
-      /** Properties of the key1=*;key2=*;... */
-      if( props.size() == 0 )
-         throw new InvalidPropertyException("props has no values");         
-   }
-
-   public String getName()
-   {
-      return name;
-   } 
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-   public int getAnInt()
-   {
-      return anInt;
-   }
-   public void setAnInt(int anInt)
-   {
-      this.anInt = anInt;
-   }
-
-   public Integer getAnInteger()
-   {
-      return anInteger;
-   }
-   public void setAnInteger(Integer anInteger)
-   {
-      this.anInteger = anInteger;
-   }
-
-   public InetAddress getLocalhost()
-   {
-      return localhost;
-   }
-   public void setLocalhost(InetAddress localhost)
-   {
-      this.localhost = localhost;
-   }
-
-   public Properties getProps()
-   {
-      return props;
-   }
-   public void setProps(Properties props)
-   {
-      this.props = props;
-   }
-
-   public ResourceAdapter getResourceAdapter()
-   {
-      return ra;
-   }
-   
-   public void setResourceAdapter(ResourceAdapter ra) throws ResourceException
-   {
-      this.ra = ra;
-   }
-   
-   public String toString()
-   {
-      return "TestActivationSpec with name " + name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.net.InetAddress;
+import java.util.Properties;
+import javax.resource.ResourceException;
+import javax.resource.spi.ActivationSpec;
+import javax.resource.spi.InvalidPropertyException;
+import javax.resource.spi.ResourceAdapter;
+
+/**
+ * A TestActivationSpec that has non-string java bean properties.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestActivationSpec implements ActivationSpec
+{
+   private ResourceAdapter ra;
+   
+   private String name;
+   /** An int between 1-10 */
+   private int anInt;
+   /** An Integer between 50-100 */
+   private Integer anInteger;
+   /** The 127.0.0.1 address */
+   private InetAddress localhost;
+   /** Properties of the form key1=*;key2=*;... */
+   private Properties props;
+
+   /**
+    * 
+    * @throws InvalidPropertyException
+    */ 
+   public void validate() throws InvalidPropertyException
+   {
+      /** An int between 1-10 */
+      if( anInt <= 0 || anInt > 10 )
+         throw new InvalidPropertyException("anInt is not between 1-10");
+      /** An int between 50-100 */
+      if( anInteger.intValue() <= 49 || anInteger.intValue() > 100 )
+         throw new InvalidPropertyException("anInt is not between 50-100");
+      /** The 127.0.0.1 address */
+      if( localhost.getHostAddress().equals("127.0.0.1") == false )
+         throw new InvalidPropertyException("localhost is not 127.0.0.1");         
+      /** Properties of the key1=*;key2=*;... */
+      if( props.size() == 0 )
+         throw new InvalidPropertyException("props has no values");         
+   }
+
+   public String getName()
+   {
+      return name;
+   } 
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public int getAnInt()
+   {
+      return anInt;
+   }
+   public void setAnInt(int anInt)
+   {
+      this.anInt = anInt;
+   }
+
+   public Integer getAnInteger()
+   {
+      return anInteger;
+   }
+   public void setAnInteger(Integer anInteger)
+   {
+      this.anInteger = anInteger;
+   }
+
+   public InetAddress getLocalhost()
+   {
+      return localhost;
+   }
+   public void setLocalhost(InetAddress localhost)
+   {
+      this.localhost = localhost;
+   }
+
+   public Properties getProps()
+   {
+      return props;
+   }
+   public void setProps(Properties props)
+   {
+      this.props = props;
+   }
+
+   public ResourceAdapter getResourceAdapter()
+   {
+      return ra;
+   }
+   
+   public void setResourceAdapter(ResourceAdapter ra) throws ResourceException
+   {
+      this.ra = ra;
+   }
+   
+   public String toString()
+   {
+      return "TestActivationSpec with name " + name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestActivationSpec.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-/**
- * A TestMessage.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestMessage
-{
-   boolean acknowledged = false;
-   
-   public void acknowledge()
-   {
-      acknowledged = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+/**
+ * A TestMessage.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestMessage
+{
+   boolean acknowledged = false;
+   
+   public void acknowledge()
+   {
+      acknowledged = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessage.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-/**
- * A TestMessageListener.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public interface TestMessageListener
-{
-   void deliverMessage(TestMessage message);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+/**
+ * A TestMessageListener.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public interface TestMessageListener
+{
+   void deliverMessage(TestMessage message);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestMessageListener.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,149 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.resource.ResourceException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.xa.XAResource;
-
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.mx.util.ObjectNameFactory;
-
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-
-/**
- * A TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapter implements ResourceAdapter, TestResourceAdapterMBean
-{
-   public static final ObjectName mbean = ObjectNameFactory.create("jboss.test:test=TestResourceAdapter");
-   
-   BootstrapContext ctx;
-
-   ConcurrentReaderHashMap endpoints = new ConcurrentReaderHashMap();
-   
-   public TestResourceAdapterInflowResults testInflow() throws Exception
-   {
-      TestResourceAdapterInflow test = new TestResourceAdapterInflow(this);
-      return test.run();
-   }
-   
-   public TestResourceAdapterWorkManagerResults testWorkManager() throws Exception
-   {
-      TestResourceAdapterWorkManager test = new TestResourceAdapterWorkManager(this);
-      return test.run();
-   }
-   
-   public TestResourceAdapterTimerResults testTimer() throws Exception
-   {
-      TestResourceAdapterTimer test = new TestResourceAdapterTimer(this);
-      return test.run();
-   }
-   
-   public TestResourceAdapterTxInflowResults testTxInflow() throws Exception
-   {
-      TestResourceAdapterTxInflow test = new TestResourceAdapterTxInflow(this);
-      return test.run();
-   }
-   
-   public void endpointActivation(MessageEndpointFactory endpointFactory, ActivationSpec spec) throws ResourceException
-   {
-      MessageEndpoint endpoint = endpointFactory.createEndpoint(null);
-      endpoints.put(spec, endpoint);
-   }
-
-   public void endpointDeactivation(MessageEndpointFactory endpointFactory, ActivationSpec spec)
-   {
-      MessageEndpoint endpoint = (MessageEndpoint) endpoints.remove(spec);
-      if (endpoint != null)
-         endpoint.release();
-   }
-   
-   public XAResource[] getXAResources(ActivationSpec[] specs) throws ResourceException
-   {
-      // TODO getXAResources
-      return null;
-   }
-   
-   public void start(BootstrapContext ctx) throws ResourceAdapterInternalException
-   {
-      this.ctx = ctx;
-
-      try
-      {
-         MBeanServer server = MBeanServerLocator.locateJBoss();
-         server.registerMBean(this, mbean);
-      }
-      catch (Exception e)
-      {
-         throw new ResourceAdapterInternalException(e);
-      }
-   }
-
-   public void stop()
-   {
-      try
-      {
-         MBeanServer server = MBeanServerLocator.locateJBoss();
-         server.unregisterMBean(mbean);
-         
-         for (Iterator i = endpoints.entrySet().iterator(); i.hasNext();)
-         {
-            Map.Entry entry = (Map.Entry) i.next();
-            MessageEndpoint endpoint = (MessageEndpoint) entry.getValue();
-            if (endpoint != null)
-            {
-               endpoint.release();
-               i.remove();
-            }
-         }
-      }
-      catch (Exception ignored)
-      {
-      }
-   }
-   
-   MessageEndpoint getEndpoint(String name) throws Exception
-   {
-      for (Iterator i = endpoints.entrySet().iterator(); i.hasNext();)
-      {
-         Map.Entry entry = (Map.Entry) i.next();
-         TestActivationSpec spec = (TestActivationSpec) entry.getKey();
-         if (name.equals(spec.getName()))
-            return (MessageEndpoint) entry.getValue();
-      }
-      throw new Exception("MessageEndpoint not found for name: " + name);      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,149 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.resource.ResourceException;
+import javax.resource.spi.ActivationSpec;
+import javax.resource.spi.BootstrapContext;
+import javax.resource.spi.ResourceAdapter;
+import javax.resource.spi.ResourceAdapterInternalException;
+import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.transaction.xa.XAResource;
+
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.ObjectNameFactory;
+
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+
+/**
+ * A TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapter implements ResourceAdapter, TestResourceAdapterMBean
+{
+   public static final ObjectName mbean = ObjectNameFactory.create("jboss.test:test=TestResourceAdapter");
+   
+   BootstrapContext ctx;
+
+   ConcurrentReaderHashMap endpoints = new ConcurrentReaderHashMap();
+   
+   public TestResourceAdapterInflowResults testInflow() throws Exception
+   {
+      TestResourceAdapterInflow test = new TestResourceAdapterInflow(this);
+      return test.run();
+   }
+   
+   public TestResourceAdapterWorkManagerResults testWorkManager() throws Exception
+   {
+      TestResourceAdapterWorkManager test = new TestResourceAdapterWorkManager(this);
+      return test.run();
+   }
+   
+   public TestResourceAdapterTimerResults testTimer() throws Exception
+   {
+      TestResourceAdapterTimer test = new TestResourceAdapterTimer(this);
+      return test.run();
+   }
+   
+   public TestResourceAdapterTxInflowResults testTxInflow() throws Exception
+   {
+      TestResourceAdapterTxInflow test = new TestResourceAdapterTxInflow(this);
+      return test.run();
+   }
+   
+   public void endpointActivation(MessageEndpointFactory endpointFactory, ActivationSpec spec) throws ResourceException
+   {
+      MessageEndpoint endpoint = endpointFactory.createEndpoint(null);
+      endpoints.put(spec, endpoint);
+   }
+
+   public void endpointDeactivation(MessageEndpointFactory endpointFactory, ActivationSpec spec)
+   {
+      MessageEndpoint endpoint = (MessageEndpoint) endpoints.remove(spec);
+      if (endpoint != null)
+         endpoint.release();
+   }
+   
+   public XAResource[] getXAResources(ActivationSpec[] specs) throws ResourceException
+   {
+      // TODO getXAResources
+      return null;
+   }
+   
+   public void start(BootstrapContext ctx) throws ResourceAdapterInternalException
+   {
+      this.ctx = ctx;
+
+      try
+      {
+         MBeanServer server = MBeanServerLocator.locateJBoss();
+         server.registerMBean(this, mbean);
+      }
+      catch (Exception e)
+      {
+         throw new ResourceAdapterInternalException(e);
+      }
+   }
+
+   public void stop()
+   {
+      try
+      {
+         MBeanServer server = MBeanServerLocator.locateJBoss();
+         server.unregisterMBean(mbean);
+         
+         for (Iterator i = endpoints.entrySet().iterator(); i.hasNext();)
+         {
+            Map.Entry entry = (Map.Entry) i.next();
+            MessageEndpoint endpoint = (MessageEndpoint) entry.getValue();
+            if (endpoint != null)
+            {
+               endpoint.release();
+               i.remove();
+            }
+         }
+      }
+      catch (Exception ignored)
+      {
+      }
+   }
+   
+   MessageEndpoint getEndpoint(String name) throws Exception
+   {
+      for (Iterator i = endpoints.entrySet().iterator(); i.hasNext();)
+      {
+         Map.Entry entry = (Map.Entry) i.next();
+         TestActivationSpec spec = (TestActivationSpec) entry.getKey();
+         if (name.equals(spec.getName()))
+            return (MessageEndpoint) entry.getValue();
+      }
+      throw new Exception("MessageEndpoint not found for name: " + name);      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import javax.resource.spi.endpoint.MessageEndpoint;
-
-import org.jboss.logging.Logger;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterInflow
-{
-   private static final Logger log = Logger.getLogger(TestResourceAdapterInflow.class);
-   
-   TestResourceAdapter adapter;
-   public TestResourceAdapterInflow(TestResourceAdapter adapter)
-   {
-      this.adapter = adapter;
-   }
-   
-   public TestResourceAdapterInflowResults run() throws Exception
-   {
-      TestResourceAdapterInflowResults results = new TestResourceAdapterInflowResults();
-      try
-      {
-         basicTest();
-         results.basicTest.pass();
-      }
-      catch (Throwable t)
-      {
-         results.basicTest.fail(t);
-      }
-
-      return results;
-   }
-   
-   public void basicTest() throws Exception
-   {
-      MessageEndpoint endpoint = adapter.getEndpoint("testInflow");
-      if (endpoint == null)
-         throw new Exception("Null endpoint");
-      TestMessage message = new TestMessage();
-    
-      ((TestMessageListener) endpoint).deliverMessage(message);
-      if (message.acknowledged == false)
-         throw new Exception("MDB did not acknowledge the message");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import javax.resource.spi.endpoint.MessageEndpoint;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterInflow
+{
+   private static final Logger log = Logger.getLogger(TestResourceAdapterInflow.class);
+   
+   TestResourceAdapter adapter;
+   public TestResourceAdapterInflow(TestResourceAdapter adapter)
+   {
+      this.adapter = adapter;
+   }
+   
+   public TestResourceAdapterInflowResults run() throws Exception
+   {
+      TestResourceAdapterInflowResults results = new TestResourceAdapterInflowResults();
+      try
+      {
+         basicTest();
+         results.basicTest.pass();
+      }
+      catch (Throwable t)
+      {
+         results.basicTest.fail(t);
+      }
+
+      return results;
+   }
+   
+   public void basicTest() throws Exception
+   {
+      MessageEndpoint endpoint = adapter.getEndpoint("testInflow");
+      if (endpoint == null)
+         throw new Exception("Null endpoint");
+      TestMessage message = new TestMessage();
+    
+      ((TestMessageListener) endpoint).deliverMessage(message);
+      if (message.acknowledged == false)
+         throw new Exception("MDB did not acknowledge the message");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflow.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.io.Serializable;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterInflowResults implements Serializable
-{
-   public Result basicTest = new Result();
-   
-   public void check() throws Throwable
-   {
-      basicTest.check();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.io.Serializable;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterInflowResults implements Serializable
+{
+   public Result basicTest = new Result();
+   
+   public void check() throws Throwable
+   {
+      basicTest.check();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterInflowResults.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public interface TestResourceAdapterMBean
-{
-   TestResourceAdapterInflowResults testInflow() throws Exception;
-   TestResourceAdapterTimerResults testTimer() throws Exception;
-   TestResourceAdapterTxInflowResults testTxInflow() throws Exception;
-   TestResourceAdapterWorkManagerResults testWorkManager() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public interface TestResourceAdapterMBean
+{
+   TestResourceAdapterInflowResults testInflow() throws Exception;
+   TestResourceAdapterTimerResults testTimer() throws Exception;
+   TestResourceAdapterTxInflowResults testTxInflow() throws Exception;
+   TestResourceAdapterWorkManagerResults testWorkManager() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import javax.resource.spi.endpoint.MessageEndpoint;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterTimer
-{
-   TestResourceAdapter adapter;
-   public TestResourceAdapterTimer(TestResourceAdapter adapter)
-   {
-      this.adapter = adapter;
-   }
-   
-   public TestResourceAdapterTimerResults run() throws Exception
-   {
-      TestResourceAdapterTimerResults results = new TestResourceAdapterTimerResults();
-      try
-      {
-         basicTest();
-         results.basicTest.pass();
-      }
-      catch (Throwable t)
-      {
-         results.basicTest.fail(t);
-      }
-
-      return results;
-   }
-   
-   public void basicTest() throws Exception
-   {
-      Timer timer = adapter.ctx.createTimer();
-      TestTimerTask task = new TestTimerTask();
-      timer.schedule(task, 5000l);
-      Thread.sleep(10000);
-      if (task.complete == false)
-         throw new Exception("Task was not run");
-   }
-   
-   public class TestTimerTask extends TimerTask
-   {
-      public boolean complete = false;
-      
-      public void run()
-      {
-         complete = true;
-      }
-}
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.resource.spi.endpoint.MessageEndpoint;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterTimer
+{
+   TestResourceAdapter adapter;
+   public TestResourceAdapterTimer(TestResourceAdapter adapter)
+   {
+      this.adapter = adapter;
+   }
+   
+   public TestResourceAdapterTimerResults run() throws Exception
+   {
+      TestResourceAdapterTimerResults results = new TestResourceAdapterTimerResults();
+      try
+      {
+         basicTest();
+         results.basicTest.pass();
+      }
+      catch (Throwable t)
+      {
+         results.basicTest.fail(t);
+      }
+
+      return results;
+   }
+   
+   public void basicTest() throws Exception
+   {
+      Timer timer = adapter.ctx.createTimer();
+      TestTimerTask task = new TestTimerTask();
+      timer.schedule(task, 5000l);
+      Thread.sleep(10000);
+      if (task.complete == false)
+         throw new Exception("Task was not run");
+   }
+   
+   public class TestTimerTask extends TimerTask
+   {
+      public boolean complete = false;
+      
+      public void run()
+      {
+         complete = true;
+      }
+}
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.io.Serializable;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterTimerResults implements Serializable
-{
-   public Result basicTest = new Result();
-   
-   public void check() throws Throwable
-   {
-      basicTest.check();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.io.Serializable;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterTimerResults implements Serializable
+{
+   public Result basicTest = new Result();
+   
+   public void check() throws Throwable
+   {
+      basicTest.check();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTimerResults.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,206 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import javax.naming.InitialContext;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.work.ExecutionContext;
-import javax.resource.spi.work.Work;
-import javax.resource.spi.work.WorkManager;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterTxInflow
-{
-   TestResourceAdapter adapter;
-   public TestResourceAdapterTxInflow(TestResourceAdapter adapter)
-   {
-      this.adapter = adapter;
-   }
-   
-   public TestResourceAdapterTxInflowResults run() throws Exception
-   {
-      TestResourceAdapterTxInflowResults results = new TestResourceAdapterTxInflowResults();
-      try
-      {
-         basicTest();
-         results.basicTest.pass();
-      }
-      catch (Throwable t)
-      {
-         results.basicTest.fail(t);
-      }
-
-      return results;
-   }
-   
-   public TransactionManager getTransactionManager() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      return (TransactionManager) ctx.lookup("java:/TransactionManager");
-   }
-   
-   public void basicTest() throws Exception
-   {
-      XATerminator xt = adapter.ctx.getXATerminator();
-      WorkManager wm = adapter.ctx.getWorkManager();
-      TestWork work = new TestWork();
-      ExecutionContext ec = new ExecutionContext();
-      Xid xid = new MyXid(1);
-      ec.setXid(xid);
-
-      wm.doWork(work, 0l, ec, null);
-      if (work.complete == false)
-         throw new Exception("Work was not done");
-      if (work.e != null)
-         throw work.e;
-      if (work.enlisted == false)
-         throw new Exception("Not enlisted");
-      if (work.delisted)
-         throw new Exception("Should not be ended yet");
-      if (work.committed)
-         throw new Exception("Should not be committed yet");
-
-      xt.commit(xid, true);
-      if (work.delisted == false)
-         throw new Exception("Should be ended");
-      if (work.committed == false)
-         throw new Exception("Should be committed");
-   }
-   
-   public class MyXid implements Xid
-   {
-      int id;
-      
-      public MyXid(int id)
-      {
-         this.id = id;
-      }
-      
-      public byte[] getBranchQualifier()
-      {
-         // TODO getBranchQualifier
-         return null;
-      }
-
-      public int getFormatId()
-      {
-         return 666;
-      }
-      
-      public byte[] getGlobalTransactionId()
-      {
-         return new byte[] { (byte) id }; 
-      }
-   }
-   
-   public class TestWork implements Work, XAResource
-   {
-      public boolean complete = false;
-      public Exception e;
-      
-      public boolean enlisted = false;
-      public boolean delisted = false;
-      public boolean committed = false;
-      
-      public void run()
-      {
-         try
-         {
-            complete = true;
-            TransactionManager tm = getTransactionManager();
-            Transaction tx = tm.getTransaction();
-            tx.enlistResource(this);
-         }
-         catch (Exception e)
-         {
-            this.e = e;
-         }
-      }
-
-      public void release()
-      {
-      }
-      
-      public void commit(Xid arg0, boolean arg1) throws XAException
-      {
-         committed = true;
-      }
-
-      public void end(Xid arg0, int arg1) throws XAException
-      {
-         delisted = true;
-      }
-      
-      public void forget(Xid arg0) throws XAException
-      {
-         throw new XAException("NYI");
-      }
-      
-      public int getTransactionTimeout() throws XAException
-      {
-         // TODO getTransactionTimeout
-         return 0;
-      }
-      
-      public boolean isSameRM(XAResource arg0) throws XAException
-      {
-         // TODO isSameRM
-         return false;
-      }
-      
-      public int prepare(Xid arg0) throws XAException
-      {
-         throw new XAException("NYI");
-      }
-
-      public Xid[] recover(int arg0) throws XAException
-      {
-         throw new XAException("NYI");
-      }
-
-      public void rollback(Xid arg0) throws XAException
-      {
-         throw new XAException("NYI");
-      }
-
-      public boolean setTransactionTimeout(int arg0) throws XAException
-      {
-         return false;
-      }
-
-      public void start(Xid arg0, int arg1) throws XAException
-      {
-         enlisted = true;
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,206 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import javax.naming.InitialContext;
+import javax.resource.spi.XATerminator;
+import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.work.ExecutionContext;
+import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkManager;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterTxInflow
+{
+   TestResourceAdapter adapter;
+   public TestResourceAdapterTxInflow(TestResourceAdapter adapter)
+   {
+      this.adapter = adapter;
+   }
+   
+   public TestResourceAdapterTxInflowResults run() throws Exception
+   {
+      TestResourceAdapterTxInflowResults results = new TestResourceAdapterTxInflowResults();
+      try
+      {
+         basicTest();
+         results.basicTest.pass();
+      }
+      catch (Throwable t)
+      {
+         results.basicTest.fail(t);
+      }
+
+      return results;
+   }
+   
+   public TransactionManager getTransactionManager() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      return (TransactionManager) ctx.lookup("java:/TransactionManager");
+   }
+   
+   public void basicTest() throws Exception
+   {
+      XATerminator xt = adapter.ctx.getXATerminator();
+      WorkManager wm = adapter.ctx.getWorkManager();
+      TestWork work = new TestWork();
+      ExecutionContext ec = new ExecutionContext();
+      Xid xid = new MyXid(1);
+      ec.setXid(xid);
+
+      wm.doWork(work, 0l, ec, null);
+      if (work.complete == false)
+         throw new Exception("Work was not done");
+      if (work.e != null)
+         throw work.e;
+      if (work.enlisted == false)
+         throw new Exception("Not enlisted");
+      if (work.delisted)
+         throw new Exception("Should not be ended yet");
+      if (work.committed)
+         throw new Exception("Should not be committed yet");
+
+      xt.commit(xid, true);
+      if (work.delisted == false)
+         throw new Exception("Should be ended");
+      if (work.committed == false)
+         throw new Exception("Should be committed");
+   }
+   
+   public class MyXid implements Xid
+   {
+      int id;
+      
+      public MyXid(int id)
+      {
+         this.id = id;
+      }
+      
+      public byte[] getBranchQualifier()
+      {
+         // TODO getBranchQualifier
+         return null;
+      }
+
+      public int getFormatId()
+      {
+         return 666;
+      }
+      
+      public byte[] getGlobalTransactionId()
+      {
+         return new byte[] { (byte) id }; 
+      }
+   }
+   
+   public class TestWork implements Work, XAResource
+   {
+      public boolean complete = false;
+      public Exception e;
+      
+      public boolean enlisted = false;
+      public boolean delisted = false;
+      public boolean committed = false;
+      
+      public void run()
+      {
+         try
+         {
+            complete = true;
+            TransactionManager tm = getTransactionManager();
+            Transaction tx = tm.getTransaction();
+            tx.enlistResource(this);
+         }
+         catch (Exception e)
+         {
+            this.e = e;
+         }
+      }
+
+      public void release()
+      {
+      }
+      
+      public void commit(Xid arg0, boolean arg1) throws XAException
+      {
+         committed = true;
+      }
+
+      public void end(Xid arg0, int arg1) throws XAException
+      {
+         delisted = true;
+      }
+      
+      public void forget(Xid arg0) throws XAException
+      {
+         throw new XAException("NYI");
+      }
+      
+      public int getTransactionTimeout() throws XAException
+      {
+         // TODO getTransactionTimeout
+         return 0;
+      }
+      
+      public boolean isSameRM(XAResource arg0) throws XAException
+      {
+         // TODO isSameRM
+         return false;
+      }
+      
+      public int prepare(Xid arg0) throws XAException
+      {
+         throw new XAException("NYI");
+      }
+
+      public Xid[] recover(int arg0) throws XAException
+      {
+         throw new XAException("NYI");
+      }
+
+      public void rollback(Xid arg0) throws XAException
+      {
+         throw new XAException("NYI");
+      }
+
+      public boolean setTransactionTimeout(int arg0) throws XAException
+      {
+         return false;
+      }
+
+      public void start(Xid arg0, int arg1) throws XAException
+      {
+         enlisted = true;
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflow.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.io.Serializable;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterTxInflowResults implements Serializable
-{
-   public Result basicTest = new Result();
-   
-   public void check() throws Throwable
-   {
-      basicTest.check();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.io.Serializable;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterTxInflowResults implements Serializable
+{
+   public Result basicTest = new Result();
+   
+   public void check() throws Throwable
+   {
+      basicTest.check();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterTxInflowResults.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,80 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.work.Work;
-import javax.resource.spi.work.WorkManager;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterWorkManager
-{
-   TestResourceAdapter adapter;
-   public TestResourceAdapterWorkManager(TestResourceAdapter adapter)
-   {
-      this.adapter = adapter;
-   }
-   
-   public TestResourceAdapterWorkManagerResults run() throws Exception
-   {
-      TestResourceAdapterWorkManagerResults results = new TestResourceAdapterWorkManagerResults();
-      try
-      {
-         basicTest();
-         results.basicTest.pass();
-      }
-      catch (Throwable t)
-      {
-         results.basicTest.fail(t);
-      }
-
-      return results;
-   }
-   
-   public void basicTest() throws Exception
-   {
-      WorkManager wm = adapter.ctx.getWorkManager();
-      TestWork work = new TestWork(); 
-      wm.doWork(work);
-      if (work.complete == false)
-         throw new Exception("Work was not done");
-   }
-   
-   public class TestWork implements Work
-   {
-      public boolean complete = false;
-
-      public void run()
-      {
-         complete = true;
-      }
-
-      public void release()
-      {
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkManager;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterWorkManager
+{
+   TestResourceAdapter adapter;
+   public TestResourceAdapterWorkManager(TestResourceAdapter adapter)
+   {
+      this.adapter = adapter;
+   }
+   
+   public TestResourceAdapterWorkManagerResults run() throws Exception
+   {
+      TestResourceAdapterWorkManagerResults results = new TestResourceAdapterWorkManagerResults();
+      try
+      {
+         basicTest();
+         results.basicTest.pass();
+      }
+      catch (Throwable t)
+      {
+         results.basicTest.fail(t);
+      }
+
+      return results;
+   }
+   
+   public void basicTest() throws Exception
+   {
+      WorkManager wm = adapter.ctx.getWorkManager();
+      TestWork work = new TestWork(); 
+      wm.doWork(work);
+      if (work.complete == false)
+         throw new Exception("Work was not done");
+   }
+   
+   public class TestWork implements Work
+   {
+      public boolean complete = false;
+
+      public void run()
+      {
+         complete = true;
+      }
+
+      public void release()
+      {
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflow;
-
-import java.io.Serializable;
-
-/**
- * Management interface of TestResourceAdapter.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class TestResourceAdapterWorkManagerResults implements Serializable
-{
-   public Result basicTest = new Result();
-   
-   public void check() throws Throwable
-   {
-      basicTest.check();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflow;
+
+import java.io.Serializable;
+
+/**
+ * Management interface of TestResourceAdapter.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class TestResourceAdapterWorkManagerResults implements Serializable
+{
+   public Result basicTest = new Result();
+   
+   public void check() throws Throwable
+   {
+      basicTest.check();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapterWorkManagerResults.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import javax.ejb.MessageDrivenContext;
-
-import org.jboss.ejb3.mdb.inflow.MessageInflowLocalProxy;
-import org.jboss.ejb3.test.jca.inflow.TestMessage;
-import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
-import org.jboss.logging.Logger;
-
-/**
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DeploymentDescriptorTestMDBMessageListener implements TestMessageListener
-{
-   private static final Logger log = Logger.getLogger(DeploymentDescriptorTestMDBMessageListener.class);
-   
-   private MessageDrivenContext ctx;
-   
-   public void deliverMessage(TestMessage message)
-   {
-      message.acknowledge();
-   }
-
-   public void ejbCreate()
-   {
-   }
-   
-   public void ejbRemove()
-   {
-   }
-
-   public void setMessageDrivenContext(MessageDrivenContext ctx)
-   {
-      this.ctx = ctx;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import javax.ejb.MessageDrivenContext;
+
+import org.jboss.ejb3.mdb.inflow.MessageInflowLocalProxy;
+import org.jboss.ejb3.test.jca.inflow.TestMessage;
+import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
+import org.jboss.logging.Logger;
+
+/**
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DeploymentDescriptorTestMDBMessageListener implements TestMessageListener
+{
+   private static final Logger log = Logger.getLogger(DeploymentDescriptorTestMDBMessageListener.class);
+   
+   private MessageDrivenContext ctx;
+   
+   public void deliverMessage(TestMessage message)
+   {
+      message.acknowledge();
+   }
+
+   public void ejbCreate()
+   {
+   }
+   
+   public void ejbRemove()
+   {
+   }
+
+   public void setMessageDrivenContext(MessageDrivenContext ctx)
+   {
+      this.ctx = ctx;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTestMDBMessageListener.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.ResourceAdapter;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-/**
- *
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at MessageDriven(activationConfig =
-{
- at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="destination", propertyValue="queue/inflowmdbtest"),
- at ActivationConfigProperty(propertyName="maxSession", propertyValue="1")
-})
- at ResourceAdapter("jms-ra.rar")
-public class JMSMDBBean implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(JMSMDBBean.class);
-
-   public static boolean called = false;
-   
-   public void onMessage(Message recvMsg)
-   {
-      log.info("************** here!!!!");
-      called = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.ResourceAdapter;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ *
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(activationConfig =
+{
+ at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ at ActivationConfigProperty(propertyName="destination", propertyValue="queue/inflowmdbtest"),
+ at ActivationConfigProperty(propertyName="maxSession", propertyValue="1")
+})
+ at ResourceAdapter("jms-ra.rar")
+public class JMSMDBBean implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(JMSMDBBean.class);
+
+   public static boolean called = false;
+   
+   public void onMessage(Message recvMsg)
+   {
+      log.info("************** here!!!!");
+      called = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface JMSTest
-{
-   boolean wasCalled();
-
-   void clearCalled();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface JMSTest
+{
+   boolean wasCalled();
+
+   void clearCalled();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class JMSTestBean implements JMSTest
-{
-   public boolean wasCalled()
-   {
-      return JMSMDBBean.called;
-   }
-
-   public void clearCalled()
-   {
-       JMSMDBBean.called = false;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class JMSTestBean implements JMSTest
+{
+   public boolean wasCalled()
+   {
+      return JMSMDBBean.called;
+   }
+
+   public void clearCalled()
+   {
+       JMSMDBBean.called = false;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSTestBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
-import org.jboss.ejb3.test.jca.inflow.TestMessage;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.ResourceAdapter;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-/**
- *
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at MessageDriven(activationConfig =
-{
- at ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
-})
- at ResourceAdapter("quartz-ra.rar")
-public class QuartzMDBBean implements Job
-{
-   private static final Logger log = Logger.getLogger(QuartzMDBBean.class);
-
-   public static boolean called = false;
-
-   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
-   {
-      log.info("************** here!!!!");
-      called = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
+import org.jboss.ejb3.test.jca.inflow.TestMessage;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.ResourceAdapter;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+/**
+ *
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(activationConfig =
+{
+ at ActivationConfigProperty(propertyName="cronTrigger", propertyValue="0/2 * * * * ?")
+})
+ at ResourceAdapter("quartz-ra.rar")
+public class QuartzMDBBean implements Job
+{
+   private static final Logger log = Logger.getLogger(QuartzMDBBean.class);
+
+   public static boolean called = false;
+
+   public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
+   {
+      log.info("************** here!!!!");
+      called = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface QuartzTest
-{
-   boolean wasCalled();
-
-   void clearCalled();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface QuartzTest
+{
+   boolean wasCalled();
+
+   void clearCalled();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class QuartzTestBean implements QuartzTest
-{
-   public boolean wasCalled()
-   {
-      return QuartzMDBBean.called;
-   }
-
-   public void clearCalled()
-   {
-       QuartzMDBBean.called = false;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class QuartzTestBean implements QuartzTest
+{
+   public boolean wasCalled()
+   {
+      return QuartzMDBBean.called;
+   }
+
+   public void clearCalled()
+   {
+       QuartzMDBBean.called = false;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzTestBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,67 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-
-import org.jboss.ejb3.InitialContextFactory;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(StatelessRemote.class)
-public class StatelessBean implements StatelessRemote
-{
-   private static final Logger log = Logger.getLogger(StatelessBean.class);
-     
-   public void sendMessage() throws Exception
-   {
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-      
-      InitialContext jndiContext = InitialContextFactory.getInitialContext();
-
-      Queue queue = (Queue) jndiContext.lookup("queue/inflowmdbtest");
-      QueueConnectionFactory factory = (QueueConnectionFactory) jndiContext.lookup("java:/ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createSender(queue);
-      
-      sender.send(msg);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import org.jboss.ejb3.InitialContextFactory;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+public class StatelessBean implements StatelessRemote
+{
+   private static final Logger log = Logger.getLogger(StatelessBean.class);
+     
+   public void sendMessage() throws Exception
+   {
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+      
+      InitialContext jndiContext = InitialContextFactory.getInitialContext();
+
+      Queue queue = (Queue) jndiContext.lookup("queue/inflowmdbtest");
+      QueueConnectionFactory factory = (QueueConnectionFactory) jndiContext.lookup("java:/ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      
+      sender.send(msg);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatelessRemote
-{
-   void sendMessage() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatelessRemote
+{
+   void sendMessage() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflowmdb;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-import org.jboss.ejb3.mdb.inflow.MessageInflowLocalProxy;
-import org.jboss.ejb3.test.jca.inflow.TestMessage;
-import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.ResourceAdapter;
-
-/**
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at MessageDriven(name = "TestMDB", activationConfig =
-{
- at ActivationConfigProperty(propertyName="name", propertyValue="testInflow"),
- at ActivationConfigProperty(propertyName="anInt", propertyValue="5"),
- at ActivationConfigProperty(propertyName="anInteger", propertyValue="55"),
- at ActivationConfigProperty(propertyName="localhost", propertyValue="127.0.0.1"),
- at ActivationConfigProperty(propertyName="props", propertyValue="key1=value1,key2=value2,key3=value3")
-})
- at ResourceAdapter("jcainflow.rar")
- at TransactionAttribute(TransactionAttributeType.REQUIRED)
-public class TestMDBMessageListener implements TestMessageListener
-{
-   private static final Logger log = Logger.getLogger(TestMDBMessageListener.class);
-
-   public void deliverMessage(TestMessage message)
-   {
-      message.acknowledge();
-      log.info(message.toString());
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+import org.jboss.ejb3.mdb.inflow.MessageInflowLocalProxy;
+import org.jboss.ejb3.test.jca.inflow.TestMessage;
+import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.ResourceAdapter;
+
+/**
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(name = "TestMDB", activationConfig =
+{
+ at ActivationConfigProperty(propertyName="name", propertyValue="testInflow"),
+ at ActivationConfigProperty(propertyName="anInt", propertyValue="5"),
+ at ActivationConfigProperty(propertyName="anInteger", propertyValue="55"),
+ at ActivationConfigProperty(propertyName="localhost", propertyValue="127.0.0.1"),
+ at ActivationConfigProperty(propertyName="props", propertyValue="key1=value1,key2=value2,key3=value3")
+})
+ at ResourceAdapter("jcainflow.rar")
+ at TransactionAttribute(TransactionAttributeType.REQUIRED)
+public class TestMDBMessageListener implements TestMessageListener
+{
+   private static final Logger log = Logger.getLogger(TestMDBMessageListener.class);
+
+   public void deliverMessage(TestMessage message)
+   {
+      message.acknowledge();
+      log.info(message.toString());
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflowmdb.unit;
-
-import org.jboss.ejb3.test.jca.inflow.TestResourceAdapter;
-import org.jboss.ejb3.test.jca.inflow.TestResourceAdapterInflowResults;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DeploymentDescriptorInflowUnitTestCase extends JBossTestCase
-{
-
-   public DeploymentDescriptorInflowUnitTestCase (String name)
-   {
-      super(name);
-   }
-
-   public void testInflow() throws Throwable
-   {
-      TestResourceAdapterInflowResults results = (TestResourceAdapterInflowResults) getServer().invoke
-      (
-          TestResourceAdapter.mbean,
-          "testInflow",
-          new Object[0],
-          new String[0]
-      );
-      
-      results.check(); 
-   }
-   
-   public static Test suite() throws Exception
-   {
-      Test t1 = getDeploySetup(DeploymentDescriptorInflowUnitTestCase.class, "jcainflowmdb_dd.jar");
-      Test t2 = getDeploySetup(t1, "jcainflow.rar");
-      return t2;
-   }
-   
-   /*public static Test suite() throws Exception
-   {
-      return getDeploySetup(DeploymentDescriptorInflowUnitTestCase.class, "");
-   } */
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb.unit;
+
+import org.jboss.ejb3.test.jca.inflow.TestResourceAdapter;
+import org.jboss.ejb3.test.jca.inflow.TestResourceAdapterInflowResults;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DeploymentDescriptorInflowUnitTestCase extends JBossTestCase
+{
+
+   public DeploymentDescriptorInflowUnitTestCase (String name)
+   {
+      super(name);
+   }
+
+   public void testInflow() throws Throwable
+   {
+      TestResourceAdapterInflowResults results = (TestResourceAdapterInflowResults) getServer().invoke
+      (
+          TestResourceAdapter.mbean,
+          "testInflow",
+          new Object[0],
+          new String[0]
+      );
+      
+      results.check(); 
+   }
+   
+   public static Test suite() throws Exception
+   {
+      Test t1 = getDeploySetup(DeploymentDescriptorInflowUnitTestCase.class, "jcainflowmdb_dd.jar");
+      Test t2 = getDeploySetup(t1, "jcainflow.rar");
+      return t2;
+   }
+   
+   /*public static Test suite() throws Exception
+   {
+      return getDeploySetup(DeploymentDescriptorInflowUnitTestCase.class, "");
+   } */
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/DeploymentDescriptorInflowUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jca.inflowmdb.unit;
-
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.InitialContextFactory;
-import org.jboss.ejb3.ClientKernelAbstraction;
-import org.jboss.ejb3.KernelAbstractionFactory;
-
-import org.jboss.ejb3.test.jca.inflow.TestResourceAdapter;
-import org.jboss.ejb3.test.jca.inflow.TestResourceAdapterInflowResults;
-import org.jboss.ejb3.test.jca.inflowmdb.QuartzTest;
-import org.jboss.ejb3.test.jca.inflowmdb.JMSTest;
-import org.jboss.ejb3.test.jca.inflowmdb.StatelessRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class InflowUnitTestCase extends JBossTestCase
-{
-
-   public InflowUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testInflow() throws Throwable
-   {
-      ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
-      TestResourceAdapterInflowResults results = (TestResourceAdapterInflowResults)kernel.invoke
-      (
-          TestResourceAdapter.mbean,
-          "testInflow",
-          new Object[0],
-          new String[0]
-      );
-      
-      results.check(); 
-   }
-
-   public void testQuartz() throws Exception
-   {
-      QuartzTest test = (QuartzTest)InitialContextFactory.getInitialContext().lookup("QuartzTestBean/remote");
-      Thread.sleep(5000); // sleep so that quartz mdb runs.
-      assertTrue(test.wasCalled());
-   }
-   
-   public void testJMS() throws Exception
-   {
-      StatelessRemote stateless = (StatelessRemote)InitialContextFactory.getInitialContext().lookup("StatelessBean/remote");
-      assertNotNull(stateless);
-      stateless.sendMessage();
-      
-      JMSTest test = (JMSTest)InitialContextFactory.getInitialContext().lookup("JMSTestBean/remote");
-      Thread.sleep(5000); // sleep so that jms mdb runs.
-      assertTrue(test.wasCalled());
-   }
-
-   
-   public static Test suite() throws Exception
-   {
-      Test t1 = getDeploySetup(InflowUnitTestCase.class, "quartzmdb.jar, jmsinflowmdb.jar, jcainflowmdb.jar"); 
-      Test t2 = getDeploySetup(t1, "jcainflow.rar");
-      return t2;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jca.inflowmdb.unit;
+
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.ClientKernelAbstraction;
+import org.jboss.ejb3.KernelAbstractionFactory;
+
+import org.jboss.ejb3.test.jca.inflow.TestResourceAdapter;
+import org.jboss.ejb3.test.jca.inflow.TestResourceAdapterInflowResults;
+import org.jboss.ejb3.test.jca.inflowmdb.QuartzTest;
+import org.jboss.ejb3.test.jca.inflowmdb.JMSTest;
+import org.jboss.ejb3.test.jca.inflowmdb.StatelessRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class InflowUnitTestCase extends JBossTestCase
+{
+
+   public InflowUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testInflow() throws Throwable
+   {
+      ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
+      TestResourceAdapterInflowResults results = (TestResourceAdapterInflowResults)kernel.invoke
+      (
+          TestResourceAdapter.mbean,
+          "testInflow",
+          new Object[0],
+          new String[0]
+      );
+      
+      results.check(); 
+   }
+
+   public void testQuartz() throws Exception
+   {
+      QuartzTest test = (QuartzTest)InitialContextFactory.getInitialContext().lookup("QuartzTestBean/remote");
+      Thread.sleep(5000); // sleep so that quartz mdb runs.
+      assertTrue(test.wasCalled());
+   }
+   
+   public void testJMS() throws Exception
+   {
+      StatelessRemote stateless = (StatelessRemote)InitialContextFactory.getInitialContext().lookup("StatelessBean/remote");
+      assertNotNull(stateless);
+      stateless.sendMessage();
+      
+      JMSTest test = (JMSTest)InitialContextFactory.getInitialContext().lookup("JMSTestBean/remote");
+      Thread.sleep(5000); // sleep so that jms mdb runs.
+      assertTrue(test.wasCalled());
+   }
+
+   
+   public static Test suite() throws Exception
+   {
+      Test t1 = getDeploySetup(InflowUnitTestCase.class, "quartzmdb.jar, jmsinflowmdb.jar, jcainflowmdb.jar"); 
+      Test t2 = getDeploySetup(t1, "jcainflow.rar");
+      return t2;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jms;
-
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface QueueStateless
-{
-   void send(String message) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jms;
+
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface QueueStateless
+{
+   void send(String message) throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jms;
-
-import javax.annotation.Resource;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(QueueStateless.class)
- at RemoteBinding(jndiBinding = "QueueStateless")
-public class QueueStatelessBean implements QueueStateless
-{
-   private static final Logger log = Logger.getLogger(QueueStatelessBean.class);
-   
-   @Resource(mappedName="java:/ConnectionFactory") javax.jms.QueueConnectionFactory queueFactory;
-   @Resource(mappedName="queue/testQueue") javax.jms.Queue testQueue;
-   
-   public void send(String text) throws Exception
-   {
-      javax.jms.QueueConnection queueConnection;
-      javax.jms.QueueSession queueSession;
-      javax.jms.QueueSender queueSender;
-      javax.jms.TextMessage message;
-
-      queueConnection = queueFactory.createQueueConnection();
-      queueSession = queueConnection.createQueueSession(true,0);
-      queueSender = queueSession.createSender(testQueue);
-      message = queueSession.createTextMessage(text);
-   }
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jms;
+
+import javax.annotation.Resource;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(QueueStateless.class)
+ at RemoteBinding(jndiBinding = "QueueStateless")
+public class QueueStatelessBean implements QueueStateless
+{
+   private static final Logger log = Logger.getLogger(QueueStatelessBean.class);
+   
+   @Resource(mappedName="java:/ConnectionFactory") javax.jms.QueueConnectionFactory queueFactory;
+   @Resource(mappedName="queue/testQueue") javax.jms.Queue testQueue;
+   
+   public void send(String text) throws Exception
+   {
+      javax.jms.QueueConnection queueConnection;
+      javax.jms.QueueSession queueSession;
+      javax.jms.QueueSender queueSender;
+      javax.jms.TextMessage message;
+
+      queueConnection = queueFactory.createQueueConnection();
+      queueSession = queueConnection.createQueueSession(true,0);
+      queueSender = queueSession.createSender(testQueue);
+      message = queueSession.createTextMessage(text);
+   }
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jms.managed;
-  
-public interface JMSTest
-{
-  void test1();
-  
-  void remove();
-}
-  
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jms.managed;
+  
+public interface JMSTest
+{
+  void test1();
+  
+  void remove();
+}
+  
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,129 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jms.managed;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-
-import javax.ejb.Remove;
-import javax.ejb.Init;
-
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-public class JMSTestBean
-   implements JMSTest
-{
-   
-   private static Logger log = Logger.getLogger(JMSTestBean.class);
-   
-   private Connection connection;
-   
-   private Queue queue;
-   
-   private SessionContext ctx;
-   
-   public void setSessionContext(SessionContext sc)
-   {
-      ctx = sc;
-   }
-   
-   @Init
-   public void ejbCreate()
-   {
-      try
-      {
-         InitialContext iniCtx = new InitialContext();
- 
-         ConnectionFactory cf =
-            (ConnectionFactory) iniCtx.lookup(Container.ENC_CTX_NAME + "/env/jms/MyConnectionFactory"); 
-         
-         connection = cf.createConnection();
-         connection.start();
-         queue = (Queue)iniCtx.lookup(Container.ENC_CTX_NAME + "/env/jms/MyQueue");
-      }
-      catch (Throwable t)
-      {           
-         log.error(t);
-      }
-   }
-   
-   
-   public void test1() throws EJBException
-   {
-      Session session = null;
-      
-      try
-      {
-         session = 
-            connection.createSession(true, 0);
-         
-         MessageProducer producer = session.createProducer(queue);
-         
-         TextMessage message = session.createTextMessage();
-         
-         message.setText("Testing 123");
-         
-         producer.send(message);
-      }
-      catch (JMSException e)
-      {           
-         log.error(e);
-         ctx.setRollbackOnly();
-         throw new EJBException(e.toString());
-      }
-      finally
-      {
-         try
-         {
-            if (session != null) session.close();
-         }
-         catch (JMSException e)
-         {            
-         }         
-      }
-   }
-   
-   @Remove
-   public void remove()
-   {
-      
-      try
-      {
-         if (connection != null)
-            connection.close();
-      } 
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jms.managed;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import javax.ejb.Remove;
+import javax.ejb.Init;
+
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+public class JMSTestBean
+   implements JMSTest
+{
+   
+   private static Logger log = Logger.getLogger(JMSTestBean.class);
+   
+   private Connection connection;
+   
+   private Queue queue;
+   
+   private SessionContext ctx;
+   
+   public void setSessionContext(SessionContext sc)
+   {
+      ctx = sc;
+   }
+   
+   @Init
+   public void ejbCreate()
+   {
+      try
+      {
+         InitialContext iniCtx = new InitialContext();
+ 
+         ConnectionFactory cf =
+            (ConnectionFactory) iniCtx.lookup(Container.ENC_CTX_NAME + "/env/jms/MyConnectionFactory"); 
+         
+         connection = cf.createConnection();
+         connection.start();
+         queue = (Queue)iniCtx.lookup(Container.ENC_CTX_NAME + "/env/jms/MyQueue");
+      }
+      catch (Throwable t)
+      {           
+         log.error(t);
+      }
+   }
+   
+   
+   public void test1() throws EJBException
+   {
+      Session session = null;
+      
+      try
+      {
+         session = 
+            connection.createSession(true, 0);
+         
+         MessageProducer producer = session.createProducer(queue);
+         
+         TextMessage message = session.createTextMessage();
+         
+         message.setText("Testing 123");
+         
+         producer.send(message);
+      }
+      catch (JMSException e)
+      {           
+         log.error(e);
+         ctx.setRollbackOnly();
+         throw new EJBException(e.toString());
+      }
+      finally
+      {
+         try
+         {
+            if (session != null) session.close();
+         }
+         catch (JMSException e)
+         {            
+         }         
+      }
+   }
+   
+   @Remove
+   public void remove()
+   {
+      
+      try
+      {
+         if (connection != null)
+            connection.close();
+      } 
+      catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/JMSTestBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jms.managed;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-import org.jboss.logging.Logger;
-
-
-public class MessageBean
-   implements MessageListener
-{
-   private static Logger log = Logger.getLogger(MessageBean.class);
-   
-   public void onMessage(Message inMessage)
-   {
-      
-      TextMessage msg = (TextMessage)inMessage;
-      
-      log.trace("Received message:" + msg);
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jms.managed;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
+
+import org.jboss.logging.Logger;
+
+
+public class MessageBean
+   implements MessageListener
+{
+   private static Logger log = Logger.getLogger(MessageBean.class);
+   
+   public void onMessage(Message inMessage)
+   {
+      
+      TextMessage msg = (TextMessage)inMessage;
+      
+      log.trace("Received message:" + msg);
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/MessageBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.jms.managed.unit;
-
-import javax.naming.InitialContext;
-import org.jboss.ejb3.test.jms.managed.JMSTest;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-
-public class ManagedTestCase
-   extends JBossTestCase
-{   
-   protected InitialContext initialContext;
-   
-   private static Logger log = Logger.getLogger(ManagedTestCase.class);
-   
-   public ManagedTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void setUp() throws Exception
-   {
-      initialContext = new InitialContext();
-   }
-   
-   public void tearDown() throws Exception
-   {
-   }
-   
-   
-   public void test1() throws Exception
-   {   
-      JMSTest testBean = (JMSTest)initialContext.lookup("jms-test-ejbs/JMSTest");
-        
-      testBean.test1();
-      testBean.remove(); 
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ManagedTestCase.class, "jms-managed.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jms.managed.unit;
+
+import javax.naming.InitialContext;
+import org.jboss.ejb3.test.jms.managed.JMSTest;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+
+public class ManagedTestCase
+   extends JBossTestCase
+{   
+   protected InitialContext initialContext;
+   
+   private static Logger log = Logger.getLogger(ManagedTestCase.class);
+   
+   public ManagedTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void setUp() throws Exception
+   {
+      initialContext = new InitialContext();
+   }
+   
+   public void tearDown() throws Exception
+   {
+   }
+   
+   
+   public void test1() throws Exception
+   {   
+      JMSTest testBean = (JMSTest)initialContext.lookup("jms-test-ejbs/JMSTest");
+        
+      testBean.test1();
+      testBean.remove(); 
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ManagedTestCase.class, "jms-managed.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jms.unit;
-
-import org.jboss.ejb3.test.jms.QueueStateless;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-
-public class JMSUnitTestCase
-   extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(JMSUnitTestCase.class);
-    
-    
-   public JMSUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   /**
-    * Test sending messages to Topic testTopic
-    */
-   public void testInjectedQueue() throws Exception
-   {
-      QueueStateless queueStateless =
-         (QueueStateless) getInitialContext().lookup("QueueStateless");
-      assertNotNull(queueStateless);
-      
-      queueStateless.send("test message");
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(JMSUnitTestCase.class, "jms.jar");
-   }
-}
-
-
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jms.unit;
+
+import org.jboss.ejb3.test.jms.QueueStateless;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+
+public class JMSUnitTestCase
+   extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(JMSUnitTestCase.class);
+    
+    
+   public JMSUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   /**
+    * Test sending messages to Topic testTopic
+    */
+   public void testInjectedQueue() throws Exception
+   {
+      QueueStateless queueStateless =
+         (QueueStateless) getInitialContext().lookup("QueueStateless");
+      assertNotNull(queueStateless);
+      
+      queueStateless.send("test message");
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(JMSUnitTestCase.class, "jms.jar");
+   }
+}
+
+
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -95,13 +95,13 @@
 
    public void test1() throws Exception
    {
-      assertEquals(manager.createQuery("select p from Person p").getResultList().size(), 3);
-      assertEquals(manager.createQuery("select p from Person p where p.class = Customer").getResultList().size(), 1);
+      assertEquals(manager.createQuery("from Person").getResultList().size(), 3);
+      assertEquals(manager.createQuery("from Person p where p.class = Customer").getResultList().size(), 1);
    }
 
    public void test2() throws Exception
    {
-      List customers = manager.createQuery("select c from Customer c left join fetch c.salesperson").getResultList();
+      List customers = manager.createQuery("from Customer c left join fetch c.salesperson").getResultList();
       for (Iterator iter = customers.iterator(); iter.hasNext();)
       {
          Customer c = (Customer) iter.next();
@@ -112,7 +112,7 @@
 
    public void test3() throws Exception
    {
-      List customers = manager.createQuery("select c from Customer c").getResultList();
+      List customers = manager.createQuery("from Customer").getResultList();
       for (Iterator iter = customers.iterator(); iter.hasNext();)
       {
          Customer c = (Customer) iter.next();
@@ -128,10 +128,10 @@
       Person yomomma = manager.find(Person.class, new Long(ids[2]));
 
       mark.setZip("30306");
-      assertEquals(manager.createQuery("select p from Person p where p.zip = '30306'").getResultList().size(), 1);
+      assertEquals(manager.createQuery("from Person p where p.zip = '30306'").getResultList().size(), 1);
       manager.remove(mark);
       manager.remove(joe);
       manager.remove(yomomma);
-      assertTrue(manager.createQuery("select p from Person p").getResultList().isEmpty());
+      assertTrue(manager.createQuery("from Person").getResultList().isEmpty());
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/joininheritance/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -35,7 +35,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jsp;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(StatelessRemote.class)
-public class StatelessBean implements StatelessRemote
-{
-   private static final Logger log = Logger.getLogger(StatelessBean.class);
-   
-   public int method(int i) throws Exception
-   {
-      return i;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jsp;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+public class StatelessBean implements StatelessRemote
+{
+   private static final Logger log = Logger.getLogger(StatelessBean.class);
+   
+   public int method(int i) throws Exception
+   {
+      return i;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jsp;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatelessRemote
-{
-   int method(int i) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jsp;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatelessRemote
+{
+   int method(int i) throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jsp.unit;
-
-import java.net.URL;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/** 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EarServletUnitTestCase extends JBossTestCase
-{
-   private static String REALM = "JBossTest Servlets";
-   private String baseURL = HttpUtils.getBaseURL(); 
-   private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth(); 
-   
-   public EarServletUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEJBServlet() throws Exception
-   {
-      try {
-         URL url = new URL(baseURL+"jsp-test/TestJSP");
-         HttpUtils.accessURL(url);
-      } catch (Exception e){
-         e.printStackTrace();
-         throw e;
-      }
-   }
-   
-   /**
-    * Setup the test suite.
-    */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EarServletUnitTestCase.class, "jsp-test.ear");
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jsp.unit;
+
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/** 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EarServletUnitTestCase extends JBossTestCase
+{
+   private static String REALM = "JBossTest Servlets";
+   private String baseURL = HttpUtils.getBaseURL(); 
+   private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth(); 
+   
+   public EarServletUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEJBServlet() throws Exception
+   {
+      try {
+         URL url = new URL(baseURL+"jsp-test/TestJSP");
+         HttpUtils.accessURL(url);
+      } catch (Exception e){
+         e.printStackTrace();
+         throw e;
+      }
+   }
+   
+   /**
+    * Setup the test suite.
+    */
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EarServletUnitTestCase.class, "jsp-test.ear");
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/EarServletUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,180 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.jsp.unit;
-
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.io.IOException;
-import java.lang.System;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.methods.OptionsMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.TraceMethod;
-import org.jboss.logging.Logger;
-
-/** Utilities for client http requests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class HttpUtils
-{
-   private static Logger log = Logger.getLogger(HttpUtils.class);
-   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
-   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
-
-   public static final int GET = 1;
-   public static final int POST = 2;
-   public static final int HEAD = 3;
-   public static final int OPTIONS = 4;
-   public static final int PUT = 5;
-   public static final int DELETE = 6;
-   public static final int TRACE = 7;
-   
-   public static String getBaseURL()
-   {
-      return baseURL;
-   }
-   public static String getBaseURL(String username, String password)
-   {
-      String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
-         + Integer.getInteger("web.port", 8080) + "/";
-      return url;
-   }
-   public static String getBaseURLNoAuth()
-   {
-      return baseURLNoAuth;
-   }
-
-   /** Perform a get on the indicated URL and assert an HTTP_OK response code
-    *
-    * @param url
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url) throws Exception
-   {
-      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
-   }
-   /** Perform a get on the indicated URL and assert that the response code
-    * matches the expectedHttpCode argument.
-    *
-    * @param url
-    * @param expectedHttpCode the http response code expected
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, int type)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null, type);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs, int type)
-      throws Exception
-   {
-      HttpClient httpConn = new HttpClient();
-      HttpMethodBase request = createMethod(url, type);
-
-      int hdrCount = hdrs != null ? hdrs.length : 0;
-      for(int n = 0; n < hdrCount; n ++)
-         request.addRequestHeader(hdrs[n]);
-      try
-      {
-         log.debug("Connecting to: "+url);
-         String userInfo = url.getUserInfo();
-
-         if( userInfo != null )
-         {
-            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
-            httpConn.getState().setCredentials(realm, url.getHost(), auth);
-         }
-         log.debug("RequestURI: "+request.getURI());
-         int responseCode = httpConn.executeMethod(request);
-         String response = request.getStatusText();
-         log.debug("responseCode="+responseCode+", response="+response);
-         String content = request.getResponseBodyAsString();
-         log.debug(content);
-         // Validate that we are seeing the requested response code
-         if( responseCode != expectedHttpCode )
-         {
-            throw new IOException("Expected reply code:"+expectedHttpCode
-               +", actual="+responseCode);
-         }
-      }
-      catch(IOException e)
-      {
-         throw e;
-      }
-      return request;
-   }
-
-   public static HttpMethodBase createMethod(URL url, int type)
-   {
-      HttpMethodBase request = null;
-      switch( type )
-      {
-         case GET:
-            request = new GetMethod(url.toString());
-            break;
-         case POST:
-            request = new PostMethod(url.toString());
-            break;
-         case HEAD:
-            request = new HeadMethod(url.toString());
-            break;
-         case OPTIONS:
-            request = new OptionsMethod(url.toString());
-            break;
-         case PUT:
-            request = new PutMethod(url.toString());
-            break;
-         case DELETE:
-            request = new DeleteMethod(url.toString());
-            break;
-         case TRACE:
-            request = new TraceMethod(url.toString());
-            break;
-      }
-      return request;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,180 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.jsp.unit;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.IOException;
+import java.lang.System;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.HeadMethod;
+import org.apache.commons.httpclient.methods.OptionsMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.TraceMethod;
+import org.jboss.logging.Logger;
+
+/** Utilities for client http requests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class HttpUtils
+{
+   private static Logger log = Logger.getLogger(HttpUtils.class);
+   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
+   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+
+   public static final int GET = 1;
+   public static final int POST = 2;
+   public static final int HEAD = 3;
+   public static final int OPTIONS = 4;
+   public static final int PUT = 5;
+   public static final int DELETE = 6;
+   public static final int TRACE = 7;
+   
+   public static String getBaseURL()
+   {
+      return baseURL;
+   }
+   public static String getBaseURL(String username, String password)
+   {
+      String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
+         + Integer.getInteger("web.port", 8080) + "/";
+      return url;
+   }
+   public static String getBaseURLNoAuth()
+   {
+      return baseURLNoAuth;
+   }
+
+   /** Perform a get on the indicated URL and assert an HTTP_OK response code
+    *
+    * @param url
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url) throws Exception
+   {
+      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
+   }
+   /** Perform a get on the indicated URL and assert that the response code
+    * matches the expectedHttpCode argument.
+    *
+    * @param url
+    * @param expectedHttpCode the http response code expected
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, int type)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null, type);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs, int type)
+      throws Exception
+   {
+      HttpClient httpConn = new HttpClient();
+      HttpMethodBase request = createMethod(url, type);
+
+      int hdrCount = hdrs != null ? hdrs.length : 0;
+      for(int n = 0; n < hdrCount; n ++)
+         request.addRequestHeader(hdrs[n]);
+      try
+      {
+         log.debug("Connecting to: "+url);
+         String userInfo = url.getUserInfo();
+
+         if( userInfo != null )
+         {
+            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
+            httpConn.getState().setCredentials(realm, url.getHost(), auth);
+         }
+         log.debug("RequestURI: "+request.getURI());
+         int responseCode = httpConn.executeMethod(request);
+         String response = request.getStatusText();
+         log.debug("responseCode="+responseCode+", response="+response);
+         String content = request.getResponseBodyAsString();
+         log.debug(content);
+         // Validate that we are seeing the requested response code
+         if( responseCode != expectedHttpCode )
+         {
+            throw new IOException("Expected reply code:"+expectedHttpCode
+               +", actual="+responseCode);
+         }
+      }
+      catch(IOException e)
+      {
+         throw e;
+      }
+      return request;
+   }
+
+   public static HttpMethodBase createMethod(URL url, int type)
+   {
+      HttpMethodBase request = null;
+      switch( type )
+      {
+         case GET:
+            request = new GetMethod(url.toString());
+            break;
+         case POST:
+            request = new PostMethod(url.toString());
+            break;
+         case HEAD:
+            request = new HeadMethod(url.toString());
+            break;
+         case OPTIONS:
+            request = new OptionsMethod(url.toString());
+            break;
+         case PUT:
+            request = new PutMethod(url.toString());
+            break;
+         case DELETE:
+            request = new DeleteMethod(url.toString());
+            break;
+         case TRACE:
+            request = new TraceMethod(url.toString());
+            break;
+      }
+      return request;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/lob/unit/BlobUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/lob/unit/BlobUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/lob/unit/BlobUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -40,7 +40,7 @@
 public class BlobUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,104 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-import javax.ejb.Remote;
-import javax.ejb.Local;
-import javax.naming.InitialContext;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Service
- at Remote(ServiceRemote.class)
- at Local(ServiceLocal.class)
-public class ServiceBean implements ServiceLocal, ServiceRemote
-{
-   public void test()
-   {
-      
-   }
-   
-   public void testLocal()throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatefulLocal stateful1 = (StatefulLocal)ctx.lookup("StatefulBean/local");
-      StatefulLocal stateful2 = (StatefulLocal)ctx.lookup("StatefulBean/local");
-      
-      StatefulClustered statefulClustered1 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
-      StatefulClustered statefulClustered2 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
-      
-      StatelessLocal stateless1 = (StatelessLocal)ctx.lookup("StatelessBean/local");
-      StatelessLocal stateless2 = (StatelessLocal)ctx.lookup("StatelessBean/local");
-      
-      StatelessClustered statelessClustered1 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
-      StatelessClustered statelessClustered2 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
-      
-      ServiceLocal service1 = (ServiceLocal)ctx.lookup("ServiceBean/local");
-      ServiceLocal service2 = (ServiceLocal)ctx.lookup("ServiceBean/local");
-      
-      stateful1.test();
-      stateful2.test();
-      statefulClustered1.test();
-      statefulClustered2.test();
-      stateless1.test();
-      stateless2.test();
-      statelessClustered1.test();
-      statelessClustered2.test();
-      service1.test();
-      service2.test();
-
-      assertFalse(stateful1.hashCode() ==  stateful2.hashCode());
-      assertFalse(statefulClustered1.hashCode() == statefulClustered2.hashCode());
-      assertTrue(stateless1.hashCode() == stateless2.hashCode());
-      assertTrue(statelessClustered1.hashCode() == statelessClustered2.hashCode());
-      assertTrue(service1.hashCode() == service2.hashCode());
-      
-      assertFalse(stateful1.equals(stateful2));
-      assertFalse(statefulClustered1.equals(statefulClustered2));
-      assertTrue(stateless1.equals(stateless2));
-      assertTrue(statelessClustered1.equals(statelessClustered2));
-      assertTrue(service1.equals(service2));
-   }
-   
-   private void assertFalse(boolean b)
-   {
-      if (b)
-      {
-         throw new RuntimeException("Assertion failed!");
-      }
-   }
-
-   private void assertTrue(boolean b)
-   {
-      if (!b)
-      {
-         throw new RuntimeException("Assertion failed!");
-      }
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+import javax.ejb.Remote;
+import javax.ejb.Local;
+import javax.naming.InitialContext;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Service
+ at Remote(ServiceRemote.class)
+ at Local(ServiceLocal.class)
+public class ServiceBean implements ServiceLocal, ServiceRemote
+{
+   public void test()
+   {
+      
+   }
+   
+   public void testLocal()throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatefulLocal stateful1 = (StatefulLocal)ctx.lookup("StatefulBean/local");
+      StatefulLocal stateful2 = (StatefulLocal)ctx.lookup("StatefulBean/local");
+      
+      StatefulClustered statefulClustered1 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
+      StatefulClustered statefulClustered2 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
+      
+      StatelessLocal stateless1 = (StatelessLocal)ctx.lookup("StatelessBean/local");
+      StatelessLocal stateless2 = (StatelessLocal)ctx.lookup("StatelessBean/local");
+      
+      StatelessClustered statelessClustered1 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
+      StatelessClustered statelessClustered2 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
+      
+      ServiceLocal service1 = (ServiceLocal)ctx.lookup("ServiceBean/local");
+      ServiceLocal service2 = (ServiceLocal)ctx.lookup("ServiceBean/local");
+      
+      stateful1.test();
+      stateful2.test();
+      statefulClustered1.test();
+      statefulClustered2.test();
+      stateless1.test();
+      stateless2.test();
+      statelessClustered1.test();
+      statelessClustered2.test();
+      service1.test();
+      service2.test();
+
+      assertFalse(stateful1.hashCode() ==  stateful2.hashCode());
+      assertFalse(statefulClustered1.hashCode() == statefulClustered2.hashCode());
+      assertTrue(stateless1.hashCode() == stateless2.hashCode());
+      assertTrue(statelessClustered1.hashCode() == statelessClustered2.hashCode());
+      assertTrue(service1.hashCode() == service2.hashCode());
+      
+      assertFalse(stateful1.equals(stateful2));
+      assertFalse(statefulClustered1.equals(statefulClustered2));
+      assertTrue(stateless1.equals(stateless2));
+      assertTrue(statelessClustered1.equals(statelessClustered2));
+      assertTrue(service1.equals(service2));
+   }
+   
+   private void assertFalse(boolean b)
+   {
+      if (b)
+      {
+         throw new RuntimeException("Assertion failed!");
+      }
+   }
+
+   private void assertTrue(boolean b)
+   {
+      if (!b)
+      {
+         throw new RuntimeException("Assertion failed!");
+      }
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface ServiceLocal
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface ServiceLocal
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface ServiceRemote
-{
-   void test();
-   void testLocal()throws Exception;
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface ServiceRemote
+{
+   void test();
+   void testLocal()throws Exception;
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.Local;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateful
- at Local(StatefulLocal.class)
- at Remote(StatefulRemote.class)
-public class StatefulBean implements StatefulRemote, StatefulLocal
-{
-   public void test()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at Local(StatefulLocal.class)
+ at Remote(StatefulRemote.class)
+public class StatefulBean implements StatefulRemote, StatefulLocal
+{
+   public void test()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface StatefulClustered
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface StatefulClustered
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClustered.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.Clustered;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateful
- at Clustered
- at Remote(StatefulClustered.class)
-public class StatefulClusteredBean implements StatefulClustered, java.io.Serializable
-{
-   public void test()
-   {
-      
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.Clustered;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at Clustered
+ at Remote(StatefulClustered.class)
+public class StatefulClusteredBean implements StatefulClustered, java.io.Serializable
+{
+   public void test()
+   {
+      
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface StatefulLocal
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface StatefulLocal
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface StatefulRemote
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface StatefulRemote
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.Local;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
- at Local(StatelessLocal.class)
- at Remote(StatelessRemote.class)
-public class StatelessBean implements StatelessLocal, StatelessRemote
-{
-   public void test()
-   {
-      
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Local(StatelessLocal.class)
+ at Remote(StatelessRemote.class)
+public class StatelessBean implements StatelessLocal, StatelessRemote
+{
+   public void test()
+   {
+      
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface StatelessClustered
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface StatelessClustered
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClustered.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.Clustered;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
- at Clustered
- at Remote(StatelessClustered.class)
-public class StatelessClusteredBean implements StatelessClustered
-{
-   public void test()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.Clustered;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Clustered
+ at Remote(StatelessClustered.class)
+public class StatelessClusteredBean implements StatelessClustered
+{
+   public void test()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface StatelessLocal
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface StatelessLocal
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public interface StatelessRemote
-{
-   void test();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public interface StatelessRemote
+{
+   void test();
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,103 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-
-package org.jboss.ejb3.test.localcall.unit;
-
-import javax.naming.InitialContext;
-import org.jboss.ejb3.test.localcall.ServiceRemote;
-import org.jboss.ejb3.test.localcall.StatefulClustered;
-import org.jboss.ejb3.test.localcall.StatefulRemote;
-import org.jboss.ejb3.test.localcall.StatelessClustered;
-import org.jboss.ejb3.test.localcall.StatelessRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class TestLocalCallsTestCase extends JBossTestCase
-{
-   public TestLocalCallsTestCase(String name)
-   {
-      super(name);
-      
-   }
-   
-   public void testRemoteIfLocalCalls() throws Exception
-   {
-      System.out.println("Testing local");
-      InitialContext ctx = getInitialContext();
-      StatefulRemote stateful1 = (StatefulRemote)ctx.lookup("StatefulBean/remote");
-      StatefulRemote stateful2 = (StatefulRemote)ctx.lookup("StatefulBean/remote");
-      
-      StatefulClustered statefulClustered1 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
-      StatefulClustered statefulClustered2 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
-      
-      StatelessRemote stateless1 = (StatelessRemote)ctx.lookup("StatelessBean/remote");
-      StatelessRemote stateless2 = (StatelessRemote)ctx.lookup("StatelessBean/remote");
-      
-      StatelessClustered statelessClustered1 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
-      StatelessClustered statelessClustered2 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
-      
-      ServiceRemote service1 = (ServiceRemote)ctx.lookup("ServiceBean/remote");
-      ServiceRemote service2 = (ServiceRemote)ctx.lookup("ServiceBean/remote");
-      
-      stateful1.test();
-      stateful2.test();
-      statefulClustered1.test();
-      statefulClustered2.test();
-      stateless1.test();
-      stateless2.test();
-      statelessClustered1.test();
-      statelessClustered2.test();
-      service1.test();
-      service2.test();
-            
-      assertFalse(stateful1.hashCode() ==  stateful2.hashCode());
-      assertFalse(statefulClustered1.hashCode() == statefulClustered2.hashCode());
-      assertTrue(stateless1.hashCode() == stateless2.hashCode());
-      assertTrue(statelessClustered1.hashCode() == statelessClustered2.hashCode());
-      assertTrue(service1.hashCode() == service2.hashCode());
-      
-      assertFalse(stateful1.equals(stateful2));
-      assertFalse(statefulClustered1.equals(statefulClustered2));
-      assertTrue(stateless1.equals(stateless2));
-      assertTrue(statelessClustered1.equals(statelessClustered2));
-      assertTrue(service1.equals(service2));
-      
-   }
-   
-   public void testLocalIfLocalCalls() throws Exception
-   {
-      System.out.println("TESTING LOCAL CALLS");
-      InitialContext ctx = getInitialContext();
-      ServiceRemote service = (ServiceRemote)ctx.lookup("ServiceBean/remote");
-      service.testLocal();
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(TestLocalCallsTestCase.class, "localcall-test.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.localcall.unit;
+
+import javax.naming.InitialContext;
+import org.jboss.ejb3.test.localcall.ServiceRemote;
+import org.jboss.ejb3.test.localcall.StatefulClustered;
+import org.jboss.ejb3.test.localcall.StatefulRemote;
+import org.jboss.ejb3.test.localcall.StatelessClustered;
+import org.jboss.ejb3.test.localcall.StatelessRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class TestLocalCallsTestCase extends JBossTestCase
+{
+   public TestLocalCallsTestCase(String name)
+   {
+      super(name);
+      
+   }
+   
+   public void testRemoteIfLocalCalls() throws Exception
+   {
+      System.out.println("Testing local");
+      InitialContext ctx = getInitialContext();
+      StatefulRemote stateful1 = (StatefulRemote)ctx.lookup("StatefulBean/remote");
+      StatefulRemote stateful2 = (StatefulRemote)ctx.lookup("StatefulBean/remote");
+      
+      StatefulClustered statefulClustered1 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
+      StatefulClustered statefulClustered2 = (StatefulClustered)ctx.lookup("StatefulClusteredBean/remote");
+      
+      StatelessRemote stateless1 = (StatelessRemote)ctx.lookup("StatelessBean/remote");
+      StatelessRemote stateless2 = (StatelessRemote)ctx.lookup("StatelessBean/remote");
+      
+      StatelessClustered statelessClustered1 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
+      StatelessClustered statelessClustered2 = (StatelessClustered)ctx.lookup("StatelessClusteredBean/remote");
+      
+      ServiceRemote service1 = (ServiceRemote)ctx.lookup("ServiceBean/remote");
+      ServiceRemote service2 = (ServiceRemote)ctx.lookup("ServiceBean/remote");
+      
+      stateful1.test();
+      stateful2.test();
+      statefulClustered1.test();
+      statefulClustered2.test();
+      stateless1.test();
+      stateless2.test();
+      statelessClustered1.test();
+      statelessClustered2.test();
+      service1.test();
+      service2.test();
+            
+      assertFalse(stateful1.hashCode() ==  stateful2.hashCode());
+      assertFalse(statefulClustered1.hashCode() == statefulClustered2.hashCode());
+      assertTrue(stateless1.hashCode() == stateless2.hashCode());
+      assertTrue(statelessClustered1.hashCode() == statelessClustered2.hashCode());
+      assertTrue(service1.hashCode() == service2.hashCode());
+      
+      assertFalse(stateful1.equals(stateful2));
+      assertFalse(statefulClustered1.equals(statefulClustered2));
+      assertTrue(stateless1.equals(stateless2));
+      assertTrue(statelessClustered1.equals(statelessClustered2));
+      assertTrue(service1.equals(service2));
+      
+   }
+   
+   public void testLocalIfLocalCalls() throws Exception
+   {
+      System.out.println("TESTING LOCAL CALLS");
+      InitialContext ctx = getInitialContext();
+      ServiceRemote service = (ServiceRemote)ctx.lookup("ServiceBean/remote");
+      service.testLocal();
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(TestLocalCallsTestCase.class, "localcall-test.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/localcall/unit/TestLocalCallsTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.longlived;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Contained
-{
-   Customer find(long id);
-
-   void setCustomer(long id);
-
-   Customer getCustomer();
-
-   void updateCustomer();
-
-   boolean isActivated();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.longlived;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Contained
+{
+   Customer find(long id);
+
+   void setCustomer(long id);
+
+   Customer getCustomer();
+
+   void updateCustomer();
+
+   boolean isActivated();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/Contained.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.longlived;
-
-import java.io.Serializable;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
-import javax.annotation.PreDestroy;
-import javax.ejb.Stateful;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 2)
-public class ContainedBean implements Contained, Serializable
-{
-   @PersistenceContext(type= PersistenceContextType.EXTENDED) EntityManager em;
-
-   Customer customer;
-
-   public Customer find(long id)
-   {
-      return em.find(Customer.class, id);
-   }
-
-   public void setCustomer(long id)
-   {
-      customer = find(id);
-   }
-
-   public Customer getCustomer()
-   {
-      return customer;
-   }
-
-   public void updateCustomer()
-   {
-      customer.setName("contained modified");
-   }
-
-   public boolean isActivated()
-   {
-      return activated;
-   }
-
-   public static boolean destroyed = false;
-   public static boolean passivated = false;
-   public static boolean activate = false;
-   private boolean activated = false;
-
-   @PrePassivate
-   public void passivate()
-   {
-      passivated = true;
-   }
-
-   @PostActivate
-   public void activate()
-   {
-      System.out.println("*********** ACTIVATED *****************");
-      if (activated) throw new RuntimeException("ACTIVATED TWICE");
-      activated = true;
-      if (activate) throw new RuntimeException("ACTIVATED TWIC IN TWO DIFFERENT INSTANCES");
-      activate = true;
-
-   }
-
-   @PreDestroy
-   public void destroy()
-   {
-      destroyed = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.longlived;
+
+import java.io.Serializable;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.EntityManager;
+import javax.annotation.PreDestroy;
+import javax.ejb.Stateful;
+import javax.ejb.PrePassivate;
+import javax.ejb.PostActivate;
+
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 2)
+public class ContainedBean implements Contained, Serializable
+{
+   @PersistenceContext(type= PersistenceContextType.EXTENDED) EntityManager em;
+
+   Customer customer;
+
+   public Customer find(long id)
+   {
+      return em.find(Customer.class, id);
+   }
+
+   public void setCustomer(long id)
+   {
+      customer = find(id);
+   }
+
+   public Customer getCustomer()
+   {
+      return customer;
+   }
+
+   public void updateCustomer()
+   {
+      customer.setName("contained modified");
+   }
+
+   public boolean isActivated()
+   {
+      return activated;
+   }
+
+   public static boolean destroyed = false;
+   public static boolean passivated = false;
+   public static boolean activate = false;
+   private boolean activated = false;
+
+   @PrePassivate
+   public void passivate()
+   {
+      passivated = true;
+   }
+
+   @PostActivate
+   public void activate()
+   {
+      System.out.println("*********** ACTIVATED *****************");
+      if (activated) throw new RuntimeException("ACTIVATED TWICE");
+      activated = true;
+      if (activate) throw new RuntimeException("ACTIVATED TWIC IN TWO DIFFERENT INSTANCES");
+      activate = true;
+
+   }
+
+   @PreDestroy
+   public void destroy()
+   {
+      destroyed = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,119 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.longlived;
-
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import org.hibernate.Session;
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
- at Stateful
- at Remote(ShoppingCart.class)
- at RemoteBinding(jndiBinding = "HibernateShoppingCart")
-public class HibernateShoppingCartBean implements ShoppingCart
-{
-   @PersistenceContext(type=PersistenceContextType.EXTENDED) Session em;
-
-   @EJB StatelessLocal stateless;
-
-   @EJB private Contained contained;
-
-   private Customer customer;
-
-   public long createCustomer()
-   {
-      customer = new Customer();
-      customer.setName("William");
-      em.save(customer);
-      System.out.println("********* created *****");
-      return customer.getId();
-   }
-
-   public boolean isContainedActivated()
-   {
-      return false;
-   }
-
-   public void update()
-   {
-      System.out.println("********* update() *****");
-      customer.setName("Bill");
-   }
-   public void update2()
-   {
-      customer.setName("Billy");
-   }
-
-   public void update3()
-   {
-      stateless.update(customer);
-   }
-
-   public Customer find(long id)
-   {
-      return (Customer)em.get(Customer.class, new Long(id));
-   }
-
-   public void findAndUpdateStateless()
-   {
-      stateless.findAndUpdate(customer.getId());
-      if (!customer.getName().equals("stateless modified")) throw new RuntimeException("stateless didn't get propagated pc");
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never()
-   {
-      customer.setName("Bob");
-   }
-
-   public void updateContained()
-   {
-      contained.updateCustomer();
-   }
-
-   public void setContainedCustomer()
-   {
-      contained.setCustomer(customer.getId());
-   }
-
-   public void checkContainedCustomer()
-   {
-      if (contained.getCustomer() != customer) throw new RuntimeException("not same customer");
-   }
-
-
-
-
-   @Remove
-   public void checkout() {}
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.longlived;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import org.hibernate.Session;
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ */
+ at Stateful
+ at Remote(ShoppingCart.class)
+ at RemoteBinding(jndiBinding = "HibernateShoppingCart")
+public class HibernateShoppingCartBean implements ShoppingCart
+{
+   @PersistenceContext(type=PersistenceContextType.EXTENDED) Session em;
+
+   @EJB StatelessLocal stateless;
+
+   @EJB private Contained contained;
+
+   private Customer customer;
+
+   public long createCustomer()
+   {
+      customer = new Customer();
+      customer.setName("William");
+      em.save(customer);
+      System.out.println("********* created *****");
+      return customer.getId();
+   }
+
+   public boolean isContainedActivated()
+   {
+      return false;
+   }
+
+   public void update()
+   {
+      System.out.println("********* update() *****");
+      customer.setName("Bill");
+   }
+   public void update2()
+   {
+      customer.setName("Billy");
+   }
+
+   public void update3()
+   {
+      stateless.update(customer);
+   }
+
+   public Customer find(long id)
+   {
+      return (Customer)em.get(Customer.class, new Long(id));
+   }
+
+   public void findAndUpdateStateless()
+   {
+      stateless.findAndUpdate(customer.getId());
+      if (!customer.getName().equals("stateless modified")) throw new RuntimeException("stateless didn't get propagated pc");
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never()
+   {
+      customer.setName("Bob");
+   }
+
+   public void updateContained()
+   {
+      contained.updateCustomer();
+   }
+
+   public void setContainedCustomer()
+   {
+      contained.setCustomer(customer.getId());
+   }
+
+   public void checkContainedCustomer()
+   {
+      if (contained.getCustomer() != customer) throw new RuntimeException("not same customer");
+   }
+
+
+
+
+   @Remove
+   public void checkout() {}
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/longlived/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mail;
-
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface StatelessMail
-{
-   void testMail() throws NamingException;
-   
-   void testMailInjection();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mail;
+
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface StatelessMail
+{
+   void testMail() throws NamingException;
+   
+   void testMailInjection();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMail.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mail;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-
-import org.jboss.logging.Logger;
-
-import javax.mail.Session;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless(name="StatelessMail")
- at Remote(StatelessMail.class)
- at RemoteBinding(jndiBinding="StatelessMail")
-public class StatelessMailBean
-   implements StatelessMail
-{
-   private static final Logger log = Logger.getLogger(StatelessMailBean.class);
-   
-   @Resource(name="DefaultMail", mappedName="java:/Mail")
-   private Session mailSession;
-   
-   @Resource(mappedName="java:/Mail")
-   private Session session;
-   
-   public void testMail() throws NamingException
-   {
-      Context initCtx = new InitialContext();
-      Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
-      
-      // JavaMail Session
-      Object obj = myEnv.lookup("mail/DefaultMail");
-      if ((obj instanceof javax.mail.Session) == false)
-         throw new NamingException("DefaultMail is not a javax.mail.Session");
-   }
-   
-   public void testMailInjection()
-   {
-      mailSession.getProperties();
-      
-      session.getProperties();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mail;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.Container;
+
+import org.jboss.logging.Logger;
+
+import javax.mail.Session;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless(name="StatelessMail")
+ at Remote(StatelessMail.class)
+ at RemoteBinding(jndiBinding="StatelessMail")
+public class StatelessMailBean
+   implements StatelessMail
+{
+   private static final Logger log = Logger.getLogger(StatelessMailBean.class);
+   
+   @Resource(name="DefaultMail", mappedName="java:/Mail")
+   private Session mailSession;
+   
+   @Resource(mappedName="java:/Mail")
+   private Session session;
+   
+   public void testMail() throws NamingException
+   {
+      Context initCtx = new InitialContext();
+      Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
+      
+      // JavaMail Session
+      Object obj = myEnv.lookup("mail/DefaultMail");
+      if ((obj instanceof javax.mail.Session) == false)
+         throw new NamingException("DefaultMail is not a javax.mail.Session");
+   }
+   
+   public void testMailInjection()
+   {
+      mailSession.getProperties();
+      
+      session.getProperties();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mail.unit;
-
-import javax.naming.InitialContext;
-
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.mail.StatelessMail;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class MailTestCase extends JBossTestCase
-{
-  
-   public MailTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void test() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      StatelessMail bean = (StatelessMail)jndiContext.lookup("StatelessMail");
-      assertNotNull(bean);
-      
-      bean.testMail();
-      bean.testMailInjection();
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(MailTestCase.class, "mail-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mail.unit;
+
+import javax.naming.InitialContext;
+
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.mail.StatelessMail;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MailTestCase extends JBossTestCase
+{
+  
+   public MailTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void test() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      StatelessMail bean = (StatelessMail)jndiContext.lookup("StatelessMail");
+      assertNotNull(bean);
+      
+      bean.testMail();
+      bean.testMailInjection();
+   }
+
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(MailTestCase.class, "mail-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mail/unit/MailTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/manytomany/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/manytomany/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/manytomany/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -41,7 +41,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.MessageDrivenContext;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-import javax.annotation.security.RunAs;
-import javax.annotation.Resource;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/bmtmdbtest")
-        })
- at RunAs("TestRole")
- at SecurityDomain("other")
- at TransactionManagement(TransactionManagementType.BEAN)
-public class BMTQueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(BMTQueueTestMDB.class);
-   
-   private static boolean thrownException = false;
-   @Resource MessageDrivenContext ctx;
-
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("*** BMTQueueTestMDB onMessage " + thrownException);
-      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
-      
-      if (!thrownException)
-      {
-         thrownException = true;
-         throw new RuntimeException();
-      }
-      
-      TestStatusBean.bmtQueueRan++;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import javax.annotation.security.RunAs;
+import javax.annotation.Resource;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/bmtmdbtest"),
+        @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
+        })
+ at RunAs("TestRole")
+ at SecurityDomain("other")
+ at TransactionManagement(TransactionManagementType.BEAN)
+public class BMTQueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(BMTQueueTestMDB.class);
+   
+   private static boolean thrownException = false;
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("*** BMTQueueTestMDB onMessage " + thrownException);
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      
+      if (!thrownException)
+      {
+         thrownException = true;
+         throw new RuntimeException();
+      }
+      
+      TestStatusBean.bmtQueueRan++;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at MessageDriven(activationConfig =
+   {
+      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+      @ActivationConfigProperty(propertyName="destination", propertyValue="queue/cmtmdbtest"),
+      @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
+   })
+ at RunAs("TestRole")
+ at SecurityDomain("other")
+public class CMTQueueTestMDB implements MessageListener
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(CMTQueueTestMDB.class);
+   
+   private static boolean thrownException = false;
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("*** CMTQueueTestMDB onMessage " + thrownException);
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      
+      if (!thrownException)
+      {
+         thrownException = true;
+         throw new RuntimeException();
+      }
+      
+      TestStatusBean.cmtQueueRan++;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTTxNotSupportedTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTTxNotSupportedTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTTxNotSupportedTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTTxNotSupportedTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.annotation.Resource;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at MessageDriven(activationConfig =
+{
+   @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+   @ActivationConfigProperty(propertyName="destination", propertyValue="queue/cmttxnotsupmdbtest"),
+   @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
+})
+ at TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+public class CMTTxNotSupportedTestMDB implements MessageListener
+{
+   private static boolean thrownException = false;
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message message)
+   {
+      System.out.println("*** CMTTxNotSupportedTestMDB onMessage " + thrownException);
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      
+      if (!thrownException)
+      {
+         thrownException = true;
+         throw new RuntimeException();
+      }
+      
+      TestStatusBean.queueRan++;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 46536 $</tt>
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/dlqtest"),
-        @ActivationConfigProperty(propertyName="dLQMaxResent", propertyValue="1")
-        })
-public class DlqTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(DlqTestMDB.class);
-   
-   public void onMessage(Message message)
-   { 
-      System.out.println("*** DlqTestMDB onMessage ");
-      throw new RuntimeException("force resend");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/dlqtest"),
+        @ActivationConfigProperty(propertyName="dLQMaxResent", propertyValue="1")
+        })
+public class DlqTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(DlqTestMDB.class);
+   
+   public void onMessage(Message message)
+   { 
+      System.out.println("*** DlqTestMDB onMessage ");
+      throw new RuntimeException("force resend");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/DlqTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.jboss.annotation.ejb.PoolClass;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at MessageDriven(activationConfig =
+{
+   @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+   @ActivationConfigProperty(propertyName="destination", propertyValue="queue/expirationmdbtest")
+})
+ at PoolClass(value=org.jboss.ejb3.StrictMaxPool.class, maxSize=1)
+public class ExpirationTestMDB implements MessageListener
+{
+   public void onMessage(Message message)
+   {
+      System.out.println("*** ExpirationTestMDB onMessage " + TestStatusBean.expirationQueueRan);
+      
+      try
+      {
+         Thread.sleep(1000);
+      }
+      catch(InterruptedException e)
+      {
+         // ignore
+      }
+      
+      TestStatusBean.expirationQueueRan++;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision: 46471 $
- */
- at Stateless(name="LocalStateless")
-public class LocalStatelessBean implements org.jboss.ejb3.test.mdb.Stateless
-{
-   private static String state = null;
-
-   public String getState()
-   {
-      return state;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless(name="LocalStateless")
+public class LocalStatelessBean implements org.jboss.ejb3.test.mdb.Stateless
+{
+   private static String state = null;
+
+   public String getState()
+   {
+      return state;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/LocalStatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.DeliveryMode;
-
-import javax.annotation.security.RunAs;
-import javax.annotation.Resource;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/nondurablemdbtest"),
-        @ActivationConfigProperty(propertyName="subscriptionDurability", propertyValue="NON_DURABLE")
-        })
- at RunAs("TestRole")
- at SecurityDomain("other")
-public class NondurableQueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(NondurableQueueTestMDB.class);
-   @Resource MessageDrivenContext ctx;
-
-   public void onMessage(Message recvMsg)
-   {
-      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
-      try
-      {
-         System.out.println("*** NondurableQueueTestMDB onMessage");
-         if (recvMsg.getJMSDeliveryMode() != DeliveryMode.NON_PERSISTENT)
-            log.error("Message is PERSISTENT - should be NON PERSISTENT");
-         else
-            TestStatusBean.nondurableQueueRan++;
-      } 
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.DeliveryMode;
+
+import javax.annotation.security.RunAs;
+import javax.annotation.Resource;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/nondurablemdbtest"),
+        @ActivationConfigProperty(propertyName="subscriptionDurability", propertyValue="NON_DURABLE")
+        })
+ at RunAs("TestRole")
+ at SecurityDomain("other")
+public class NondurableQueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(NondurableQueueTestMDB.class);
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message recvMsg)
+   {
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      try
+      {
+         System.out.println("*** NondurableQueueTestMDB onMessage");
+         if (recvMsg.getJMSDeliveryMode() != DeliveryMode.NON_PERSISTENT)
+            log.error("Message is PERSISTENT - should be NON PERSISTENT");
+         else
+            TestStatusBean.nondurableQueueRan++;
+      } 
+      catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-import javax.annotation.security.RunAs;
-import javax.annotation.Resource;
-
-import org.jboss.annotation.ejb.DefaultActivationSpecs;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 46009 $
- */
- at DefaultActivationSpecs({
-      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Bogus")
-      })
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/overridedefaultedmdbtest")
-        })
- at RunAs("TestRole")
- at SecurityDomain("other")
-public class OverrideDefaultedQueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(DefaultedQueueTestMDB.class);
-   @Resource MessageDrivenContext ctx;
-
-   public void onMessage(Message recvMsg)
-   {
-      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
-      System.out.println("*** OverrideDefaultedQueueTestMDB onMessage");
-      TestStatusBean.overrideDefaultedQueueRan++;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import javax.annotation.security.RunAs;
+import javax.annotation.Resource;
+
+import org.jboss.annotation.ejb.DefaultActivationSpecs;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at DefaultActivationSpecs({
+      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Bogus")
+      })
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/overridedefaultedmdbtest")
+        })
+ at RunAs("TestRole")
+ at SecurityDomain("other")
+public class OverrideDefaultedQueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(DefaultedQueueTestMDB.class);
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message recvMsg)
+   {
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      System.out.println("*** OverrideDefaultedQueueTestMDB onMessage");
+      TestStatusBean.overrideDefaultedQueueRan++;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.annotation.Resource;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Bogus"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/bogus")
-        })
-public class OverrideTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(OverrideTestMDB.class);
-   @Resource MessageDrivenContext ctx;
-
-   public void onMessage(Message recvMsg)
-   {
-      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
-      TestStatusBean.overrideQueueRan++;
-      
-      System.out.println("*** OverrideTestMDB onMessage " + TestStatusBean.overrideQueueRan);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.annotation.Resource;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Bogus"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/bogus")
+        })
+public class OverrideTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(OverrideTestMDB.class);
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message recvMsg)
+   {
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      TestStatusBean.overrideQueueRan++;
+      
+      System.out.println("*** OverrideTestMDB onMessage " + TestStatusBean.overrideQueueRan);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at MessageDriven(activationConfig =
+   {
+      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+      @ActivationConfigProperty(propertyName="destination", propertyValue="queue/rollbackcmtmdbtest"),
+      @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
+   })
+ at RunAs("TestRole")
+ at SecurityDomain("other")
+public class RollbackCMTQueueTestMDB implements MessageListener
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(RollbackCMTQueueTestMDB.class);
+   
+   private static boolean rolledback = false;
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("*** RollbackCMTQueueTestMDB onMessage " + rolledback);
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      
+      if (!rolledback)
+      {
+         rolledback = true;
+         ctx.setRollbackOnly();
+         return;
+      }
+      
+      TestStatusBean.rollbackCmtQueueRan++;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface Stateless
-{
-   String getState();
-
-   void setState(String state);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface Stateless
+{
+   String getState();
+
+   void setState(String state);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/Stateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdb;
-
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless(name="Stateless")
- at Remote(org.jboss.ejb3.test.mdb.Stateless.class)
- at RemoteBinding(jndiBinding = "Stateless")
- at SecurityDomain("other")
-public class StatelessBean
-{
-   private static String state = null;
-
-   @RolesAllowed({"anyone"})
-   public String getState()
-   {
-      return state;
-   }
-
-   @RolesAllowed({"TestRole"})
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless(name="Stateless")
+ at Remote(org.jboss.ejb3.test.mdb.Stateless.class)
+ at RemoteBinding(jndiBinding = "Stateless")
+ at SecurityDomain("other")
+public class StatelessBean
+{
+   private static String state = null;
+
+   @RolesAllowed({"anyone"})
+   public String getState()
+   {
+      return state;
+   }
+
+   @RolesAllowed({"TestRole"})
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -48,6 +48,10 @@
    
    int bmtQueueRan();
    
+   int cmtQueueRan();
+   
+   int transactionQueueRan();
+   
    int messageCount();
 
    boolean interceptedTopic();
@@ -58,4 +62,7 @@
 
    boolean preDestroy();
    
+   int rollbackCmtQueueRan();
+   
+   int expirationQueueRan();
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,8 +36,8 @@
 @Remote(TestStatus.class)
 public class TestStatusBean implements TestStatus
 {
-   private static final Logger log = Logger
-   .getLogger(TestStatusBean.class);
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(TestStatusBean.class);
    
    public static int queueRan = 0;
    public static int overrideQueueRan = 0;
@@ -46,22 +46,28 @@
    public static int nondurableQueueRan = 0;
    public static int topicRan = 0;
    public static int bmtQueueRan = 0;
+   static int cmtQueueRan = 0;
+   public static int transactionQueueRan = 0;
    public static int messageCount = 0;
    public static boolean interceptedTopic = false;
    public static boolean interceptedQueue = false;
    public static boolean postConstruct = false;
    public static boolean preDestroy = false;
+   static int rollbackCmtQueueRan = 0;
+   static int expirationQueueRan = 0;
 
    public void clear()
    {
       queueRan = 0;
       topicRan = 0;
       bmtQueueRan = 0;
+      cmtQueueRan = 0;
       overrideQueueRan = 0;
       defaultedQueueRan = 0;
       overrideDefaultedQueueRan = 0;
       messageCount = 0;
       nondurableQueueRan = 0;
+      transactionQueueRan = 0;
       interceptedTopic = false;
       interceptedQueue = false;
       postConstruct = false;
@@ -88,6 +94,11 @@
       return defaultedQueueRan;
    }
    
+   public int transactionQueueRan()
+   {
+      return transactionQueueRan;
+   }
+   
    public int nondurableQueueFired()
    {
       return nondurableQueueRan;
@@ -103,6 +114,11 @@
       return bmtQueueRan;
    }
 
+   public int cmtQueueRan()
+   {
+      return cmtQueueRan;
+   }
+   
    public boolean interceptedTopic()
    {
       return interceptedTopic;
@@ -127,4 +143,14 @@
    {
       return messageCount;
    }
+   
+   public int rollbackCmtQueueRan()
+   {
+      return rollbackCmtQueueRan;
+   }
+   
+   public int expirationQueueRan()
+   {
+      return expirationQueueRan;
+   }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TopicTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TopicTestMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -43,7 +43,8 @@
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
         @ActivationConfigProperty(propertyName="destination", propertyValue="topic/mdbtest"),
         @ActivationConfigProperty(propertyName="subscriptionDurability", propertyValue="Durable"),
-        @ActivationConfigProperty(propertyName="subscriptionName", propertyValue="topicmdb")
+        @ActivationConfigProperty(propertyName="subscriptionName", propertyValue="topicmdb"),
+        @ActivationConfigProperty(propertyName="clientId", propertyValue="mdb-test")
         })
 public class TopicTestMDB implements MessageListener
 {

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import javax.annotation.security.RunAs;
+import javax.annotation.Resource;
+
+import org.jboss.annotation.ejb.TransactionTimeout;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/transactionmdbtest"),
+        @ActivationConfigProperty(propertyName="maxSession", propertyValue="1")
+        })
+ at TransactionTimeout(1)
+//@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+public class TransactionQueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(TransactionQueueTestMDB.class);
+   
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("*** TransactionQueueTestMDB onMessage " + this);
+      
+      try
+      {
+    	  Thread.sleep(1000 * 60 * 6);
+      } 
+      catch (InterruptedException e)
+      {
+    	  e.printStackTrace();
+      }
+      
+      TestStatusBean.transactionQueueRan++;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,180 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.test.mdb.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.logging.Logger;
+import org.jboss.ejb3.ClientKernelAbstraction;
+import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.test.mdb.TestStatus;
+import org.jboss.ejb3.test.mdb.Stateless;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.util.collection.CollectionsUtil;
+import org.jboss.embedded.junit.EmbeddedTestCase;
+import org.jboss.embedded.Bootstrap;
+
+import javax.management.ObjectName;
+import javax.jms.QueueConnection;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Queue;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.TextMessage;
+import javax.jms.DeliveryMode;
+import javax.jms.TopicConnection;
+import javax.jms.MessageProducer;
+import javax.jms.TopicSession;
+import javax.jms.Topic;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueBrowser;
+import javax.naming.NamingException;
+import javax.naming.InitialContext;
+import java.util.List;
+import java.util.Enumeration;
+
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: MDBUnitTestCase.java 59422 2007-01-08 23:18:40Z bdecoste $
+ */
+public class MDBUnitEmbeddedTest extends JBossTestCase
+{
+   public MDBUnitEmbeddedTest(String name)
+   {
+
+      super(name);
+
+   }
+
+   protected void setSecurity(String user, String password)
+   {
+      SecurityAssociation.setPrincipal(new SimplePrincipal(user));
+      SecurityAssociation.setCredential(password.toCharArray());
+
+      InitialContextFactory.setSecurity(user, password);
+   }
+
+   protected void clear(TestStatus status)
+   {
+      status.clear();
+      assertEquals(0, status.bmtQueueRan());
+      assertEquals(0, status.defaultedQueueFired());
+      assertEquals(0, status.messageCount());
+      assertEquals(0, status.nondurableQueueFired());
+      assertEquals(0, status.overrideDefaultedQueueFired());
+      assertEquals(0, status.overrideQueueFired());
+      assertEquals(0, status.queueFired());
+      assertEquals(0, status.topicFired());
+      assertFalse(status.interceptedQueue());
+      assertFalse(status.interceptedTopic());
+      assertFalse(status.postConstruct());
+      assertFalse(status.preDestroy());
+   }
+
+   protected QueueConnectionFactory getQueueConnectionFactory()
+         throws Exception
+   {
+      try
+      {
+         return (QueueConnectionFactory) getInitialContext().lookup(
+               "ConnectionFactory");
+      } catch (NamingException e)
+      {
+         return (QueueConnectionFactory) getInitialContext().lookup(
+               "java:/ConnectionFactory");
+      }
+   }
+
+   protected TopicConnectionFactory getTopicConnectionFactory()
+         throws Exception
+   {
+      try
+      {
+         return (TopicConnectionFactory) getInitialContext().lookup(
+               "ConnectionFactory");
+      } catch (NamingException e)
+      {
+         return (TopicConnectionFactory) getInitialContext().lookup(
+               "java:/ConnectionFactory");
+      }
+   }
+
+
+
+   public void testQueue() throws Exception
+   {
+      setSecurity("anyone", "password");
+
+      TestStatus status = (TestStatus) getInitialContext().lookup(
+            "TestStatusBean/remote");
+      clear(status);
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+      sender.send(msg);
+      sender.send(msg);
+      sender.send(msg);
+      sender.send(msg);
+      session.close();
+      cnn.close();
+
+      Thread.sleep(2000);
+      assertEquals(5, status.queueFired());
+      assertTrue(status.interceptedQueue());
+      assertTrue(status.postConstruct());
+      assertEquals(5, status.messageCount());
+
+      // TODO: Figure out how to test preDestroy gets invoked
+      // assertTrue(status.preDestroy());
+
+      setSecurity("anyone", "password");
+      Stateless stateless = (Stateless) getInitialContext().lookup("Stateless");
+      assertNotNull(stateless);
+      String state = stateless.getState();
+      assertEquals("Set", state);
+      Bootstrap.getInstance().setIgnoreShutdownErrors(true);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return EmbeddedTestCase.getAdaptedSetup(MDBUnitEmbeddedTest.class,
+            "mdbtest-service.xml, mdb-test.jar");
+   }
+
+}
+    
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -24,8 +24,8 @@
 import java.util.Enumeration;
 import java.util.List;
 
+import javax.jms.DeliveryMode;
 import javax.jms.MessageProducer;
-import javax.jms.DeliveryMode;
 import javax.jms.Queue;
 import javax.jms.QueueBrowser;
 import javax.jms.QueueConnection;
@@ -33,20 +33,20 @@
 import javax.jms.QueueReceiver;
 import javax.jms.QueueSender;
 import javax.jms.QueueSession;
-import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.jms.TopicConnection;
 import javax.jms.TopicConnectionFactory;
 import javax.jms.TopicSession;
-
-import javax.management.Attribute;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
+import junit.framework.Test;
+
+import org.jboss.ejb3.ClientKernelAbstraction;
 import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.KernelAbstractionFactory;
 import org.jboss.ejb3.test.mdb.Stateless;
 import org.jboss.ejb3.test.mdb.TestStatus;
 import org.jboss.logging.Logger;
@@ -55,8 +55,6 @@
 import org.jboss.test.JBossTestCase;
 import org.jboss.util.collection.CollectionsUtil;
 
-import junit.framework.Test;
-
 /**
  * Sample client for the jboss container.
  * 
@@ -65,6 +63,7 @@
  */
 public class MDBUnitTestCase extends JBossTestCase
 {
+   @SuppressWarnings("unused")
    private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
 
    static boolean deployed = false;
@@ -78,6 +77,13 @@
 
    }
 
+   private static void removeAllMessagesFromDLQ() throws Exception
+   {
+      ObjectName dlqName = new ObjectName("jboss.messaging.destination:name=DLQ,service=Queue");
+      ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
+      kernel.invoke(dlqName, "removeAllMessages", new Object[0], new String[0]);
+   }
+   
    public void testOverrideQueue() throws Exception
    {
       SecurityAssociation.setPrincipal(new SimplePrincipal("anyone"));
@@ -292,6 +298,31 @@
       assertEquals(1, status.bmtQueueRan());
    }
 
+   public void testRuntimeExceptionCMT() throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      clear(status);
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/cmtmdbtest");
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+      msg.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 1);
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+      session.close();
+      cnn.close();
+
+      Thread.sleep(2000);
+      assertEquals(1, status.cmtQueueRan());
+   }
+
    /**
     * Test that expired messages are moved to a separate queue.
     */
@@ -312,9 +343,7 @@
 
       Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
 
-      ObjectName dlqName = new ObjectName(
-            "jboss.mq.destination:service=Queue,name=DLQ");
-      getServer().invoke(dlqName, "removeAllMessages", null, null);
+      removeAllMessagesFromDLQ();
 
       long now = System.currentTimeMillis();
 
@@ -323,12 +352,14 @@
       message.setStringProperty("null", null);
       String text = "expire on server";
       message.setText(text);
+      
+      sender.send(message, DeliveryMode.NON_PERSISTENT, 4, 1);
 
-      sender.send(message, DeliveryMode.PERSISTENT, 4, 1);
+      Thread.sleep(2000);
 
-      Thread.sleep(1000);
-
       assertSize(session, queue, 0);
+      
+      /* TODO: await implementation of JBMESSAGING-126
       assertSize(session, dlq, 1);
 
       QueueReceiver receiver = session.createReceiver(dlq);
@@ -341,10 +372,11 @@
       assertEquals(text, message.getText());
       assertEquals("bar", message.getStringProperty("foo"));
       assertNull(message.getStringProperty("null"));
-
+      
+      receiver.close();
+       */
       sender.close();
-      receiver.close();
-
+      
       session.close();
       connection.close();
    }
@@ -366,9 +398,7 @@
 
       Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
 
-      ObjectName dlqName = new ObjectName(
-            "jboss.mq.destination:service=Queue,name=DLQ");
-      getServer().invoke(dlqName, "removeAllMessages", null, null);
+      removeAllMessagesFromDLQ();
 
       TextMessage message = session.createTextMessage();
       message.setStringProperty("foo", "bar");
@@ -386,7 +416,11 @@
       QueueReceiver receiver = session.createReceiver(dlq);
       message = (TextMessage) receiver.receiveNoWait();
       assertNotNull(message);
-      assertEquals("QUEUE.dlqtest", message
+      // AS 4.x
+//      assertEquals("QUEUE.dlqtest", message
+//            .getStringProperty("JBOSS_ORIG_DESTINATION"));
+      // AS 5.x
+      assertEquals("JBossQueue[dlqtest]", message
             .getStringProperty("JBOSS_ORIG_DESTINATION"));
       assertEquals(0L, message.getJMSExpiration());
       assertEquals(text, message.getText());
@@ -400,6 +434,169 @@
       connection.close();
    }
 
+   public void testRollbackCMT() throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      clear(status);
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/rollbackcmtmdbtest");
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+      msg.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 1);
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+      session.close();
+      cnn.close();
+
+      Thread.sleep(2000);
+      assertEquals(1, status.rollbackCmtQueueRan());
+   }
+
+   /**
+    * Test that expired messages are not delivered
+    */
+   public void testExpiration() throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      clear(status);
+      
+      QueueConnection connection = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      connection = factory.createQueueConnection();
+      connection.start();
+      session = connection.createQueueSession(false,
+            QueueSession.AUTO_ACKNOWLEDGE);
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/expirationmdbtest");
+      sender = session.createSender(queue);
+
+      Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
+
+      removeAllMessagesFromDLQ();
+
+      long now = System.currentTimeMillis();
+
+      {
+         TextMessage message = session.createTextMessage();
+         message.setStringProperty("foo", "bar");
+         message.setStringProperty("null", null);
+         String text = "do not expire on server";
+         message.setText(text);
+   
+         sender.send(message, DeliveryMode.NON_PERSISTENT, 4, 100);
+      }
+
+      {
+         TextMessage message = session.createTextMessage();
+         message.setStringProperty("foo", "bar");
+         message.setStringProperty("null", null);
+         String text = "expire on server";
+         message.setText(text);
+   
+         sender.send(message, DeliveryMode.NON_PERSISTENT, 4, 1);
+      }
+
+      Thread.sleep(2000);
+
+      assertSize(session, queue, 0);
+      
+      /* TODO: await implementation of JBMESSAGING-126
+      assertSize(session, dlq, 1);
+
+      QueueReceiver receiver = session.createReceiver(dlq);
+      message = (TextMessage) receiver.receiveNoWait();
+      assertNotNull(message);
+      assertEquals("QUEUE.expirytest", message
+            .getStringProperty("JBOSS_ORIG_DESTINATION"));
+      assertTrue(message.getLongProperty("JBOSS_ORIG_EXPIRATION") > now);
+      assertEquals(0L, message.getJMSExpiration());
+      assertEquals(text, message.getText());
+      assertEquals("bar", message.getStringProperty("foo"));
+      assertNull(message.getStringProperty("null"));
+      
+      receiver.close();
+       */
+      sender.close();
+      
+      session.close();
+      connection.close();
+      
+      // the second message should never have arrived, so the bean ran once
+      assertEquals(1, status.expirationQueueRan());
+   }
+
+   public void testCMTTxNotSupported() throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      clear(status);
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/cmttxnotsupmdbtest");
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+      msg.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 1);
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+      session.close();
+      cnn.close();
+
+      Thread.sleep(2000);
+      assertEquals(1, status.queueFired());
+   }
+   
+   public void testTransactionTimeout() throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup(
+            "TestStatusBean/remote");
+      clear(status);
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/transactionmdbtest");
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      cnn = factory.createQueueConnection();
+      cnn.start();
+      session = cnn.createQueueSession(true, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+     
+      sender = session.createSender(queue);
+      
+      sender.send(msg);
+      session.commit();
+
+      Thread.sleep(1000 * 60 * 7);
+      assertEquals(1, status.transactionQueueRan());
+      
+      msg = session.createTextMessage("Hello World II");
+      sender.send(msg);
+      session.commit();
+      
+      Thread.sleep(1000 * 60 * 7);
+      assertEquals(2, status.transactionQueueRan());
+      
+      session.close();
+      cnn.close();
+   }
+
+
    private List list(QueueSession session, Queue queue) throws Exception
    {
       QueueBrowser browser = session.createBrowser(queue);

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdbtopic;
-
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 58399 $
- */
-public interface TestStatus
-{
-   void clear();
-
-   int queueFired();
-   
-   int overrideQueueFired();
-   
-   int nondurableQueueFired();
-   
-   int defaultedQueueFired();
-   
-   int overrideDefaultedQueueFired();
-
-   int topicFired();
-   
-   int bmtQueueRan();
-   
-   int cmtQueueRan();
-   
-   int messageCount();
-
-   boolean interceptedTopic();
-
-   boolean interceptedQueue();
-
-   boolean postConstruct();
-
-   boolean preDestroy();
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdbtopic;
+
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 58399 $
+ */
+public interface TestStatus
+{
+   void clear();
+
+   int queueFired();
+   
+   int overrideQueueFired();
+   
+   int nondurableQueueFired();
+   
+   int defaultedQueueFired();
+   
+   int overrideDefaultedQueueFired();
+
+   int topicFired();
+   
+   int bmtQueueRan();
+   
+   int cmtQueueRan();
+   
+   int messageCount();
+
+   boolean interceptedTopic();
+
+   boolean interceptedQueue();
+
+   boolean postConstruct();
+
+   boolean preDestroy();
+   
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,137 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdbtopic;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 58399 $
- */
- at Stateless
- at Remote(TestStatus.class)
-public class TestStatusBean implements TestStatus
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(TestStatusBean.class);
-   
-   public static int queueRan = 0;
-   public static int overrideQueueRan = 0;
-   public static int defaultedQueueRan = 0;
-   public static int overrideDefaultedQueueRan = 0;
-   public static int nondurableQueueRan = 0;
-   public static int topicRan = 0;
-   public static int bmtQueueRan = 0;
-   static int cmtQueueRan = 0;
-   public static int messageCount = 0;
-   public static boolean interceptedTopic = false;
-   public static boolean interceptedQueue = false;
-   public static boolean postConstruct = false;
-   public static boolean preDestroy = false;
-
-   public void clear()
-   {
-      queueRan = 0;
-      topicRan = 0;
-      bmtQueueRan = 0;
-      cmtQueueRan = 0;
-      overrideQueueRan = 0;
-      defaultedQueueRan = 0;
-      overrideDefaultedQueueRan = 0;
-      messageCount = 0;
-      nondurableQueueRan = 0;
-      interceptedTopic = false;
-      interceptedQueue = false;
-      postConstruct = false;
-      preDestroy = false;
-   }
-
-   public int queueFired()
-   {
-      return queueRan;
-   }
-   
-   public int overrideQueueFired()
-   {
-      return overrideQueueRan;
-   }
-   
-   public int overrideDefaultedQueueFired()
-   {
-      return overrideDefaultedQueueRan;
-   }
-   
-   public int defaultedQueueFired()
-   {
-      return defaultedQueueRan;
-   }
-   
-   public int nondurableQueueFired()
-   {
-      return nondurableQueueRan;
-   }
-
-   public int topicFired()
-   {
-      return topicRan;
-   }
-   
-   public int bmtQueueRan()
-   {
-      return bmtQueueRan;
-   }
-
-   public int cmtQueueRan()
-   {
-      return cmtQueueRan;
-   }
-   
-   public boolean interceptedTopic()
-   {
-      return interceptedTopic;
-   }
-
-   public boolean interceptedQueue()
-   {
-      return interceptedQueue;
-   }
-
-   public boolean postConstruct()
-   {
-      return postConstruct;
-   }
-
-   public boolean preDestroy()
-   {
-      return preDestroy;
-   }
-   
-   public int messageCount()
-   {
-      return messageCount;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdbtopic;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 58399 $
+ */
+ at Stateless
+ at Remote(TestStatus.class)
+public class TestStatusBean implements TestStatus
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(TestStatusBean.class);
+   
+   public static int queueRan = 0;
+   public static int overrideQueueRan = 0;
+   public static int defaultedQueueRan = 0;
+   public static int overrideDefaultedQueueRan = 0;
+   public static int nondurableQueueRan = 0;
+   public static int topicRan = 0;
+   public static int bmtQueueRan = 0;
+   static int cmtQueueRan = 0;
+   public static int messageCount = 0;
+   public static boolean interceptedTopic = false;
+   public static boolean interceptedQueue = false;
+   public static boolean postConstruct = false;
+   public static boolean preDestroy = false;
+
+   public void clear()
+   {
+      queueRan = 0;
+      topicRan = 0;
+      bmtQueueRan = 0;
+      cmtQueueRan = 0;
+      overrideQueueRan = 0;
+      defaultedQueueRan = 0;
+      overrideDefaultedQueueRan = 0;
+      messageCount = 0;
+      nondurableQueueRan = 0;
+      interceptedTopic = false;
+      interceptedQueue = false;
+      postConstruct = false;
+      preDestroy = false;
+   }
+
+   public int queueFired()
+   {
+      return queueRan;
+   }
+   
+   public int overrideQueueFired()
+   {
+      return overrideQueueRan;
+   }
+   
+   public int overrideDefaultedQueueFired()
+   {
+      return overrideDefaultedQueueRan;
+   }
+   
+   public int defaultedQueueFired()
+   {
+      return defaultedQueueRan;
+   }
+   
+   public int nondurableQueueFired()
+   {
+      return nondurableQueueRan;
+   }
+
+   public int topicFired()
+   {
+      return topicRan;
+   }
+   
+   public int bmtQueueRan()
+   {
+      return bmtQueueRan;
+   }
+
+   public int cmtQueueRan()
+   {
+      return cmtQueueRan;
+   }
+   
+   public boolean interceptedTopic()
+   {
+      return interceptedTopic;
+   }
+
+   public boolean interceptedQueue()
+   {
+      return interceptedQueue;
+   }
+
+   public boolean postConstruct()
+   {
+      return postConstruct;
+   }
+
+   public boolean preDestroy()
+   {
+      return preDestroy;
+   }
+   
+   public int messageCount()
+   {
+      return messageCount;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdbtopic;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.11 $
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/mdbtest"),
-        @ActivationConfigProperty(propertyName="subscriptionDurability", propertyValue="Durable"),
-        @ActivationConfigProperty(propertyName="subscriptionName", propertyValue="topicmdb"),
-        @ActivationConfigProperty(propertyName="clientId", propertyValue="mdbtopic-test")
-        })
-public class TopicTestMDB implements MessageListener
-{
-   @Resource MessageDrivenContext ctx;
-   public void onMessage(Message recvMsg)
-   {
-      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
-      TestStatusBean.topicRan++;
-      System.out.println("*** TopicTestMDB onMessage " + TestStatusBean.topicRan + " " + recvMsg);
-   }
-
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      TestStatusBean.interceptedTopic = true;
-      return ctx.proceed();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdbtopic;
+
+import javax.annotation.Resource;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 1.11 $
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/mdbtest"),
+        @ActivationConfigProperty(propertyName="subscriptionDurability", propertyValue="Durable"),
+        @ActivationConfigProperty(propertyName="subscriptionName", propertyValue="topicmdb"),
+        @ActivationConfigProperty(propertyName="clientId", propertyValue="mdbtopic-test")
+        })
+public class TopicTestMDB implements MessageListener
+{
+   @Resource MessageDrivenContext ctx;
+   public void onMessage(Message recvMsg)
+   {
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      TestStatusBean.topicRan++;
+      System.out.println("*** TopicTestMDB onMessage " + TestStatusBean.topicRan + " " + recvMsg);
+   }
+
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      TestStatusBean.interceptedTopic = true;
+      return ctx.proceed();
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdbtopic.unit;
-
-import javax.jms.MessageProducer;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
-import javax.naming.NamingException;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.mdbtopic.TestStatus;
-//import org.jboss.ejb3.test.mdb.TestStatus; // makes StackOverflowErrors
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- * 
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: MDBUnitTestCase.java 58403 2006-11-15 17:14:37 +0100 (Wed, 15 Nov 2006) wolfc $
- */
-public class TopicMDBUnitTestCase extends JBossTestCase
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(TopicMDBUnitTestCase.class);
-
-   static boolean deployed = false;
-
-   static int test = 0;
-
-   public TopicMDBUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testTopic() throws Exception
-   {
-      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
-      clear(status);
-      TopicConnection cnn = null;
-      MessageProducer sender = null;
-      TopicSession session = null;
-
-      Topic topic = (Topic) getInitialContext().lookup("topic/mdbtest");
-      TopicConnectionFactory factory = getTopicConnectionFactory();
-      cnn = factory.createTopicConnection();
-      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createProducer(topic);
-      sender.send(msg);
-      session.close();
-      cnn.close();
-
-      Thread.sleep(2000);
-      assertEquals(1, status.topicFired());
-      assertTrue(status.interceptedTopic());
-      assertFalse(status.postConstruct());
-      assertFalse(status.preDestroy());
-   }
-
-   private TopicConnectionFactory getTopicConnectionFactory()
-         throws Exception
-   {
-      try
-      {
-         return (TopicConnectionFactory) getInitialContext().lookup("ConnectionFactory");
-      }
-      catch (NamingException e)
-      {
-         return (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      }
-   }
-
-   private void clear(TestStatus status)
-   {
-      status.clear();
-      assertEquals(0, status.bmtQueueRan());
-      assertEquals(0, status.defaultedQueueFired());
-      assertEquals(0, status.messageCount());
-      assertEquals(0, status.nondurableQueueFired());
-      assertEquals(0, status.overrideDefaultedQueueFired());
-      assertEquals(0, status.overrideQueueFired());
-      assertEquals(0, status.queueFired());
-      assertEquals(0, status.topicFired());
-      assertFalse(status.interceptedQueue());
-      assertFalse(status.interceptedTopic());
-      assertFalse(status.postConstruct());
-      assertFalse(status.preDestroy());
-   }
-
-//   protected InitialContext getInitialContext() throws Exception
-//   {
-//      return InitialContextFactory.getInitialContext();
-//   }
-//
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(TopicMDBUnitTestCase.class, "mdbtopic-test.jar");
-   }
-
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtopic/unit/TopicMDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdbtopic.unit;
+
+import javax.jms.MessageProducer;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicSession;
+import javax.naming.NamingException;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.mdbtopic.TestStatus;
+//import org.jboss.ejb3.test.mdb.TestStatus; // makes StackOverflowErrors
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ * 
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: MDBUnitTestCase.java 58403 2006-11-15 17:14:37 +0100 (Wed, 15 Nov 2006) wolfc $
+ */
+public class TopicMDBUnitTestCase extends JBossTestCase
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(TopicMDBUnitTestCase.class);
+
+   static boolean deployed = false;
+
+   static int test = 0;
+
+   public TopicMDBUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testTopic() throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      clear(status);
+      TopicConnection cnn = null;
+      MessageProducer sender = null;
+      TopicSession session = null;
+
+      Topic topic = (Topic) getInitialContext().lookup("topic/mdbtest");
+      TopicConnectionFactory factory = getTopicConnectionFactory();
+      cnn = factory.createTopicConnection();
+      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createProducer(topic);
+      sender.send(msg);
+      session.close();
+      cnn.close();
+
+      Thread.sleep(2000);
+      assertEquals(1, status.topicFired());
+      assertTrue(status.interceptedTopic());
+      assertFalse(status.postConstruct());
+      assertFalse(status.preDestroy());
+   }
+
+   private TopicConnectionFactory getTopicConnectionFactory()
+         throws Exception
+   {
+      try
+      {
+         return (TopicConnectionFactory) getInitialContext().lookup("ConnectionFactory");
+      }
+      catch (NamingException e)
+      {
+         return (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      }
+   }
+
+   private void clear(TestStatus status)
+   {
+      status.clear();
+      assertEquals(0, status.bmtQueueRan());
+      assertEquals(0, status.defaultedQueueFired());
+      assertEquals(0, status.messageCount());
+      assertEquals(0, status.nondurableQueueFired());
+      assertEquals(0, status.overrideDefaultedQueueFired());
+      assertEquals(0, status.overrideQueueFired());
+      assertEquals(0, status.queueFired());
+      assertEquals(0, status.topicFired());
+      assertFalse(status.interceptedQueue());
+      assertFalse(status.interceptedTopic());
+      assertFalse(status.postConstruct());
+      assertFalse(status.preDestroy());
+   }
+
+//   protected InitialContext getInitialContext() throws Exception
+//   {
+//      return InitialContextFactory.getInitialContext();
+//   }
+//
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(TopicMDBUnitTestCase.class, "mdbtopic-test.jar");
+   }
+
+}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at javax.persistence.Entity
- at Table(name = "ENTITY")
-public class Entity implements java.io.Serializable
-{
-   private Long id;
-   private String name;
-
-   @Id
-   //@GeneratedValue(strategy= GenerationType.IDENTITY)
-   public Long getId()
-   {
-      return id;
-   }
-
-   public void setId(Long id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/Entity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at javax.persistence.Entity
+ at Table(name = "ENTITY")
+public class Entity implements java.io.Serializable
+{
+   private Long id;
+   private String name;
+
+   @Id
+   //@GeneratedValue(strategy= GenerationType.IDENTITY)
+   public Long getId()
+   {
+      return id;
+   }
+
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.EJBException;
-
-import javax.jms.MessageListener;
-import javax.jms.Message;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class QueueBean21 implements MessageDrivenBean, MessageListener
-{
-   private static final Logger log = Logger.getLogger(QueueBean21.class);
-   
-    private MessageDrivenContext ctx = null;
-    
-    public void onMessage(Message message)
-    {
-       log.info("***** onMessage " + message);
-    }
-    
-    public void setMessageDrivenContext(MessageDrivenContext ctx)
-       throws EJBException
-    {
-       this.ctx = ctx;
-    }
-    
-    public void ejbCreate(){}
-
-    public void ejbRemove(){}
-} 
-
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueBean21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+import javax.ejb.MessageDrivenBean;
+import javax.ejb.MessageDrivenContext;
+import javax.ejb.EJBException;
+
+import javax.jms.MessageListener;
+import javax.jms.Message;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class QueueBean21 implements MessageDrivenBean, MessageListener
+{
+   private static final Logger log = Logger.getLogger(QueueBean21.class);
+   
+    private MessageDrivenContext ctx = null;
+    
+    public void onMessage(Message message)
+    {
+       log.info("***** onMessage " + message);
+    }
+    
+    public void setMessageDrivenContext(MessageDrivenContext ctx)
+       throws EJBException
+    {
+       this.ctx = ctx;
+    }
+    
+    public void ejbCreate(){}
+
+    public void ejbRemove(){}
+} 
+
+

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
-        })
-public class QueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
-   
-   private @PersistenceContext EntityManager manager;
-   @EJB StatelessFacade stateless;
-   
-   public void onMessage(Message recvMsg)
-   {    
-      try
-      {
-         ObjectMessage message = (ObjectMessage)recvMsg;
-         Entity entity = (Entity)message.getObject(); 
-         stateless.persist(entity);
-         ++TestStatusBean.messageCount;
-      }
-      catch (Throwable t)
-      {
-         TestStatusBean.caughtRollback = true;
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.EJB;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.ObjectMessage;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
+        })
+public class QueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
+   
+   private @PersistenceContext EntityManager manager;
+   @EJB StatelessFacade stateless;
+   
+   public void onMessage(Message recvMsg)
+   {    
+      try
+      {
+         ObjectMessage message = (ObjectMessage)recvMsg;
+         Entity entity = (Entity)message.getObject(); 
+         stateless.persist(entity);
+         ++TestStatusBean.messageCount;
+      }
+      catch (Throwable t)
+      {
+         TestStatusBean.caughtRollback = true;
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/rollbackmdbtest")
-        })
-public class RollbackQueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
-   
-   private @PersistenceContext EntityManager manager;
-   @EJB StatelessFacade stateless;
-   
-   public void onMessage(Message recvMsg)
-   {    
-      try
-      {
-         ObjectMessage message = (ObjectMessage)recvMsg;
-         Entity entity = (Entity)message.getObject();
-         manager.remove(entity);
-      }
-      catch (Throwable t)
-      {
-          t.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.EJB;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.ObjectMessage;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/rollbackmdbtest")
+        })
+public class RollbackQueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
+   
+   private @PersistenceContext EntityManager manager;
+   @EJB StatelessFacade stateless;
+   
+   public void onMessage(Message recvMsg)
+   {    
+      try
+      {
+         ObjectMessage message = (ObjectMessage)recvMsg;
+         Entity entity = (Entity)message.getObject();
+         manager.remove(entity);
+      }
+      catch (Throwable t)
+      {
+          t.printStackTrace();
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatelessFacade
-{
-   void clear(Entity entity);
-   
-   void persist(Entity entity);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatelessFacade
+{
+   void clear(Entity entity);
+   
+   void persist(Entity entity);
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="Stateless")
- at Remote(StatelessFacade.class)
- at RemoteBinding(jndiBinding = "StatelessFacade")
-public class StatelessFacadeBean implements StatelessFacade
-{
-   private static final Logger log = Logger.getLogger(StatelessFacadeBean.class);
-   
-   private @PersistenceContext EntityManager manager;
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public void clear(Entity entity)
-   {
-      try
-      {
-         entity = manager.find(Entity.class, entity.getId());
-         if (entity != null)
-            manager.remove(entity);
-      }
-      catch (Throwable t)
-      {
-         t.printStackTrace();
-      }
-   }
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public void persist(Entity entity)
-   {
-      try
-      {
-         manager.persist(entity);
-      }
-      catch (Throwable t)
-      {
-         t.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="Stateless")
+ at Remote(StatelessFacade.class)
+ at RemoteBinding(jndiBinding = "StatelessFacade")
+public class StatelessFacadeBean implements StatelessFacade
+{
+   private static final Logger log = Logger.getLogger(StatelessFacadeBean.class);
+   
+   private @PersistenceContext EntityManager manager;
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public void clear(Entity entity)
+   {
+      try
+      {
+         entity = manager.find(Entity.class, entity.getId());
+         if (entity != null)
+            manager.remove(entity);
+      }
+      catch (Throwable t)
+      {
+         t.printStackTrace();
+      }
+   }
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public void persist(Entity entity)
+   {
+      try
+      {
+         manager.persist(entity);
+      }
+      catch (Throwable t)
+      {
+         t.printStackTrace();
+      }
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface TestStatus
-{
-   boolean caughtRollback();
-   
-   int messageCount();
-   
-   void clear();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface TestStatus
+{
+   boolean caughtRollback();
+   
+   int messageCount();
+   
+   void clear();
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.mdbtransactions;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless
- at Remote(TestStatus.class)
-public class TestStatusBean implements TestStatus
-{
-   private static final Logger log = Logger.getLogger(TestStatusBean.class);
-   
-   public static boolean caughtRollback = false;
-   public static int messageCount = 0;
-
-   public boolean caughtRollback()
-   {
-      return caughtRollback;
-   }
-   
-   public int messageCount()
-   {
-      return messageCount;
-   }
-   
-   public void clear()
-   {
-      caughtRollback = false;
-      messageCount = 0;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.mdbtransactions;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless
+ at Remote(TestStatus.class)
+public class TestStatusBean implements TestStatus
+{
+   private static final Logger log = Logger.getLogger(TestStatusBean.class);
+   
+   public static boolean caughtRollback = false;
+   public static int messageCount = 0;
+
+   public boolean caughtRollback()
+   {
+      return caughtRollback;
+   }
+   
+   public int messageCount()
+   {
+      return messageCount;
+   }
+   
+   public void clear()
+   {
+      caughtRollback = false;
+      messageCount = 0;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,159 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.mdbtransactions.unit;
-
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.ObjectMessage;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.ejb3.InitialContextFactory;
-import org.jboss.ejb3.test.mdbtransactions.Entity;
-import org.jboss.ejb3.test.mdbtransactions.StatelessFacade;
-import org.jboss.ejb3.test.mdbtransactions.TestStatus;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class MDBUnitTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
-
-   static boolean deployed = false;
-
-   static int test = 0;
-
-   public MDBUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testMdbTransactions() throws Exception
-   {
-      TestStatus status = (TestStatus)getInitialContext().lookup("TestStatusBean/remote");
-      status.clear();
-      
-      sendMessages("queue/mdbtest", 2);
-      
-      Thread.sleep(5000);
-      
-      assertEquals(1, status.messageCount());
-      assertTrue(status.caughtRollback());
-   }
-   
-   protected void sendMessages(String queueName, int numMessages) throws Exception
-   {
-      QueueConnection connection = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-
-      Queue queue = (Queue) getInitialContext().lookup(
-            queueName);
-      QueueConnectionFactory factory = getQueueConnectionFactory();
-      connection = factory.createQueueConnection();
-      connection.start();
-      session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-      
-      QueueReceiver receiver = session.createReceiver(queue);
-      Message message = receiver.receiveNoWait();
-      while (message != null)
-         message = receiver.receiveNoWait();
-
-      Entity entity = new Entity();
-      entity.setName("test-entity");
-      entity.setId(1234L);
-      
-      StatelessFacade stateless = (StatelessFacade)getInitialContext().lookup("StatelessFacade");
-      stateless.clear(entity);
-      
-      ObjectMessage msg = session.createObjectMessage(entity);
-
-      sender = session.createSender(queue);
-      
-      for (int i = 0 ; i < numMessages ; ++i)
-         sender.send(msg);
- 
-      session.close();
-      connection.close();
-   }
-   
-   public void testRollback() throws Exception
-   {
-      TestStatus status = (TestStatus)getInitialContext().lookup("TestStatusBean/remote");
-      status.clear();
-      
-      sendMessages("queue/rollbackmdbtest", 1);
-      
-      Thread.sleep(5000);
-      
-      Queue queue = (Queue) getInitialContext().lookup("queue/DLQ");
-      QueueConnectionFactory factory = getQueueConnectionFactory();
-      QueueConnection connection = factory.createQueueConnection();
-      connection.start();
-      QueueSession session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-      QueueReceiver receiver = session.createReceiver(queue);
-      Message message = receiver.receiveNoWait();
-      assertNotNull(message);
-      
-      session.close();
-      connection.close();
-   }
-   
-   protected QueueConnectionFactory getQueueConnectionFactory()
-      throws Exception
-   {
-      try
-      {
-         return (QueueConnectionFactory) getInitialContext().lookup(
-               "ConnectionFactory");
-      } catch (NamingException e)
-      {
-         return (QueueConnectionFactory) getInitialContext().lookup(
-               "java:/ConnectionFactory");
-      }
-   }
-   
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return InitialContextFactory.getInitialContext();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(MDBUnitTestCase.class,
-            "mdbtransactionstest-service.xml, mdbtransactions-test.jar");
-   }
-
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.mdbtransactions.unit;
+
+import javax.jms.Message;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.ObjectMessage;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.test.mdbtransactions.Entity;
+import org.jboss.ejb3.test.mdbtransactions.StatelessFacade;
+import org.jboss.ejb3.test.mdbtransactions.TestStatus;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class MDBUnitTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
+
+   static boolean deployed = false;
+
+   static int test = 0;
+
+   public MDBUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testMdbTransactions() throws Exception
+   {
+      TestStatus status = (TestStatus)getInitialContext().lookup("TestStatusBean/remote");
+      status.clear();
+      
+      sendMessages("queue/mdbtest", 2);
+      
+      Thread.sleep(5000);
+      
+      assertEquals(1, status.messageCount());
+      assertTrue(status.caughtRollback());
+   }
+   
+   protected void sendMessages(String queueName, int numMessages) throws Exception
+   {
+      QueueConnection connection = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup(
+            queueName);
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      connection = factory.createQueueConnection();
+      connection.start();
+      session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+      
+      QueueReceiver receiver = session.createReceiver(queue);
+      Message message = receiver.receiveNoWait();
+      while (message != null)
+         message = receiver.receiveNoWait();
+
+      Entity entity = new Entity();
+      entity.setName("test-entity");
+      entity.setId(1234L);
+      
+      StatelessFacade stateless = (StatelessFacade)getInitialContext().lookup("StatelessFacade");
+      stateless.clear(entity);
+      
+      ObjectMessage msg = session.createObjectMessage(entity);
+
+      sender = session.createSender(queue);
+      
+      for (int i = 0 ; i < numMessages ; ++i)
+         sender.send(msg);
+ 
+      session.close();
+      connection.close();
+   }
+   
+   public void testRollback() throws Exception
+   {
+      TestStatus status = (TestStatus)getInitialContext().lookup("TestStatusBean/remote");
+      status.clear();
+      
+      sendMessages("queue/rollbackmdbtest", 1);
+      
+      Thread.sleep(5000);
+      
+      Queue queue = (Queue) getInitialContext().lookup("queue/DLQ");
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      QueueConnection connection = factory.createQueueConnection();
+      connection.start();
+      QueueSession session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+      QueueReceiver receiver = session.createReceiver(queue);
+      Message message = receiver.receiveNoWait();
+      assertNotNull(message);
+      
+      session.close();
+      connection.close();
+   }
+   
+   protected QueueConnectionFactory getQueueConnectionFactory()
+      throws Exception
+   {
+      try
+      {
+         return (QueueConnectionFactory) getInitialContext().lookup(
+               "ConnectionFactory");
+      } catch (NamingException e)
+      {
+         return (QueueConnectionFactory) getInitialContext().lookup(
+               "java:/ConnectionFactory");
+      }
+   }
+   
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return InitialContextFactory.getInitialContext();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(MDBUnitTestCase.class,
+            "mdbtransactionstest-service.xml, mdbtransactions-test.jar");
+   }
+
+}
\ No newline at end of file

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/microbench/unit/BenchUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/microbench/unit/BenchUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/microbench/unit/BenchUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -52,7 +52,7 @@
    {
 	   MBeanServerConnection server = getServer();
       ObjectName testerName = new ObjectName("jboss.ejb3:service=Benchmark");
-      Object[] params = {new Integer(100000)};
+      Object[] params = {new Integer(1000)};
       String[] sig = {"int"};
       System.out.println("21Local: " + server.invoke(testerName, "benchLocalStateless21", params, sig));
       System.out.println("30Local: " + server.invoke(testerName, "benchLocalStateless30", params, sig));

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface Stateful
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface Stateful
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="Stateful2")
- at Remote(org.jboss.ejb3.test.naming.Stateful.class)
- at RemoteBinding(jndiBinding = "Stateful")
-public class Stateful2Bean
-{
-   private static final Logger log = Logger.getLogger(Stateful2Bean.class);
-   
-   public void test()
-   {
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="Stateful2")
+ at Remote(org.jboss.ejb3.test.naming.Stateful.class)
+ at RemoteBinding(jndiBinding = "Stateful")
+public class Stateful2Bean
+{
+   private static final Logger log = Logger.getLogger(Stateful2Bean.class);
+   
+   public void test()
+   {
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="Stateful")
- at Remote(org.jboss.ejb3.test.naming.Stateful.class)
- at RemoteBinding(jndiBinding = "Stateful")
-public class StatefulBean
-{
-   private static final Logger log = Logger.getLogger(StatefulBean.class);
-   
-   public void test()
-   {
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="Stateful")
+ at Remote(org.jboss.ejb3.test.naming.Stateful.class)
+ at RemoteBinding(jndiBinding = "Stateful")
+public class StatefulBean
+{
+   private static final Logger log = Logger.getLogger(StatefulBean.class);
+   
+   public void test()
+   {
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="StatefulOverrideBean")
- at Remote(org.jboss.ejb3.test.naming.Stateful.class)
- at RemoteBinding(jndiBinding = "Stateful")
-public class StatefulOverrideBean
-{
-   private static final Logger log = Logger.getLogger(StatefulOverrideBean.class);
-   
-   public void test()
-   {
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="StatefulOverrideBean")
+ at Remote(org.jboss.ejb3.test.naming.Stateful.class)
+ at RemoteBinding(jndiBinding = "Stateful")
+public class StatefulOverrideBean
+{
+   private static final Logger log = Logger.getLogger(StatefulOverrideBean.class);
+   
+   public void test()
+   {
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming;
-
-import java.rmi.RemoteException;
-
-/**
-
- at author  Scott.Stark at jboss.org
- at version $Revision$
-*/
-public interface TestENC
-{
-   /** Perform interations count lookups against the ENC
-    * @return the time spent in the method
-    * @throws RemoteException
-    */ 
-   public long stressENC(long iterations);
-   /**
-    * Test access of the various types of java:comp entries
-    * @throws RemoteException
-    */ 
-   public void accessENC();
-   
-   public void remove();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming;
+
+import java.rmi.RemoteException;
+
+/**
+
+ at author  Scott.Stark at jboss.org
+ at version $Revision$
+*/
+public interface TestENC
+{
+   /** Perform interations count lookups against the ENC
+    * @return the time spent in the method
+    * @throws RemoteException
+    */ 
+   public long stressENC(long iterations);
+   /**
+    * Test access of the various types of java:comp entries
+    * @throws RemoteException
+    */ 
+   public void accessENC();
+   
+   public void remove();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENC.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,252 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming;
-
-import javax.ejb.EJBException;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.Topic;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-import javax.ejb.Remove;
-
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.Container;
-
-/** A bean that does nothing but access resources from the ENC
- to test ENC usage.
-
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
-public class TestENCBean implements TestENC
-{
-   Logger log = Logger.getLogger(getClass());
-   
-   @Remove
-   public void remove()
-   {
-      
-   }
-
-   public long stressENC(long iterations)
-   {
-      long start = System.currentTimeMillis();
-      for(int i = 0; i < iterations; i ++)
-         accessENC();
-      long end = System.currentTimeMillis();
-      return end - start;
-   }
-
-   public void accessENC()
-   {
-      try
-      {
-         // Obtain the enterprise beans environment naming context.
-         Context initCtx = new InitialContext();
-         Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
-         Boolean hasFullENC = (Boolean) myEnv.lookup("hasFullENC");
-         log.debug("ThreadContext CL = " + Thread.currentThread().getContextClassLoader());
-         log.debug("hasFullENC = " + hasFullENC);
-         if (hasFullENC.equals(Boolean.TRUE))
-         {
-            // This bean should have the full ENC setup of the ENCBean
-            testEnvEntries(initCtx, myEnv);
-            testEjbRefs(initCtx, myEnv);
-            testJdbcDataSource(initCtx, myEnv);
-            testMail(initCtx, myEnv);
-            testJMS(initCtx, myEnv);
-   //         testURL(initCtx, myEnv);
-            testResourceEnvEntries(initCtx, myEnv);
-            testMessageDestinationRefs(initCtx, myEnv);
-         }
-         else
-         {
-            // This bean should only have the hasFullENC env entry
-            try
-            {
-               Integer i = (Integer) myEnv.lookup("Ints/i0");
-               throw new EJBException("Was able to find java:comp/env/Ints/i0 in bean with hasFullENC = false");
-            }
-            catch (NamingException e)
-            {
-               // This is what we expect
-            }
-         }
-      }
-      catch (NamingException e)
-      {
-         e.printStackTrace();
-         log.debug("failed", e);
-         throw new EJBException(e.toString(true));
-      }
-      catch (JMSException e)
-      {
-         e.printStackTrace();
-         log.debug("failed", e);
-         throw new EJBException(e);
-      }
-   }
-
-   private void testEnvEntries(Context initCtx, Context myEnv) throws NamingException
-   {
-      // Basic env values
-      Integer i = (Integer) myEnv.lookup("Ints/i0");
-      log.debug("Ints/i0 = " + i);
-      i = (Integer) initCtx.lookup(Container.ENC_CTX_NAME + "/env/Ints/i1");
-      log.debug("Ints/i1 = " + i);
-      Float f = (Float) myEnv.lookup("Floats/f0");
-      log.debug("Floats/f0 = " + f);
-      f = (Float) initCtx.lookup(Container.ENC_CTX_NAME + "/env/Floats/f1");
-      log.debug("Floats/f1 = " + f);
-      String s = (String) myEnv.lookup("Strings/s0");
-      log.debug("Strings/s0 = " + s);
-      s = (String) initCtx.lookup(Container.ENC_CTX_NAME + "/env/Strings/s1");
-      log.debug("Strings/s1 = " + s);
-      Short s0 = (Short) myEnv.lookup("Short/s0");
-      log.debug("Short/s0 = " + s0);
-      Long l0 = (Long) myEnv.lookup("Long/l0");
-      log.debug("Long/s0 = " + l0);
-      Double d0 = (Double) myEnv.lookup("Double/d0");
-      log.debug("Double/s0 = " + d0);
-      Byte b0 = (Byte) myEnv.lookup("Byte/b0");
-      log.debug("Byte/b0 = " + b0);
-      Character c0 = (Character) myEnv.lookup("Character/c0");
-      log.debug("Character/c0 = " + c0);
-   }
-
-   private void testEjbRefs(Context initCtx, Context myEnv) throws NamingException
-   {
-      // EJB References
-      Object ejb = myEnv.lookup("ejb/bean0");
-      if ((ejb instanceof TestENC) == false)
-         throw new NamingException("ejb/bean0 is not a TestENC");
-      log.debug("ejb/bean0 = " + ejb);
-      ejb = initCtx.lookup(Container.ENC_CTX_NAME + "/env/ejb/bean1");
-      log.debug("ejb/bean1 = " + ejb);
-      ejb = initCtx.lookup(Container.ENC_CTX_NAME + "/env/ejb/bean2");
-      log.debug("ejb/bean2 = " + ejb);
-      //ejb = initCtx.lookup("java:comp/env/ejb/remote-bean");
-      ejb = null;
-      log.debug("ejb/remote-bean = " + ejb);
-   }
-
-   private void testJdbcDataSource(Context initCtx, Context myEnv) throws NamingException
-   {
-      // JDBC DataSource
-      Object obj = myEnv.lookup("jdbc/DefaultDS");
-      if ((obj instanceof javax.sql.DataSource) == false)
-         throw new NamingException("jdbc/DefaultDS is not a javax.sql.DataSource");
-      log.debug("jdbc/DefaultDS = " + obj);
-   }
-   
-   private void lookup(String name)
-   {
-      log.info("lookup " + name);
-      try {
-         InitialContext jndiContext = new InitialContext();
-         NamingEnumeration names = jndiContext.list(name);
-         if (names != null){
-            while (names.hasMore()){
-               log.info("  " + names.next());
-            }
-         }
-      } catch (Exception e){
-      }
-   }
-
-   private void testMail(Context initCtx, Context myEnv) throws NamingException
-   {
-      // JavaMail Session
-      Object obj = myEnv.lookup("mail/DefaultMail");
-      if ((obj instanceof javax.mail.Session) == false)
-         throw new NamingException("DefaultMail is not a javax.mail.Session");
-      log.debug("mail/DefaultMail = " + obj);
-   }
-
-   private void testJMS(Context initCtx, Context myEnv) throws NamingException
-   {
-      // JavaMail Session
-      Object obj = myEnv.lookup("jms/QueFactory");
-      if ((obj instanceof javax.jms.QueueConnectionFactory) == false)
-         throw new NamingException("mail/DefaultMail is not a javax.jms.QueueConnectionFactory");
-      log.debug("jms/QueFactory = " + obj);
-   }
-
-   private void testURL(Context initCtx, Context myEnv) throws NamingException
-   {
-      // JavaMail Session
-      Object obj = myEnv.lookup("url/JBossHomePage");
-      if ((obj instanceof java.net.URL) == false)
-         throw new NamingException("url/JBossHomePage is not a java.net.URL");
-      log.debug("url/SourceforgeHomePage = " + obj);
-
-      obj = myEnv.lookup("url/SourceforgeHomePage");
-      if ((obj instanceof java.net.URL) == false)
-         throw new NamingException("url/SourceforgeHomePage is not a java.net.URL");
-      log.debug("url/SourceforgeHomePage = " + obj);
-
-      obj = myEnv.lookup("url/IndirectURL");
-      if ((obj instanceof java.net.URL) == false)
-         throw new NamingException("url/IndirectURL is not a java.net.URL");
-      log.debug("url/IndirectURL = " + obj);
-   }
-
-   private void testResourceEnvEntries(Context initCtx, Context myEnv) throws NamingException
-   {
-      Object obj = myEnv.lookup("res/aQueue");
-      if ((obj instanceof javax.jms.Queue) == false)
-         throw new NamingException("res/aQueue is not a javax.jms.Queue");
-      log.debug("res/aQueue = " + obj);
-   }
-
-   private void testMessageDestinationRefs(Context initCtx, Context myEnv) throws NamingException, JMSException
-   {
-      Object obj = myEnv.lookup("mdr/ConsumesLink");
-      log.debug("mdr/ConsumesLink = " + obj);
-      if ((obj instanceof Queue) == false)
-         throw new RuntimeException("mdr/ConsumesLink is not a javax.jms.Queue");
-      Queue queue = (Queue) obj;
-      if ("QUEUE.testQueue".equals(queue.getQueueName()))
-         throw new RuntimeException("Excepted QUEUE.testQueue, got " + queue);
-      
-      obj = myEnv.lookup("mdr/ProducesLink");
-      log.debug("mdr/ProducesLink = " + obj);
-      if ((obj instanceof Topic) == false)
-         throw new RuntimeException("mdr/ProducesLink is not a javax.jms.Topic");
-      Topic topic = (Topic) obj;
-      if ("TOPIC.testTopic".equals(topic.getTopicName()))
-         throw new RuntimeException("Excepted TOPIC.testTopic got " + topic);
-
-      obj = myEnv.lookup("mdr/ConsumesProducesJNDIName");
-      log.debug("mdr/ConsumesProducesJNDIName = " + obj);
-      if ((obj instanceof Queue) == false)
-         throw new RuntimeException("mdr/ConsumesProducesJNDIName is not a javax.jms.Queue");
-      queue = (Queue) obj;
-      if ("QUEUE.A".equals(queue.getQueueName()))
-         throw new RuntimeException("Excepted QUEUE.A, got " + queue);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,252 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming;
+
+import javax.ejb.EJBException;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import javax.ejb.Remove;
+
+import org.jboss.logging.Logger;
+import org.jboss.ejb3.Container;
+
+/** A bean that does nothing but access resources from the ENC
+ to test ENC usage.
+
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+public class TestENCBean implements TestENC
+{
+   Logger log = Logger.getLogger(getClass());
+   
+   @Remove
+   public void remove()
+   {
+      
+   }
+
+   public long stressENC(long iterations)
+   {
+      long start = System.currentTimeMillis();
+      for(int i = 0; i < iterations; i ++)
+         accessENC();
+      long end = System.currentTimeMillis();
+      return end - start;
+   }
+
+   public void accessENC()
+   {
+      try
+      {
+         // Obtain the enterprise beans environment naming context.
+         Context initCtx = new InitialContext();
+         Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
+         Boolean hasFullENC = (Boolean) myEnv.lookup("hasFullENC");
+         log.debug("ThreadContext CL = " + Thread.currentThread().getContextClassLoader());
+         log.debug("hasFullENC = " + hasFullENC);
+         if (hasFullENC.equals(Boolean.TRUE))
+         {
+            // This bean should have the full ENC setup of the ENCBean
+            testEnvEntries(initCtx, myEnv);
+            testEjbRefs(initCtx, myEnv);
+            testJdbcDataSource(initCtx, myEnv);
+            testMail(initCtx, myEnv);
+            testJMS(initCtx, myEnv);
+   //         testURL(initCtx, myEnv);
+            testResourceEnvEntries(initCtx, myEnv);
+            testMessageDestinationRefs(initCtx, myEnv);
+         }
+         else
+         {
+            // This bean should only have the hasFullENC env entry
+            try
+            {
+               Integer i = (Integer) myEnv.lookup("Ints/i0");
+               throw new EJBException("Was able to find java:comp/env/Ints/i0 in bean with hasFullENC = false");
+            }
+            catch (NamingException e)
+            {
+               // This is what we expect
+            }
+         }
+      }
+      catch (NamingException e)
+      {
+         e.printStackTrace();
+         log.debug("failed", e);
+         throw new EJBException(e.toString(true));
+      }
+      catch (JMSException e)
+      {
+         e.printStackTrace();
+         log.debug("failed", e);
+         throw new EJBException(e);
+      }
+   }
+
+   private void testEnvEntries(Context initCtx, Context myEnv) throws NamingException
+   {
+      // Basic env values
+      Integer i = (Integer) myEnv.lookup("Ints/i0");
+      log.debug("Ints/i0 = " + i);
+      i = (Integer) initCtx.lookup(Container.ENC_CTX_NAME + "/env/Ints/i1");
+      log.debug("Ints/i1 = " + i);
+      Float f = (Float) myEnv.lookup("Floats/f0");
+      log.debug("Floats/f0 = " + f);
+      f = (Float) initCtx.lookup(Container.ENC_CTX_NAME + "/env/Floats/f1");
+      log.debug("Floats/f1 = " + f);
+      String s = (String) myEnv.lookup("Strings/s0");
+      log.debug("Strings/s0 = " + s);
+      s = (String) initCtx.lookup(Container.ENC_CTX_NAME + "/env/Strings/s1");
+      log.debug("Strings/s1 = " + s);
+      Short s0 = (Short) myEnv.lookup("Short/s0");
+      log.debug("Short/s0 = " + s0);
+      Long l0 = (Long) myEnv.lookup("Long/l0");
+      log.debug("Long/s0 = " + l0);
+      Double d0 = (Double) myEnv.lookup("Double/d0");
+      log.debug("Double/s0 = " + d0);
+      Byte b0 = (Byte) myEnv.lookup("Byte/b0");
+      log.debug("Byte/b0 = " + b0);
+      Character c0 = (Character) myEnv.lookup("Character/c0");
+      log.debug("Character/c0 = " + c0);
+   }
+
+   private void testEjbRefs(Context initCtx, Context myEnv) throws NamingException
+   {
+      // EJB References
+      Object ejb = myEnv.lookup("ejb/bean0");
+      if ((ejb instanceof TestENC) == false)
+         throw new NamingException("ejb/bean0 is not a TestENC");
+      log.debug("ejb/bean0 = " + ejb);
+      ejb = initCtx.lookup(Container.ENC_CTX_NAME + "/env/ejb/bean1");
+      log.debug("ejb/bean1 = " + ejb);
+      ejb = initCtx.lookup(Container.ENC_CTX_NAME + "/env/ejb/bean2");
+      log.debug("ejb/bean2 = " + ejb);
+      //ejb = initCtx.lookup("java:comp/env/ejb/remote-bean");
+      ejb = null;
+      log.debug("ejb/remote-bean = " + ejb);
+   }
+
+   private void testJdbcDataSource(Context initCtx, Context myEnv) throws NamingException
+   {
+      // JDBC DataSource
+      Object obj = myEnv.lookup("jdbc/DefaultDS");
+      if ((obj instanceof javax.sql.DataSource) == false)
+         throw new NamingException("jdbc/DefaultDS is not a javax.sql.DataSource");
+      log.debug("jdbc/DefaultDS = " + obj);
+   }
+   
+   private void lookup(String name)
+   {
+      log.info("lookup " + name);
+      try {
+         InitialContext jndiContext = new InitialContext();
+         NamingEnumeration names = jndiContext.list(name);
+         if (names != null){
+            while (names.hasMore()){
+               log.info("  " + names.next());
+            }
+         }
+      } catch (Exception e){
+      }
+   }
+
+   private void testMail(Context initCtx, Context myEnv) throws NamingException
+   {
+      // JavaMail Session
+      Object obj = myEnv.lookup("mail/DefaultMail");
+      if ((obj instanceof javax.mail.Session) == false)
+         throw new NamingException("DefaultMail is not a javax.mail.Session");
+      log.debug("mail/DefaultMail = " + obj);
+   }
+
+   private void testJMS(Context initCtx, Context myEnv) throws NamingException
+   {
+      // JavaMail Session
+      Object obj = myEnv.lookup("jms/QueFactory");
+      if ((obj instanceof javax.jms.QueueConnectionFactory) == false)
+         throw new NamingException("mail/DefaultMail is not a javax.jms.QueueConnectionFactory");
+      log.debug("jms/QueFactory = " + obj);
+   }
+
+   private void testURL(Context initCtx, Context myEnv) throws NamingException
+   {
+      // JavaMail Session
+      Object obj = myEnv.lookup("url/JBossHomePage");
+      if ((obj instanceof java.net.URL) == false)
+         throw new NamingException("url/JBossHomePage is not a java.net.URL");
+      log.debug("url/SourceforgeHomePage = " + obj);
+
+      obj = myEnv.lookup("url/SourceforgeHomePage");
+      if ((obj instanceof java.net.URL) == false)
+         throw new NamingException("url/SourceforgeHomePage is not a java.net.URL");
+      log.debug("url/SourceforgeHomePage = " + obj);
+
+      obj = myEnv.lookup("url/IndirectURL");
+      if ((obj instanceof java.net.URL) == false)
+         throw new NamingException("url/IndirectURL is not a java.net.URL");
+      log.debug("url/IndirectURL = " + obj);
+   }
+
+   private void testResourceEnvEntries(Context initCtx, Context myEnv) throws NamingException
+   {
+      Object obj = myEnv.lookup("res/aQueue");
+      if ((obj instanceof javax.jms.Queue) == false)
+         throw new NamingException("res/aQueue is not a javax.jms.Queue");
+      log.debug("res/aQueue = " + obj);
+   }
+
+   private void testMessageDestinationRefs(Context initCtx, Context myEnv) throws NamingException, JMSException
+   {
+      Object obj = myEnv.lookup("mdr/ConsumesLink");
+      log.debug("mdr/ConsumesLink = " + obj);
+      if ((obj instanceof Queue) == false)
+         throw new RuntimeException("mdr/ConsumesLink is not a javax.jms.Queue");
+      Queue queue = (Queue) obj;
+      if ("QUEUE.testQueue".equals(queue.getQueueName()))
+         throw new RuntimeException("Excepted QUEUE.testQueue, got " + queue);
+      
+      obj = myEnv.lookup("mdr/ProducesLink");
+      log.debug("mdr/ProducesLink = " + obj);
+      if ((obj instanceof Topic) == false)
+         throw new RuntimeException("mdr/ProducesLink is not a javax.jms.Topic");
+      Topic topic = (Topic) obj;
+      if ("TOPIC.testTopic".equals(topic.getTopicName()))
+         throw new RuntimeException("Excepted TOPIC.testTopic got " + topic);
+
+      obj = myEnv.lookup("mdr/ConsumesProducesJNDIName");
+      log.debug("mdr/ConsumesProducesJNDIName = " + obj);
+      if ((obj instanceof Queue) == false)
+         throw new RuntimeException("mdr/ConsumesProducesJNDIName is not a javax.jms.Queue");
+      queue = (Queue) obj;
+      if ("QUEUE.A".equals(queue.getQueueName()))
+         throw new RuntimeException("Excepted QUEUE.A, got " + queue);
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/TestENCBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/bad)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming.bad;
-
-import javax.ejb.Remove;
-import javax.annotation.PostConstruct;
-import javax.ejb.Stateless;
-import javax.annotation.Resource;
-
-/** A bean that uses resource injection incorrectly to test the container
- * problem detection
- * 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless
-public class BadFieldMethodBean implements BadInjector
-{
-   private @Resource String key;
-
-   @PostConstruct
-   public void init()
-   {
-      System.out.println("PostConstruct state, key="+key);
-   }
-
-   @Resource
-   public void setKey(String key)
-   {
-      this.key = key;
-      System.out.println("setKey, key="+key);
-   }
-
-   public String getKey()
-   {
-      System.out.println("ping, key="+key);
-      return key;
-   }
-
-   @Remove
-   public void remove()
-   {
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming.bad;
+
+import javax.ejb.Remove;
+import javax.annotation.PostConstruct;
+import javax.ejb.Stateless;
+import javax.annotation.Resource;
+
+/** A bean that uses resource injection incorrectly to test the container
+ * problem detection
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless
+public class BadFieldMethodBean implements BadInjector
+{
+   private @Resource String key;
+
+   @PostConstruct
+   public void init()
+   {
+      System.out.println("PostConstruct state, key="+key);
+   }
+
+   @Resource
+   public void setKey(String key)
+   {
+      this.key = key;
+      System.out.println("setKey, key="+key);
+   }
+
+   public String getKey()
+   {
+      System.out.println("ping, key="+key);
+      return key;
+   }
+
+   @Remove
+   public void remove()
+   {
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming.bad;
-
-import javax.ejb.Remote;
-
-
-/**
-   The interface for the 
- at author  Scott.Stark at jboss.org
- at version $Revision$
-*/
- at Remote
-public interface BadInjector
-{
-   public String getKey();
-   public void remove();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming.bad;
+
+import javax.ejb.Remote;
+
+
+/**
+   The interface for the 
+ at author  Scott.Stark at jboss.org
+ at version $Revision$
+*/
+ at Remote
+public interface BadInjector
+{
+   public String getKey();
+   public void remove();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/bad/BadInjector.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming.unit;
-
-import javax.naming.InitialContext;
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.naming.bad.BadInjector;
-
-/**
- * Tests of the secure access to EJBs.
- *
- * @author  Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class BadInjectionsUnitTestCase extends JBossTestCase
-{
-   /**
-    * Constructor for the ENCUnitTestCase object
-    *
-    * @param name  Testcase name
-    */
-   public BadInjectionsUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   /**
-    * Test deployment of an ejb3 bean that tries to inject the same
-    * resource to a field and a method.
-    * 
-    * @throws Exception
-    */
-   public void testFieldMethodCollision() throws Exception
-   {
-      log.info("+++ testFieldMethodCollision");
-      super.redeploy("bad-field-method.jar");
-      log.error("Should not have been able to deploy bad-field-method.jar");
-      InitialContext ctx = getInitialContext();
-      Object ref = ctx.lookup("BadFieldMethodBean/remote");
-      log.info("Found BadInjector");
-      BadInjector bean = (BadInjector) ref;
-      assertEquals("BadFieldMethodBean", bean.getKey());
-      bean.remove();
-      super.undeploy("bad-field-method.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming.unit;
+
+import javax.naming.InitialContext;
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.naming.bad.BadInjector;
+
+/**
+ * Tests of the secure access to EJBs.
+ *
+ * @author  Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class BadInjectionsUnitTestCase extends JBossTestCase
+{
+   /**
+    * Constructor for the ENCUnitTestCase object
+    *
+    * @param name  Testcase name
+    */
+   public BadInjectionsUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   /**
+    * Test deployment of an ejb3 bean that tries to inject the same
+    * resource to a field and a method.
+    * 
+    * @throws Exception
+    */
+   public void testFieldMethodCollision() throws Exception
+   {
+      log.info("+++ testFieldMethodCollision");
+      super.redeploy("bad-field-method.jar");
+      log.error("Should not have been able to deploy bad-field-method.jar");
+      InitialContext ctx = getInitialContext();
+      Object ref = ctx.lookup("BadFieldMethodBean/remote");
+      log.info("Found BadInjector");
+      BadInjector bean = (BadInjector) ref;
+      assertEquals("BadFieldMethodBean", bean.getKey());
+      bean.remove();
+      super.undeploy("bad-field-method.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BadInjectionsUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming.unit;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-
-import org.jboss.ejb3.test.naming.Stateful;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class BindFailureTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(BindFailureTestCase.class);
-   
-   /**
-    * Constructor for the ENCUnitTestCase object
-    *
-    * @param name  Testcase name
-    */
-   public BindFailureTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testJndiBindingExceptions() throws Exception
-   {
-      try
-      {
-// test was originally to catch redeploying with the same jndi name, but now we are
-// using rebind instead of bind
-         this.redeploy("bind-failure-test.jar");
-         this.redeploy("bind-failure-test.jar");
-//         fail();
-      } catch (Exception e)
-      {
-         log.info("caught " + e.getClass().getName() + " " + e.getMessage() + " " + e.getCause());
-         System.out.println("caught " + e.getClass().getName() + " " + e.getMessage() + " " + e.getCause());
-         fail();
-      }
-      
-      this.undeploy("bind-failure-test.jar");
-      
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      return suite;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming.unit;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
+import org.jboss.ejb3.test.naming.Stateful;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class BindFailureTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(BindFailureTestCase.class);
+   
+   /**
+    * Constructor for the ENCUnitTestCase object
+    *
+    * @param name  Testcase name
+    */
+   public BindFailureTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testJndiBindingExceptions() throws Exception
+   {
+      try
+      {
+// test was originally to catch redeploying with the same jndi name, but now we are
+// using rebind instead of bind
+         this.redeploy("bind-failure-test.jar");
+         this.redeploy("bind-failure-test.jar");
+//         fail();
+      } catch (Exception e)
+      {
+         log.info("caught " + e.getClass().getName() + " " + e.getMessage() + " " + e.getCause());
+         System.out.println("caught " + e.getClass().getName() + " " + e.getMessage() + " " + e.getCause());
+         fail();
+      }
+      
+      this.undeploy("bind-failure-test.jar");
+      
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      return suite;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindFailureTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming.unit;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-
-import javax.naming.InitialContext;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class BindingTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(BindingTestCase.class);
-   
-   /**
-    *
-    * @param name  Testcase name
-    */
-   public BindingTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testCleanup() throws Exception
-   {
-      this.redeploy("naming.jar");
-      this.undeploy("naming.jar");
-      
-      InitialContext jndiContext = new InitialContext();
-      
-      try
-      {
-         Object o = jndiContext.lookup("ENCTests");
-         org.jnp.interfaces.NamingContext nc = (org.jnp.interfaces.NamingContext)o;
-         Object ejbs = nc.lookup("ejbs");
-         nc.destroySubcontext("ejbs");
-         fail("ENCTests should no longer be bound");
-      }
-      catch (javax.naming.NamingException e)
-      {
-      }
-      
-   }
-
-   public static Test suite() throws Exception
-   {
-      return new TestSuite(BindingTestCase.class);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming.unit;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
+import javax.naming.InitialContext;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class BindingTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(BindingTestCase.class);
+   
+   /**
+    *
+    * @param name  Testcase name
+    */
+   public BindingTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testCleanup() throws Exception
+   {
+      this.redeploy("naming.jar");
+      this.undeploy("naming.jar");
+      
+      InitialContext jndiContext = new InitialContext();
+      
+      try
+      {
+         Object o = jndiContext.lookup("ENCTests");
+         org.jnp.interfaces.NamingContext nc = (org.jnp.interfaces.NamingContext)o;
+         Object ejbs = nc.lookup("ejbs");
+         nc.destroySubcontext("ejbs");
+         fail("ENCTests should no longer be bound");
+      }
+      catch (javax.naming.NamingException e)
+      {
+      }
+      
+   }
+
+   public static Test suite() throws Exception
+   {
+      return new TestSuite(BindingTestCase.class);
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/BindingTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,85 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming.unit;
-
-import org.jboss.ejb3.test.naming.TestENC;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Tests of the secure access to EJBs.
- *
- * @author   Scott.Stark at jboss.org
- * @author   <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
- * @version $Revision$
- */
-public class ENCUnitTestCase extends JBossTestCase
-{
-   /**
-    * Constructor for the ENCUnitTestCase object
-    *
-    * @param name  Testcase name
-    */
-   public ENCUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   /** Tests of accessing the various types of java:comp entries
-    *
-    * @exception Exception  Description of Exception
-    */
-   public void testENC() throws Exception
-   {
-      SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
-      SecurityAssociation.setCredential("theduke".toCharArray());
-      
-      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean");
-      getLog().debug("Created ENCBean");
-      bean.accessENC();
-      bean.remove();
-   }
-
-   /**
-    * A unit test for JUnit
-    *
-    * @exception Exception  Description of Exception
-    */
-   public void testENC2() throws Exception
-   {
-      SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
-      SecurityAssociation.setCredential("theduke".toCharArray());
-      
-      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean0");
-      getLog().debug("Created ENCBean0");
-      bean.accessENC();
-      bean.remove();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ENCUnitTestCase.class, "naming.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming.unit;
+
+import org.jboss.ejb3.test.naming.TestENC;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Tests of the secure access to EJBs.
+ *
+ * @author   Scott.Stark at jboss.org
+ * @author   <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
+ * @version $Revision$
+ */
+public class ENCUnitTestCase extends JBossTestCase
+{
+   /**
+    * Constructor for the ENCUnitTestCase object
+    *
+    * @param name  Testcase name
+    */
+   public ENCUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   /** Tests of accessing the various types of java:comp entries
+    *
+    * @exception Exception  Description of Exception
+    */
+   public void testENC() throws Exception
+   {
+      SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
+      SecurityAssociation.setCredential("theduke".toCharArray());
+      
+      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean");
+      getLog().debug("Created ENCBean");
+      bean.accessENC();
+      bean.remove();
+   }
+
+   /**
+    * A unit test for JUnit
+    *
+    * @exception Exception  Description of Exception
+    */
+   public void testENC2() throws Exception
+   {
+      SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
+      SecurityAssociation.setCredential("theduke".toCharArray());
+      
+      TestENC bean = (TestENC)getInitialContext().lookup("ENCBean0");
+      getLog().debug("Created ENCBean0");
+      bean.accessENC();
+      bean.remove();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ENCUnitTestCase.class, "naming.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.naming.unit;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-
-import org.jboss.ejb3.test.naming.Stateful;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class NamingTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(NamingTestCase.class);
-   
-   /**
-    * Constructor for the ENCUnitTestCase object
-    *
-    * @param name  Testcase name
-    */
-   public NamingTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testJndiOverride() throws Exception
-   { 
-      Stateful stateful = (Stateful)getInitialContext().lookup("StatefulOverride");
-      assertNotNull(stateful);
-      
-      try
-      {
-         stateful = (Stateful)getInitialContext().lookup("Stateful");
-         fail();
-      } catch (javax.naming.NamingException e)
-      {
-         
-      }
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(NamingTestCase.class, "naming-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.naming.unit;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
+import org.jboss.ejb3.test.naming.Stateful;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class NamingTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(NamingTestCase.class);
+   
+   /**
+    * Constructor for the ENCUnitTestCase object
+    *
+    * @param name  Testcase name
+    */
+   public NamingTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testJndiOverride() throws Exception
+   { 
+      Stateful stateful = (Stateful)getInitialContext().lookup("StatefulOverride");
+      assertNotNull(stateful);
+      
+      try
+      {
+         stateful = (Stateful)getInitialContext().lookup("Stateful");
+         fail();
+      } catch (javax.naming.NamingException e)
+      {
+         
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(NamingTestCase.class, "naming-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/naming/unit/NamingTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,124 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.pkg;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.SecondaryTable;
-
-/**
- * Company customer
- *
- * @author Emmanuel Bernard
- */
- at Entity
- at SecondaryTable(name = "EMBEDDED_ADDRESS")
- at NamedQuery(name="customerById", query="from Customer c where c.id = :id")
-public class Customer implements java.io.Serializable
-{
-   Long id;
-   String name;
-   String street;
-   String city;
-   String state;
-   String zip;
-
-   public
-   Customer()
-   {
-   }
-
-   @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
-   public
-   Long getId()
-   {
-      return id;
-   }
-
-   public
-   String getName()
-   {
-      return name;
-   }
-
-   public
-   void setId(Long long1)
-   {
-      id = long1;
-   }
-
-   public
-   void setName(String string)
-   {
-      name = string;
-   }
-
-   @Column(name = "street", table="EMBEDDED_ADDRESS")
-   public String getStreet()
-   {
-      return street;
-   }
-
-   public void setStreet(String street)
-   {
-      this.street = street;
-   }
-
-   @Column(name = "city", table="EMBEDDED_ADDRESS")
-   public String getCity()
-   {
-      return city;
-   }
-
-   public void setCity(String city)
-   {
-      this.city = city;
-   }
-
-   @Column(name = "state", table="EMBEDDED_ADDRESS")
-   public String getState()
-   {
-      return state;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-
-   @Column(name = "zip", table = "EMBEDDED_ADDRESS")
-   public String getZip()
-   {
-      return zip;
-   }
-
-   public void setZip(String zip)
-   {
-      this.zip = zip;
-   }
-
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.pkg;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.SecondaryTable;
+
+/**
+ * Company customer
+ *
+ * @author Emmanuel Bernard
+ */
+ at Entity
+ at SecondaryTable(name = "EMBEDDED_ADDRESS")
+ at NamedQuery(name="customerById", query="from Customer c where c.id = :id")
+public class Customer implements java.io.Serializable
+{
+   Long id;
+   String name;
+   String street;
+   String city;
+   String state;
+   String zip;
+
+   public
+   Customer()
+   {
+   }
+
+   @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
+   public
+   Long getId()
+   {
+      return id;
+   }
+
+   public
+   String getName()
+   {
+      return name;
+   }
+
+   public
+   void setId(Long long1)
+   {
+      id = long1;
+   }
+
+   public
+   void setName(String string)
+   {
+      name = string;
+   }
+
+   @Column(name = "street", table="EMBEDDED_ADDRESS")
+   public String getStreet()
+   {
+      return street;
+   }
+
+   public void setStreet(String street)
+   {
+      this.street = street;
+   }
+
+   @Column(name = "city", table="EMBEDDED_ADDRESS")
+   public String getCity()
+   {
+      return city;
+   }
+
+   public void setCity(String city)
+   {
+      this.city = city;
+   }
+
+   @Column(name = "state", table="EMBEDDED_ADDRESS")
+   public String getState()
+   {
+      return state;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+
+   @Column(name = "zip", table = "EMBEDDED_ADDRESS")
+   public String getZip()
+   {
+      return zip;
+   }
+
+   public void setZip(String zip)
+   {
+      this.zip = zip;
+   }
+
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.pkg;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface EntityTest
-{
-   Customer createCustomer();
-
-   Customer findByCustomerId(Long id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.pkg;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface EntityTest
+{
+   Customer createCustomer();
+
+   Customer findByCustomerId(Long id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.pkg;
-
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.NamedQuery;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(EntityTest.class)
- at NamedQuery(name="customerById", query="from Customer c where c.id = :id")
-public class EntityTestBean implements EntityTest
-{
-   @PersistenceContext
-   private EntityManager manager;
-
-   public Customer createCustomer()
-   {
-      Customer c = new Customer();
-      c.setName("Bill");
-      c.setStreet("Landsdown Street");
-      c.setCity("Boston");
-      c.setState("MA");
-      c.setZip("02114");
-      manager.persist(c);
-      return c;
-   }
-
-   public Customer findByCustomerId(Long id)
-   {
-      Query query = manager.createNamedQuery("customerById");
-      return (Customer)query.setParameter("id", id).getSingleResult();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.pkg;
+
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.NamedQuery;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(EntityTest.class)
+ at NamedQuery(name="customerById", query="from Customer c where c.id = :id")
+public class EntityTestBean implements EntityTest
+{
+   @PersistenceContext
+   private EntityManager manager;
+
+   public Customer createCustomer()
+   {
+      Customer c = new Customer();
+      c.setName("Bill");
+      c.setStreet("Landsdown Street");
+      c.setCity("Boston");
+      c.setState("MA");
+      c.setZip("02114");
+      manager.persist(c);
+      return c;
+   }
+
+   public Customer findByCustomerId(Long id)
+   {
+      Query query = manager.createNamedQuery("customerById");
+      return (Customer)query.setParameter("id", id).getSingleResult();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/EntityTestBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,23 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.pkg;
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.pkg;
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/package-info.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.pkg.unit;
-
-import org.jboss.ejb3.test.pkg.Customer;
-import org.jboss.ejb3.test.pkg.EntityTest;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class EntityUnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public EntityUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testAll() throws Exception
-   {
-      EntityTest tester = (EntityTest) getInitialContext().lookup("EntityTestBean/remote");
-      Customer c = tester.createCustomer();
-      c = tester.findByCustomerId(c.getId());
-
-      assertEquals(c.getName(), "Bill");
-      assertEquals(c.getState(), "MA");
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EntityUnitTestCase.class, "pkg-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.pkg.unit;
+
+import org.jboss.ejb3.test.pkg.Customer;
+import org.jboss.ejb3.test.pkg.EntityTest;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class EntityUnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public EntityUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testAll() throws Exception
+   {
+      EntityTest tester = (EntityTest) getInitialContext().lookup("EntityTestBean/remote");
+      Customer c = tester.createCustomer();
+      c = tester.findByCustomerId(c.getId());
+
+      assertEquals(c.getName(), "Bill");
+      assertEquals(c.getState(), "MA");
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EntityUnitTestCase.class, "pkg-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pkg/unit/EntityUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -52,9 +52,11 @@
    @Timeout
    public void timeoutHandler(Timer timer)
    {
+      System.out.println("Timeout " + timer);
+      
       timer.cancel();
 
-      ctx.getTimerService().createTimer(new Date(new Date().getTime() + 50),
+      ctx.getTimerService().createTimer(new Date(new Date().getTime() + 200),
             "Hello World");
    }
 

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.naming.*;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="GlobalSession30")
- at Remote(Session30.class)
- at RemoteBinding(jndiBinding = "GlobalSession30")
-public class GlobalSession30Bean 
-{
-   private static final Logger log = Logger.getLogger(GlobalSession30Bean.class);
-   
-   public String access()
-   {
-      return "Session30";
-   }
-   
-   public String access21()
-   {
-      return null;
-   }
-   
-   public String accessLocalStateful()
-   {
-      return "not supported";
-   }
-   
-   public String accessLocalStateful(String value)
-   {
-      return "not supported";
-   }
-   
-   public String accessLocalStateful(String value, Integer suffix)
-   {
-      return "not supported";
-   }
-   
-   public String globalAccess21()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Session21Home home = (Session21Home)jndiContext.lookup("Session21");
-         Session21 session = (Session21)home.create();
-         return session.access();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.naming.*;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="GlobalSession30")
+ at Remote(Session30.class)
+ at RemoteBinding(jndiBinding = "GlobalSession30")
+public class GlobalSession30Bean 
+{
+   private static final Logger log = Logger.getLogger(GlobalSession30Bean.class);
+   
+   public String access()
+   {
+      return "Session30";
+   }
+   
+   public String access21()
+   {
+      return null;
+   }
+   
+   public String accessLocalStateful()
+   {
+      return "not supported";
+   }
+   
+   public String accessLocalStateful(String value)
+   {
+      return "not supported";
+   }
+   
+   public String accessLocalStateful(String value, Integer suffix)
+   {
+      return "not supported";
+   }
+   
+   public String globalAccess21()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Session21Home home = (Session21Home)jndiContext.lookup("Session21");
+         Session21 session = (Session21)home.create();
+         return session.access();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.Init;
-import javax.ejb.Local;
-import javax.ejb.LocalHome;
-import javax.annotation.PreDestroy;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.Stateful;
-import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateful(name="HomedStatefulSession30")
- at RemoteHome(StatefulSession30Home.class)
- at LocalHome(StatefulSession30LocalHome.class)
- at Local(LocalStatefulSession30.class)
- at Remote(StatefulSession30.class)
- at RemoteBinding(jndiBinding = "HomedStatefulSession30")
- at LocalBinding(jndiBinding = "HomedLocalStatefulSession30")
-public class HomedStatefulSession30Bean implements java.io.Serializable
-{
-   private static final Logger log = Logger.getLogger(HomedStatefulSession30Bean.class);
-   
-   private String value = null;
-   
-   public void setValue(String value)
-   {
-      this.value = value;
-   }
-   
-   public String getValue()
-   {
-      return value;
-   }
-   
-   public void setLocalValue(String value)
-   {
-      this.value = value;
-   }
-   
-   public String getLocalValue()
-   {
-      return value;
-   }
-   
-   public String accessLocalStateless()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Session30LocalHome localHome = (Session30LocalHome)jndiContext.lookup("LocalSession30");
-         LocalSession30 localSession = localHome.create();
-         return localSession.access();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-   @Init
-   public void ejbCreate()
-   {
-      value="default";
-   }
-   
-   @Init
-   public void ejbCreate(String value)
-   {
-      this.value=value;
-   }
-   
-   @Init
-   public void ejbCreate(String value, Integer suffix)
-   {
-      this.value=value + suffix;
-   }
-   
-   @PreDestroy
-   public void preDestroy()
-   {
-      log.info("Invoking PreDestroy");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.ejb.LocalHome;
+import javax.annotation.PreDestroy;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.Stateful;
+import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateful(name="HomedStatefulSession30")
+ at RemoteHome(StatefulSession30Home.class)
+ at LocalHome(StatefulSession30LocalHome.class)
+ at Local(LocalStatefulSession30.class)
+ at Remote(StatefulSession30.class)
+ at RemoteBinding(jndiBinding = "HomedStatefulSession30")
+ at LocalBinding(jndiBinding = "HomedLocalStatefulSession30")
+public class HomedStatefulSession30Bean implements java.io.Serializable
+{
+   private static final Logger log = Logger.getLogger(HomedStatefulSession30Bean.class);
+   
+   private String value = null;
+   
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   public String getValue()
+   {
+      return value;
+   }
+   
+   public void setLocalValue(String value)
+   {
+      this.value = value;
+   }
+   
+   public String getLocalValue()
+   {
+      return value;
+   }
+   
+   public String accessLocalStateless()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Session30LocalHome localHome = (Session30LocalHome)jndiContext.lookup("LocalSession30");
+         LocalSession30 localSession = localHome.create();
+         return localSession.access();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+   @Init
+   public void ejbCreate()
+   {
+      value="default";
+   }
+   
+   @Init
+   public void ejbCreate(String value)
+   {
+      this.value=value;
+   }
+   
+   @Init
+   public void ejbCreate(String value, Integer suffix)
+   {
+      this.value=value + suffix;
+   }
+   
+   @PreDestroy
+   public void preDestroy()
+   {
+      log.info("Invoking PreDestroy");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface LocalSession30 
-{
-   public String access();
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface LocalSession30 
+{
+   public String access();
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalSession30.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface LocalStatefulSession30 
-{
-   public String getLocalValue();
-   
-   public void setLocalValue(String value);
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface LocalStatefulSession30 
+{
+   public String getLocalValue();
+   
+   public void setLocalValue(String value);
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/LocalStatefulSession30.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import java.rmi.*;
-
-/**
- * @see <related>
- * @author $Author$
- * @version $Revision$
- */
-public interface Session21 extends javax.ejb.EJBObject
-{
-   public String access() throws RemoteException;
-   
-   public String access30() throws RemoteException;
-   
-   public String globalAccess30() throws RemoteException;
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import java.rmi.*;
+
+/**
+ * @see <related>
+ * @author $Author$
+ * @version $Revision$
+ */
+public interface Session21 extends javax.ejb.EJBObject
+{
+   public String access() throws RemoteException;
+   
+   public String access30() throws RemoteException;
+   
+   public String globalAccess30() throws RemoteException;
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class Session21Bean implements javax.ejb.SessionBean
-{
-   private static final Logger log = Logger.getLogger(Session21Bean.class);
-   
-   public String access()
-   {
-      return "Session21";
-   }
-   
-   public String access30()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Session30 session = (Session30)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/Session30");
-         return session.access();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-   public String globalAccess30()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Session30 session = (Session30)jndiContext.lookup("GlobalSession30");
-         return session.access();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-
-   public void ejbCreate()
-   {
-    
-   }
-   
-   public void ejbActivate()
-   {
-   
-   }
-   
-   public void ejbPassivate()
-   {
-      
-   }
-   
-   public void ejbRemove()
-   {
-      
-   }
-   
-   public void setSessionContext(SessionContext context)
-   {
-      
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class Session21Bean implements javax.ejb.SessionBean
+{
+   private static final Logger log = Logger.getLogger(Session21Bean.class);
+   
+   public String access()
+   {
+      return "Session21";
+   }
+   
+   public String access30()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Session30 session = (Session30)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/Session30");
+         return session.access();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+   public String globalAccess30()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Session30 session = (Session30)jndiContext.lookup("GlobalSession30");
+         return session.access();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+
+   public void ejbCreate()
+   {
+    
+   }
+   
+   public void ejbActivate()
+   {
+   
+   }
+   
+   public void ejbPassivate()
+   {
+      
+   }
+   
+   public void ejbRemove()
+   {
+      
+   }
+   
+   public void setSessionContext(SessionContext context)
+   {
+      
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session21Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.EJBObject;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30 extends EJBObject
-{
-   String access();
-   
-   String access21();
-   
-   String globalAccess21();
-   
-   String accessLocalStateful();
-   
-   String accessLocalStateful(String value);
-   
-   String accessLocalStateful(String value, Integer suffix);
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.EJBObject;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30 extends EJBObject
+{
+   String access();
+   
+   String access21();
+   
+   String globalAccess21();
+   
+   String accessLocalStateful();
+   
+   String accessLocalStateful(String value);
+   
+   String accessLocalStateful(String value, Integer suffix);
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,126 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.Local;
-
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="Session30")
- at Remote(Session30.class)
- at Local(LocalSession30.class)
- at RemoteBinding(jndiBinding = "Session30")
- at LocalBinding(jndiBinding = "LocalSession30")
- at EJBs({@EJB(name="injected", beanInterface=org.jboss.ejb3.test.reference21_30.Session21.class, beanName="Session21")})
-public class Session30Bean 
-{
-   private static final Logger log = Logger.getLogger(Session30Bean.class);
-
-   @EJB(mappedName="Session21") Object testMappedName;
-   
-   public String access()
-   {
-      return "Session30";
-   }
-   
-   public String access21()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Session21 session = (Session21)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/injected");
-         return session.access();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-   public String globalAccess21()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Session21Home home = (Session21Home)jndiContext.lookup("Session21");
-         Session21 session = (Session21)home.create();
-         return session.access();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-   public String accessLocalStateful()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         StatefulSession30LocalHome localHome = (StatefulSession30LocalHome)jndiContext.lookup("LocalStatefulSession30Home");
-         LocalStatefulSession30 localSession = localHome.create();
-         return localSession.getLocalValue();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-   public String accessLocalStateful(String value)
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         StatefulSession30LocalHome localHome = (StatefulSession30LocalHome)jndiContext.lookup("LocalStatefulSession30Home");
-         LocalStatefulSession30 localSession = localHome.create(value);
-         return localSession.getLocalValue();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-   public String accessLocalStateful(String value, Integer suffix)
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         StatefulSession30LocalHome localHome = (StatefulSession30LocalHome)jndiContext.lookup("LocalStatefulSession30Home");
-         LocalStatefulSession30 localSession = localHome.create(value, suffix);
-         return localSession.getLocalValue();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.naming.*;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.ejb.Local;
+
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="Session30")
+ at Remote(Session30.class)
+ at Local(LocalSession30.class)
+ at RemoteBinding(jndiBinding = "Session30")
+ at LocalBinding(jndiBinding = "LocalSession30")
+ at EJBs({@EJB(name="injected", beanInterface=org.jboss.ejb3.test.reference21_30.Session21.class, beanName="Session21")})
+public class Session30Bean 
+{
+   private static final Logger log = Logger.getLogger(Session30Bean.class);
+
+   @EJB(mappedName="Session21") Object testMappedName;
+   
+   public String access()
+   {
+      return "Session30";
+   }
+   
+   public String access21()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Session21 session = (Session21)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/injected");
+         return session.access();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+   public String globalAccess21()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Session21Home home = (Session21Home)jndiContext.lookup("Session21");
+         Session21 session = (Session21)home.create();
+         return session.access();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+   public String accessLocalStateful()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         StatefulSession30LocalHome localHome = (StatefulSession30LocalHome)jndiContext.lookup("LocalStatefulSession30Home");
+         LocalStatefulSession30 localSession = localHome.create();
+         return localSession.getLocalValue();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+   public String accessLocalStateful(String value)
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         StatefulSession30LocalHome localHome = (StatefulSession30LocalHome)jndiContext.lookup("LocalStatefulSession30Home");
+         LocalStatefulSession30 localSession = localHome.create(value);
+         return localSession.getLocalValue();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+   public String accessLocalStateful(String value, Integer suffix)
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         StatefulSession30LocalHome localHome = (StatefulSession30LocalHome)jndiContext.lookup("LocalStatefulSession30Home");
+         LocalStatefulSession30 localSession = localHome.create(value, suffix);
+         return localSession.getLocalValue();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30Home extends EJBHome {
-    
-  public Session30 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30Home extends EJBHome {
+    
+  public Session30 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Home.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30LocalHome extends EJBLocalHome
-{
-  public LocalSession30 create() throws javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30LocalHome extends EJBLocalHome
+{
+  public LocalSession30 create() throws javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30LocalHome.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import java.rmi.*;
-
-import javax.ejb.EJBObject;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatefulSession30 extends EJBObject
-{
-   void setValue(String value);
-   
-   String getValue();
-   
-   String accessLocalStateless();
-   
-   String accessLocalHome();
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import java.rmi.*;
+
+import javax.ejb.EJBObject;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulSession30 extends EJBObject
+{
+   void setValue(String value);
+   
+   String getValue();
+   
+   String accessLocalStateless();
+   
+   String accessLocalHome();
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,123 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.Init;
-import javax.ejb.Local;
-import javax.annotation.PreDestroy;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateful(name="StatefulSession30")
- at Local(LocalStatefulSession30.class)
- at Remote(StatefulSession30.class)
- at RemoteBinding(jndiBinding = "StatefulSession30")
- at LocalBinding(jndiBinding = "LocalStatefulSession30")
-public class StatefulSession30Bean implements java.io.Serializable
-{
-   private static final Logger log = Logger.getLogger(StatefulSession30Bean.class);
-   
-   private String value = null;
-   
-   public void setValue(String value)
-   {
-      this.value = value;
-   }
-   
-   public String getValue()
-   {
-      return value;
-   }
-   
-   public void setLocalValue(String value)
-   {
-      this.value = value;
-   }
-   
-   public String getLocalValue()
-   {
-      return value;
-   }
-   
-   public String accessLocalStateless()
-   {
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Session30LocalHome localHome = (Session30LocalHome)jndiContext.lookup("LocalSession30Home");
-         LocalSession30 localSession = localHome.create();
-         return localSession.access();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-   
-   public String accessLocalHome()
-   {
-      try
-      {
-         InitialContext jndiContext = new InitialContext();
-         StatefulSession30LocalHome home = (StatefulSession30LocalHome)jndiContext.lookup("HomedLocalStatefulSession30Home");
-         LocalStatefulSession30 session = (LocalStatefulSession30)home.create();
-         session.setLocalValue("LocalHome");
-         return session.getLocalValue();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-      
-   }
-   
-   @Init
-   public void ejbCreate()
-   {
-      value="default";
-   }
-   
-   @Init
-   public void ejbCreate(String value)
-   {
-      this.value=value;
-   }
-   
-   @Init
-   public void ejbCreate(String value, Integer suffix)
-   {
-      this.value=value + suffix;
-   }
-   
-   @PreDestroy
-   public void preDestroy()
-   {
-      log.info("Invoking PreDestroy");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.annotation.PreDestroy;
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateful(name="StatefulSession30")
+ at Local(LocalStatefulSession30.class)
+ at Remote(StatefulSession30.class)
+ at RemoteBinding(jndiBinding = "StatefulSession30")
+ at LocalBinding(jndiBinding = "LocalStatefulSession30")
+public class StatefulSession30Bean implements java.io.Serializable
+{
+   private static final Logger log = Logger.getLogger(StatefulSession30Bean.class);
+   
+   private String value = null;
+   
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   public String getValue()
+   {
+      return value;
+   }
+   
+   public void setLocalValue(String value)
+   {
+      this.value = value;
+   }
+   
+   public String getLocalValue()
+   {
+      return value;
+   }
+   
+   public String accessLocalStateless()
+   {
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Session30LocalHome localHome = (Session30LocalHome)jndiContext.lookup("LocalSession30Home");
+         LocalSession30 localSession = localHome.create();
+         return localSession.access();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+   
+   public String accessLocalHome()
+   {
+      try
+      {
+         InitialContext jndiContext = new InitialContext();
+         StatefulSession30LocalHome home = (StatefulSession30LocalHome)jndiContext.lookup("HomedLocalStatefulSession30Home");
+         LocalStatefulSession30 session = (LocalStatefulSession30)home.create();
+         session.setLocalValue("LocalHome");
+         return session.getLocalValue();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+      
+   }
+   
+   @Init
+   public void ejbCreate()
+   {
+      value="default";
+   }
+   
+   @Init
+   public void ejbCreate(String value)
+   {
+      this.value=value;
+   }
+   
+   @Init
+   public void ejbCreate(String value, Integer suffix)
+   {
+      this.value=value + suffix;
+   }
+   
+   @PreDestroy
+   public void preDestroy()
+   {
+      log.info("Invoking PreDestroy");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatefulSession30Home extends EJBHome {
-    
-  public StatefulSession30 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-  
-  public StatefulSession30 create(String value) throws java.rmi.RemoteException, javax.ejb.CreateException;
-  
-  public StatefulSession30 create(String value, Integer suffix) throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulSession30Home extends EJBHome {
+    
+  public StatefulSession30 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+  
+  public StatefulSession30 create(String value) throws java.rmi.RemoteException, javax.ejb.CreateException;
+  
+  public StatefulSession30 create(String value, Integer suffix) throws java.rmi.RemoteException, javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Home.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatefulSession30LocalHome extends EJBLocalHome {
-    
-  public LocalStatefulSession30 create() throws javax.ejb.CreateException;
-  
-  public LocalStatefulSession30 create(String value) throws javax.ejb.CreateException;
-  
-  public LocalStatefulSession30 create(String value, Integer suffix) throws javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulSession30LocalHome extends EJBLocalHome {
+    
+  public LocalStatefulSession30 create() throws javax.ejb.CreateException;
+  
+  public LocalStatefulSession30 create(String value) throws javax.ejb.CreateException;
+  
+  public LocalStatefulSession30 create(String value, Integer suffix) throws javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30LocalHome.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import java.rmi.RemoteException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface Test2
-   extends javax.ejb.EJBObject
-{
-   void testAccess() throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import java.rmi.RemoteException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface Test2
+   extends javax.ejb.EJBObject
+{
+   void testAccess() throws RemoteException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class Test2Bean
-implements javax.ejb.SessionBean
-{
-   private static final Logger log = Logger.getLogger(Test2Bean.class);
-    
-   public void testAccess()
-   {
-      try
-      {
-         InitialContext jndiContext = new InitialContext();
-         Test3 session = (Test3)jndiContext.lookup("java:comp/env/ejb/Test3");
-         session.testAccess();
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-   
-   public void ejbCreate()
-   {
-    
-   }
-   
-   public void ejbActivate()
-   {
-   
-   }
-   
-   public void ejbPassivate()
-   {
-      
-   }
-   
-   public void ejbRemove()
-   {
-      
-   }
-   
-   public void setSessionContext(SessionContext context)
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Test2Bean
+implements javax.ejb.SessionBean
+{
+   private static final Logger log = Logger.getLogger(Test2Bean.class);
+    
+   public void testAccess() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      Test3 session = (Test3)jndiContext.lookup("java:comp/env/ejb/Test3");
+      session.testAccess();
+     
+      Test3Home home = (Test3Home)jndiContext.lookup("java:comp/env/ejb/Test3Home");
+      session = home.create();
+      session.testAccess();
+   }
+   
+   public void ejbCreate()
+   {
+    
+   }
+   
+   public void ejbActivate()
+   {
+   
+   }
+   
+   public void ejbPassivate()
+   {
+      
+   }
+   
+   public void ejbRemove()
+   {
+      
+   }
+   
+   public void setSessionContext(SessionContext context)
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Test2Home extends EJBHome {
-    
-  public Test2 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Test2Home extends EJBHome {
+    
+  public Test2 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test2Home.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface Test3
-{
-   void testAccess() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface Test3
+{
+   void testAccess() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
-import javax.naming.InitialContext;
-import javax.ejb.EJBs;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless(name="Test3")
- at Remote(Test3.class)
- at RemoteBinding(jndiBinding="Test3")
- at RemoteHome(Test3Home.class)
- at EJBs({@EJB(name="injected/Test2",  mappedName="Test2")})
-public class Test3Bean
-   implements Test3
-{
-   private static final Logger log = Logger.getLogger(Test3Bean.class);
-   
-   @EJB(name="ejb/Test2")
-   private Test2Home test2Home=null;
-    
-   public void testAccess() throws Exception
-   {
-      Test2 test2 = test2Home.create();
-      try {
-         InitialContext jndiContext = new InitialContext();
-         Test2Home home = (Test2Home)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/injected/Test2");
-         test2 = home.create();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.Stateless;
+import javax.ejb.EJB;
+import javax.naming.InitialContext;
+import javax.ejb.EJBs;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.Container;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless(name="Test3")
+ at Remote(Test3.class)
+ at RemoteBinding(jndiBinding="Test3")
+ at RemoteHome(Test3Home.class)
+ at EJBs({@EJB(name="injected/Test2",  mappedName="Test2")})
+public class Test3Bean
+   implements Test3
+{
+   private static final Logger log = Logger.getLogger(Test3Bean.class);
+   
+   @EJB(name="ejb/Test2")
+   private Test2Home test2Home=null;
+    
+   public void testAccess() throws Exception
+   {
+      Test2 test2 = test2Home.create();
+      try {
+         InitialContext jndiContext = new InitialContext();
+         Test2Home home = (Test2Home)jndiContext.lookup(Container.ENC_CTX_NAME + "/env/injected/Test2");
+         test2 = home.create();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.reference21_30;
-
-import javax.ejb.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Test3Home extends EJBHome {
-    
-  public Test3 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30;
+
+import javax.ejb.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Test3Home extends EJBHome {
+    
+  public Test3 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Home.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.reference21_30.unit;
-
-import javax.naming.*;
-
-import org.jboss.ejb3.test.reference21_30.*;
-import org.jboss.logging.Logger;
-
-import org.jboss.ejb3.test.reference21_30.Test3;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/**
- * Test for EJB3.0/EJB2.1 references
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class EarTestCase
-    extends JBossTestCase {
-
-   private static final Logger log = Logger
-   .getLogger(EarTestCase.class);
-
-   public EarTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testEjbInjection() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      Test3 test3 = (Test3)jndiContext.lookup("Test3");
-      assertNotNull(test3);
-      test3.testAccess();
-      
-      Test2Home home = (Test2Home)jndiContext.lookup("Test2");
-      assertNotNull(home);
-      Test2 test2 = home.create();
-      assertNotNull(test2);
-      test2.testAccess();
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EarTestCase.class, "multideploy.ear");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30.unit;
+
+import javax.naming.*;
+
+import org.jboss.ejb3.test.reference21_30.*;
+import org.jboss.logging.Logger;
+
+import org.jboss.ejb3.test.reference21_30.Test3;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Test for EJB3.0/EJB2.1 references
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class EarTestCase
+    extends JBossTestCase {
+
+   private static final Logger log = Logger
+   .getLogger(EarTestCase.class);
+
+   public EarTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testEjbInjection() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      Test3 test3 = (Test3)jndiContext.lookup("Test3");
+      assertNotNull(test3);
+      test3.testAccess();
+      
+      Test2Home home = (Test2Home)jndiContext.lookup("Test2");
+      assertNotNull(home);
+      Test2 test2 = home.create();
+      assertNotNull(test2);
+      test2.testAccess();
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EarTestCase.class, "multideploy.ear");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/EarTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.reference21_30.unit;
-
-import javax.naming.*;
-
-import org.jboss.ejb3.test.reference21_30.*;
-import org.jboss.logging.Logger;
-
-import javax.ejb.EJBException;
-
-import junit.framework.Test;
-
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Test for EJB3.0/EJB2.1 references
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class GlobalReferenceTestCase
-    extends JBossTestCase {
-
-   private static final Logger log = Logger
-         .getLogger(GlobalReferenceTestCase.class);
-
-   public GlobalReferenceTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testSession21() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
- 
-      Session21Home home = (Session21Home) jndiContext.lookup("Session21");
-      Session21 session = (Session21)home.create();
-      String access = session.access();
-      assertEquals("Session21", access);
-      access = session.globalAccess30();
-      assertEquals("Session30", access);
-   }
-   
-   public void testSession30() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
- 
-      Session30 session = (Session30) jndiContext.lookup("GlobalSession30");
-      String access = session.access();
-      assertEquals("Session30", access);
-      access = session.globalAccess21();
-      assertEquals("Session21", access);
-   }
-
-   protected void setUp() throws Exception
-   {
-   }
-
-   public static Test suite() throws Exception
-   {
-   //   return new TestSuite(BankDeploymentDescriptorTestCase.class);
-      return getDeploySetup(GlobalReferenceTestCase.class, "globalReference-ejb3.jar,globalReference.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30.unit;
+
+import javax.naming.*;
+
+import org.jboss.ejb3.test.reference21_30.*;
+import org.jboss.logging.Logger;
+
+import javax.ejb.EJBException;
+
+import junit.framework.Test;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Test for EJB3.0/EJB2.1 references
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class GlobalReferenceTestCase
+    extends JBossTestCase {
+
+   private static final Logger log = Logger
+         .getLogger(GlobalReferenceTestCase.class);
+
+   public GlobalReferenceTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testSession21() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+ 
+      Session21Home home = (Session21Home) jndiContext.lookup("Session21");
+      Session21 session = (Session21)home.create();
+      String access = session.access();
+      assertEquals("Session21", access);
+      access = session.globalAccess30();
+      assertEquals("Session30", access);
+   }
+   
+   public void testSession30() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+ 
+      Session30 session = (Session30) jndiContext.lookup("GlobalSession30");
+      String access = session.access();
+      assertEquals("Session30", access);
+      access = session.globalAccess21();
+      assertEquals("Session21", access);
+   }
+
+   protected void setUp() throws Exception
+   {
+   }
+
+   public static Test suite() throws Exception
+   {
+   //   return new TestSuite(BankDeploymentDescriptorTestCase.class);
+      return getDeploySetup(GlobalReferenceTestCase.class, "globalReference-ejb3.jar,globalReference.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/GlobalReferenceTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.reference21_30.unit;
-
-import javax.naming.*;
-
-import org.jboss.ejb3.test.reference21_30.*;
-import org.jboss.logging.Logger;
-
-import org.jboss.ejb3.test.reference21_30.Test3;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/**
- * Test for EJB3.0/EJB2.1 references
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class MultiDeployTestCase
-    extends JBossTestCase {
-
-   private static final Logger log = Logger
-         .getLogger(MultiDeployTestCase.class);
-
-   public MultiDeployTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testEjbInjection() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      Test3 test3 = (Test3)jndiContext.lookup("Test3");
-      assertNotNull(test3);
-      test3.testAccess();
-      
-      Test2Home home = (Test2Home)jndiContext.lookup("Test2");
-      assertNotNull(home);
-      Test2 test2 = home.create();
-      assertNotNull(test2);
-      test2.testAccess();
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(MultiDeployTestCase.class, "multideploy.jar, multideploy-ejb3.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30.unit;
+
+import javax.naming.*;
+
+import org.jboss.ejb3.test.reference21_30.*;
+import org.jboss.logging.Logger;
+
+import org.jboss.ejb3.test.reference21_30.Test3;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Test for EJB3.0/EJB2.1 references
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class MultiDeployTestCase
+    extends JBossTestCase {
+
+   private static final Logger log = Logger
+         .getLogger(MultiDeployTestCase.class);
+
+   public MultiDeployTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testEjbInjection() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      Test3 test3 = (Test3)jndiContext.lookup("Test3");
+      assertNotNull(test3);
+      test3.testAccess();
+      
+      Test2Home home = (Test2Home)jndiContext.lookup("Test2");
+      assertNotNull(home);
+      Test2 test2 = home.create();
+      assertNotNull(test2);
+      test2.testAccess();
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(MultiDeployTestCase.class, "multideploy.jar, multideploy-ejb3.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/MultiDeployTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,368 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.reference21_30.unit;
-
-import javax.ejb.EJBException;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBMetaData;
-import javax.ejb.EJBObject;
-import javax.ejb.Handle;
-import javax.ejb.HomeHandle;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.test.reference21_30.Session21;
-import org.jboss.ejb3.test.reference21_30.Session30;
-import org.jboss.ejb3.test.reference21_30.Session30Home;
-import org.jboss.ejb3.test.reference21_30.StatefulSession30;
-import org.jboss.ejb3.test.reference21_30.StatefulSession30Home;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Test for EJB3.0/EJB2.1 references
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ReferenceTestCase
-    extends JBossTestCase {
-
-   private static final Logger log = Logger
-         .getLogger(ReferenceTestCase.class);
-
-   public ReferenceTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testSession21() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      Session21 session = (Session21)jndiContext.lookup("Session21");
-      String access = session.access();
-      assertEquals("Session21", access);
-      access = session.access30();
-      assertEquals("Session30", access);
-   }
-   
-   public void testSession30() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
- 
-      Session30 session = (Session30) jndiContext.lookup("Session30");
-      String access = session.access();
-      assertEquals("Session30", access);
-      access = session.access21();
-      assertEquals("Session21", access);
-   } 
-   
-   public void testSessionHome30() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      Session30 session = (Session30) jndiContext.lookup("Session30");
-      assertNotNull(session);
-      String access = session.access();
-      assertEquals("Session30", access);
-      
-      Session30Home home = (Session30Home) jndiContext.lookup("Session30Home");
-      assertNotNull(home);
-      session = (Session30)home.create();
-      assertNotNull(session);
-      access = session.access();
-      assertEquals("Session30", access);
-   }
-
-   public void testStatefulRemove() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
-      assertNotNull(home);
-      StatefulSession30 session = (StatefulSession30)home.create();
-      assertNotNull(session);
-      session.setValue("123");
-      String value = session.getValue();
-      assertEquals("123", value);
-      
-      EJBObject ejbObject = (EJBObject)session;
-      
-      Handle handle = session.getHandle();
-      assertNotNull(handle);
-      
-      home.remove(handle);
-      
-      try {
-         session.getValue();
-         assertTrue(false);
-      } catch (EJBException e)
-      {
-         assertTrue(e instanceof EJBException);
-      }
-      
-      session = (StatefulSession30)home.create();
-      assertNotNull(session);
-      session.setValue("123");
-      value = session.getValue();
-      assertEquals("123", value);
-      
-      session.remove();
-      
-      try {
-         session.getValue();
-         assertTrue(false);
-      } catch (EJBException e)
-      {
-         assertTrue(e instanceof EJBException);
-      }
-   }
- 
-   public void testStatefulSessionHome30() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      StatefulSession30 session = (StatefulSession30) jndiContext.lookup("StatefulSession30");
-      assertNotNull(session);
-      session.setValue("testing");
-      String value = session.getValue();
-      assertEquals("testing", value);
-      
-      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
-      assertNotNull(home);
-      session = (StatefulSession30)home.create();
-      assertNotNull(session);
-      session.setValue("123");
-      value = session.getValue();
-      assertEquals("123", value);
-      
-      session = (StatefulSession30)home.create("456");
-      assertNotNull(session);
-      value = session.getValue();
-      assertEquals("456", value);
-      
-      session = (StatefulSession30)home.create("combined", new Integer("789"));
-      assertNotNull(session);
-      value = session.getValue();
-      assertEquals("combined789", value);
-   }
-   
-   public void testRemoteHomeAnnotation() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("HomedStatefulSession30Home");
-      assertNotNull(home);
-      StatefulSession30 session = (StatefulSession30)home.create();
-      assertNotNull(session);
-      session.setValue("123");
-      String value = session.getValue();
-      assertEquals("123", value);
-      
-      session = (StatefulSession30)home.create("456");
-      assertNotNull(session);
-      value = session.getValue();
-      assertEquals("456", value);
-      
-      session = (StatefulSession30)home.create("combined", new Integer("789"));
-      assertNotNull(session);
-      value = session.getValue();
-      assertEquals("combined789", value);
-   }
-   
-   public void testLocalHomeAnnotation() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      StatefulSession30 session = (StatefulSession30) jndiContext.lookup("StatefulSession30");
-      
-      String access = session.accessLocalHome();
-      assertEquals("LocalHome", access);
-   }
-   
-   public void testLocalHome() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      StatefulSession30 statefulSession = (StatefulSession30) jndiContext.lookup("StatefulSession30");
-      assertNotNull(statefulSession);
-      String access = statefulSession.accessLocalStateless();
-      assertEquals("Session30", access);
-      
-      Session30 session = (Session30) jndiContext.lookup("Session30");
-      assertNotNull(session);
-      access = session.accessLocalStateful();
-      assertEquals("default", access);
-      
-      access = session.accessLocalStateful("testing");
-      assertEquals("testing", access);
-      
-      access = session.accessLocalStateful("testing", new Integer(123));
-      assertEquals("testing123", access);
-   } 
- 
-   public void testStatefulState() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-           
-      StatefulSession30 session1 = (StatefulSession30) jndiContext.lookup("StatefulSession30");
-      assertNotNull(session1);
-      session1.setValue("testing");
-      assertEquals("testing", session1.getValue());
-      
-      StatefulSession30 session2 = (StatefulSession30) jndiContext.lookup("StatefulSession30");
-      assertNotNull(session2);
-      assertEquals("default", session2.getValue());
-     
-      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
-      assertNotNull(home);
-      StatefulSession30 session3 = (StatefulSession30)home.create();
-      assertNotNull(session3);
-      session3.setValue("123");
-      assertEquals("123", session3.getValue());
-      
-      StatefulSession30 session4 = (StatefulSession30)home.create();
-      assertNotNull(session4);
-      assertEquals("default", session4.getValue());
-      assertEquals("default", session4.getValue());
-      
-      StatefulSession30 session5 = (StatefulSession30)home.create("init");
-      assertNotNull(session5);
-      assertEquals("init", session5.getValue());
-      
-      StatefulSession30 session6 = (StatefulSession30)home.create("init", new Integer(123));
-      assertNotNull(session6);
-      assertEquals("init123", session6.getValue());
-      
-      StatefulSession30 session7 = (StatefulSession30)home.create("secondinit");
-      assertNotNull(session7);
-      assertEquals("secondinit", session7.getValue());
-      
-      StatefulSession30 session8 = (StatefulSession30) jndiContext.lookup("StatefulSession30");
-      assertNotNull(session8);
-      assertEquals("default", session8.getValue());
-      
-      assertEquals("testing", session1.getValue());
-      assertEquals("default", session2.getValue());
-      assertEquals("123", session3.getValue());
-      assertEquals("default", session4.getValue());
-      assertEquals("init", session5.getValue());
-      assertEquals("init123", session6.getValue());
-      assertEquals("secondinit", session7.getValue());
-   }
-   
-   public void testStateful21Interfaces() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
-      assertNotNull(home);
-      
-      EJBMetaData metadata = home.getEJBMetaData();
-      assertNotNull(metadata);
-      assertEquals("org.jboss.ejb3.test.reference21_30.StatefulSession30",metadata.getRemoteInterfaceClass().getName());
-      
-      HomeHandle homeHandle = home.getHomeHandle();
-      assertNotNull(homeHandle);
-      
-      EJBHome ejbHome = homeHandle.getEJBHome();
-      assertNotNull(ejbHome);
-      metadata = ejbHome.getEJBMetaData();
-      assertNotNull(metadata);
-      assertEquals("org.jboss.ejb3.test.reference21_30.StatefulSession30",metadata.getRemoteInterfaceClass().getName());
-      
-      StatefulSession30 session = (StatefulSession30)home.create();
-      assertNotNull(session);
-      ejbHome = session.getEJBHome();
-      assertNotNull(ejbHome);
-      Object primaryKey = session.getPrimaryKey();
-      assertNotNull(primaryKey);
-      
-      Handle handle = session.getHandle();
-      assertNotNull(handle);
-      
-      EJBObject ejbObject = handle.getEJBObject();
-      assertNotNull(ejbObject);
-      
-      ejbHome = ejbObject.getEJBHome();
-      assertNotNull(ejbHome);
-    
-      Handle handle1 = ejbObject.getHandle();
-      assertNotNull(handle1);
-      
-      StatefulSession30 session1 = (StatefulSession30)home.create();
-      assertFalse(session.isIdentical(session1));
-      assertTrue(session.isIdentical(session));
-   }
- 
-   public void testStateless21Interfaces() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      
-      Session30Home home = (Session30Home) jndiContext.lookup("Session30Home");
-      assertNotNull(home);
-      
-      EJBMetaData metadata = home.getEJBMetaData();
-      assertNotNull(metadata);
-      assertEquals("org.jboss.ejb3.test.reference21_30.Session30",metadata.getRemoteInterfaceClass().getName());
-      
-      HomeHandle homeHandle = home.getHomeHandle();
-      assertNotNull(homeHandle);
-      
-      EJBHome ejbHome = homeHandle.getEJBHome();
-      assertNotNull(ejbHome);
-      metadata = ejbHome.getEJBMetaData();
-      assertNotNull(metadata);
-      assertEquals("org.jboss.ejb3.test.reference21_30.Session30",metadata.getRemoteInterfaceClass().getName());
-      
-      Session30 session = (Session30)home.create();
-      assertNotNull(session);
-      ejbHome = session.getEJBHome();
-      assertNotNull(ejbHome);
-      Object primaryKey = session.getPrimaryKey();
-      assertNull(primaryKey);
-      
-      Handle handle = session.getHandle();
-      assertNotNull(handle);
-      
-      EJBObject ejbObject = handle.getEJBObject();
-      assertNotNull(ejbObject);
-      
-      ejbHome = ejbObject.getEJBHome();
-      assertNotNull(ejbHome);
-    
-      Handle handle1 = ejbObject.getHandle();
-      assertNotNull(handle1);
-      
-      Session30 session1 = (Session30)home.create();
-      assertFalse(session.isIdentical(session1));
-   }
-
-   protected void setUp() throws Exception
-   {
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ReferenceTestCase.class, "reference.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,368 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.reference21_30.unit;
+
+import javax.ejb.EJBException;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBMetaData;
+import javax.ejb.EJBObject;
+import javax.ejb.Handle;
+import javax.ejb.HomeHandle;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.test.reference21_30.Session21;
+import org.jboss.ejb3.test.reference21_30.Session30;
+import org.jboss.ejb3.test.reference21_30.Session30Home;
+import org.jboss.ejb3.test.reference21_30.StatefulSession30;
+import org.jboss.ejb3.test.reference21_30.StatefulSession30Home;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Test for EJB3.0/EJB2.1 references
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ReferenceTestCase
+    extends JBossTestCase {
+
+   private static final Logger log = Logger
+         .getLogger(ReferenceTestCase.class);
+
+   public ReferenceTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testSession21() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      Session21 session = (Session21)jndiContext.lookup("Session21");
+      String access = session.access();
+      assertEquals("Session21", access);
+      access = session.access30();
+      assertEquals("Session30", access);
+   }
+   
+   public void testSession30() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+ 
+      Session30 session = (Session30) jndiContext.lookup("Session30");
+      String access = session.access();
+      assertEquals("Session30", access);
+      access = session.access21();
+      assertEquals("Session21", access);
+   } 
+   
+   public void testSessionHome30() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      Session30 session = (Session30) jndiContext.lookup("Session30");
+      assertNotNull(session);
+      String access = session.access();
+      assertEquals("Session30", access);
+      
+      Session30Home home = (Session30Home) jndiContext.lookup("Session30Home");
+      assertNotNull(home);
+      session = (Session30)home.create();
+      assertNotNull(session);
+      access = session.access();
+      assertEquals("Session30", access);
+   }
+
+   public void testStatefulRemove() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
+      assertNotNull(home);
+      StatefulSession30 session = (StatefulSession30)home.create();
+      assertNotNull(session);
+      session.setValue("123");
+      String value = session.getValue();
+      assertEquals("123", value);
+      
+      EJBObject ejbObject = (EJBObject)session;
+      
+      Handle handle = session.getHandle();
+      assertNotNull(handle);
+      
+      home.remove(handle);
+      
+      try {
+         session.getValue();
+         assertTrue(false);
+      } catch (EJBException e)
+      {
+         assertTrue(e instanceof EJBException);
+      }
+      
+      session = (StatefulSession30)home.create();
+      assertNotNull(session);
+      session.setValue("123");
+      value = session.getValue();
+      assertEquals("123", value);
+      
+      session.remove();
+      
+      try {
+         session.getValue();
+         assertTrue(false);
+      } catch (EJBException e)
+      {
+         assertTrue(e instanceof EJBException);
+      }
+   }
+ 
+   public void testStatefulSessionHome30() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      StatefulSession30 session = (StatefulSession30) jndiContext.lookup("StatefulSession30");
+      assertNotNull(session);
+      session.setValue("testing");
+      String value = session.getValue();
+      assertEquals("testing", value);
+      
+      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
+      assertNotNull(home);
+      session = (StatefulSession30)home.create();
+      assertNotNull(session);
+      session.setValue("123");
+      value = session.getValue();
+      assertEquals("123", value);
+      
+      session = (StatefulSession30)home.create("456");
+      assertNotNull(session);
+      value = session.getValue();
+      assertEquals("456", value);
+      
+      session = (StatefulSession30)home.create("combined", new Integer("789"));
+      assertNotNull(session);
+      value = session.getValue();
+      assertEquals("combined789", value);
+   }
+   
+   public void testRemoteHomeAnnotation() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("HomedStatefulSession30Home");
+      assertNotNull(home);
+      StatefulSession30 session = (StatefulSession30)home.create();
+      assertNotNull(session);
+      session.setValue("123");
+      String value = session.getValue();
+      assertEquals("123", value);
+      
+      session = (StatefulSession30)home.create("456");
+      assertNotNull(session);
+      value = session.getValue();
+      assertEquals("456", value);
+      
+      session = (StatefulSession30)home.create("combined", new Integer("789"));
+      assertNotNull(session);
+      value = session.getValue();
+      assertEquals("combined789", value);
+   }
+   
+   public void testLocalHomeAnnotation() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      StatefulSession30 session = (StatefulSession30) jndiContext.lookup("StatefulSession30");
+      
+      String access = session.accessLocalHome();
+      assertEquals("LocalHome", access);
+   }
+   
+   public void testLocalHome() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      StatefulSession30 statefulSession = (StatefulSession30) jndiContext.lookup("StatefulSession30");
+      assertNotNull(statefulSession);
+      String access = statefulSession.accessLocalStateless();
+      assertEquals("Session30", access);
+      
+      Session30 session = (Session30) jndiContext.lookup("Session30");
+      assertNotNull(session);
+      access = session.accessLocalStateful();
+      assertEquals("default", access);
+      
+      access = session.accessLocalStateful("testing");
+      assertEquals("testing", access);
+      
+      access = session.accessLocalStateful("testing", new Integer(123));
+      assertEquals("testing123", access);
+   } 
+ 
+   public void testStatefulState() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+           
+      StatefulSession30 session1 = (StatefulSession30) jndiContext.lookup("StatefulSession30");
+      assertNotNull(session1);
+      session1.setValue("testing");
+      assertEquals("testing", session1.getValue());
+      
+      StatefulSession30 session2 = (StatefulSession30) jndiContext.lookup("StatefulSession30");
+      assertNotNull(session2);
+      assertEquals("default", session2.getValue());
+     
+      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
+      assertNotNull(home);
+      StatefulSession30 session3 = (StatefulSession30)home.create();
+      assertNotNull(session3);
+      session3.setValue("123");
+      assertEquals("123", session3.getValue());
+      
+      StatefulSession30 session4 = (StatefulSession30)home.create();
+      assertNotNull(session4);
+      assertEquals("default", session4.getValue());
+      assertEquals("default", session4.getValue());
+      
+      StatefulSession30 session5 = (StatefulSession30)home.create("init");
+      assertNotNull(session5);
+      assertEquals("init", session5.getValue());
+      
+      StatefulSession30 session6 = (StatefulSession30)home.create("init", new Integer(123));
+      assertNotNull(session6);
+      assertEquals("init123", session6.getValue());
+      
+      StatefulSession30 session7 = (StatefulSession30)home.create("secondinit");
+      assertNotNull(session7);
+      assertEquals("secondinit", session7.getValue());
+      
+      StatefulSession30 session8 = (StatefulSession30) jndiContext.lookup("StatefulSession30");
+      assertNotNull(session8);
+      assertEquals("default", session8.getValue());
+      
+      assertEquals("testing", session1.getValue());
+      assertEquals("default", session2.getValue());
+      assertEquals("123", session3.getValue());
+      assertEquals("default", session4.getValue());
+      assertEquals("init", session5.getValue());
+      assertEquals("init123", session6.getValue());
+      assertEquals("secondinit", session7.getValue());
+   }
+   
+   public void testStateful21Interfaces() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      StatefulSession30Home home = (StatefulSession30Home) jndiContext.lookup("StatefulSession30Home");
+      assertNotNull(home);
+      
+      EJBMetaData metadata = home.getEJBMetaData();
+      assertNotNull(metadata);
+      assertEquals("org.jboss.ejb3.test.reference21_30.StatefulSession30",metadata.getRemoteInterfaceClass().getName());
+      
+      HomeHandle homeHandle = home.getHomeHandle();
+      assertNotNull(homeHandle);
+      
+      EJBHome ejbHome = homeHandle.getEJBHome();
+      assertNotNull(ejbHome);
+      metadata = ejbHome.getEJBMetaData();
+      assertNotNull(metadata);
+      assertEquals("org.jboss.ejb3.test.reference21_30.StatefulSession30",metadata.getRemoteInterfaceClass().getName());
+      
+      StatefulSession30 session = (StatefulSession30)home.create();
+      assertNotNull(session);
+      ejbHome = session.getEJBHome();
+      assertNotNull(ejbHome);
+      Object primaryKey = session.getPrimaryKey();
+      assertNotNull(primaryKey);
+      
+      Handle handle = session.getHandle();
+      assertNotNull(handle);
+      
+      EJBObject ejbObject = handle.getEJBObject();
+      assertNotNull(ejbObject);
+      
+      ejbHome = ejbObject.getEJBHome();
+      assertNotNull(ejbHome);
+    
+      Handle handle1 = ejbObject.getHandle();
+      assertNotNull(handle1);
+      
+      StatefulSession30 session1 = (StatefulSession30)home.create();
+      assertFalse(session.isIdentical(session1));
+      assertTrue(session.isIdentical(session));
+   }
+ 
+   public void testStateless21Interfaces() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      
+      Session30Home home = (Session30Home) jndiContext.lookup("Session30Home");
+      assertNotNull(home);
+      
+      EJBMetaData metadata = home.getEJBMetaData();
+      assertNotNull(metadata);
+      assertEquals("org.jboss.ejb3.test.reference21_30.Session30",metadata.getRemoteInterfaceClass().getName());
+      
+      HomeHandle homeHandle = home.getHomeHandle();
+      assertNotNull(homeHandle);
+      
+      EJBHome ejbHome = homeHandle.getEJBHome();
+      assertNotNull(ejbHome);
+      metadata = ejbHome.getEJBMetaData();
+      assertNotNull(metadata);
+      assertEquals("org.jboss.ejb3.test.reference21_30.Session30",metadata.getRemoteInterfaceClass().getName());
+      
+      Session30 session = (Session30)home.create();
+      assertNotNull(session);
+      ejbHome = session.getEJBHome();
+      assertNotNull(ejbHome);
+      Object primaryKey = session.getPrimaryKey();
+      assertNull(primaryKey);
+      
+      Handle handle = session.getHandle();
+      assertNotNull(handle);
+      
+      EJBObject ejbObject = handle.getEJBObject();
+      assertNotNull(ejbObject);
+      
+      ejbHome = ejbObject.getEJBHome();
+      assertNotNull(ejbHome);
+    
+      Handle handle1 = ejbObject.getHandle();
+      assertNotNull(handle1);
+      
+      Session30 session1 = (Session30)home.create();
+      assertFalse(session.isIdentical(session1));
+   }
+
+   protected void setUp() throws Exception
+   {
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ReferenceTestCase.class, "reference.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/reference21_30/unit/ReferenceTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -81,7 +81,7 @@
 
    public List getContacts()
    {
-      Query query = em.createQuery("select c from Contact c");
+      Query query = em.createQuery("from Contact");
       return query.getResultList();
    }
 }

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree231;
-
-import java.io.Serializable;
-import javax.ejb.Stateful;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.SessionContext;
-import javax.annotation.Resource;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
-public class StatefulBean implements Serializable, StatefulRemote
-{
-   public static boolean postActivateCalled = false;
-   public static boolean prePassivateCalled = false;
-
-
-   @Resource private SessionContext ctx;
-   private String state;
-
-   public boolean getPostActivate()
-   {
-      return postActivateCalled;
-   }
-
-   public boolean getPrePassivate()
-   {
-      return prePassivateCalled;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-
-   public String getState()
-   {
-      return this.state;
-   }
-
-   public void reset()
-   {
-      state = null;
-      postActivateCalled = false;
-      prePassivateCalled = false;
-   }
-
-   @PostActivate
-   public void postActivate()
-   {
-      postActivateCalled = true;
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      prePassivateCalled = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree231;
+
+import java.io.Serializable;
+import javax.ejb.Stateful;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.SessionContext;
+import javax.annotation.Resource;
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+public class StatefulBean implements Serializable, StatefulRemote
+{
+   public static boolean postActivateCalled = false;
+   public static boolean prePassivateCalled = false;
+
+
+   @Resource private SessionContext ctx;
+   private String state;
+
+   public boolean getPostActivate()
+   {
+      return postActivateCalled;
+   }
+
+   public boolean getPrePassivate()
+   {
+      return prePassivateCalled;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+
+   public String getState()
+   {
+      return this.state;
+   }
+
+   public void reset()
+   {
+      state = null;
+      postActivateCalled = false;
+      prePassivateCalled = false;
+   }
+
+   @PostActivate
+   public void postActivate()
+   {
+      postActivateCalled = true;
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      prePassivateCalled = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree231;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface StatefulRemote
-{
-   boolean getPostActivate();
-
-   boolean getPrePassivate();
-
-   void setState(String state);
-
-   String getState();
-
-   void reset();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree231;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatefulRemote
+{
+   boolean getPostActivate();
+
+   boolean getPrePassivate();
+
+   void setState(String state);
+
+   String getState();
+
+   void reset();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,66 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree231.unit;
-
-import org.jboss.ejb3.test.regression.ejbthree231.StatefulRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class StatefulUnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public StatefulUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testStateful() throws Exception
-   {
-      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("StatefulBean/remote");
-      remote.reset();
-      remote.setState("hello");
-      Thread.sleep(5000);
-      assertEquals("hello", remote.getState());
-      assertTrue(remote.getPostActivate());
-      assertTrue(remote.getPrePassivate());
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(StatefulUnitTestCase.class, "regression-ejbthree231.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree231.unit;
+
+import org.jboss.ejb3.test.regression.ejbthree231.StatefulRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class StatefulUnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public StatefulUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testStateful() throws Exception
+   {
+      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("StatefulBean/remote");
+      remote.reset();
+      remote.setState("hello");
+      Thread.sleep(5000);
+      assertEquals("hello", remote.getState());
+      assertTrue(remote.getPostActivate());
+      assertTrue(remote.getPrePassivate());
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(StatefulUnitTestCase.class, "regression-ejbthree231.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/unit/StatefulUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree249;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface MyManagement
-{
-   void doit();
-   void create();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree249;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface MyManagement
+{
+   void doit();
+   void create();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree249;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface MyRemote
-{
-   void doit();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree249;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MyRemote
+{
+   void doit();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree249;
-
-import javax.ejb.EJB;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Service
- at Management(MyManagement.class)
-public class MyServiceBean implements MyManagement, MyRemote
-{
-   @EJB Session injected;
-
-   public void doit()
-   {
-
-   }
-
-   public void create()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree249;
+
+import javax.ejb.EJB;
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Service
+ at Management(MyManagement.class)
+public class MyServiceBean implements MyManagement, MyRemote
+{
+   @EJB Session injected;
+
+   public void doit()
+   {
+
+   }
+
+   public void create()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree249;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Session
-{
-   void doit();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree249;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Session
+{
+   void doit();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/Session.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree249;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class SessionBean implements Session
-{
-   public void doit()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree249;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class SessionBean implements Session
+{
+   public void doit()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/SessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree249.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.regression.ejbthree249.MyRemote;
-import junit.framework.Test;
-
-/**
- * Test reentrant remote call.  There was a bug that remoting didn't route locally
- * and the tx propagation was happening when it shouldn't
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class DependenciesUnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public DependenciesUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testDependencies() throws Exception
-   {
-      MyRemote remote = (MyRemote)getInitialContext().lookup("MyServiceBean/remote");
-      remote.doit();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(DependenciesUnitTestCase.class, "regression-ejbthree249-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree249.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.regression.ejbthree249.MyRemote;
+import junit.framework.Test;
+
+/**
+ * Test reentrant remote call.  There was a bug that remoting didn't route locally
+ * and the tx propagation was happening when it shouldn't
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class DependenciesUnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public DependenciesUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testDependencies() throws Exception
+   {
+      MyRemote remote = (MyRemote)getInitialContext().lookup("MyServiceBean/remote");
+      remote.doit();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(DependenciesUnitTestCase.class, "regression-ejbthree249-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/unit/DependenciesUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree290;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface DAO
-{
-   MyEntity create();
-
-   void findAndDelete(int id) throws Exception;
-
-   void merge(MyEntity e) throws Exception;
-
-   void mergeAfterRemove(MyEntity e) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree290;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface DAO
+{
+   MyEntity create();
+
+   void findAndDelete(int id) throws Exception;
+
+   void merge(MyEntity e) throws Exception;
+
+   void mergeAfterRemove(MyEntity e) throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAO.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree290;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityNotFoundException;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(DAO.class)
-public class DAOBean implements DAO
-{
-   @PersistenceContext EntityManager manager;
-   @EJB DeleteLocal local;
-
-   public MyEntity create()
-   {
-      MyEntity e = new MyEntity();
-      e.name = "Bill";
-      manager.persist(e);
-      return e;
-   }
-
-   public void findAndDelete(int id) throws Exception
-   {
-      MyEntity e = manager.find(MyEntity.class, id);
-      local.removeEntity(e.id);
-      try
-      {
-         manager.refresh(e);
-      }
-      catch (EntityNotFoundException e1)
-      {
-         return; // correct
-      }
-      throw new RuntimeException("Expected EntityNotFoundException");
-   }
-
-   public void merge(MyEntity e) throws Exception
-   {
-      //local.removeEntity(e.id);
-	  //the spec says IllegalArgumentException if the entity is removed (ie a scheduled for remove as per the spec)
-	  MyEntity managedEntity = manager.find(MyEntity.class, e.id);
-	  managedEntity.name="Joe";
-	  manager.remove(managedEntity);
-      try
-      {
-         manager.merge(managedEntity);
-      }
-      catch (IllegalArgumentException e1)
-      {
-         return;
-      }
-      throw new RuntimeException("expected IllegalArgumentException");
-   }
-
-   public void mergeAfterRemove(MyEntity e) throws Exception
-   {
-      e = manager.merge(e);
-      manager.remove(e);
-      try
-      {
-         manager.merge(e);
-      }
-      catch (IllegalArgumentException e1)
-      {
-         return;
-      }
-      throw new RuntimeException("expected IllegalArgumentException");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree290;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityNotFoundException;
+import javax.ejb.Remote;
+import javax.ejb.EJB;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(DAO.class)
+public class DAOBean implements DAO
+{
+   @PersistenceContext EntityManager manager;
+   @EJB DeleteLocal local;
+
+   public MyEntity create()
+   {
+      MyEntity e = new MyEntity();
+      e.name = "Bill";
+      manager.persist(e);
+      return e;
+   }
+
+   public void findAndDelete(int id) throws Exception
+   {
+      MyEntity e = manager.find(MyEntity.class, id);
+      local.removeEntity(e.id);
+      try
+      {
+         manager.refresh(e);
+      }
+      catch (EntityNotFoundException e1)
+      {
+         return; // correct
+      }
+      throw new RuntimeException("Expected EntityNotFoundException");
+   }
+
+   public void merge(MyEntity e) throws Exception
+   {
+      //local.removeEntity(e.id);
+	  //the spec says IllegalArgumentException if the entity is removed (ie a scheduled for remove as per the spec)
+	  MyEntity managedEntity = manager.find(MyEntity.class, e.id);
+	  managedEntity.name="Joe";
+	  manager.remove(managedEntity);
+      try
+      {
+         manager.merge(managedEntity);
+      }
+      catch (IllegalArgumentException e1)
+      {
+         return;
+      }
+      throw new RuntimeException("expected IllegalArgumentException");
+   }
+
+   public void mergeAfterRemove(MyEntity e) throws Exception
+   {
+      e = manager.merge(e);
+      manager.remove(e);
+      try
+      {
+         manager.merge(e);
+      }
+      catch (IllegalArgumentException e1)
+      {
+         return;
+      }
+      throw new RuntimeException("expected IllegalArgumentException");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DAOBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree290;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class DeleteBean implements DeleteLocal
-{
-   @Resource(mappedName="java:/DefaultDS") DataSource ds;
-
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   public void removeEntity(int id) throws Exception
-   {
-      Connection conn = ds.getConnection();
-      PreparedStatement ps  = conn.prepareStatement("delete from MYENTITY_TABLE where id=?");
-      ps.setInt(1, id);
-      ps.executeUpdate();
-      ps.close();
-      conn.close();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree290;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class DeleteBean implements DeleteLocal
+{
+   @Resource(mappedName="java:/DefaultDS") DataSource ds;
+
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   public void removeEntity(int id) throws Exception
+   {
+      Connection conn = ds.getConnection();
+      PreparedStatement ps  = conn.prepareStatement("delete from MYENTITY_TABLE where id=?");
+      ps.setInt(1, id);
+      ps.executeUpdate();
+      ps.close();
+      conn.close();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree290;
-
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface DeleteLocal
-{
-   void removeEntity(int id) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree290;
+
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface DeleteLocal
+{
+   void removeEntity(int id) throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/DeleteLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree290;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
- at Table(name="MYENTITY_TABLE")
-public class MyEntity implements Serializable
-{
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int id;
-
-   public String name;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree290;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+ at Table(name="MYENTITY_TABLE")
+public class MyEntity implements Serializable
+{
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int id;
+
+   public String name;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/MyEntity.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,76 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree290.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.regression.ejbthree290.DAO;
-import org.jboss.ejb3.test.regression.ejbthree290.MyEntity;
-import junit.framework.Test;
-
-/**
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class Ejb290UnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public Ejb290UnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testRefresh() throws Exception
-   {
-      DAO dao = (DAO)getInitialContext().lookup("DAOBean/remote");
-      MyEntity e = dao.create();
-      dao.findAndDelete(e.id);
-   }
-
-   public void testMerge() throws Exception
-   {
-      DAO dao = (DAO)getInitialContext().lookup("DAOBean/remote");
-      MyEntity e = dao.create();
-      dao.merge(e);
-   }
-
-   public void testMergeAfterRemove() throws Exception
-   {
-      DAO dao = (DAO)getInitialContext().lookup("DAOBean/remote");
-      MyEntity e = dao.create();
-      dao.mergeAfterRemove(e);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(Ejb290UnitTestCase.class, "regression-ejbthree290-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree290.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.regression.ejbthree290.DAO;
+import org.jboss.ejb3.test.regression.ejbthree290.MyEntity;
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class Ejb290UnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public Ejb290UnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testRefresh() throws Exception
+   {
+      DAO dao = (DAO)getInitialContext().lookup("DAOBean/remote");
+      MyEntity e = dao.create();
+      dao.findAndDelete(e.id);
+   }
+
+   public void testMerge() throws Exception
+   {
+      DAO dao = (DAO)getInitialContext().lookup("DAOBean/remote");
+      MyEntity e = dao.create();
+      dao.merge(e);
+   }
+
+   public void testMergeAfterRemove() throws Exception
+   {
+      DAO dao = (DAO)getInitialContext().lookup("DAOBean/remote");
+      MyEntity e = dao.create();
+      dao.mergeAfterRemove(e);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(Ejb290UnitTestCase.class, "regression-ejbthree290-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree290/unit/Ejb290UnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree315;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Service
-public class ServiceBean implements ServiceRemote
-{
-
-   public void _method()
-   {
-      System.out.println("ServiceBean._method()");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree315;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Service
+public class ServiceBean implements ServiceRemote
+{
+
+   public void _method()
+   {
+      System.out.println("ServiceBean._method()");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree315;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface ServiceRemote
-{
-   void _method();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree315;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface ServiceRemote
+{
+   void _method();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree315;
-
-import javax.ejb.Stateful;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateful
-public class StatefulBean implements StatefulRemote
-{
-   public void _method()
-   {
-      System.out.println("StatefulBean._method()");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree315;
+
+import javax.ejb.Stateful;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateful
+public class StatefulBean implements StatefulRemote
+{
+   public void _method()
+   {
+      System.out.println("StatefulBean._method()");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree315;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface StatefulRemote
-{
-   void _method();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree315;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatefulRemote
+{
+   void _method();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree315;
-
-import javax.ejb.Stateless;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
-public class StatelessBean implements StatelessRemote
-{
-   public void _method()
-   {
-      System.out.println("StatelessBean._method()");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree315;
+
+import javax.ejb.Stateless;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class StatelessBean implements StatelessRemote
+{
+   public void _method()
+   {
+      System.out.println("StatelessBean._method()");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree315;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface StatelessRemote
-{
-   void _method();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree315;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatelessRemote
+{
+   void _method();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree315.unit;
-
-import javax.naming.InitialContext;
-import org.jboss.ejb3.test.regression.ejbthree315.ServiceRemote;
-import org.jboss.ejb3.test.regression.ejbthree315.StatefulRemote;
-import org.jboss.ejb3.test.regression.ejbthree315.StatelessRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class UnderscoreInMethodNameTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   public UnderscoreInMethodNameTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testUnderscoreMethods() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      StatefulRemote stateful = (StatefulRemote)ctx.lookup("StatefulBean/remote");
-      stateful._method();
-      
-      StatelessRemote stateless = (StatelessRemote)ctx.lookup("StatelessBean/remote");
-      stateless._method();
-      
-      ServiceRemote service = (ServiceRemote)ctx.lookup("ServiceBean/remote");
-      service._method();
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(UnderscoreInMethodNameTestCase.class, "regression-ejbthree315.jar");
-   }
-
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree315.unit;
+
+import javax.naming.InitialContext;
+import org.jboss.ejb3.test.regression.ejbthree315.ServiceRemote;
+import org.jboss.ejb3.test.regression.ejbthree315.StatefulRemote;
+import org.jboss.ejb3.test.regression.ejbthree315.StatelessRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class UnderscoreInMethodNameTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   public UnderscoreInMethodNameTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testUnderscoreMethods() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      StatefulRemote stateful = (StatefulRemote)ctx.lookup("StatefulBean/remote");
+      stateful._method();
+      
+      StatelessRemote stateless = (StatelessRemote)ctx.lookup("StatelessBean/remote");
+      stateless._method();
+      
+      ServiceRemote service = (ServiceRemote)ctx.lookup("ServiceBean/remote");
+      service._method();
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(UnderscoreInMethodNameTestCase.class, "regression-ejbthree315.jar");
+   }
+
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/unit/UnderscoreInMethodNameTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree316;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-
-   @Id
-   @GeneratedValue(strategy= GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree316;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree316;
-
-import java.io.Serializable;
-import javax.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at CacheConfig(idleTimeoutSeconds = 2)
- at RemoteBinding(jndiBinding = "NonExtended")
-public class NonExtendedStatefuBean implements Serializable, StatefulRemote
-{
-   @PersistenceContext
-   EntityManager manager;
-
-   public int doit()
-   {
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      manager.persist(cust);
-      return cust.getId();
-   }
-
-   public void find(int id)
-   {
-      if (manager.find(Customer.class, id) == null) throw new RuntimeException("not found");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree316;
+
+import java.io.Serializable;
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at CacheConfig(idleTimeoutSeconds = 2)
+ at RemoteBinding(jndiBinding = "NonExtended")
+public class NonExtendedStatefuBean implements Serializable, StatefulRemote
+{
+   @PersistenceContext
+   EntityManager manager;
+
+   public int doit()
+   {
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      manager.persist(cust);
+      return cust.getId();
+   }
+
+   public void find(int id)
+   {
+      if (manager.find(Customer.class, id) == null) throw new RuntimeException("not found");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree316;
-
-import java.io.Serializable;
-import javax.ejb.Stateful;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at CacheConfig(idleTimeoutSeconds = 2)
-public class StatefulBean implements Serializable, StatefulRemote
-{
-   @PersistenceContext(type= PersistenceContextType.EXTENDED)
-   EntityManager manager;
-
-   public int doit()
-   {
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      manager.persist(cust);
-      return cust.getId();
-   }
-
-   public void find(int id)
-   {
-      if (manager.find(Customer.class, id) == null) throw new RuntimeException("not found");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree316;
+
+import java.io.Serializable;
+import javax.ejb.Stateful;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContextType;
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at CacheConfig(idleTimeoutSeconds = 2)
+public class StatefulBean implements Serializable, StatefulRemote
+{
+   @PersistenceContext(type= PersistenceContextType.EXTENDED)
+   EntityManager manager;
+
+   public int doit()
+   {
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      manager.persist(cust);
+      return cust.getId();
+   }
+
+   public void find(int id)
+   {
+      if (manager.find(Customer.class, id) == null) throw new RuntimeException("not found");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree316;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface StatefulRemote
-{
-   int doit();
-
-   void find(int id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree316;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatefulRemote
+{
+   int doit();
+
+   void find(int id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree316;
-
-import java.io.Serializable;
-import javax.ejb.Stateful;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Transient;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at CacheConfig(idleTimeoutSeconds = 2)
- at RemoteBinding(jndiBinding = "Transient")
-public class StatefulTransientBean implements Serializable, StatefulRemote
-{
-   @Transient @PersistenceContext(type= PersistenceContextType.EXTENDED)
-   EntityManager manager;
-
-   public int doit()
-   {
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      manager.persist(cust);
-      return cust.getId();
-   }
-
-   public void find(int id)
-   {
-      if (manager.find(Customer.class, id) == null) throw new RuntimeException("not found");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree316;
+
+import java.io.Serializable;
+import javax.ejb.Stateful;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContextType;
+import javax.persistence.Transient;
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.RemoteBinding;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at CacheConfig(idleTimeoutSeconds = 2)
+ at RemoteBinding(jndiBinding = "Transient")
+public class StatefulTransientBean implements Serializable, StatefulRemote
+{
+   @Transient @PersistenceContext(type= PersistenceContextType.EXTENDED)
+   EntityManager manager;
+
+   public int doit()
+   {
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      manager.persist(cust);
+      return cust.getId();
+   }
+
+   public void find(int id)
+   {
+      if (manager.find(Customer.class, id) == null) throw new RuntimeException("not found");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree316.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.regression.ejbthree316.StatefulRemote;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class StatefulUnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public StatefulUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testStateful() throws Exception
-   {
-      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("StatefulBean/remote");
-      System.out.println("Before DOIT testStateful");
-      int id = remote.doit();
-      System.out.println("After DOIT testStateful");
-      Thread.sleep(5000);
-      remote.find(id);
-      System.out.println("After find testStateful");
-   }
-
-   public void testTransientStateful() throws Exception
-   {
-      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("Transient");
-      int id = remote.doit();
-      Thread.sleep(5000);
-      remote.find(id);
-   }
-
-   public void testNonExtended() throws Exception
-   {
-      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("NonExtended");
-      int id = remote.doit();
-      Thread.sleep(5000);
-      remote.find(id);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(StatefulUnitTestCase.class, "regression-ejbthree316.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree316.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.regression.ejbthree316.StatefulRemote;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class StatefulUnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public StatefulUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testStateful() throws Exception
+   {
+      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("StatefulBean/remote");
+      System.out.println("Before DOIT testStateful");
+      int id = remote.doit();
+      System.out.println("After DOIT testStateful");
+      Thread.sleep(5000);
+      remote.find(id);
+      System.out.println("After find testStateful");
+   }
+
+   public void testTransientStateful() throws Exception
+   {
+      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("Transient");
+      int id = remote.doit();
+      Thread.sleep(5000);
+      remote.find(id);
+   }
+
+   public void testNonExtended() throws Exception
+   {
+      StatefulRemote remote = (StatefulRemote) getInitialContext().lookup("NonExtended");
+      int id = remote.doit();
+      Thread.sleep(5000);
+      remote.find(id);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(StatefulUnitTestCase.class, "regression-ejbthree316.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/unit/StatefulUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public abstract class AbstractBaseClass
-{
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public abstract class AbstractBaseClass
+{
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClass.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public abstract class AbstractBaseClassWithInterceptor
-{
-
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("TestInterceptor intercepting");
-      StatusBean.beanIntercepted = true;
-      return ctx.proceed();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public abstract class AbstractBaseClassWithInterceptor
+{
+
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("TestInterceptor intercepting");
+      StatusBean.beanIntercepted = true;
+      return ctx.proceed();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/AbstractBaseClassWithInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import javax.interceptor.Interceptors;
-import javax.ejb.Stateless;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
- at Interceptors ({TestInterceptor.class})
-public class StatelessBean extends AbstractBaseClass implements StatelessRemote
-{
-
-   public void method()
-   {
-      System.out.println("*** method");
-   }
-
-   public void superMethod()
-   {
-      System.out.println("*** superMethod");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import javax.interceptor.Interceptors;
+import javax.ejb.Stateless;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Interceptors ({TestInterceptor.class})
+public class StatelessBean extends AbstractBaseClass implements StatelessRemote
+{
+
+   public void method()
+   {
+      System.out.println("*** method");
+   }
+
+   public void superMethod()
+   {
+      System.out.println("*** superMethod");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface StatelessRemote extends SuperInterface
-{
-   void method();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatelessRemote extends SuperInterface
+{
+   void method();
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import javax.interceptor.Interceptors;
-import javax.ejb.Stateless;
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Stateless
- at Interceptors ({TestInterceptor.class})
-public class StatelessWithBeanInterceptorBean extends AbstractBaseClassWithInterceptor implements StatelessRemote
-{
-   public void method()
-   {
-      System.out.println("*** method");
-   }
-
-   public void superMethod()
-   {
-      System.out.println("*** superMethod");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import javax.interceptor.Interceptors;
+import javax.ejb.Stateless;
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Interceptors ({TestInterceptor.class})
+public class StatelessWithBeanInterceptorBean extends AbstractBaseClassWithInterceptor implements StatelessRemote
+{
+   public void method()
+   {
+      System.out.println("*** method");
+   }
+
+   public void superMethod()
+   {
+      System.out.println("*** superMethod");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatelessWithBeanInterceptorBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Service
-public class StatusBean implements StatusRemote
-{
-   static boolean interceptorIntercepted;
-   static boolean beanIntercepted;
-
-   public boolean getBeanIntercepted()
-   {
-      return beanIntercepted;
-   }
-
-   public boolean getInterceptorIntercepted()
-   {
-      return interceptorIntercepted;
-   }
-   
-   public void clear()
-   {
-      interceptorIntercepted = false;
-      beanIntercepted = false;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Service
+public class StatusBean implements StatusRemote
+{
+   static boolean interceptorIntercepted;
+   static boolean beanIntercepted;
+
+   public boolean getBeanIntercepted()
+   {
+      return beanIntercepted;
+   }
+
+   public boolean getInterceptorIntercepted()
+   {
+      return interceptorIntercepted;
+   }
+   
+   public void clear()
+   {
+      interceptorIntercepted = false;
+      beanIntercepted = false;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import javax.ejb.Remote;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface StatusRemote
-{
-   boolean getBeanIntercepted();
-
-   boolean getInterceptorIntercepted();
-   
-   void clear();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import javax.ejb.Remote;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatusRemote
+{
+   boolean getBeanIntercepted();
+
+   boolean getInterceptorIntercepted();
+   
+   void clear();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import javax.ejb.Remote;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface SuperInterface
-{
-   void superMethod();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import javax.ejb.Remote;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface SuperInterface
+{
+   void superMethod();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/SuperInterface.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.ejb3.test.regression.ejbthree376;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class TestInterceptor
-{
-   @AroundInvoke
-   public Object intercept(InvocationContext ctx) throws Exception
-   {
-      System.out.println("TestInterceptor intercepting");
-      StatusBean.interceptorIntercepted = true;
-      return ctx.proceed();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+package org.jboss.ejb3.test.regression.ejbthree376;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class TestInterceptor
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      System.out.println("TestInterceptor intercepting");
+      StatusBean.interceptorIntercepted = true;
+      return ctx.proceed();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/TestInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,89 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree376.unit;
-
-import org.jboss.ejb3.test.regression.ejbthree376.StatelessRemote;
-import org.jboss.ejb3.test.regression.ejbthree376.StatusRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class InterceptorTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public InterceptorTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testInterceptionWithNoSuperClassAroundInvoke() throws Exception
-   {
-      StatelessRemote slWithInterceptor = (StatelessRemote) getInitialContext().lookup("StatelessBean/remote");
-      StatusRemote status = (StatusRemote)getInitialContext().lookup("StatusBean/remote");
-
-      status.clear();
-      slWithInterceptor.method();
-      assertTrue(status.getInterceptorIntercepted());
-      assertFalse(status.getBeanIntercepted());
-      
-      status.clear();
-      slWithInterceptor.superMethod();
-      assertTrue(status.getInterceptorIntercepted());
-      assertFalse(status.getBeanIntercepted());
-   }
-
-   public void testInterceptionWithSuperClassAroundInvoke() throws Exception
-   {
-      StatelessRemote slWithInterceptorAndBean = (StatelessRemote) getInitialContext().lookup("StatelessWithBeanInterceptorBean/remote");
-      StatusRemote status = (StatusRemote)getInitialContext().lookup("StatusBean/remote");
-
-      status.clear();
-      slWithInterceptorAndBean.method();
-      assertTrue(status.getInterceptorIntercepted());
-      assertTrue(status.getBeanIntercepted());
-      
-      status.clear();
-      slWithInterceptorAndBean.superMethod();
-      assertTrue(status.getInterceptorIntercepted());
-      assertTrue(status.getBeanIntercepted());
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(InterceptorTestCase.class, "regression-ejbthree376.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree376.unit;
+
+import org.jboss.ejb3.test.regression.ejbthree376.StatelessRemote;
+import org.jboss.ejb3.test.regression.ejbthree376.StatusRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class InterceptorTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public InterceptorTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testInterceptionWithNoSuperClassAroundInvoke() throws Exception
+   {
+      StatelessRemote slWithInterceptor = (StatelessRemote) getInitialContext().lookup("StatelessBean/remote");
+      StatusRemote status = (StatusRemote)getInitialContext().lookup("StatusBean/remote");
+
+      status.clear();
+      slWithInterceptor.method();
+      assertTrue(status.getInterceptorIntercepted());
+      assertFalse(status.getBeanIntercepted());
+      
+      status.clear();
+      slWithInterceptor.superMethod();
+      assertTrue(status.getInterceptorIntercepted());
+      assertFalse(status.getBeanIntercepted());
+   }
+
+   public void testInterceptionWithSuperClassAroundInvoke() throws Exception
+   {
+      StatelessRemote slWithInterceptorAndBean = (StatelessRemote) getInitialContext().lookup("StatelessWithBeanInterceptorBean/remote");
+      StatusRemote status = (StatusRemote)getInitialContext().lookup("StatusBean/remote");
+
+      status.clear();
+      slWithInterceptorAndBean.method();
+      assertTrue(status.getInterceptorIntercepted());
+      assertTrue(status.getBeanIntercepted());
+      
+      status.clear();
+      slWithInterceptorAndBean.superMethod();
+      assertTrue(status.getInterceptorIntercepted());
+      assertTrue(status.getBeanIntercepted());
+   }
+
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(InterceptorTestCase.class, "regression-ejbthree376.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/unit/InterceptorTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440)

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.model;
-
-import java.io.Serializable;
-
-import javax.persistence.*;
-
- at Entity
- at Table(name="TBLOCATION")
- at TableGenerator(name="LOC_SEQ")
-public class Location implements Serializable {
-  private int id, version;
-  private String name, description;
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  @Id
-  @GeneratedValue(strategy=GenerationType.TABLE, generator="LOC_SEQ")
-  public int getId() {
-    return id;
-  }
-
-  public void setId(int id) {
-    this.id = id;
-  }
-
-  @Version
-  @Column(name="versionnr")
-  public int getVersion() {
-    return version;
-  }
-
-  public void setVersion(int version) {
-    this.version = version;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+package org.jboss.ejb3.test.regression.ejbthree440.model;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+ at Entity
+ at Table(name="TBLOCATION")
+ at TableGenerator(name="LOC_SEQ")
+public class Location implements Serializable {
+  private int id, version;
+  private String name, description;
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  @Id
+  @GeneratedValue(strategy=GenerationType.TABLE, generator="LOC_SEQ")
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  @Version
+  @Column(name="versionnr")
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Location.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.model;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-/**
- * This demonstrates entity inheritance.
- * 
- * @author Ortwin Glück
- */
- at Entity
- at Table(name="TBRESOURCE2")
- at Inheritance
- at DiscriminatorValue("M")
- at PrimaryKeyJoinColumn(name="resource_id")
-public class MyResource extends Resource {
-  private String myField;
-  
-  public MyResource() {
-    super();
-  }
-
-  public String getMyField() {
-    return myField;
-  }
-
-  public void setMyField(String myField) {
-    this.myField = myField;
-  }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+package org.jboss.ejb3.test.regression.ejbthree440.model;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Table;
+
+/**
+ * This demonstrates entity inheritance.
+ * 
+ * @author Ortwin Glück
+ */
+ at Entity
+ at Table(name="TBRESOURCE2")
+ at Inheritance
+ at DiscriminatorValue("M")
+ at PrimaryKeyJoinColumn(name="resource_id")
+public class MyResource extends Resource {
+  private String myField;
+  
+  public MyResource() {
+    super();
+  }
+
+  public String getMyField() {
+    return myField;
+  }
+
+  public void setMyField(String myField) {
+    this.myField = myField;
+  }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/MyResource.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.*;
-
- at Entity
- at Table(name="TBCALENDAR")
- at TableGenerator(
-    name="CAL_SEQ"
-)
-public class Rescalendar implements Serializable {
-  private int id, version;
-  private Resource resource;
-  private Date start, end;
-  private int status;
-  private boolean active;
-
-  public boolean isActive() {
-    return active;
-  }
-
-  public void setActive(boolean active) {
-    this.active = active;
-  }
-
-  @Column(name="end_dt")
-  public Date getEnd() {
-    return end;
-  }
-
-  public void setEnd(Date end) {
-    this.end = end;
-  }
-
-  @Id
-  @GeneratedValue(strategy=GenerationType.TABLE, generator="CAL_SEQ")
-  public int getId() {
-    return id;
-  }
-
-  public void setId(int id) {
-    this.id = id;
-  }
-
-  @ManyToOne
-  public Resource getResource() {
-    return resource;
-  }
-
-  public void setResource(Resource resource) {
-    this.resource = resource;
-  }
-
-  @Column(name="start_dt")
-  public Date getStart() {
-    return start;
-  }
-
-  public void setStart(Date start) {
-    this.start = start;
-  }
-
-  public int getStatus() {
-    return status;
-  }
-
-  public void setStatus(int status) {
-    this.status = status;
-  }
-
-  @Version
-  @Column(name="versionnr")
-  public int getVersion() {
-    return version;
-  }
-
-  public void setVersion(int version) {
-    this.version = version;
-  }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+package org.jboss.ejb3.test.regression.ejbthree440.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.*;
+
+ at Entity
+ at Table(name="TBCALENDAR")
+ at TableGenerator(
+    name="CAL_SEQ"
+)
+public class Rescalendar implements Serializable {
+  private int id, version;
+  private Resource resource;
+  private Date start, end;
+  private int status;
+  private boolean active;
+
+  public boolean isActive() {
+    return active;
+  }
+
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+
+  @Column(name="end_dt")
+  public Date getEnd() {
+    return end;
+  }
+
+  public void setEnd(Date end) {
+    this.end = end;
+  }
+
+  @Id
+  @GeneratedValue(strategy=GenerationType.TABLE, generator="CAL_SEQ")
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  @ManyToOne
+  public Resource getResource() {
+    return resource;
+  }
+
+  public void setResource(Resource resource) {
+    this.resource = resource;
+  }
+
+  @Column(name="start_dt")
+  public Date getStart() {
+    return start;
+  }
+
+  public void setStart(Date start) {
+    this.start = start;
+  }
+
+  public int getStatus() {
+    return status;
+  }
+
+  public void setStatus(int status) {
+    this.status = status;
+  }
+
+  @Version
+  @Column(name="versionnr")
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Rescalendar.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,126 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.*;
-
- at Entity
- at Table(name="TBRESOURCE")
- at Inheritance(strategy=InheritanceType.JOINED)
- at DiscriminatorValue("R")
- at DiscriminatorColumn(name="inhtype", length=2)
- at TableGenerator(
-    name="RES_SEQ"
-)
-public class Resource implements Serializable{
-  private int id, version;
-  private Integer region;
-  private String description, skills;
-  private Date created, updated;
-  private Set<Location> locations;
-  private Set<ResourceLocation> resourceLocations;
-  private Set<Rescalendar> calendars;
-  private User user;
-  private boolean active;
-
-  @OneToMany(mappedBy="resource")
-  public Set<ResourceLocation> getResourceLocations() {
-    return resourceLocations;
-  }
-
-  public void setResourceLocations(Set<ResourceLocation> resourceLocations) {
-    this.resourceLocations = resourceLocations;
-  }
-
-  @Column(name="create_dt")
-  public Date getCreated() {
-    return created;
-  }
-
-  public void setCreated(Date created) {
-    this.created = created;
-  }
-
-  @Column(name="description")
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  @Id
-  @GeneratedValue(strategy=GenerationType.TABLE, generator="RES_SEQ")
-  public int getId() {
-    return id;
-  }
-
-  public void setId(int id) {
-    this.id = id;
-  }
-
-
-  public String getSkills() {
-    return skills;
-  }
-
-  public void setSkills(String skills) {
-    this.skills = skills;
-  }
-
-  @Column(name="update_dt")
-  public Date getUpdated() {
-    return updated;
-  }
-
-  public void setUpdated(Date updated) {
-    this.updated = updated;
-  }
-
-  @Version
-  @Column(name="versionnr")
-  public int getVersion() {
-    return version;
-  }
-
-  public void setVersion(int version) {
-    this.version = version;
-  }
-
-  public Integer getRegion() {
-    return region;
-  }
-
-  public void setRegion(Integer region) {
-    this.region = region;
-  }
-
-  @OneToMany(mappedBy="resource")
-  public Set<Rescalendar> getCalendars() {
-    return calendars;
-  }
-
-  public void setCalendars(Set<Rescalendar> calendars) {
-    this.calendars = calendars;
-  }
-
-  @ManyToOne(fetch=FetchType.LAZY)
-  public User getUser() {
-    return user;
-  }
-
-  public void setUser(User user) {
-    this.user = user;
-  }
-
-  public boolean isActive() {
-    return active;
-  }
-
-  public void setActive(boolean active) {
-    this.active = active;
-  }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,126 @@
+package org.jboss.ejb3.test.regression.ejbthree440.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+
+import javax.persistence.*;
+
+ at Entity
+ at Table(name="TBRESOURCE")
+ at Inheritance(strategy=InheritanceType.JOINED)
+ at DiscriminatorValue("R")
+ at DiscriminatorColumn(name="inhtype", length=2)
+ at TableGenerator(
+    name="RES_SEQ"
+)
+public class Resource implements Serializable{
+  private int id, version;
+  private Integer region;
+  private String description, skills;
+  private Date created, updated;
+  private Set<Location> locations;
+  private Set<ResourceLocation> resourceLocations;
+  private Set<Rescalendar> calendars;
+  private User user;
+  private boolean active;
+
+  @OneToMany(mappedBy="resource")
+  public Set<ResourceLocation> getResourceLocations() {
+    return resourceLocations;
+  }
+
+  public void setResourceLocations(Set<ResourceLocation> resourceLocations) {
+    this.resourceLocations = resourceLocations;
+  }
+
+  @Column(name="create_dt")
+  public Date getCreated() {
+    return created;
+  }
+
+  public void setCreated(Date created) {
+    this.created = created;
+  }
+
+  @Column(name="description")
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  @Id
+  @GeneratedValue(strategy=GenerationType.TABLE, generator="RES_SEQ")
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+
+  public String getSkills() {
+    return skills;
+  }
+
+  public void setSkills(String skills) {
+    this.skills = skills;
+  }
+
+  @Column(name="update_dt")
+  public Date getUpdated() {
+    return updated;
+  }
+
+  public void setUpdated(Date updated) {
+    this.updated = updated;
+  }
+
+  @Version
+  @Column(name="versionnr")
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+
+  public Integer getRegion() {
+    return region;
+  }
+
+  public void setRegion(Integer region) {
+    this.region = region;
+  }
+
+  @OneToMany(mappedBy="resource")
+  public Set<Rescalendar> getCalendars() {
+    return calendars;
+  }
+
+  public void setCalendars(Set<Rescalendar> calendars) {
+    this.calendars = calendars;
+  }
+
+  @ManyToOne(fetch=FetchType.LAZY)
+  public User getUser() {
+    return user;
+  }
+
+  public void setUser(User user) {
+    this.user = user;
+  }
+
+  public boolean isActive() {
+    return active;
+  }
+
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/Resource.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.model;
-
-import java.io.Serializable;
-
-import javax.persistence.*;
-
- at Entity
- at Table(name="TBRESOURCELOCATION")
- at TableGenerator(
-    name="RL_SEQ"
-)
-public class ResourceLocation implements Serializable {
-  private int id, version;
-  private Resource resource;
-  private Location location;
-  private int factor;
-
-  public int getFactor() {
-    return factor;
-  }
-
-  public void setFactor(int factor) {
-    this.factor = factor;
-  }
-
-  @Id
-  @GeneratedValue(strategy=GenerationType.TABLE, generator="RL_SEQ")
-  public int getId() {
-    return id;
-  }
-
-  public void setId(int id) {
-    this.id = id;
-  }
-
-  @ManyToOne
-  public Location getLocation() {
-    return location;
-  }
-
-  public void setLocation(Location location) {
-    this.location = location;
-  }
-
-  @ManyToOne
-  public Resource getResource() {
-    return resource;
-  }
-
-  public void setResource(Resource resource) {
-    this.resource = resource;
-  }
-
-  @Version
-  public int getVersion() {
-    return version;
-  }
-
-  public void setVersion(int version) {
-    this.version = version;
-  }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+package org.jboss.ejb3.test.regression.ejbthree440.model;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+ at Entity
+ at Table(name="TBRESOURCELOCATION")
+ at TableGenerator(
+    name="RL_SEQ"
+)
+public class ResourceLocation implements Serializable {
+  private int id, version;
+  private Resource resource;
+  private Location location;
+  private int factor;
+
+  public int getFactor() {
+    return factor;
+  }
+
+  public void setFactor(int factor) {
+    this.factor = factor;
+  }
+
+  @Id
+  @GeneratedValue(strategy=GenerationType.TABLE, generator="RL_SEQ")
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  @ManyToOne
+  public Location getLocation() {
+    return location;
+  }
+
+  public void setLocation(Location location) {
+    this.location = location;
+  }
+
+  @ManyToOne
+  public Resource getResource() {
+    return resource;
+  }
+
+  public void setResource(Resource resource) {
+    this.resource = resource;
+  }
+
+  @Version
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/ResourceLocation.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.model;
-
-import java.io.Serializable;
-
-import javax.persistence.*;
-
- at Entity
- at Table(name="TBUSER")
- at TableGenerator(name="USER_SEQ")
-public class User implements Serializable {
-  private int id, version;
-  private boolean active;
-  private String name, password;
-  private double homeX, homeY;
-  private Double posX, posY;
-
-  @Id
-  @GeneratedValue(strategy=GenerationType.TABLE, generator="USER_SEQ")
-  public int getId() {
-    return id;
-  }
-
-  public void setId(int id) {
-    this.id = id;
-  }
-
-  @Column(name="homepos_x")
-  public double getHomeX() {
-    return homeX;
-  }
-
-  public void setHomeX(double homeX) {
-    this.homeX = homeX;
-  }
-
-  @Column(name="homepos_y")
-  public double getHomeY() {
-    return homeY;
-  }
-
-  public void setHomeY(double homeY) {
-    this.homeY = homeY;
-  }
-
-  @Column(name="actualpos_x")
-  public Double getPosX() {
-    return posX;
-  }
-
-  public void setPosX(Double posX) {
-    this.posX = posX;
-  }
-
-  @Column(name="actualpos_y")
-  public Double getPosY() {
-    return posY;
-  }
-
-  public void setPosY(Double poxY) {
-    this.posY = poxY;
-  }
-
-  @Column(name="username")
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Column(name="passwrd")
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  public boolean isActive() {
-    return active;
-  }
-
-  public void setActive(boolean active) {
-    this.active = active;
-  }
-
-  @Version
-  @Column(name="versionnr")
-  public int getVersion() {
-    return version;
-  }
-
-  public void setVersion(int version) {
-    this.version = version;
-  }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+package org.jboss.ejb3.test.regression.ejbthree440.model;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+ at Entity
+ at Table(name="TBUSER")
+ at TableGenerator(name="USER_SEQ")
+public class User implements Serializable {
+  private int id, version;
+  private boolean active;
+  private String name, password;
+  private double homeX, homeY;
+  private Double posX, posY;
+
+  @Id
+  @GeneratedValue(strategy=GenerationType.TABLE, generator="USER_SEQ")
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  @Column(name="homepos_x")
+  public double getHomeX() {
+    return homeX;
+  }
+
+  public void setHomeX(double homeX) {
+    this.homeX = homeX;
+  }
+
+  @Column(name="homepos_y")
+  public double getHomeY() {
+    return homeY;
+  }
+
+  public void setHomeY(double homeY) {
+    this.homeY = homeY;
+  }
+
+  @Column(name="actualpos_x")
+  public Double getPosX() {
+    return posX;
+  }
+
+  public void setPosX(Double posX) {
+    this.posX = posX;
+  }
+
+  @Column(name="actualpos_y")
+  public Double getPosY() {
+    return posY;
+  }
+
+  public void setPosY(Double poxY) {
+    this.posY = poxY;
+  }
+
+  @Column(name="username")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @Column(name="passwrd")
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public boolean isActive() {
+    return active;
+  }
+
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+
+  @Version
+  @Column(name="versionnr")
+  public int getVersion() {
+    return version;
+  }
+
+  public void setVersion(int version) {
+    this.version = version;
+  }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/model/User.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.session;
-
-import java.util.Date;
-import org.jboss.serial.io.MarshalledObject;
-import java.io.IOException;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-import org.jboss.ejb3.test.regression.ejbthree440.model.MyResource;
-import org.jboss.ejb3.test.regression.ejbthree440.model.Resource;
-import org.jboss.ejb3.test.regression.ejbthree440.model.User;
-import org.jboss.ejb3.test.regression.ejbthree440.session.i.IInheritanceDemo;
-
- at Stateless
- at RemoteBinding(jndiBinding="InheritanceDemo/remote")
- at Remote(IInheritanceDemo.class)
-public class InheritanceDemo implements IInheritanceDemo {
-  @PersistenceContext(unitName="mlog")
-  protected EntityManager em;
-
-  public void create() {
-    User u = new User();
-    u.setName("Test User");
-    u.setPassword("acuia.sckln");
-    u.setActive(false);
-    em.persist(u);
-    
-    MyResource r = new MyResource();
-    r.setUser(u);
-    r.setSkills("0");
-    r.setActive(false);
-    r.setDescription("Inheritance Demo Resource");
-    r.setMyField("hello world");
-    r.setCreated(new Date());
-    r.setUpdated(new Date());
-    em.persist(r);
-  }
-  
-  public Resource read() {
-    Query q = em.createQuery("SELECT u FROM Resource u WHERE u.description = :d");
-    q.setParameter("d", "Inheritance Demo Resource");
-    Resource r = (Resource) q.getSingleResult();
-    return r;
-  }
-
-   public MarshalledObject readFromMO()
-   {
-      try
-      {
-         return new MarshalledObject(read());
-      }
-      catch (IOException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-  
-  public void remove() {
-    Resource r = read();
-    em.remove(r);
-  }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+package org.jboss.ejb3.test.regression.ejbthree440.session;
+
+import java.util.Date;
+import org.jboss.serial.io.MarshalledObject;
+import java.io.IOException;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+import org.jboss.ejb3.test.regression.ejbthree440.model.MyResource;
+import org.jboss.ejb3.test.regression.ejbthree440.model.Resource;
+import org.jboss.ejb3.test.regression.ejbthree440.model.User;
+import org.jboss.ejb3.test.regression.ejbthree440.session.i.IInheritanceDemo;
+
+ at Stateless
+ at RemoteBinding(jndiBinding="InheritanceDemo/remote")
+ at Remote(IInheritanceDemo.class)
+public class InheritanceDemo implements IInheritanceDemo {
+  @PersistenceContext(unitName="mlog")
+  protected EntityManager em;
+
+  public void create() {
+    User u = new User();
+    u.setName("Test User");
+    u.setPassword("acuia.sckln");
+    u.setActive(false);
+    em.persist(u);
+    
+    MyResource r = new MyResource();
+    r.setUser(u);
+    r.setSkills("0");
+    r.setActive(false);
+    r.setDescription("Inheritance Demo Resource");
+    r.setMyField("hello world");
+    r.setCreated(new Date());
+    r.setUpdated(new Date());
+    em.persist(r);
+  }
+  
+  public Resource read() {
+    Query q = em.createQuery("SELECT u FROM Resource u WHERE u.description = :d");
+    q.setParameter("d", "Inheritance Demo Resource");
+    Resource r = (Resource) q.getSingleResult();
+    return r;
+  }
+
+   public MarshalledObject readFromMO()
+   {
+      try
+      {
+         return new MarshalledObject(read());
+      }
+      catch (IOException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+  
+  public void remove() {
+    Resource r = read();
+    em.remove(r);
+  }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,16 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.session.i;
-
-import javax.ejb.Remote;
-
-import org.jboss.ejb3.test.regression.ejbthree440.model.Resource;
-import org.jboss.serial.io.MarshalledObject;
-
-
- at Remote
-public interface IInheritanceDemo {
-  void create();
-  Resource read();
-  void remove();
-
-   MarshalledObject readFromMO();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+package org.jboss.ejb3.test.regression.ejbthree440.session.i;
+
+import javax.ejb.Remote;
+
+import org.jboss.ejb3.test.regression.ejbthree440.model.Resource;
+import org.jboss.serial.io.MarshalledObject;
+
+
+ at Remote
+public interface IInheritanceDemo {
+  void create();
+  Resource read();
+  void remove();
+
+   MarshalledObject readFromMO();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/i/IInheritanceDemo.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,69 +0,0 @@
-package org.jboss.ejb3.test.regression.ejbthree440.unit;
-
-import junit.framework.Test;
-import org.jboss.ejb3.test.regression.ejbthree440.model.MyResource;
-import org.jboss.ejb3.test.regression.ejbthree440.session.i.IInheritanceDemo;
-import org.jboss.test.JBossTestCase;
-import org.jnp.interfaces.NamingContextFactory;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
-import java.util.Properties;
-import org.jboss.serial.io.MarshalledObject;
-
-
-/**
- * Demonstrates entity inheritance.
- *
- * @author Ortwin Gl�ck
- */
-public class FailingTestCase extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public FailingTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testSerializationError() throws Exception
-   {
-      try
-      {
-         UserTransaction tx = null;
-         Context ctx = getInitialContext();
-
-         tx = (UserTransaction) ctx.lookup("UserTransaction");
-         IInheritanceDemo playground = (IInheritanceDemo) ctx.lookup("InheritanceDemo/remote");
-
-         tx.begin();
-         playground.create();
-         tx.commit();
-
-         tx.begin();
-         MarshalledObject mo = playground.readFromMO();
-         MyResource r = (MyResource)mo.get();
-         r = (MyResource) playground.read();
-         playground.remove();
-         tx.commit();
-         tx = null;
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         throw e;
-      }
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(FailingTestCase.class, "ejbthree440.ear");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,69 @@
+package org.jboss.ejb3.test.regression.ejbthree440.unit;
+
+import junit.framework.Test;
+import org.jboss.ejb3.test.regression.ejbthree440.model.MyResource;
+import org.jboss.ejb3.test.regression.ejbthree440.session.i.IInheritanceDemo;
+import org.jboss.test.JBossTestCase;
+import org.jnp.interfaces.NamingContextFactory;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.transaction.UserTransaction;
+import java.util.Properties;
+import org.jboss.serial.io.MarshalledObject;
+
+
+/**
+ * Demonstrates entity inheritance.
+ *
+ * @author Ortwin Gl�ck
+ */
+public class FailingTestCase extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public FailingTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testSerializationError() throws Exception
+   {
+      try
+      {
+         UserTransaction tx = null;
+         Context ctx = getInitialContext();
+
+         tx = (UserTransaction) ctx.lookup("UserTransaction");
+         IInheritanceDemo playground = (IInheritanceDemo) ctx.lookup("InheritanceDemo/remote");
+
+         tx.begin();
+         playground.create();
+         tx.commit();
+
+         tx.begin();
+         MarshalledObject mo = playground.readFromMO();
+         MyResource r = (MyResource)mo.get();
+         r = (MyResource) playground.read();
+         playground.remove();
+         tx.commit();
+         tx = null;
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         throw e;
+      }
+   }
+
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(FailingTestCase.class, "ejbthree440.ear");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/unit/FailingTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree454;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface AEJB
-{
-   void doit();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree454;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface AEJB
+{
+   void doit();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree454;
-
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class AEJBBean implements AEJB
-{
-   @EJB Shared shared;
-
-   public void doit() {
-      shared.doit("A");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree454;
+
+import javax.ejb.Stateless;
+import javax.ejb.EJB;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class AEJBBean implements AEJB
+{
+   @EJB Shared shared;
+
+   public void doit() {
+      shared.doit("A");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/AEJBBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree454;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface BEJB
-{
-   void doit();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree454;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface BEJB
+{
+   void doit();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree454;
-
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class BEJBBean implements BEJB
-{
-   @EJB Shared shared;
-
-   public void doit() {
-      shared.doit("B");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree454;
+
+import javax.ejb.Stateless;
+import javax.ejb.EJB;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class BEJBBean implements BEJB
+{
+   @EJB Shared shared;
+
+   public void doit() {
+      shared.doit("B");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/BEJBBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree454;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface Shared
-{
-   public void doit(String caller); 
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree454;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface Shared
+{
+   public void doit(String caller); 
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/Shared.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree454;
-
-import org.jboss.ejb3.test.regression.ejbthree454.Shared;
-
-import javax.ejb.Stateless;
-import javax.annotation.Resource;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class SharedBean implements Shared
-{
-   @Resource(name="who") String who;
-
-   public void doit(String caller)
-   {
-      if (!caller.equals(who)) throw new RuntimeException("env entry not set properly expected: " + caller + " was " + who);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree454;
+
+import org.jboss.ejb3.test.regression.ejbthree454.Shared;
+
+import javax.ejb.Stateless;
+import javax.annotation.Resource;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class SharedBean implements Shared
+{
+   @Resource(name="who") String who;
+
+   public void doit(String caller)
+   {
+      if (!caller.equals(who)) throw new RuntimeException("env entry not set properly expected: " + caller + " was " + who);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/SharedBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,64 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree454.unit;
-
-import junit.framework.Test;
-import org.jboss.ejb3.test.regression.ejbthree454.AEJB;
-import org.jboss.ejb3.test.regression.ejbthree454.BEJB;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Test EJBs of the same name and code that are deployed in different ears.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class RemoteUnitTestCase
-        extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public RemoteUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testScopedClassLoaders() throws Exception
-   {
-      AEJB remote = (AEJB) getInitialContext().lookup("ejbthree454-a/AEJBBean/remote");
-      remote.doit();
-      BEJB bremote = (BEJB) getInitialContext().lookup("ejbthree454-b/BEJBBean/remote");
-      bremote.doit();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(RemoteUnitTestCase.class, "ejbthree454-a.ear, ejbthree454-b.ear");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree454.unit;
+
+import junit.framework.Test;
+import org.jboss.ejb3.test.regression.ejbthree454.AEJB;
+import org.jboss.ejb3.test.regression.ejbthree454.BEJB;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Test EJBs of the same name and code that are deployed in different ears.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class RemoteUnitTestCase
+        extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public RemoteUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testScopedClassLoaders() throws Exception
+   {
+      AEJB remote = (AEJB) getInitialContext().lookup("ejbthree454-a/AEJBBean/remote");
+      remote.doit();
+      BEJB bremote = (BEJB) getInitialContext().lookup("ejbthree454-b/BEJBBean/remote");
+      bremote.doit();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(RemoteUnitTestCase.class, "ejbthree454-a.ear, ejbthree454-b.ear");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree454/unit/RemoteUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree485;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class MyException extends Exception
-{
-   private static final long serialVersionUID = 1L;
-
-   public MyException(String message)
-   {
-      super(message);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree485;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class MyException extends Exception
+{
+   private static final long serialVersionUID = 1L;
+
+   public MyException(String message)
+   {
+      super(message);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyException.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree485;
-
-import java.io.Serializable;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Remote
-public interface MyRemote //extends Serializable
-{
-   void giveMeAnException() throws MyException;
-   void giveMeARuntimeException();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree485;
+
+import java.io.Serializable;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MyRemote //extends Serializable
+{
+   void giveMeAnException() throws MyException;
+   void giveMeARuntimeException();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/MyRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree485;
-
-import javax.ejb.Stateless;
-
-/**
- * For EJBTHREE-485 unit test
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Stateless
-public class StatelessBean implements MyRemote
-{
-   public void giveMeAnException() throws MyException {
-      throw new MyException("Here you are");
-   }
-   
-   public void giveMeARuntimeException() {
-      throw new RuntimeException("Sure, no problem");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree485;
+
+import javax.ejb.Stateless;
+
+/**
+ * For EJBTHREE-485 unit test
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class StatelessBean implements MyRemote
+{
+   public void giveMeAnException() throws MyException {
+      throw new MyException("Here you are");
+   }
+   
+   public void giveMeARuntimeException() {
+      throw new RuntimeException("Sure, no problem");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree485.unit;
-
-import java.rmi.RMISecurityManager;
-
-import javax.naming.Context;
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.regression.ejbthree485.MyException;
-import org.jboss.ejb3.test.regression.ejbthree485.MyRemote;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class ClassNameTestCase extends JBossTestCase
-{
-   public ClassNameTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testException() throws Exception {
-      Context ctx = getInitialContext();
-      MyRemote remote = (MyRemote) ctx.lookup("StatelessBean/remote");
-      try {
-         remote.giveMeAnException();
-         
-         fail("expected an exception");
-      }
-      catch(MyException e) {
-         e.printStackTrace();
-         
-         StackTraceElement stackTrace[] = e.getStackTrace();
-         int i = 0;
-         while(i < stackTrace.length && !stackTrace[i].getClassName().equals(ClassNameTestCase.class.getName()))
-            i++;
-         //assertTrue(i < stackTrace.length); // let's error if this happens
-         i--;
-         String actual = stackTrace[i].getClassName();
-         String expected = "?";
-         assertFalse("class name must not start with $Proxy", actual.startsWith("$Proxy"));
-         assertEquals(expected, actual);
-         return;
-      }
-   }
-   
-   public void testRuntimeException() throws Exception {
-      Context ctx = getInitialContext();
-      MyRemote remote = (MyRemote) ctx.lookup("StatelessBean/remote");
-      try {
-         remote.giveMeARuntimeException();
-         
-         fail("expected an exception");
-      }
-      catch(RuntimeException re) {
-         Throwable e = re.getCause();
-         StackTraceElement stackTrace[] = e.getStackTrace();
-         int i = 0;
-         while(i < stackTrace.length && !stackTrace[i].getClassName().equals(ClassNameTestCase.class.getName()))
-            i++;
-         //assertTrue(i < stackTrace.length); // let's error if this happens
-         i--;
-         String actual = stackTrace[i].getClassName();
-         String expected = "?";
-         assertFalse("class name must not start with $Proxy", actual.startsWith("$Proxy"));
-         assertEquals(expected, actual);
-      }
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ClassNameTestCase.class, "ejbthree485.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree485.unit;
+
+import java.rmi.RMISecurityManager;
+
+import javax.naming.Context;
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.regression.ejbthree485.MyException;
+import org.jboss.ejb3.test.regression.ejbthree485.MyRemote;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class ClassNameTestCase extends JBossTestCase
+{
+   public ClassNameTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testException() throws Exception {
+      Context ctx = getInitialContext();
+      MyRemote remote = (MyRemote) ctx.lookup("StatelessBean/remote");
+      try {
+         remote.giveMeAnException();
+         
+         fail("expected an exception");
+      }
+      catch(MyException e) {
+         e.printStackTrace();
+         
+         StackTraceElement stackTrace[] = e.getStackTrace();
+         int i = 0;
+         while(i < stackTrace.length && !stackTrace[i].getClassName().equals(ClassNameTestCase.class.getName()))
+            i++;
+         //assertTrue(i < stackTrace.length); // let's error if this happens
+         i--;
+         String actual = stackTrace[i].getClassName();
+         String expected = "?";
+         assertFalse("class name must not start with $Proxy", actual.startsWith("$Proxy"));
+         assertEquals(expected, actual);
+         return;
+      }
+   }
+   
+   public void testRuntimeException() throws Exception {
+      Context ctx = getInitialContext();
+      MyRemote remote = (MyRemote) ctx.lookup("StatelessBean/remote");
+      try {
+         remote.giveMeARuntimeException();
+         
+         fail("expected an exception");
+      }
+      catch(RuntimeException re) {
+         Throwable e = re.getCause();
+         StackTraceElement stackTrace[] = e.getStackTrace();
+         int i = 0;
+         while(i < stackTrace.length && !stackTrace[i].getClassName().equals(ClassNameTestCase.class.getName()))
+            i++;
+         //assertTrue(i < stackTrace.length); // let's error if this happens
+         i--;
+         String actual = stackTrace[i].getClassName();
+         String expected = "?";
+         assertFalse("class name must not start with $Proxy", actual.startsWith("$Proxy"));
+         assertEquals(expected, actual);
+      }
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ClassNameTestCase.class, "ejbthree485.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree485/unit/ClassNameTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree620;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Remote
-public interface Calculator
-{
-   int add(int a, int b);
-   
-   int performAddition(int a, int b);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree620;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface Calculator
+{
+   int add(int a, int b);
+   
+   int performAddition(int a, int b);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/Calculator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree620;
-
-import javax.ejb.EJB;
-//import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Stateless
-public class CalculatorBean implements Calculator
-{
-   @EJB(beanInterface=Calculator.class) Object other;
-//   @EJB(businessInterface=Calculator.class) Object deprecatedOther;
-   
-   public int add(int a, int b)
-   {
-      int result1 = ((Calculator) other).performAddition(a, b);
-//      int result2 = ((Calculator) deprecatedOther).performAddition(a, b);
-//      if(result1 != result2)
-//         throw new EJBException("something horrible happened");
-      return result1;
-   }
-
-   public int performAddition(int a, int b)
-   {
-      return a + b;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree620;
+
+import javax.ejb.EJB;
+//import javax.ejb.EJBException;
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CalculatorBean implements Calculator
+{
+   @EJB(beanInterface=Calculator.class) Object other;
+//   @EJB(businessInterface=Calculator.class) Object deprecatedOther;
+   
+   public int add(int a, int b)
+   {
+      int result1 = ((Calculator) other).performAddition(a, b);
+//      int result2 = ((Calculator) deprecatedOther).performAddition(a, b);
+//      if(result1 != result2)
+//         throw new EJBException("something horrible happened");
+      return result1;
+   }
+
+   public int performAddition(int a, int b)
+   {
+      return a + b;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/CalculatorBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.ejbthree620.unit;
-
-import javax.naming.Context;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.regression.ejbthree620.Calculator;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public class EJBBeanInterfaceTestCase extends JBossTestCase
-{
-   public EJBBeanInterfaceTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testAddition() throws Exception {
-      Context ctx = getInitialContext();
-      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
-      assertEquals(3, calculator.add(1, 2));
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EJBBeanInterfaceTestCase.class, "ejbthree620.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree620.unit;
+
+import javax.naming.Context;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.regression.ejbthree620.Calculator;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class EJBBeanInterfaceTestCase extends JBossTestCase
+{
+   public EJBBeanInterfaceTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testAddition() throws Exception {
+      Context ctx = getInitialContext();
+      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
+      assertEquals(3, calculator.add(1, 2));
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EJBBeanInterfaceTestCase.class, "ejbthree620.jar");
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree620/unit/EJBBeanInterfaceTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree625;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface Silly
-{
-   int add(int x, int y);
-
-   int sub(int x, int y);
-
-   void clear();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree625;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface Silly
+{
+   int add(int x, int y);
+
+   int sub(int x, int y);
+
+   void clear();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/Silly.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree625;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class SillyBean implements Silly
-{
-   public int add(int x, int y)
-   {
-      if (StupidInterceptor.count != 1) throw new RuntimeException("count is wrong: " + StupidInterceptor.count);
-      return x + y;
-   }
-
-   public int sub(int x, int y)
-   {
-      if (StupidInterceptor.count != 1) throw new RuntimeException("count is wrong: " + StupidInterceptor.count);
-      return x-y;
-   }
-
-   public void clear()
-   {
-      StupidInterceptor.count = 0;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree625;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class SillyBean implements Silly
+{
+   public int add(int x, int y)
+   {
+      if (StupidInterceptor.count != 1) throw new RuntimeException("count is wrong: " + StupidInterceptor.count);
+      return x + y;
+   }
+
+   public int sub(int x, int y)
+   {
+      if (StupidInterceptor.count != 1) throw new RuntimeException("count is wrong: " + StupidInterceptor.count);
+      return x-y;
+   }
+
+   public void clear()
+   {
+      StupidInterceptor.count = 0;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/SillyBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree625;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class StupidInterceptor
-{
-   public static int count = 0;
-   @AroundInvoke
-   public Object intercept(InvocationContext ic) throws Exception
-   {
-       count++;
-       return ic.proceed();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree625;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class StupidInterceptor
+{
+   public static int count = 0;
+   @AroundInvoke
+   public Object intercept(InvocationContext ic) throws Exception
+   {
+       count++;
+       return ic.proceed();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/StupidInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,65 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.ejbthree625.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.regression.ejbthree290.DAO;
-import org.jboss.ejb3.test.regression.ejbthree290.MyEntity;
-import org.jboss.ejb3.test.regression.ejbthree290.unit.Ejb290UnitTestCase;
-import org.jboss.ejb3.test.regression.ejbthree625.Silly;
-import junit.framework.Test;
-
-/**
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class Ejb625UnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public Ejb625UnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testDefaultInterceptors() throws Exception
-   {
-      Silly silly = (Silly)getInitialContext().lookup("SillyBean/remote");
-      assertEquals(2, silly.add(1, 1));
-      silly.clear();
-      assertEquals(0, silly.sub(1, 1));
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(Ejb625UnitTestCase.class, "regression-ejbthree625-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree625.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.regression.ejbthree290.DAO;
+import org.jboss.ejb3.test.regression.ejbthree290.MyEntity;
+import org.jboss.ejb3.test.regression.ejbthree290.unit.Ejb290UnitTestCase;
+import org.jboss.ejb3.test.regression.ejbthree625.Silly;
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class Ejb625UnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public Ejb625UnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testDefaultInterceptors() throws Exception
+   {
+      Silly silly = (Silly)getInitialContext().lookup("SillyBean/remote");
+      assertEquals(2, silly.add(1, 1));
+      silly.clear();
+      assertEquals(0, silly.sub(1, 1));
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(Ejb625UnitTestCase.class, "regression-ejbthree625-test.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree625/unit/Ejb625UnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree653;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStateful21 extends EJBObject
-{
-   String sayHelloTo(String name) throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree653;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStateful21 extends EJBObject
+{
+   String sayHelloTo(String name) throws RemoteException;
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree653;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateful
- at Remote(MyStateful21.class)
- at RemoteHome(MyStateful21Home.class)
-public class MyStateful21Bean implements SessionBean
-{
-   private static final long serialVersionUID = 1L;
-
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(MyStateful21Bean.class);
-   
-   @EJB
-   private MyStateless delegate;
-   
-   public void ejbActivate() throws EJBException, RemoteException
-   {
-   }
-
-   public void ejbPassivate() throws EJBException, RemoteException
-   {
-   }
-
-   public void ejbRemove() throws EJBException, RemoteException
-   {
-   }
-
-   public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
-   {
-   }
-
-   public String sayHelloTo(String name)
-   {
-      return delegate.sayHelloTo(name);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree653;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateful
+ at Remote(MyStateful21.class)
+ at RemoteHome(MyStateful21Home.class)
+public class MyStateful21Bean implements SessionBean
+{
+   private static final long serialVersionUID = 1L;
+
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(MyStateful21Bean.class);
+   
+   @EJB
+   private MyStateless delegate;
+   
+   public void ejbActivate() throws EJBException, RemoteException
+   {
+   }
+
+   public void ejbPassivate() throws EJBException, RemoteException
+   {
+   }
+
+   public void ejbRemove() throws EJBException, RemoteException
+   {
+   }
+
+   public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
+   {
+   }
+
+   public String sayHelloTo(String name)
+   {
+      return delegate.sayHelloTo(name);
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree653;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStateful21Home extends EJBHome
-{
-   MyStateful21 create() throws CreateException, RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateful21Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree653;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStateful21Home extends EJBHome
+{
+   MyStateful21 create() throws CreateException, RemoteException;
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree653;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStateless
-{
-   String sayHelloTo(String name);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree653;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStateless
+{
+   String sayHelloTo(String name);
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree653;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(MyStateless.class)
-public class MyStatelessBean
-{
-   private static long currentThreadId;
-   
-   /**
-    * EJBCreate method.
-    */
-   @PostConstruct
-   public void ejb3Create() 
-   {
-      System.out.println("New SessionBean " + this);
-      System.out.println("Thread " + Thread.currentThread().getId());
-      //setupBean();
-      if(currentThreadId == 0)
-      {
-         currentThreadId = Thread.currentThread().getId();
-      }
-      else
-      {
-         if(Thread.currentThread().getId() == currentThreadId)
-         {
-            throw new IllegalStateException("no new instance should be created");
-         }
-         else
-         {
-            // could happen with remoting 2.0
-            currentThreadId = Thread.currentThread().getId();
-         }
-      }
-   } 
-   
-   public String sayHelloTo(String name)
-   {
-      return "Hi " + name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/MyStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree653;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateless
+ at Remote(MyStateless.class)
+public class MyStatelessBean
+{
+   private static long currentThreadId;
+   
+   /**
+    * EJBCreate method.
+    */
+   @PostConstruct
+   public void ejb3Create() 
+   {
+      System.out.println("New SessionBean " + this);
+      System.out.println("Thread " + Thread.currentThread().getId());
+      //setupBean();
+      if(currentThreadId == 0)
+      {
+         currentThreadId = Thread.currentThread().getId();
+      }
+      else
+      {
+         if(Thread.currentThread().getId() == currentThreadId)
+         {
+            throw new IllegalStateException("no new instance should be created");
+         }
+         else
+         {
+            // could happen with remoting 2.0
+            currentThreadId = Thread.currentThread().getId();
+         }
+      }
+   } 
+   
+   public String sayHelloTo(String name)
+   {
+      return "Hi " + name;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree653.unit;
-
-import java.util.Date;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.regression.ejbthree653.MyStateful21;
-import org.jboss.ejb3.test.regression.ejbthree653.MyStateful21Home;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class PoolingSLBSTestCase extends JBossTestCase
-{
-
-   public PoolingSLBSTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void test1() throws Exception
-   {
-      MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/remoteHome");
-      MyStateful21 session = home.create();
-      for(int i = 0; i < 1000; i++)
-      {
-         String me = new Date().toString();
-         String expected = "Hi " + me;
-         String actual = session.sayHelloTo(me);
-         assertEquals(expected, actual);
-      }
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(PoolingSLBSTestCase.class, "ejbthree653.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree653/unit/PoolingSLBSTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree653.unit;
+
+import java.util.Date;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.regression.ejbthree653.MyStateful21;
+import org.jboss.ejb3.test.regression.ejbthree653.MyStateful21Home;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class PoolingSLBSTestCase extends JBossTestCase
+{
+
+   public PoolingSLBSTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void test1() throws Exception
+   {
+      MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/remoteHome");
+      MyStateful21 session = home.create();
+      for(int i = 0; i < 1000; i++)
+      {
+         String me = new Date().toString();
+         String expected = "Hi " + me;
+         String actual = session.sayHelloTo(me);
+         assertEquals(expected, actual);
+      }
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(PoolingSLBSTestCase.class, "ejbthree653.jar");
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree670;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStateful
-{
-   void remove();
-   void setName(String name);
-   String sayHello();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree670;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStateful
+{
+   void remove();
+   void setName(String name);
+   String sayHello();
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree670;
-
-import javax.ejb.EJBObject;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStateful21 extends EJBObject, MyStateful
-{
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree670;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStateful21 extends EJBObject, MyStateful
+{
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree670;
-
-import java.rmi.RemoteException;
-
-import javax.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.Remove;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateful
- at Remote(MyStateful21.class)
- at RemoteHome(MyStateful21Home.class)
-public class MyStateful21Bean implements SessionBean
-{
-   private static final Logger log = Logger.getLogger(MyStateful21Bean.class);
-   
-   private String name;
-   private int preDestroyCalls = 0;
-   
-   public void ejbActivate() throws EJBException, RemoteException
-   {
-   }
-
-   public void ejbPassivate() throws EJBException, RemoteException
-   {
-   }
-
-   public void ejbRemove() throws EJBException, RemoteException
-   {
-      log.info("remove");
-   }
-
-   public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
-   {
-   }
-
-   @PreDestroy
-   public void preDestroy()
-   {
-      //new Exception().printStackTrace();
-      preDestroyCalls++;
-      log.info("pre destroy");
-      if(preDestroyCalls > 1)
-         throw new IllegalStateException("pre destroy called multiple times");
-   }
-   
-   public String sayHello()
-   {
-      return "Hi " + name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree670;
+
+import java.rmi.RemoteException;
+
+import javax.annotation.PreDestroy;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.RemoteHome;
+import javax.ejb.Remove;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateful
+ at Remote(MyStateful21.class)
+ at RemoteHome(MyStateful21Home.class)
+public class MyStateful21Bean implements SessionBean
+{
+   private static final Logger log = Logger.getLogger(MyStateful21Bean.class);
+   
+   private String name;
+   private int preDestroyCalls = 0;
+   
+   public void ejbActivate() throws EJBException, RemoteException
+   {
+   }
+
+   public void ejbPassivate() throws EJBException, RemoteException
+   {
+   }
+
+   public void ejbRemove() throws EJBException, RemoteException
+   {
+      log.info("remove");
+   }
+
+   public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
+   {
+   }
+
+   @PreDestroy
+   public void preDestroy()
+   {
+      //new Exception().printStackTrace();
+      preDestroyCalls++;
+      log.info("pre destroy");
+      if(preDestroyCalls > 1)
+         throw new IllegalStateException("pre destroy called multiple times");
+   }
+   
+   public String sayHello()
+   {
+      return "Hi " + name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree670;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStateful21Home extends EJBHome
-{
-   MyStateful21 create() throws CreateException, RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree670;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStateful21Home extends EJBHome
+{
+   MyStateful21 create() throws CreateException, RemoteException;
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree670;
-
-import javax.annotation.PreDestroy;
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.ejb3.cache.simple.SimpleStatefulCache;
-import org.jboss.logging.Logger;
-
-/**
- * Test how many times pre destroy is called.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateful
- at Remote(MyStateful.class)
-public class MyStatefulBean implements MyStateful
-{
-   private static final Logger log = Logger.getLogger(MyStatefulBean.class);
-   
-   private String name;
-   private int preDestroyCalls = 0;
-   
-   @PreDestroy
-   public void preDestroy()
-   {
-      preDestroyCalls++;
-      log.info("pre destroy");
-      if(preDestroyCalls > 1)
-         throw new IllegalStateException("pre destroy called multiple times");
-   }
-   
-   @Remove
-   public void remove()
-   {
-      log.info("remove");
-   }
-   
-   public String sayHello()
-   {
-      return "Hi " + name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree670;
+
+import javax.annotation.PreDestroy;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.cache.Cache;
+import org.jboss.ejb3.cache.simple.SimpleStatefulCache;
+import org.jboss.logging.Logger;
+
+/**
+ * Test how many times pre destroy is called.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateful
+ at Remote(MyStateful.class)
+public class MyStatefulBean implements MyStateful
+{
+   private static final Logger log = Logger.getLogger(MyStatefulBean.class);
+   
+   private String name;
+   private int preDestroyCalls = 0;
+   
+   @PreDestroy
+   public void preDestroy()
+   {
+      preDestroyCalls++;
+      log.info("pre destroy");
+      if(preDestroyCalls > 1)
+         throw new IllegalStateException("pre destroy called multiple times");
+   }
+   
+   @Remove
+   public void remove()
+   {
+      log.info("remove");
+   }
+   
+   public String sayHello()
+   {
+      return "Hi " + name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.regression.ejbthree670.unit;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.regression.ejbthree670.MyStateful;
-import org.jboss.ejb3.test.regression.ejbthree670.MyStateful21;
-import org.jboss.ejb3.test.regression.ejbthree670.MyStateful21Home;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class PreDestroyCallsTestCase extends JBossTestCase
-{
-
-   public PreDestroyCallsTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void test1() throws Exception
-   {
-      MyStateful session = (MyStateful) getInitialContext().lookup("MyStatefulBean/remote");
-      session.setName("Test");
-      String actual = session.sayHello();
-      assertEquals("Hi Test", actual);
-      try
-      {
-         session.remove();
-      }
-      catch(RuntimeException e)
-      {
-         if(e.getCause().getMessage().equals("pre destroy called multiple times"))
-            fail("pre destroy called multiple times");
-         throw e;
-      }
-   }
-   
-   public void test21() throws Exception
-   {
-      MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/remoteHome");
-      MyStateful21 session = home.create();
-      session.setName("Test");
-      String actual = session.sayHello();
-      assertEquals("Hi Test", actual);
-      try
-      {
-         session.remove();
-      }
-      catch(RuntimeException e)
-      {
-         if(e.getCause().getMessage().equals("pre destroy called multiple times"))
-            fail("pre destroy called multiple times");
-         throw e;
-      }
-   }
-   
-   public void testRemoveByHandle() throws Exception
-   {
-      MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/remoteHome");
-      MyStateful21 session = home.create();
-      session.setName("Test");
-      String actual = session.sayHello();
-      assertEquals("Hi Test", actual);
-      try
-      {
-         home.remove(session.getHandle());
-      }
-      catch(RuntimeException e)
-      {
-         if(e.getCause().getMessage().equals("pre destroy called multiple times"))
-            fail("pre destroy called multiple times");
-         throw e;
-      }
-   }
-   
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(PreDestroyCallsTestCase.class, "ejbthree670.jar");
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.ejbthree670.unit;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.regression.ejbthree670.MyStateful;
+import org.jboss.ejb3.test.regression.ejbthree670.MyStateful21;
+import org.jboss.ejb3.test.regression.ejbthree670.MyStateful21Home;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class PreDestroyCallsTestCase extends JBossTestCase
+{
+
+   public PreDestroyCallsTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void test1() throws Exception
+   {
+      MyStateful session = (MyStateful) getInitialContext().lookup("MyStatefulBean/remote");
+      session.setName("Test");
+      String actual = session.sayHello();
+      assertEquals("Hi Test", actual);
+      try
+      {
+         session.remove();
+      }
+      catch(RuntimeException e)
+      {
+         if(e.getCause().getMessage().equals("pre destroy called multiple times"))
+            fail("pre destroy called multiple times");
+         throw e;
+      }
+   }
+   
+   public void test21() throws Exception
+   {
+      MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/remoteHome");
+      MyStateful21 session = home.create();
+      session.setName("Test");
+      String actual = session.sayHello();
+      assertEquals("Hi Test", actual);
+      try
+      {
+         session.remove();
+      }
+      catch(RuntimeException e)
+      {
+         if(e.getCause().getMessage().equals("pre destroy called multiple times"))
+            fail("pre destroy called multiple times");
+         throw e;
+      }
+   }
+   
+   public void testRemoveByHandle() throws Exception
+   {
+      MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/remoteHome");
+      MyStateful21 session = home.create();
+      session.setName("Test");
+      String actual = session.sayHello();
+      assertEquals("Hi Test", actual);
+      try
+      {
+         home.remove(session.getHandle());
+      }
+      catch(RuntimeException e)
+      {
+         if(e.getCause().getMessage().equals("pre destroy called multiple times"))
+            fail("pre destroy called multiple times");
+         throw e;
+      }
+   }
+   
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(PreDestroyCallsTestCase.class, "ejbthree670.jar");
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.salesforce7123;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.io.Serializable;
-import static javax.persistence.CascadeType.ALL;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class BaseData implements Serializable
-{
-   private int id;
-   private String name;
-   private List<Child> children = new ArrayList<Child>();
-
-   @Id @GeneratedValue
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-   @OneToMany(mappedBy="parent", cascade=ALL)
-   public List<Child> getChildren()
-   {
-      return children;
-   }
-
-   public void setChildren(List<Child> children)
-   {
-      this.children = children;
-   }
-
-   public void prepareTransport()
-   {
-      this.children = new ArrayList<Child>();
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.io.Serializable;
+import static javax.persistence.CascadeType.ALL;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class BaseData implements Serializable
+{
+   private int id;
+   private String name;
+   private List<Child> children = new ArrayList<Child>();
+
+   @Id @GeneratedValue
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   @OneToMany(mappedBy="parent", cascade=ALL)
+   public List<Child> getChildren()
+   {
+      return children;
+   }
+
+   public void setChildren(List<Child> children)
+   {
+      this.children = children;
+   }
+
+   public void prepareTransport()
+   {
+      this.children = new ArrayList<Child>();
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/BaseData.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,75 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.salesforce7123;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Child implements Serializable
-{
-   private int id;
-   private String data;
-   private BaseData parent;
-
-   @Id @GeneratedValue
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getData()
-   {
-      return data;
-   }
-
-   public void setData(String data)
-   {
-      this.data = data;
-   }
-
-   @ManyToOne(fetch= FetchType.EAGER)
-   public BaseData getParent()
-   {
-      return parent;
-   }
-
-   public void setParent(BaseData parent)
-   {
-      this.parent = parent;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.ManyToOne;
+import javax.persistence.FetchType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Child implements Serializable
+{
+   private int id;
+   private String data;
+   private BaseData parent;
+
+   @Id @GeneratedValue
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getData()
+   {
+      return data;
+   }
+
+   public void setData(String data)
+   {
+      this.data = data;
+   }
+
+   @ManyToOne(fetch= FetchType.EAGER)
+   public BaseData getParent()
+   {
+      return parent;
+   }
+
+   public void setParent(BaseData parent)
+   {
+      this.parent = parent;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/Child.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.salesforce7123;
-
-import java.util.List;
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface DataAccess
-{
-   void initialize();
-
-   List findMyBeans();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123;
+
+import java.util.List;
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface DataAccess
+{
+   void initialize();
+
+   List findMyBeans();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccess.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.salesforce7123;
-
-import java.util.List;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class DataAccessBean implements DataAccess, DataAccessRemote
-{
-   @PersistenceContext EntityManager manager;
-
-
-   public void initialize()
-   {
-      BaseData data = new BaseData();
-      data.setName("Bill");
-      Child molly = new Child();
-      molly.setData("molly");
-      molly.setParent(data);
-      data.getChildren().add(molly);
-      manager.persist(data);
-   }
-
-   public List findMyBeans()
-   {
-      List list = manager.createQuery("FROM BaseData base").getResultList();
-      for (Object obj : list)
-      {
-         BaseData data = (BaseData)obj;
-         data.getChildren().size();
-      }
-      return list;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123;
+
+import java.util.List;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class DataAccessBean implements DataAccess, DataAccessRemote
+{
+   @PersistenceContext EntityManager manager;
+
+
+   public void initialize()
+   {
+      BaseData data = new BaseData();
+      data.setName("Bill");
+      Child molly = new Child();
+      molly.setData("molly");
+      molly.setParent(data);
+      data.getChildren().add(molly);
+      manager.persist(data);
+   }
+
+   public List findMyBeans()
+   {
+      List list = manager.createQuery("FROM BaseData base").getResultList();
+      for (Object obj : list)
+      {
+         BaseData data = (BaseData)obj;
+         data.getChildren().size();
+      }
+      return list;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.salesforce7123;
-
-import java.util.List;
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface DataAccessRemote
-{
-   void initialize();
-
-   List findMyBeans();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123;
+
+import java.util.List;
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface DataAccessRemote
+{
+   void initialize();
+
+   List findMyBeans();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.salesforce7123;
-
-import java.util.List;
-import java.util.ArrayList;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJB;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class MyBusinessSessionBean implements MyBusinessSessionRemote
-{
-   @EJB DataAccess dao;
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public List getMyBeans()
-   {
-      List nodeList = new ArrayList();
-      List data = dao.findMyBeans();
-
-      int counter = 0;
-      for (Object obj : data)
-      {
-         BaseData d = (BaseData)obj;
-         d.prepareTransport();
-         nodeList.add(d);
-         // change the name too
-         d.setName(((Integer)(counter++)).toString());
-      }
-      return nodeList;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123;
+
+import java.util.List;
+import java.util.ArrayList;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.EJB;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class MyBusinessSessionBean implements MyBusinessSessionRemote
+{
+   @EJB DataAccess dao;
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public List getMyBeans()
+   {
+      List nodeList = new ArrayList();
+      List data = dao.findMyBeans();
+
+      int counter = 0;
+      for (Object obj : data)
+      {
+         BaseData d = (BaseData)obj;
+         d.prepareTransport();
+         nodeList.add(d);
+         // change the name too
+         d.setName(((Integer)(counter++)).toString());
+      }
+      return nodeList;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.salesforce7123;
-
-import java.util.List;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface MyBusinessSessionRemote
-{
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   List getMyBeans();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123;
+
+import java.util.List;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface MyBusinessSessionRemote
+{
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   List getMyBeans();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/MyBusinessSessionRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.salesforce7123.unit;
-
-import java.util.List;
-import org.jboss.ejb3.test.regression.salesforce7123.BaseData;
-import org.jboss.ejb3.test.regression.salesforce7123.DataAccessRemote;
-import org.jboss.ejb3.test.regression.salesforce7123.MyBusinessSessionRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Test reentrant remote call.  There was a bug that remoting didn't route locally
- * and the tx propagation was happening when it shouldn't
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class NotSupportedUnitTestCase
-extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public NotSupportedUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testInheritance() throws Exception
-   {
-      DataAccessRemote remote = (DataAccessRemote) getInitialContext().lookup("DataAccessBean/remote");
-      remote.initialize();
-      MyBusinessSessionRemote biz =(MyBusinessSessionRemote) getInitialContext().lookup("MyBusinessSessionBean/remote");
-      biz.getMyBeans();
-      List real = remote.findMyBeans();
-      assertEquals(real.size(), 1);
-      BaseData data = (BaseData)real.get(0);
-      assertEquals("Bill", data.getName());
-      assertEquals(1, data.getChildren().size());
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(NotSupportedUnitTestCase.class, "salesforce-7123.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.salesforce7123.unit;
+
+import java.util.List;
+import org.jboss.ejb3.test.regression.salesforce7123.BaseData;
+import org.jboss.ejb3.test.regression.salesforce7123.DataAccessRemote;
+import org.jboss.ejb3.test.regression.salesforce7123.MyBusinessSessionRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Test reentrant remote call.  There was a bug that remoting didn't route locally
+ * and the tx propagation was happening when it shouldn't
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class NotSupportedUnitTestCase
+extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public NotSupportedUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testInheritance() throws Exception
+   {
+      DataAccessRemote remote = (DataAccessRemote) getInitialContext().lookup("DataAccessBean/remote");
+      remote.initialize();
+      MyBusinessSessionRemote biz =(MyBusinessSessionRemote) getInitialContext().lookup("MyBusinessSessionBean/remote");
+      biz.getMyBeans();
+      List real = remote.findMyBeans();
+      assertEquals(real.size(), 1);
+      BaseData data = (BaseData)real.get(0);
+      assertEquals("Bill", data.getName());
+      assertEquals(1, data.getChildren().size());
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(NotSupportedUnitTestCase.class, "salesforce-7123.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/unit/NotSupportedUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.scopedclassloader;
-
-import javax.naming.InitialContext;
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class ClientBean implements ClientRemote
-{
-   public void doit() throws Exception
-   {
-      StatelessRemote remote = (StatelessRemote)new InitialContext().lookup("scopedclassloader-ejb/StatelessBean/remote");
-      ValueObject vo = remote.doit();
-      System.out.println(vo.getValue());
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      int id = remote.createCustomer(cust);
-      cust = remote.findCustomer(id);
-      if (!cust.getName().equals("Bill")) throw new RuntimeException("Failed to persist");
-
-      try
-      {
-         remote.throwException();
-      }
-      catch (ScopedException ignored) {}
-
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader;
+
+import javax.naming.InitialContext;
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class ClientBean implements ClientRemote
+{
+   public void doit() throws Exception
+   {
+      StatelessRemote remote = (StatelessRemote)new InitialContext().lookup("scopedclassloader-ejb/StatelessBean/remote");
+      ValueObject vo = remote.doit();
+      System.out.println(vo.getValue());
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      int id = remote.createCustomer(cust);
+      cust = remote.findCustomer(id);
+      if (!cust.getName().equals("Bill")) throw new RuntimeException("Failed to persist");
+
+      try
+      {
+         remote.throwException();
+      }
+      catch (ScopedException ignored) {}
+
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.scopedclassloader;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface ClientRemote
-{
-   void doit() throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface ClientRemote
+{
+   void doit() throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ClientRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.scopedclassloader;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements java.io.Serializable
-{
-   private int id;
-   private String name;
-
-   @Id @GeneratedValue
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements java.io.Serializable
+{
+   private int id;
+   private String name;
+
+   @Id @GeneratedValue
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.scopedclassloader;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ScopedException extends Exception
-{
-   public ScopedException()
-   {
-   }
-
-   public ScopedException(String message)
-   {
-      super(message);
-   }
-
-   public ScopedException(String message, Throwable cause)
-   {
-      super(message, cause);
-   }
-
-   public ScopedException(Throwable cause)
-   {
-      super(cause);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ScopedException extends Exception
+{
+   public ScopedException()
+   {
+   }
+
+   public ScopedException(String message)
+   {
+      super(message);
+   }
+
+   public ScopedException(String message, Throwable cause)
+   {
+      super(message, cause);
+   }
+
+   public ScopedException(Throwable cause)
+   {
+      super(cause);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.scopedclassloader;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class StatelessBean implements StatelessRemote
-{
-   @PersistenceContext EntityManager manager;
-
-   public ValueObject doit()
-   {
-      return new ValueObject("hello");
-   }
-
-   public int createCustomer(Customer cust)
-   {
-      manager.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return manager.find(Customer.class, id);
-   }
-
-   public void throwException() throws ScopedException
-   {
-      throw new ScopedException();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class StatelessBean implements StatelessRemote
+{
+   @PersistenceContext EntityManager manager;
+
+   public ValueObject doit()
+   {
+      return new ValueObject("hello");
+   }
+
+   public int createCustomer(Customer cust)
+   {
+      manager.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return manager.find(Customer.class, id);
+   }
+
+   public void throwException() throws ScopedException
+   {
+      throw new ScopedException();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.scopedclassloader;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface StatelessRemote
-{
-   ValueObject doit();
-
-   int createCustomer(Customer cust);
-
-   Customer findCustomer(int id);
-
-   void throwException() throws ScopedException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface StatelessRemote
+{
+   ValueObject doit();
+
+   int createCustomer(Customer cust);
+
+   Customer findCustomer(int id);
+
+   void throwException() throws ScopedException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.regression.scopedclassloader;
-
-import java.io.Serializable;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ValueObject implements Serializable
-{
-   private String value;
-
-   public ValueObject(String value)
-   {
-      this.value = value;
-   }
-
-   public ValueObject()
-   {
-   }
-
-   public String getValue()
-   {
-      return value;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader;
+
+import java.io.Serializable;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ValueObject implements Serializable
+{
+   private String value;
+
+   public ValueObject(String value)
+   {
+      this.value = value;
+   }
+
+   public ValueObject()
+   {
+   }
+
+   public String getValue()
+   {
+      return value;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,74 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.regression.scopedclassloader.unit;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.Attribute;
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.regression.scopedclassloader.ClientRemote;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class ScopeUnitTestCase
-        extends JBossTestCase
-{
-   org.jboss.logging.Logger log = getLog();
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public ScopeUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testScopedClassLoaders() throws Exception
-   {
-	   MBeanServerConnection server = getServer();
-      ObjectName naming = new ObjectName("jboss:service=Naming");
-      server.setAttribute(naming, new Attribute("CallByValue", true));
-      try
-      {
-         ClientRemote remote = (ClientRemote)getInitialContext().lookup("scopedclassloader-web/ClientBean/remote");
-         remote.doit();
-      }
-      finally
-      {
-         server.setAttribute(naming, new Attribute("CallByValue", false));
-      }
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ScopeUnitTestCase.class, "scopedclassloader-ejb.ear, scopedclassloader-web.ear");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.regression.scopedclassloader.unit;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.Attribute;
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.regression.scopedclassloader.ClientRemote;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class ScopeUnitTestCase
+        extends JBossTestCase
+{
+   org.apache.log4j.Logger log = getLog();
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public ScopeUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testScopedClassLoaders() throws Exception
+   {
+	   MBeanServerConnection server = getServer();
+      ObjectName naming = new ObjectName("jboss:service=Naming");
+      server.setAttribute(naming, new Attribute("CallByValue", true));
+      try
+      {
+         ClientRemote remote = (ClientRemote)getInitialContext().lookup("scopedclassloader-web/ClientBean/remote");
+         remote.doit();
+      }
+      finally
+      {
+         server.setAttribute(naming, new Attribute("CallByValue", false));
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ScopeUnitTestCase.class, "scopedclassloader-ejb.ear, scopedclassloader-web.ear");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/scopedclassloader/unit/ScopeUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EmeddedIdUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EmeddedIdUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EmeddedIdUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 public class EmeddedIdUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EntityManagerPassivationUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EntityManagerPassivationUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/EntityManagerPassivationUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 public class EntityManagerPassivationUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/InheritanceUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/InheritanceUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/InheritanceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 public class InheritanceUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/ReentrantUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/ReentrantUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regression/unit/ReentrantUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 public class ReentrantUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -60,7 +60,7 @@
 
    public int find()
    {
-      Query q = em.createQuery("select s From SavedSearch s WHERE (s.id = 'u1' OR s.id = 'USER_ALL_USERS') AND s.searchTitle = 'CRAP'");
+      Query q = em.createQuery("From SavedSearch s WHERE (s.id = 'u1' OR s.id = 'USER_ALL_USERS') AND s.searchTitle = 'CRAP'");
       return q.getResultList().size();
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/unit/HHH275UnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/unit/HHH275UnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/unit/HHH275UnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 public class HHH275UnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/relationships/unit/RelationshipUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/relationships/unit/RelationshipUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/relationships/unit/RelationshipUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -41,7 +41,7 @@
 public class RelationshipUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema)

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.schema.unit;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
-
-/**
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class EjbJarValidationTestCase
-    extends JBossTestCase
-{
-   Exception caughtException = null;
-   
-   private static final Logger log = Logger
-         .getLogger(EjbJarValidationTestCase.class);
-   
-   public void test()
-   {
-      
-   }
-
-   public EjbJarValidationTestCase(String name)
-   {
-      super(name);
-   }
- 
-   public static Test suite() throws Exception
-   {
-      try
-      {
-         return getDeploySetup(EjbJarValidationTestCase.class, "ejbjar-validation.jar");
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-
-}
- 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.schema.unit;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import org.w3c.dom.Document;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+
+/**
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class EjbJarValidationTestCase
+    extends JBossTestCase
+{
+   Exception caughtException = null;
+   
+   private static final Logger log = Logger
+         .getLogger(EjbJarValidationTestCase.class);
+   
+   public void test()
+   {
+      
+   }
+
+   public EjbJarValidationTestCase(String name)
+   {
+      super(name);
+   }
+ 
+   public static Test suite() throws Exception
+   {
+      try
+      {
+         return getDeploySetup(EjbJarValidationTestCase.class, "ejbjar-validation.jar");
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+
+}
+ 
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/EjbJarValidationTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.schema.unit;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
-
-/**
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class JbossValidationTestCase
-    extends JBossTestCase
-{
-   Exception caughtException = null;
-   
-   private static final Logger log = Logger
-         .getLogger(JbossValidationTestCase.class);
-   
-   public void test()
-   {
-      
-   }
-
-   public JbossValidationTestCase(String name)
-   {
-      super(name);
-   }
- 
-   public static Test suite() throws Exception
-   {
-      try
-      {
-         return getDeploySetup(JbossValidationTestCase.class, "jboss-validation.jar");
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         return null;
-      }
-   }
-
-}
- 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.schema.unit;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import org.w3c.dom.Document;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+
+/**
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class JbossValidationTestCase
+    extends JBossTestCase
+{
+   Exception caughtException = null;
+   
+   private static final Logger log = Logger
+         .getLogger(JbossValidationTestCase.class);
+   
+   public void test()
+   {
+      
+   }
+
+   public JbossValidationTestCase(String name)
+   {
+      super(name);
+   }
+ 
+   public static Test suite() throws Exception
+   {
+      try
+      {
+         return getDeploySetup(JbossValidationTestCase.class, "jboss-validation.jar");
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         return null;
+      }
+   }
+
+}
+ 
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/JbossValidationTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,198 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.schema.unit;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import org.jboss.util.xml.JBossEntityResolver;
-
-import junit.framework.Test;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
-
-/**
- * 
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class SchemaTestCase
-    extends JBossTestCase
-    implements ErrorHandler
-{
-   Exception caughtException = null;
-   
-   private static final Logger log = Logger
-         .getLogger(SchemaTestCase.class);
-
-   public SchemaTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEjbClassOptionalEjbJar() throws Exception
-   {
-      DocumentBuilder builder = getDocumentBuilder();
-      
-      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarC.xml", builder);
-      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarD.xml", builder);
-      validateFile("../src/resources/test/enventry/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/mail/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/reference21_30/META-INF/ejb-jar3.xml", builder);
-   }
-   
-   public void testTestEjbJar() throws Exception
-   {
-      DocumentBuilder builder = getDocumentBuilder();
-      
-      validateFile("../src/resources/test/bank/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/bmt/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/dd/mdb/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/dd/override/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarA.xml", builder);
-      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarB.xml", builder);
-      validateFile("../src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/interceptors/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/interceptors2/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/jca/inflow/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/jms/managed/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/microbench/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/naming/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/securitydomain/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/service/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/stateful/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/txexceptions/META-INF/ejb-jar.xml", builder);
-      validateFile("../src/resources/test/webservices/META-INF/ejb-jar.xml", builder);
-   }
-   
-   public void testTutorialEjbJar() throws Exception
-   {
-      DocumentBuilder builder = getDocumentBuilder();
-      
-      validateFile("../docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml", builder);
-      validateFile("../docs/tutorial/interceptor/META-INF/ejb-jar.xml", builder);
-      validateFile("../docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml", builder);
-      validateFile("../docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml", builder);
-      validateFile("../docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml", builder);
-      validateFile("../docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml", builder);
-      validateFile("../docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml", builder);
-      validateFile("../docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml", builder);
-   }
-   
-   public void testTestJBoss() throws Exception
-   {
-      DocumentBuilder builder = getDocumentBuilder();
-      
-      validateFile("../src/resources/test/bank/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/clusteredsession/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/consumer/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/dd/mdb/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/dd/web/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/dependency/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/interceptors2/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/jca/inflow/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/mail/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/microbench/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/naming/META-INF/jboss1.xml", builder);
-      validateFile("../src/resources/test/naming/META-INF/jboss1.xml", builder);
-      validateFile("../src/resources/test/reference21_30/META-INF/jboss3.xml", builder);
-      validateFile("../src/resources/test/reference21_30/META-INF/jboss-reference.xml", builder);
-      validateFile("../src/resources/test/securitydomain/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/service/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/ssladvanced/META-INF/jboss.xml", builder);
-      validateFile("../src/resources/test/strictpool/META-INF/jboss.xml", builder);
-   }
-   
-   public void testTutorialJBoss() throws Exception
-   {
-      DocumentBuilder builder = getDocumentBuilder();
-      
-      validateFile("../docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/dependency/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/jboss_resource_ref/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml", builder);
-      validateFile("../docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml", builder);
-   }
-   
-   private void validateFile(String filename, DocumentBuilder builder) throws Exception
-   {
-      File xmlFile = new File(filename);
-      System.out.println("Parsing and validating " + filename);
-      Document dom = builder.parse(xmlFile);
-      
-      if (caughtException != null)
-         throw caughtException;
-      
-      System.out.println("Success parsing " + filename);
-   }
-   
-   private DocumentBuilder getDocumentBuilder() throws Exception
-   {
-      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      factory.setAttribute("http://apache.org/xml/features/validation/schema", true);
-      
-      factory.setValidating(true);
-      factory.setNamespaceAware(true);
-         
-      DocumentBuilder builder = factory.newDocumentBuilder();
-      builder.setErrorHandler(this);
-      
-      JBossEntityResolver entityResolver = new JBossEntityResolver();
-      builder.setEntityResolver(entityResolver);
-      
-      return builder;
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(SchemaTestCase.class, "");
-   }
-   
-   public void fatalError(SAXParseException e)
-   {
-      System.out.println("fatalError " + e);
-      caughtException = e;
-   }
-   
-   public void error(SAXParseException e)
-   {
-      System.out.println("Error " + e);
-      caughtException = e;
-   }
-   
-   public void warning(SAXParseException e)
-   {
-      System.out.println("Warning " + e);
-   }
-
-}
- 
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,198 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.schema.unit;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import org.jboss.util.xml.JBossEntityResolver;
+
+import junit.framework.Test;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import org.w3c.dom.Document;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+
+/**
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class SchemaTestCase
+    extends JBossTestCase
+    implements ErrorHandler
+{
+   Exception caughtException = null;
+   
+   private static final Logger log = Logger
+         .getLogger(SchemaTestCase.class);
+
+   public SchemaTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEjbClassOptionalEjbJar() throws Exception
+   {
+      DocumentBuilder builder = getDocumentBuilder();
+      
+      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarC.xml", builder);
+      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarD.xml", builder);
+      validateFile("../src/resources/test/enventry/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/mail/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/reference21_30/META-INF/ejb-jar3.xml", builder);
+   }
+   
+   public void testTestEjbJar() throws Exception
+   {
+      DocumentBuilder builder = getDocumentBuilder();
+      
+      validateFile("../src/resources/test/bank/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/bmt/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/dd/mdb/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/dd/override/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarA.xml", builder);
+      validateFile("../src/resources/test/dd/override/META-INF/ejb-jarB.xml", builder);
+      validateFile("../src/resources/test/factoryxml/session1/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/factoryxml/session2/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/interceptors/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/interceptors2/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/jca/inflow/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/jms/managed/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/microbench/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/naming/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/securitydomain/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/service/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/stateful/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/txexceptions/META-INF/ejb-jar.xml", builder);
+      validateFile("../src/resources/test/webservices/META-INF/ejb-jar.xml", builder);
+   }
+   
+   public void testTutorialEjbJar() throws Exception
+   {
+      DocumentBuilder builder = getDocumentBuilder();
+      
+      validateFile("../docs/tutorial/ejb21_client_adaptors/META-INF/ejb-jar.xml", builder);
+      validateFile("../docs/tutorial/interceptor/META-INF/ejb-jar.xml", builder);
+      validateFile("../docs/tutorial/jboss_deployment_descriptor/META-INF/ejb-jar.xml", builder);
+      validateFile("../docs/tutorial/jboss_resource_ref/META-INF/ejb-jar.xml", builder);
+      validateFile("../docs/tutorial/jca/inflow/swiftmq/resources/META-INF/ejb-jar.xml", builder);
+      validateFile("../docs/tutorial/mdb_deployment_descriptor/META-INF/ejb-jar.xml", builder);
+      validateFile("../docs/tutorial/stateful_deployment_descriptor/META-INF/ejb-jar.xml", builder);
+      validateFile("../docs/tutorial/stateless_deployment_descriptor/META-INF/ejb-jar.xml", builder);
+   }
+   
+   public void testTestJBoss() throws Exception
+   {
+      DocumentBuilder builder = getDocumentBuilder();
+      
+      validateFile("../src/resources/test/bank/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/clusteredsession/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/consumer/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/dd/mdb/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/dd/web/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/dependency/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/interceptors2/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/jca/inflow/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/mail/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/microbench/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/naming/META-INF/jboss1.xml", builder);
+      validateFile("../src/resources/test/naming/META-INF/jboss1.xml", builder);
+      validateFile("../src/resources/test/reference21_30/META-INF/jboss3.xml", builder);
+      validateFile("../src/resources/test/reference21_30/META-INF/jboss-reference.xml", builder);
+      validateFile("../src/resources/test/securitydomain/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/service/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/ssladvanced/META-INF/jboss.xml", builder);
+      validateFile("../src/resources/test/strictpool/META-INF/jboss.xml", builder);
+   }
+   
+   public void testTutorialJBoss() throws Exception
+   {
+      DocumentBuilder builder = getDocumentBuilder();
+      
+      validateFile("../docs/tutorial/consumer_deployment_descriptor/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/dependency/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/ejb21_client_adaptors/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/jboss_deployment_descriptor/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/jboss_resource_ref/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/jca/inflow/swiftmq/resources/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/mdb_deployment_descriptor/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/service_deployment_descriptor/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/stateful_deployment_descriptor/META-INF/jboss.xml", builder);
+      validateFile("../docs/tutorial/stateless_deployment_descriptor/META-INF/jboss.xml", builder);
+   }
+   
+   private void validateFile(String filename, DocumentBuilder builder) throws Exception
+   {
+      File xmlFile = new File(filename);
+      System.out.println("Parsing and validating " + filename);
+      Document dom = builder.parse(xmlFile);
+      
+      if (caughtException != null)
+         throw caughtException;
+      
+      System.out.println("Success parsing " + filename);
+   }
+   
+   private DocumentBuilder getDocumentBuilder() throws Exception
+   {
+      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+      factory.setAttribute("http://apache.org/xml/features/validation/schema", true);
+      
+      factory.setValidating(true);
+      factory.setNamespaceAware(true);
+         
+      DocumentBuilder builder = factory.newDocumentBuilder();
+      builder.setErrorHandler(this);
+      
+      JBossEntityResolver entityResolver = new JBossEntityResolver();
+      builder.setEntityResolver(entityResolver);
+      
+      return builder;
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(SchemaTestCase.class, "");
+   }
+   
+   public void fatalError(SAXParseException e)
+   {
+      System.out.println("fatalError " + e);
+      caughtException = e;
+   }
+   
+   public void error(SAXParseException e)
+   {
+      System.out.println("Error " + e);
+      caughtException = e;
+   }
+   
+   public void warning(SAXParseException e)
+   {
+      System.out.println("Warning " + e);
+   }
+
+}
+ 
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/secondary/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/secondary/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/secondary/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,103 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.io.IOException;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.TextInputCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.jboss.logging.Logger;
-
-/** An implemeentation of the JAAS CallbackHandler interface that handles
- NameCallbacks, PasswordCallbac, TextInputCallback and the JBoss
- ByteArrayCallback
-
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
-public class AppCallbackHandler implements CallbackHandler
-{
-   private static final Logger log = Logger.getLogger(AppCallbackHandler.class);
-   
-   private String username;
-   private char[] password;
-   private byte[] data;
-   private String text;
-
-   public AppCallbackHandler(String username, char[] password)
-   {
-      this.username = username;
-      this.password = password;
-   }
-   public AppCallbackHandler(String username, char[] password, byte[] data)
-   {
-      this.username = username;
-      this.password = password;
-      this.data = data;
-   }
-   public AppCallbackHandler(String username, char[] password, byte[] data, String text)
-   {
-      this.username = username;
-      this.password = password;
-      this.data = data;
-      this.text = text;
-   }
-
-   public void handle(Callback[] callbacks) throws
-         IOException, UnsupportedCallbackException
-   {
-      for (int i = 0; i < callbacks.length; i++)
-      {
-         Callback c = callbacks[i];
- 
-         if( c instanceof NameCallback )
-         {
-            NameCallback nc = (NameCallback) c;
-            nc.setName(username);
-         }
-         else if( c instanceof PasswordCallback )
-         {
-            PasswordCallback pc = (PasswordCallback) c;
-            pc.setPassword(password);
-         }
-         else if( c instanceof TextInputCallback )
-         {
-            TextInputCallback tc = (TextInputCallback) c;
-            tc.setText(text);
-         }
-         else if( c instanceof ByteArrayCallback )
-         {
-            ByteArrayCallback bac = (ByteArrayCallback) c;
-            bac.setByteArray(data);
-         }
-         else
-         {
-            throw new UnsupportedCallbackException(c, "Unrecognized Callback");
-         }
-      }
-   }
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.io.IOException;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.TextInputCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.jboss.logging.Logger;
+
+/** An implemeentation of the JAAS CallbackHandler interface that handles
+ NameCallbacks, PasswordCallbac, TextInputCallback and the JBoss
+ ByteArrayCallback
+
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+public class AppCallbackHandler implements CallbackHandler
+{
+   private static final Logger log = Logger.getLogger(AppCallbackHandler.class);
+   
+   private String username;
+   private char[] password;
+   private byte[] data;
+   private String text;
+
+   public AppCallbackHandler(String username, char[] password)
+   {
+      this.username = username;
+      this.password = password;
+   }
+   public AppCallbackHandler(String username, char[] password, byte[] data)
+   {
+      this.username = username;
+      this.password = password;
+      this.data = data;
+   }
+   public AppCallbackHandler(String username, char[] password, byte[] data, String text)
+   {
+      this.username = username;
+      this.password = password;
+      this.data = data;
+      this.text = text;
+   }
+
+   public void handle(Callback[] callbacks) throws
+         IOException, UnsupportedCallbackException
+   {
+      for (int i = 0; i < callbacks.length; i++)
+      {
+         Callback c = callbacks[i];
+ 
+         if( c instanceof NameCallback )
+         {
+            NameCallback nc = (NameCallback) c;
+            nc.setName(username);
+         }
+         else if( c instanceof PasswordCallback )
+         {
+            PasswordCallback pc = (PasswordCallback) c;
+            pc.setPassword(password);
+         }
+         else if( c instanceof TextInputCallback )
+         {
+            TextInputCallback tc = (TextInputCallback) c;
+            tc.setText(text);
+         }
+         else if( c instanceof ByteArrayCallback )
+         {
+            ByteArrayCallback bac = (ByteArrayCallback) c;
+            bac.setByteArray(data);
+         }
+         else
+         {
+            throw new UnsupportedCallbackException(c, "Unrecognized Callback");
+         }
+      }
+   }
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/AppCallbackHandler.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.security.auth.callback.Callback;
-
-/** An implementation of Callback that obtains a binary parameter as a byte[].
- Interpretation of the array is up to the LoginModule.
-
- at author  Scott.Stark at jboss.org
- at version $Revision$
-*/
-public class ByteArrayCallback implements Callback
-{
-    private transient String prompt;
-    private transient byte[] data;
-
-    /** Initialize the SecurityAssociationCallback
-    */
-    public ByteArrayCallback(String prompt)
-    {
-        this.prompt = prompt;
-    }
-
-    public String getPrompt()
-    {
-        return prompt;
-    }
-    public byte[] getByteArray()
-    {
-        return data;
-    }
-    public void setByteArray(byte[] data)
-    {
-        this.data = data;
-    }
-    public void clearByteArray()
-    {
-        this.data = null;
-    }
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.security.auth.callback.Callback;
+
+/** An implementation of Callback that obtains a binary parameter as a byte[].
+ Interpretation of the array is up to the LoginModule.
+
+ at author  Scott.Stark at jboss.org
+ at version $Revision$
+*/
+public class ByteArrayCallback implements Callback
+{
+    private transient String prompt;
+    private transient byte[] data;
+
+    /** Initialize the SecurityAssociationCallback
+    */
+    public ByteArrayCallback(String prompt)
+    {
+        this.prompt = prompt;
+    }
+
+    public String getPrompt()
+    {
+        return prompt;
+    }
+    public byte[] getByteArray()
+    {
+        return data;
+    }
+    public void setByteArray(byte[] data)
+    {
+        this.data = data;
+    }
+    public void clearByteArray()
+    {
+        this.data = null;
+    }
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/ByteArrayCallback.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/** A session interface used to test 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */ 
-public interface CalledSession
-{
-   /** This method should call echo on a StatelessSessionLocal */
-   public String invokeEcho(String arg);
-   /** This method should call invokeEcho on another CalledSession */
-   public String callEcho();
-   /**
-    * A method that does nothing but is not assiged a
-    * method-permission in the ejb-jar.xml descriptor
-    */
-   public void noop();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/** A session interface used to test 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */ 
+public interface CalledSession
+{
+   /** This method should call echo on a StatelessSessionLocal */
+   public String invokeEcho(String arg);
+   /** This method should call invokeEcho on another CalledSession */
+   public String callEcho();
+   /**
+    * A method that does nothing but is not assiged a
+    * method-permission in the ejb-jar.xml descriptor
+    */
+   public void noop();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSession.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.EJBLocalObject;
-
-/** A session interface used to test 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */ 
-public interface CalledSessionLocal
-{
-   /** This method should call invokeEcho on a CalledSession */
-   public String callLocalEcho(String arg);
-   /** Calls StatelessSessionLocal.echo */
-   public String invokeEcho(String arg);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.EJBLocalObject;
+
+/** A session interface used to test 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */ 
+public interface CalledSessionLocal
+{
+   /** This method should call invokeEcho on a CalledSession */
+   public String callLocalEcho(String arg);
+   /** Calls StatelessSessionLocal.echo */
+   public String invokeEcho(String arg);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalledSessionLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.CreateException;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
-import javax.annotation.security.RolesAllowed;
-
-/** A simple session bean that is called by the CallerBean to test
- run-as identity and role propagation.
- 
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
- at Stateless(name="CalleeBean")
- at Local(org.jboss.ejb3.test.security.StatelessSessionLocal.class)
- at Remote(org.jboss.ejb3.test.security.StatelessSessionLocal.class)
- at LocalBinding(jndiBinding = "spec.CalleeBean")
- at RemoteBinding(jndiBinding = "spec.CalleeBeanRemote")
- at SecurityDomain("spec-test")
-public class CalleeBean
-{
-   private static Logger log = Logger.getLogger(CalleeBean.class);
-   
-   @Resource SessionContext sessionContext;
-
-   @RolesAllowed({"Echo"})
-   public String echo(String arg)
-   {
-      log.info("------------ CalleeBean.echo");
-      log.info("echo, arg="+arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.info("echo, callerPrincipal="+p);
-      boolean isCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole('Echo')="+isCaller);
-      isCaller = sessionContext.isCallerInRole("InternalRole");
-      log.info("echo, isCallerInRole('InternalRole')="+isCaller);
-      
-      log.info("------------ CalleeBean.echo done");
-      return arg;
-   }
-
-   public void noop()
-   {
-      log.info("noop");
-   }   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.CreateException;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+
+import javax.annotation.security.RolesAllowed;
+
+/** A simple session bean that is called by the CallerBean to test
+ run-as identity and role propagation.
+ 
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+ at Stateless(name="CalleeBean")
+ at Local(org.jboss.ejb3.test.security.StatelessSessionLocal.class)
+ at Remote(org.jboss.ejb3.test.security.StatelessSessionLocal.class)
+ at LocalBinding(jndiBinding = "spec.CalleeBean")
+ at RemoteBinding(jndiBinding = "spec.CalleeBeanRemote")
+ at SecurityDomain("spec-test")
+public class CalleeBean
+{
+   private static Logger log = Logger.getLogger(CalleeBean.class);
+   
+   @Resource SessionContext sessionContext;
+
+   @RolesAllowed({"Echo"})
+   public String echo(String arg)
+   {
+      log.info("------------ CalleeBean.echo");
+      log.info("echo, arg="+arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.info("echo, callerPrincipal="+p);
+      boolean isCaller = sessionContext.isCallerInRole("Echo");
+      log.info("echo, isCallerInRole('Echo')="+isCaller);
+      isCaller = sessionContext.isCallerInRole("InternalRole");
+      log.info("echo, isCallerInRole('InternalRole')="+isCaller);
+      
+      log.info("------------ CalleeBean.echo done");
+      return arg;
+   }
+
+   public void noop()
+   {
+      log.info("noop");
+   }   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,153 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-
-/**
- * A simple session bean that calls the CalleeBean
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless(name="CallerBean")
- at Remote(CalledSession.class)
- at RemoteBinding(jndiBinding = "spec.CallerBean")
- at RunAs("InternalRole")
- at RolesAllowed({"Echo"})
- at SecurityDomain("spec-test")
-public class CallerBean implements CalledSession
-{
-   private static Logger log = Logger.getLogger(CallerBean.class);
-   @Resource  SessionContext sessionContext;
-
-   /**
-    * This method calls echo on a StatelessSessionLocal and asserts that the
-    * caller is in the EchoCaller role.
-    */
-   public String invokeEcho(String arg)
-   {
-      log.info("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.info("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
-      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
-      log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
-      
-      if (isEchoCaller == false && isInternalRole == false)
-         throw new SecurityException("isEchoCaller == false && isInternalRole == false");
-    
-      try
-      {
-         InitialContext ic = new InitialContext();
-     //    StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/ejb/Callee");
-         
-         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup("spec.CalleeBeanRemote");
-         
-         String echo2 = localBean.echo(arg);
-         log.info("echo#1, callee.echo=" + echo2);
-     //    echo2 = localBean.echo(arg);
-     //    log.info("echo#2, callee.echo=" + echo2);
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.echo", e);
-         throw new EJBException("Failed to invoke Callee.echo", e);
-      }
-
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
-      isInternalRole = sessionContext.isCallerInRole("InternalRole");
-      log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
-
-      if (isEchoCaller == false && isInternalRole == false)
-         throw new SecurityException("isEchoCaller == false && isInternalRole == false post calls");
-      
-      return arg;
-   }
-
-   /**
-    * This method should call invokeEcho on another CalledSession
-    */
-   public String callEcho()
-   {
-      try
-      {
-         InitialContext ic = new InitialContext();
-       
-         CalledSession bean = (CalledSession)ic.lookup(Container.ENC_CTX_NAME + "/env/ejb/Caller2");
-         String echo = bean.invokeEcho("Level1");
-         log.info("echo, callee.invokeEcho=" + echo);
-         
-         String principal = sessionContext.getCallerPrincipal().getName();
-         return principal;
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
-      }
-
-   }
-
-   /**
-    * This method should call invokeEcho on a CalledSession
-    */
-   public String callLocalEcho(String arg)
-   {
-      try
-      {
-         InitialContext ic = new InitialContext();
-         Context enc = (Context) ic.lookup("java:comp/env");
-         CalledSessionLocal bean = (CalledSessionLocal)enc.lookup("ejb/Caller");
-         String echo2 = bean.invokeEcho(arg + "Level1");
-         log.info("echo, callee.invokeEcho=" + echo2);
-         return echo2;
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
-      }
-   }
-
-   public void noop()
-   {
-      log.info("noop");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,153 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.RunAs;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+
+/**
+ * A simple session bean that calls the CalleeBean
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless(name="CallerBean")
+ at Remote(CalledSession.class)
+ at RemoteBinding(jndiBinding = "spec.CallerBean")
+ at RunAs("InternalRole")
+ at RolesAllowed({"Echo"})
+ at SecurityDomain("spec-test")
+public class CallerBean implements CalledSession
+{
+   private static Logger log = Logger.getLogger(CallerBean.class);
+   @Resource  SessionContext sessionContext;
+
+   /**
+    * This method calls echo on a StatelessSessionLocal and asserts that the
+    * caller is in the EchoCaller role.
+    */
+   public String invokeEcho(String arg)
+   {
+      log.info("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.info("echo, callerPrincipal=" + p);
+      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
+      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
+      log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
+      
+      if (isEchoCaller == false && isInternalRole == false)
+         throw new SecurityException("isEchoCaller == false && isInternalRole == false");
+    
+      try
+      {
+         InitialContext ic = new InitialContext();
+     //    StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/ejb/Callee");
+         
+         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup("spec.CalleeBeanRemote");
+         
+         String echo2 = localBean.echo(arg);
+         log.info("echo#1, callee.echo=" + echo2);
+     //    echo2 = localBean.echo(arg);
+     //    log.info("echo#2, callee.echo=" + echo2);
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.echo", e);
+         throw new EJBException("Failed to invoke Callee.echo", e);
+      }
+
+      isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
+      isInternalRole = sessionContext.isCallerInRole("InternalRole");
+      log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
+
+      if (isEchoCaller == false && isInternalRole == false)
+         throw new SecurityException("isEchoCaller == false && isInternalRole == false post calls");
+      
+      return arg;
+   }
+
+   /**
+    * This method should call invokeEcho on another CalledSession
+    */
+   public String callEcho()
+   {
+      try
+      {
+         InitialContext ic = new InitialContext();
+       
+         CalledSession bean = (CalledSession)ic.lookup(Container.ENC_CTX_NAME + "/env/ejb/Caller2");
+         String echo = bean.invokeEcho("Level1");
+         log.info("echo, callee.invokeEcho=" + echo);
+         
+         String principal = sessionContext.getCallerPrincipal().getName();
+         return principal;
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
+      }
+
+   }
+
+   /**
+    * This method should call invokeEcho on a CalledSession
+    */
+   public String callLocalEcho(String arg)
+   {
+      try
+      {
+         InitialContext ic = new InitialContext();
+         Context enc = (Context) ic.lookup("java:comp/env");
+         CalledSessionLocal bean = (CalledSessionLocal)enc.lookup("ejb/Caller");
+         String echo2 = bean.invokeEcho(arg + "Level1");
+         log.info("echo, callee.invokeEcho=" + echo2);
+         return echo2;
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
+      }
+   }
+
+   public void noop()
+   {
+      log.info("noop");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,152 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-
-/**
- * A simple session bean that calls the CalleeBean
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless(name="CallerBean2")
- at Remote(CalledSession.class)
- at RemoteBinding(jndiBinding = "spec.Level2CallerBean")
- at RolesAllowed({"InternalRole"})
- at SecurityDomain("spec-test")
- at EJBs({@EJB(name="Callee", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
-public class CallerBean2 implements CalledSession
-{
-   private static Logger log = Logger.getLogger(CallerBean2.class);
-   @Resource  SessionContext sessionContext;
-
-   /**
-    * This method calls echo on a StatelessSessionLocal and asserts that the
-    * caller is in the EchoCaller role.
-    */
-   public String invokeEcho(String arg)
-   {
-      log.info("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.info("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
-      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
-      log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
-
-      if (isEchoCaller == false && isInternalRole == false)
-         throw new SecurityException("isEchoCaller == false && isInternalRole == false");
-      try
-      {
-         InitialContext ic = new InitialContext();
-         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup("spec.CalleeBean"); //Container.ENC_CTX_NAME + "/env/ejb/Callee");
-     //    String echo2 = localBean.echo(arg);
-    //     log.info("echo#1, callee.echo=" + echo2);
-    //     echo2 = localBean.echo(arg);
-    //     log.info("echo#2, callee.echo=" + echo2);
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.echo", e);
-         throw new EJBException("Failed to invoke Callee.echo", e);
-      }
-
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
-      isInternalRole = sessionContext.isCallerInRole("InternalRole");
-      log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
-
-      if (isEchoCaller == false && isInternalRole == false)
-         throw new SecurityException("isEchoCaller == false && isInternalRole == false post calls ");
-
-      return arg;
-   }
-
-   /**
-    * This method should call invokeEcho on another CalledSession
-    */
-   public String callEcho()
-   {
-      try
-      {
-         InitialContext ic = new InitialContext();
-       
-         javax.naming.NamingEnumeration list = ic.list(Container.ENC_CTX_NAME + "/env/ejb");
-     
-         CalledSession bean = (CalledSession)ic.lookup(Container.ENC_CTX_NAME + "/env/ejb/Caller");
-         String echo = bean.invokeEcho("Level2");
-         log.info("echo, callee.invokeEcho=" + echo);
-         
-         String principal = sessionContext.getCallerPrincipal().getName();
-         return principal;
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
-      }
-
-   }
-
-   /**
-    * This method should call invokeEcho on a CalledSession
-    */
-   public String callLocalEcho(String arg)
-   {
-      try
-      {
-         InitialContext ic = new InitialContext();
-         Context enc = (Context) ic.lookup("java:comp/env");
-         CalledSessionLocal bean = (CalledSessionLocal)enc.lookup("ejb/Caller");
-         String echo2 = bean.invokeEcho(arg + "Level1");
-         log.info("echo, callee.invokeEcho=" + echo2);
-         return echo2;
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
-      }
-   }
-
-   public void noop()
-   {
-      log.info("noop");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+
+/**
+ * A simple session bean that calls the CalleeBean
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless(name="CallerBean2")
+ at Remote(CalledSession.class)
+ at RemoteBinding(jndiBinding = "spec.Level2CallerBean")
+ at RolesAllowed({"InternalRole"})
+ at SecurityDomain("spec-test")
+ at EJBs({@EJB(name="Callee", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
+public class CallerBean2 implements CalledSession
+{
+   private static Logger log = Logger.getLogger(CallerBean2.class);
+   @Resource  SessionContext sessionContext;
+
+   /**
+    * This method calls echo on a StatelessSessionLocal and asserts that the
+    * caller is in the EchoCaller role.
+    */
+   public String invokeEcho(String arg)
+   {
+      log.info("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.info("echo, callerPrincipal=" + p);
+      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
+      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
+      log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
+
+      if (isEchoCaller == false && isInternalRole == false)
+         throw new SecurityException("isEchoCaller == false && isInternalRole == false");
+      try
+      {
+         InitialContext ic = new InitialContext();
+         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup("spec.CalleeBean"); //Container.ENC_CTX_NAME + "/env/ejb/Callee");
+     //    String echo2 = localBean.echo(arg);
+    //     log.info("echo#1, callee.echo=" + echo2);
+    //     echo2 = localBean.echo(arg);
+    //     log.info("echo#2, callee.echo=" + echo2);
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.echo", e);
+         throw new EJBException("Failed to invoke Callee.echo", e);
+      }
+
+      isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
+      isInternalRole = sessionContext.isCallerInRole("InternalRole");
+      log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
+
+      if (isEchoCaller == false && isInternalRole == false)
+         throw new SecurityException("isEchoCaller == false && isInternalRole == false post calls ");
+
+      return arg;
+   }
+
+   /**
+    * This method should call invokeEcho on another CalledSession
+    */
+   public String callEcho()
+   {
+      try
+      {
+         InitialContext ic = new InitialContext();
+       
+         javax.naming.NamingEnumeration list = ic.list(Container.ENC_CTX_NAME + "/env/ejb");
+     
+         CalledSession bean = (CalledSession)ic.lookup(Container.ENC_CTX_NAME + "/env/ejb/Caller");
+         String echo = bean.invokeEcho("Level2");
+         log.info("echo, callee.invokeEcho=" + echo);
+         
+         String principal = sessionContext.getCallerPrincipal().getName();
+         return principal;
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
+      }
+
+   }
+
+   /**
+    * This method should call invokeEcho on a CalledSession
+    */
+   public String callLocalEcho(String arg)
+   {
+      try
+      {
+         InitialContext ic = new InitialContext();
+         Context enc = (Context) ic.lookup("java:comp/env");
+         CalledSessionLocal bean = (CalledSessionLocal)enc.lookup("ejb/Caller");
+         String echo2 = bean.invokeEcho(arg + "Level1");
+         log.info("echo, callee.invokeEcho=" + echo2);
+         return echo2;
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
+      }
+   }
+
+   public void noop()
+   {
+      log.info("noop");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,114 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-
-/**
- * A simple session bean that calls the CalleeBean
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless(name="CallerFacadeBean-testRunAsSFSB")
- at Remote(org.jboss.ejb3.test.security.CalledSession.class)
- at RemoteBinding(jndiBinding = "spec.CallerFacadeBean-testRunAsSFSB")
- at SecurityDomain("spec-test")
- at RolesAllowed({"Echo"})
- at EJBs({@EJB(name="CalledSessionLocal", beanInterface=org.jboss.ejb3.test.security.CalledSessionLocal.class, beanName="CallerFacadeTargetSFSB")})
-public class CallerFacadeBean 
-{
-   private static Logger log = Logger.getLogger(CallerFacadeBean.class);
-   @Resource SessionContext sessionContext;
-
-   /**
-    * This method calls echo on a StatelessSessionLocal and asserts that the
-    * caller is in the EchoCaller role.
-    */
-   public String invokeEcho(String arg)
-   {
-      log.debug("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
-      log.debug("echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
-      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
-      log.debug("echo, isCallerInRole('InternalRole')=" + isInternalRole);
-
-      try
-      {
-         InitialContext ic = new InitialContext();
-         CalledSessionLocal localBean = (CalledSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/CalledSessionLocal");
-         String echo2 = localBean.invokeEcho(arg);
-         log.debug("echo#1, callee.invokeEcho=" + echo2);
-         echo2 = localBean.invokeEcho(arg);
-         log.debug("echo#2, callee.invokeEcho=" + echo2);
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         log.error("Failed to invoke CalledSession.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.echo", e);
-      }
-      return arg;
-   }
-
-   /**
-    * This method should call invokeEcho on another CalledSession
-    */
-   public void callEcho()
-   {
-      try
-      {
-         InitialContext ic = new InitialContext();
-         CalledSessionLocal bean = (CalledSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/CalledSessionLocal");
-         bean.callLocalEcho("callEcho#2");
-         log.debug("echo, callee.callLocalEcho#1");
-         bean.callLocalEcho("callEcho#2");
-         log.debug("echo, callee.callLocalEcho#2");
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
-      }
-
-   }
-
-   public void noop()
-   {
-      log.debug("noop");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+
+/**
+ * A simple session bean that calls the CalleeBean
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless(name="CallerFacadeBean-testRunAsSFSB")
+ at Remote(org.jboss.ejb3.test.security.CalledSession.class)
+ at RemoteBinding(jndiBinding = "spec.CallerFacadeBean-testRunAsSFSB")
+ at SecurityDomain("spec-test")
+ at RolesAllowed({"Echo"})
+ at EJBs({@EJB(name="CalledSessionLocal", beanInterface=org.jboss.ejb3.test.security.CalledSessionLocal.class, beanName="CallerFacadeTargetSFSB")})
+public class CallerFacadeBean 
+{
+   private static Logger log = Logger.getLogger(CallerFacadeBean.class);
+   @Resource SessionContext sessionContext;
+
+   /**
+    * This method calls echo on a StatelessSessionLocal and asserts that the
+    * caller is in the EchoCaller role.
+    */
+   public String invokeEcho(String arg)
+   {
+      log.debug("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("echo, callerPrincipal=" + p);
+      boolean isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.debug("echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
+      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
+      log.debug("echo, isCallerInRole('InternalRole')=" + isInternalRole);
+
+      try
+      {
+         InitialContext ic = new InitialContext();
+         CalledSessionLocal localBean = (CalledSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/CalledSessionLocal");
+         String echo2 = localBean.invokeEcho(arg);
+         log.debug("echo#1, callee.invokeEcho=" + echo2);
+         echo2 = localBean.invokeEcho(arg);
+         log.debug("echo#2, callee.invokeEcho=" + echo2);
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         log.error("Failed to invoke CalledSession.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.echo", e);
+      }
+      return arg;
+   }
+
+   /**
+    * This method should call invokeEcho on another CalledSession
+    */
+   public void callEcho()
+   {
+      try
+      {
+         InitialContext ic = new InitialContext();
+         CalledSessionLocal bean = (CalledSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/CalledSessionLocal");
+         bean.callLocalEcho("callEcho#2");
+         log.debug("echo, callee.callLocalEcho#1");
+         bean.callLocalEcho("callEcho#2");
+         log.debug("echo, callee.callLocalEcho#2");
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
+      }
+
+   }
+
+   public void noop()
+   {
+      log.debug("noop");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,87 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.EntityContext;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.security.auth.Subject;
-
-/** A BMP entity bean that creates beans on the fly with
-a key equal to that passed to findByPrimaryKey. Obviously
-not a real entity bean. It is used to test Principal propagation
-using the echo method. 
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
- at Entity
- at Table(name = "ENTITY_BEAN")     
-public class EntityBean
-{
-   org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
-   
-    private Long key;
-   
-    @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
-    public Long getKey()
-    {
-       return key;
-    }
-    
-    public void setKey(Long key)
-    {
-       this.key = key;
-    }
-
-    public String echo(String arg)
-    {
-        log.debug("EntityBean.echo, arg="+arg);
-        // Check the java:comp/env/security/security-domain
-        try
-        {
-           InitialContext ctx = new InitialContext();
-           Object securityMgr = ctx.lookup("java:comp/env/security/security-domain");
-           log.debug("Checking java:comp/env/security/security-domain");
-           if( securityMgr == null )
-              throw new EJBException("Failed to find security mgr under: java:comp/env/security/security-domain");
-           log.debug("Found SecurityManager: "+securityMgr);
-           Subject activeSubject = (Subject) ctx.lookup("java:comp/env/security/subject");
-           log.debug("ActiveSubject: "+activeSubject);
-        }
-        catch(NamingException e)
-        {
-           log.debug("failed", e);
-           throw new EJBException("Naming exception: "+e.toString(true));
-        }
-        return null;
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.EntityContext;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.security.auth.Subject;
+
+/** A BMP entity bean that creates beans on the fly with
+a key equal to that passed to findByPrimaryKey. Obviously
+not a real entity bean. It is used to test Principal propagation
+using the echo method. 
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$
+*/
+ at Entity
+ at Table(name = "ENTITY_BEAN")     
+public class EntityBean
+{
+   org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
+   
+    private Long key;
+   
+    @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
+    public Long getKey()
+    {
+       return key;
+    }
+    
+    public void setKey(Long key)
+    {
+       this.key = key;
+    }
+
+    public String echo(String arg)
+    {
+        log.debug("EntityBean.echo, arg="+arg);
+        // Check the java:comp/env/security/security-domain
+        try
+        {
+           InitialContext ctx = new InitialContext();
+           Object securityMgr = ctx.lookup("java:comp/env/security/security-domain");
+           log.debug("Checking java:comp/env/security/security-domain");
+           if( securityMgr == null )
+              throw new EJBException("Failed to find security mgr under: java:comp/env/security/security-domain");
+           log.debug("Found SecurityManager: "+securityMgr);
+           Subject activeSubject = (Subject) ctx.lookup("java:comp/env/security/subject");
+           log.debug("ActiveSubject: "+activeSubject);
+        }
+        catch(NamingException e)
+        {
+           log.debug("failed", e);
+           throw new EJBException("Naming exception: "+e.toString(true));
+        }
+        return null;
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/EntityBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,100 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
-import javax.naming.InitialContext;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-
-/**
- * A simple session bean that calls the CalleeBean
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateful(name="CallerFacadeTargetSFSB")
- at Local(org.jboss.ejb3.test.security.CalledSessionLocal.class)
- at Remote(org.jboss.ejb3.test.security.CalledSession.class)
- at RemoteBinding(jndiBinding="spec.CallerFacadeTargetSFSB")
- at SecurityDomain("spec-test")
- at EJBs({@EJB(name="StatelessSessionLocal", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
-public class FacadeTargetBean
-{
-   private static Logger log = Logger.getLogger(FacadeTargetBean.class);
-   @Resource SessionContext sessionContext;
-
-   /**
-    * This method calls echo on a StatelessSessionLocal and asserts that the
-    * caller is in the EchoCaller role.
-    */
-   public String invokeEcho(String arg)
-   {
-      log.debug("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.debug("echo, isCallerInRole('Echo')=" + isEchoCaller);
-
-      if (isEchoCaller == false)
-         throw new SecurityException("isEchoCaller == false");
-      try
-      {
-         InitialContext ic = new InitialContext();
-         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/StatelessSessionLocal");
-         String echo2 = localBean.echo(arg);
-         log.debug("echo#1, callee.echo=" + echo2);
-         echo2 = localBean.echo(arg);
-         log.debug("echo#2, callee.echo=" + echo2);
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.echo", e);
-         throw new EJBException("Failed to invoke Callee.echo", e);
-      }
-
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.debug("echo, post calls isCallerInRole('Echo')=" + isEchoCaller);
-      if (isEchoCaller == false)
-         throw new SecurityException("isEchoCaller == false post calls");
-
-      return arg;
-   }
-
-   /**
-    * Unused
-    */
-   public String callLocalEcho(String arg)
-   {
-      return arg;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+import javax.naming.InitialContext;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+
+/**
+ * A simple session bean that calls the CalleeBean
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateful(name="CallerFacadeTargetSFSB")
+ at Local(org.jboss.ejb3.test.security.CalledSessionLocal.class)
+ at Remote(org.jboss.ejb3.test.security.CalledSession.class)
+ at RemoteBinding(jndiBinding="spec.CallerFacadeTargetSFSB")
+ at SecurityDomain("spec-test")
+ at EJBs({@EJB(name="StatelessSessionLocal", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
+public class FacadeTargetBean
+{
+   private static Logger log = Logger.getLogger(FacadeTargetBean.class);
+   @Resource SessionContext sessionContext;
+
+   /**
+    * This method calls echo on a StatelessSessionLocal and asserts that the
+    * caller is in the EchoCaller role.
+    */
+   public String invokeEcho(String arg)
+   {
+      log.debug("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("echo, callerPrincipal=" + p);
+      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.debug("echo, isCallerInRole('Echo')=" + isEchoCaller);
+
+      if (isEchoCaller == false)
+         throw new SecurityException("isEchoCaller == false");
+      try
+      {
+         InitialContext ic = new InitialContext();
+         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/StatelessSessionLocal");
+         String echo2 = localBean.echo(arg);
+         log.debug("echo#1, callee.echo=" + echo2);
+         echo2 = localBean.echo(arg);
+         log.debug("echo#2, callee.echo=" + echo2);
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.echo", e);
+         throw new EJBException("Failed to invoke Callee.echo", e);
+      }
+
+      isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.debug("echo, post calls isCallerInRole('Echo')=" + isEchoCaller);
+      if (isEchoCaller == false)
+         throw new SecurityException("isEchoCaller == false post calls");
+
+      return arg;
+   }
+
+   /**
+    * Unused
+    */
+   public String callLocalEcho(String arg)
+   {
+      return arg;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.EJBObject;
-import java.rmi.RemoteException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface JobDAO
-{
-    /** A method that returns its arg */
-    public void foo();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.EJBObject;
+import java.rmi.RemoteException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface JobDAO
+{
+    /** A method that returns its arg */
+    public void foo();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAO.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.annotation.security.RolesAllowed;
-
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.security.SecurityDomain;
-
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-
- at Stateful 
- at TransactionManagement(TransactionManagementType.BEAN) 
- at SecurityDomain("security-web") 
- at RolesAllowed(value = { "Echo" }) 
-public class JobDAOBean implements JobDAO
-{ 
-
-    public void foo()
-    {
-       
-    }
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.annotation.security.RolesAllowed;
+
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.security.SecurityDomain;
+
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+
+ at Stateful 
+ at TransactionManagement(TransactionManagementType.BEAN) 
+ at SecurityDomain("security-web") 
+ at RolesAllowed(value = { "Echo" }) 
+public class JobDAOBean implements JobDAO
+{ 
+
+    public void foo()
+    {
+       
+    }
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,152 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-
-/**
- * A simple session bean that calls the CalleeBean
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless(name="Level1CallerBean")
- at Remote(CalledSession.class)
- at RemoteBinding(jndiBinding = "spec.Level1CallerBean")
- at RunAs("InternalRole")
- at RolesAllowed({"Echo"})
- at SecurityDomain("spec-test")
- at EJBs({@EJB(name="Caller2", beanInterface=org.jboss.ejb3.test.security.CalledSession.class, beanName="CallerBean2"),
-   @EJB(name="Callee", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
-public class Level1CallerBean implements CalledSession
-{
-   private static Logger log = Logger.getLogger(Level1CallerBean.class);
-   @Resource  SessionContext sessionContext;
-
-   /**
-    * This method calls echo on a StatelessSessionLocal and asserts that the
-    * caller is in the EchoCaller role.
-    */
-   public String invokeEcho(String arg)
-   {
-      log.info("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.info("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
-      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
-      log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
-      
-      if (isEchoCaller == false && isInternalRole == false)
-         throw new SecurityException("isEchoCaller == false && isInternalRole == false");
-    
-      try
-      {
-         InitialContext ic = new InitialContext();
-         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/Callee");
-         String echo2 = localBean.echo(arg);
-         log.info("echo#1, callee.echo=" + echo2);
-         echo2 = localBean.echo(arg);
-         log.info("echo#2, callee.echo=" + echo2);
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.echo", e);
-         throw new EJBException("Failed to invoke Callee.echo", e);
-      }
-
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
-      isInternalRole = sessionContext.isCallerInRole("InternalRole");
-      log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
-
-      if (isEchoCaller == false && isInternalRole == false)
-         throw new SecurityException("isEchoCaller == false && isInternalRole == false post calls");
-      
-      return arg;
-   }
-
-   /**
-    * This method should call invokeEcho on another CalledSession
-    */
-   public String callEcho()
-   {
-      try
-      {
-         InitialContext ic = new InitialContext();
-       
-         CalledSession bean = (CalledSession)ic.lookup(Container.ENC_CTX_NAME + "/env/Caller2");
-         String echo = bean.invokeEcho("Level1");
-         log.info("echo, callee.invokeEcho=" + echo);
-         
-         String principal = sessionContext.getCallerPrincipal().getName();
-         return principal;
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
-      }
-
-   }
-
-   /**
-    * This method should call invokeEcho on a CalledSession
-    */
-   public String callLocalEcho(String arg)
-   {
-      try
-      {
-         InitialContext ic = new InitialContext();
-         Context enc = (Context) ic.lookup("java:comp/env");
-         CalledSessionLocal bean = (CalledSessionLocal)enc.lookup("ejb/Caller");
-         String echo2 = bean.invokeEcho(arg + "Level1");
-         log.info("echo, callee.invokeEcho=" + echo2);
-         return echo2;
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to invoke Callee.invokeEcho", e);
-         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
-      }
-   }
-
-   public void noop()
-   {
-      log.info("noop");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.RunAs;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+
+/**
+ * A simple session bean that calls the CalleeBean
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless(name="Level1CallerBean")
+ at Remote(CalledSession.class)
+ at RemoteBinding(jndiBinding = "spec.Level1CallerBean")
+ at RunAs("InternalRole")
+ at RolesAllowed({"Echo"})
+ at SecurityDomain("spec-test")
+ at EJBs({@EJB(name="Caller2", beanInterface=org.jboss.ejb3.test.security.CalledSession.class, beanName="CallerBean2"),
+   @EJB(name="Callee", beanInterface=org.jboss.ejb3.test.security.StatelessSessionLocal.class, beanName="CalleeBean")})
+public class Level1CallerBean implements CalledSession
+{
+   private static Logger log = Logger.getLogger(Level1CallerBean.class);
+   @Resource  SessionContext sessionContext;
+
+   /**
+    * This method calls echo on a StatelessSessionLocal and asserts that the
+    * caller is in the EchoCaller role.
+    */
+   public String invokeEcho(String arg)
+   {
+      log.info("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.info("echo, callerPrincipal=" + p);
+      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
+      boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
+      log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
+      
+      if (isEchoCaller == false && isInternalRole == false)
+         throw new SecurityException("isEchoCaller == false && isInternalRole == false");
+    
+      try
+      {
+         InitialContext ic = new InitialContext();
+         StatelessSessionLocal localBean = (StatelessSessionLocal)ic.lookup(Container.ENC_CTX_NAME + "/env/Callee");
+         String echo2 = localBean.echo(arg);
+         log.info("echo#1, callee.echo=" + echo2);
+         echo2 = localBean.echo(arg);
+         log.info("echo#2, callee.echo=" + echo2);
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.echo", e);
+         throw new EJBException("Failed to invoke Callee.echo", e);
+      }
+
+      isEchoCaller = sessionContext.isCallerInRole("Echo");
+      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
+      isInternalRole = sessionContext.isCallerInRole("InternalRole");
+      log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
+
+      if (isEchoCaller == false && isInternalRole == false)
+         throw new SecurityException("isEchoCaller == false && isInternalRole == false post calls");
+      
+      return arg;
+   }
+
+   /**
+    * This method should call invokeEcho on another CalledSession
+    */
+   public String callEcho()
+   {
+      try
+      {
+         InitialContext ic = new InitialContext();
+       
+         CalledSession bean = (CalledSession)ic.lookup(Container.ENC_CTX_NAME + "/env/Caller2");
+         String echo = bean.invokeEcho("Level1");
+         log.info("echo, callee.invokeEcho=" + echo);
+         
+         String principal = sessionContext.getCallerPrincipal().getName();
+         return principal;
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
+      }
+
+   }
+
+   /**
+    * This method should call invokeEcho on a CalledSession
+    */
+   public String callLocalEcho(String arg)
+   {
+      try
+      {
+         InitialContext ic = new InitialContext();
+         Context enc = (Context) ic.lookup("java:comp/env");
+         CalledSessionLocal bean = (CalledSessionLocal)enc.lookup("ejb/Caller");
+         String echo2 = bean.invokeEcho(arg + "Level1");
+         log.info("echo, callee.invokeEcho=" + echo2);
+         return echo2;
+      }
+      catch (Exception e)
+      {
+         log.error("Failed to invoke Callee.invokeEcho", e);
+         throw new EJBException("Failed to invoke Callee.invokeEcho", e);
+      }
+   }
+
+   public void noop()
+   {
+      log.info("noop");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
-/** An implmentation of the Session interface that should not
-be accessible by external users.
-
- at author Scott.Stark at jboss.org
- at version $Revision$ 
-*/
- at Stateless(name="PrivateSession")
- at Remote(org.jboss.ejb3.test.security.Session.class)
- at RemoteBinding(jndiBinding = "spec.PrivateSession")
- at SecurityDomain("spec-test")
- at RolesAllowed({"InternalUser"})
-public class PrivateSessionBean
-{
-   @Resource SessionContext sessionContext;
-
-    public String echo(String arg)
-    {
-        System.out.println("PrivateSessionBean.echo, arg="+arg);
-        Principal p = sessionContext.getCallerPrincipal();
-        System.out.println("PrivateSessionBean.echo, callerPrincipal="+p);
-        System.out.println("PrivateSessionBean.echo, isCallerInRole('InternalUser')="+sessionContext.isCallerInRole("InternalUser"));
-        return arg;
-    }
-    public void noop() 
-    {
-        System.out.println("PrivateSessionBean.noop");
-        Principal p = sessionContext.getCallerPrincipal();
-        System.out.println("PrivateSessionBean.noop, callerPrincipal="+p);
-    }
-    public void restricted() 
-    {
-        System.out.println("PrivateSessionBean.restricted");
-        Principal p = sessionContext.getCallerPrincipal();
-        System.out.println("PrivateSessionBean.restricted, callerPrincipal="+p);
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+
+/** An implmentation of the Session interface that should not
+be accessible by external users.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$ 
+*/
+ at Stateless(name="PrivateSession")
+ at Remote(org.jboss.ejb3.test.security.Session.class)
+ at RemoteBinding(jndiBinding = "spec.PrivateSession")
+ at SecurityDomain("spec-test")
+ at RolesAllowed({"InternalUser"})
+public class PrivateSessionBean
+{
+   @Resource SessionContext sessionContext;
+
+    public String echo(String arg)
+    {
+        System.out.println("PrivateSessionBean.echo, arg="+arg);
+        Principal p = sessionContext.getCallerPrincipal();
+        System.out.println("PrivateSessionBean.echo, callerPrincipal="+p);
+        System.out.println("PrivateSessionBean.echo, isCallerInRole('InternalUser')="+sessionContext.isCallerInRole("InternalUser"));
+        return arg;
+    }
+    public void noop() 
+    {
+        System.out.println("PrivateSessionBean.noop");
+        Principal p = sessionContext.getCallerPrincipal();
+        System.out.println("PrivateSessionBean.noop, callerPrincipal="+p);
+    }
+    public void restricted() 
+    {
+        System.out.println("PrivateSessionBean.restricted");
+        Principal p = sessionContext.getCallerPrincipal();
+        System.out.println("PrivateSessionBean.restricted, callerPrincipal="+p);
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-
-/** An implmentation of the Session interface that delegates its
-echo method call to the PrivateSession bean to test run-as.
-
- at author Scott.Stark at jboss.org
- at version $Revision$ 
-*/
- at Stateless(name="PublicSession")
- at Remote(org.jboss.ejb3.test.security.Session.class)
- at RemoteBinding(jndiBinding = "spec.PublicSession")
- at SecurityDomain("spec-test")
- at RolesAllowed({"Echo"})
- at EJBs({@EJB(name="PrivateSession", beanInterface=org.jboss.ejb3.test.security.Session.class, beanName="PrivateSession")})
-public class PublicSessionBean
-{
-   @Resource SessionContext sessionContext;
-   
-    public String echo(String arg)
-    {
-        System.out.println("PublicSessionBean.echo, arg="+arg);
-        Principal p = sessionContext.getCallerPrincipal();
-        System.out.println("PublicSessionBean.echo, callerPrincipal="+p);
-        System.out.println("PublicSessionBean.echo, isCallerInRole('EchoUser')="+sessionContext.isCallerInRole("EchoUser"));
-        try
-        {
-            InitialContext ctx = new InitialContext();
-			Session bean = (Session) ctx.lookup(Container.ENC_CTX_NAME + "/env/PrivateSession");
-            System.out.println("PublicSessionBean.echo, created PrivateSession");
-            arg = bean.echo(arg);
-        }
-        catch(Exception e)
-        {
-        }
-        return arg;
-    }
-    public void noop()
-    {
-        System.out.println("PublicSessionBean.noop");
-        Principal p = sessionContext.getCallerPrincipal();
-        System.out.println("PublicSessionBean.noop, callerPrincipal="+p);
-    }
-    public void restricted() 
-    {
-        System.out.println("PublicSessionBean.restricted");
-        Principal p = sessionContext.getCallerPrincipal();
-        System.out.println("PublicSessionBean.restricted, callerPrincipal="+p);
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+
+/** An implmentation of the Session interface that delegates its
+echo method call to the PrivateSession bean to test run-as.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$ 
+*/
+ at Stateless(name="PublicSession")
+ at Remote(org.jboss.ejb3.test.security.Session.class)
+ at RemoteBinding(jndiBinding = "spec.PublicSession")
+ at SecurityDomain("spec-test")
+ at RolesAllowed({"Echo"})
+ at EJBs({@EJB(name="PrivateSession", beanInterface=org.jboss.ejb3.test.security.Session.class, beanName="PrivateSession")})
+public class PublicSessionBean
+{
+   @Resource SessionContext sessionContext;
+   
+    public String echo(String arg)
+    {
+        System.out.println("PublicSessionBean.echo, arg="+arg);
+        Principal p = sessionContext.getCallerPrincipal();
+        System.out.println("PublicSessionBean.echo, callerPrincipal="+p);
+        System.out.println("PublicSessionBean.echo, isCallerInRole('EchoUser')="+sessionContext.isCallerInRole("EchoUser"));
+        try
+        {
+            InitialContext ctx = new InitialContext();
+			Session bean = (Session) ctx.lookup(Container.ENC_CTX_NAME + "/env/PrivateSession");
+            System.out.println("PublicSessionBean.echo, created PrivateSession");
+            arg = bean.echo(arg);
+        }
+        catch(Exception e)
+        {
+        }
+        return arg;
+    }
+    public void noop()
+    {
+        System.out.println("PublicSessionBean.noop");
+        Principal p = sessionContext.getCallerPrincipal();
+        System.out.println("PublicSessionBean.noop, callerPrincipal="+p);
+    }
+    public void restricted() 
+    {
+        System.out.println("PublicSessionBean.restricted");
+        Principal p = sessionContext.getCallerPrincipal();
+        System.out.println("PublicSessionBean.restricted, callerPrincipal="+p);
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.rmi.RemoteException;
-import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless(name="PublicSessionFacade")
- at Remote(org.jboss.ejb3.test.security.SessionFacade.class)
- at RemoteBinding(jndiBinding = "spec.PublicSessionFacade")
- at SecurityDomain("spec-test")
- at RolesAllowed({"Echo"})
- at EJBs({@EJB(name="TargetEJB", beanInterface=org.jboss.ejb3.test.security.Session.class, beanName="PublicSession")})
-public class PublicSessionFacade
-{
-   @Resource SessionContext sessionContext;
-   
-   public String callEcho(String arg)
-      throws RemoteException
-   {
-      Principal user = sessionContext.getCallerPrincipal();
-      String echoMsg = null;
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         Session bean = (Session) ctx.lookup(Container.ENC_CTX_NAME + "/env/TargetEJB");
-         echoMsg = bean.echo("Hello, arg="+arg);
-         echoMsg = bean.echo("Hello 2, arg="+arg);
-      }
-      catch (NamingException e)
-      {
-         throw new RemoteException("callEcho failed", e);
-      }
-    
-      return echoMsg;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.rmi.RemoteException;
+import java.security.Principal;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless(name="PublicSessionFacade")
+ at Remote(org.jboss.ejb3.test.security.SessionFacade.class)
+ at RemoteBinding(jndiBinding = "spec.PublicSessionFacade")
+ at SecurityDomain("spec-test")
+ at RolesAllowed({"Echo"})
+ at EJBs({@EJB(name="TargetEJB", beanInterface=org.jboss.ejb3.test.security.Session.class, beanName="PublicSession")})
+public class PublicSessionFacade
+{
+   @Resource SessionContext sessionContext;
+   
+   public String callEcho(String arg)
+      throws RemoteException
+   {
+      Principal user = sessionContext.getCallerPrincipal();
+      String echoMsg = null;
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         Session bean = (Session) ctx.lookup(Container.ENC_CTX_NAME + "/env/TargetEJB");
+         echoMsg = bean.echo("Hello, arg="+arg);
+         echoMsg = bean.echo("Hello 2, arg="+arg);
+      }
+      catch (NamingException e)
+      {
+         throw new RemoteException("callEcho failed", e);
+      }
+    
+      return echoMsg;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.util.Set;
-import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public interface SecurityContext
-{
-   /**
-    * Test that a secured ejb can 
-    * @param expectedRoles
-    */ 
-   public void testDomainInteraction(Set expectedRoles);
-
-   public void nestedInteraction(Set expectedRoles);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.util.Set;
+import java.rmi.RemoteException;
+import javax.ejb.EJBObject;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public interface SecurityContext
+{
+   /**
+    * Test that a secured ejb can 
+    * @param expectedRoles
+    */ 
+   public void testDomainInteraction(Set expectedRoles);
+
+   public void nestedInteraction(Set expectedRoles);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContext.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,106 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.util.Iterator;
-import java.util.Set;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless(name="UserInRoleContextSession")
- at Remote(org.jboss.ejb3.test.security.SecurityContext.class)
- at RemoteBinding(jndiBinding = "spec.UserInRoleContextSession")
- at SecurityDomain("spec-test")
- at RolesAllowed({"Role1", "Role2"})
- at EJBs({@EJB(name="CalledBean", beanInterface=org.jboss.ejb3.test.security.SecurityContext.class, beanName="UserInRoleContextSessionTarget")})
-public class SecurityContextBean implements SecurityContext
-{
-   static Logger log = Logger.getLogger(SecurityContextBean.class);
-   
-   @Resource  SessionContext sessionContext;
-
-   public void testDomainInteraction(Set expectedRoles)
-   {
-      // Validate that caller has the expected roles
-      validateRoles(expectedRoles, true);
-      // Access a bean from another security-domain
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         SecurityContext bean = (SecurityContext)ctx.lookup(Container.ENC_CTX_NAME + "/env/CalledBean");
-         bean.nestedInteraction(expectedRoles);
-      }
-      catch(Exception e)
-      {
-         e.printStackTrace();
-         SecurityException se = new SecurityException("DataSource connection failed");
-         se.initCause(e);
-         throw se;         
-      }
-      // Validate that caller still has the expected roles
-      validateRoles(expectedRoles, true);
-   }
-
-   public void nestedInteraction(Set expectedRoles)
-      throws SecurityException
-   {
-      validateRoles(expectedRoles, false);
-   }
-
-   /**
-    * Validate that the current caller has every role from expectedRoles in the
-    * context isCallerInRole set.
-    * 
-    * @param expectedRoles - Set<String> of the role names
-    * @param isCallerInRoleFlag - Should isCallerInRole return true
-    * @throws SecurityException - thrown if sessionContext.isCallerInRole(name)
-    *    fails for any name in expectedRoles
-    */ 
-   private void validateRoles(Set expectedRoles, boolean isCallerInRoleFlag)
-      throws SecurityException
-   {
-      Iterator names = expectedRoles.iterator();
-      while( names.hasNext() )
-      {
-         String name = (String) names.next();
-         boolean hasRole = sessionContext.isCallerInRole(name);
-         if( hasRole != isCallerInRoleFlag )
-         {
-            throw new SecurityException("Caller does not have role: "+name);
-         }
-      }      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.util.Iterator;
+import java.util.Set;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless(name="UserInRoleContextSession")
+ at Remote(org.jboss.ejb3.test.security.SecurityContext.class)
+ at RemoteBinding(jndiBinding = "spec.UserInRoleContextSession")
+ at SecurityDomain("spec-test")
+ at RolesAllowed({"Role1", "Role2"})
+ at EJBs({@EJB(name="CalledBean", beanInterface=org.jboss.ejb3.test.security.SecurityContext.class, beanName="UserInRoleContextSessionTarget")})
+public class SecurityContextBean implements SecurityContext
+{
+   static Logger log = Logger.getLogger(SecurityContextBean.class);
+   
+   @Resource  SessionContext sessionContext;
+
+   public void testDomainInteraction(Set expectedRoles)
+   {
+      // Validate that caller has the expected roles
+      validateRoles(expectedRoles, true);
+      // Access a bean from another security-domain
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         SecurityContext bean = (SecurityContext)ctx.lookup(Container.ENC_CTX_NAME + "/env/CalledBean");
+         bean.nestedInteraction(expectedRoles);
+      }
+      catch(Exception e)
+      {
+         e.printStackTrace();
+         SecurityException se = new SecurityException("DataSource connection failed");
+         se.initCause(e);
+         throw se;         
+      }
+      // Validate that caller still has the expected roles
+      validateRoles(expectedRoles, true);
+   }
+
+   public void nestedInteraction(Set expectedRoles)
+      throws SecurityException
+   {
+      validateRoles(expectedRoles, false);
+   }
+
+   /**
+    * Validate that the current caller has every role from expectedRoles in the
+    * context isCallerInRole set.
+    * 
+    * @param expectedRoles - Set<String> of the role names
+    * @param isCallerInRoleFlag - Should isCallerInRole return true
+    * @throws SecurityException - thrown if sessionContext.isCallerInRole(name)
+    *    fails for any name in expectedRoles
+    */ 
+   private void validateRoles(Set expectedRoles, boolean isCallerInRoleFlag)
+      throws SecurityException
+   {
+      Iterator names = expectedRoles.iterator();
+      while( names.hasNext() )
+      {
+         String name = (String) names.next();
+         boolean hasRole = sessionContext.isCallerInRole(name);
+         if( hasRole != isCallerInRoleFlag )
+         {
+            throw new SecurityException("Caller does not have role: "+name);
+         }
+      }      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,105 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.rmi.RemoteException;
-import java.util.Iterator;
-import java.util.Set;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at Stateless(name="UserInRoleContextSessionTarget")
- at Remote(org.jboss.ejb3.test.security.SecurityContext.class)
- at RemoteBinding(jndiBinding = "spec.UserInRoleContextSessionTarget")
- at SecurityDomain("spec-test-domain2")
- at PermitAll
-public class SecurityContextTargetBean 
-{
-   static Logger log = Logger.getLogger(SecurityContextTargetBean.class);
-   
-   @Resource  SessionContext sessionContext;
-
-   public void testDomainInteraction(Set expectedRoles)
-   {
-      // Validate that caller has the expected roles
-      validateRoles(expectedRoles, true);
-      // Access a bean from another security-domain
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         SecurityContext bean = (SecurityContext)ctx.lookup(Container.ENC_CTX_NAME + "/env/ejb/CalledBean");
-         bean.nestedInteraction(expectedRoles);
-      }
-      catch(Exception e)
-      {
-         SecurityException se = new SecurityException("DataSource connection failed");
-         se.initCause(e);
-         throw se;         
-      }
-      // Validate that caller still has the expected roles
-      validateRoles(expectedRoles, true);
-   }
-
-   public void nestedInteraction(Set expectedRoles)
-      throws SecurityException
-   {
-      validateRoles(expectedRoles, false);
-   }
-
-   /**
-    * Validate that the current caller has every role from expectedRoles in the
-    * context isCallerInRole set.
-    * 
-    * @param expectedRoles - Set<String> of the role names
-    * @param isCallerInRoleFlag - Should isCallerInRole return true
-    * @throws SecurityException - thrown if sessionContext.isCallerInRole(name)
-    *    fails for any name in expectedRoles
-    */ 
-   private void validateRoles(Set expectedRoles, boolean isCallerInRoleFlag)
-      throws SecurityException
-   {
-      Iterator names = expectedRoles.iterator();
-      while( names.hasNext() )
-      {
-         String name = (String) names.next();
-         boolean hasRole = sessionContext.isCallerInRole(name);
-         if( hasRole != isCallerInRoleFlag )
-         {
-            throw new SecurityException("Caller does not have role: "+name);
-         }
-      }      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.rmi.RemoteException;
+import java.util.Iterator;
+import java.util.Set;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+
+import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at Stateless(name="UserInRoleContextSessionTarget")
+ at Remote(org.jboss.ejb3.test.security.SecurityContext.class)
+ at RemoteBinding(jndiBinding = "spec.UserInRoleContextSessionTarget")
+ at SecurityDomain("spec-test-domain2")
+ at PermitAll
+public class SecurityContextTargetBean 
+{
+   static Logger log = Logger.getLogger(SecurityContextTargetBean.class);
+   
+   @Resource  SessionContext sessionContext;
+
+   public void testDomainInteraction(Set expectedRoles)
+   {
+      // Validate that caller has the expected roles
+      validateRoles(expectedRoles, true);
+      // Access a bean from another security-domain
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         SecurityContext bean = (SecurityContext)ctx.lookup(Container.ENC_CTX_NAME + "/env/ejb/CalledBean");
+         bean.nestedInteraction(expectedRoles);
+      }
+      catch(Exception e)
+      {
+         SecurityException se = new SecurityException("DataSource connection failed");
+         se.initCause(e);
+         throw se;         
+      }
+      // Validate that caller still has the expected roles
+      validateRoles(expectedRoles, true);
+   }
+
+   public void nestedInteraction(Set expectedRoles)
+      throws SecurityException
+   {
+      validateRoles(expectedRoles, false);
+   }
+
+   /**
+    * Validate that the current caller has every role from expectedRoles in the
+    * context isCallerInRole set.
+    * 
+    * @param expectedRoles - Set<String> of the role names
+    * @param isCallerInRoleFlag - Should isCallerInRole return true
+    * @throws SecurityException - thrown if sessionContext.isCallerInRole(name)
+    *    fails for any name in expectedRoles
+    */ 
+   private void validateRoles(Set expectedRoles, boolean isCallerInRoleFlag)
+      throws SecurityException
+   {
+      Iterator names = expectedRoles.iterator();
+      while( names.hasNext() )
+      {
+         String name = (String) names.next();
+         boolean hasRole = sessionContext.isCallerInRole(name);
+         if( hasRole != isCallerInRoleFlag )
+         {
+            throw new SecurityException("Caller does not have role: "+name);
+         }
+      }      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/Session.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/** A simple stateless session bean interface used by the example beans.
-
- at author Scott.Stark at jboss.org
- at version $Revision$ 
-*/
-public interface Session
-{
-    public String echo(String arg);
-    public void noop();
-    public void restricted();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/Session.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/** A simple stateless session bean interface used by the example beans.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$ 
+*/
+public interface Session
+{
+    public String echo(String arg);
+    public void noop();
+    public void restricted();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Session.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/** A simple stateless session bean interface used by the example beans.
-
- at author Scott.Stark at jboss.org
- at version $Revision$ 
-*/
-public interface SessionFacade
-{
-    public String callEcho(String arg);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/** A simple stateless session bean interface used by the example beans.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$ 
+*/
+public interface SessionFacade
+{
+    public String callEcho(String arg);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/SessionFacade.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
- at Stateful
- at Remote(org.jboss.ejb3.test.security.StatefulSession.class)
- at RemoteBinding(jndiBinding = "spec.StatefulSession")
- at RolesAllowed({ "Echo" })
- at SecurityDomain("spec-test")
-public class StatefulBean
-{
-   org.jboss.logging.Logger log = org.jboss.logging.Logger
-         .getLogger(getClass());
-   
-   @Resource SessionContext sessionContext;
-
-   public String echo(String arg)
-   {
-      Principal p = sessionContext.getCallerPrincipal();
-
-      return p.getName();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+
+ at Stateful
+ at Remote(org.jboss.ejb3.test.security.StatefulSession.class)
+ at RemoteBinding(jndiBinding = "spec.StatefulSession")
+ at RolesAllowed({ "Echo" })
+ at SecurityDomain("spec-test")
+public class StatefulBean
+{
+   org.apache.log4j.Logger log = org.apache.log4j.Logger
+         .getLogger(getClass());
+   
+   @Resource SessionContext sessionContext;
+
+   public String echo(String arg)
+   {
+      Principal p = sessionContext.getCallerPrincipal();
+
+      return p.getName();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.EJBObject;
-import java.rmi.RemoteException;
-
-/** 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public interface StatefulSession
-{
-    /** A method that returns its arg */
-    public String echo(String arg);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.EJBObject;
+import java.rmi.RemoteException;
+
+/** 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public interface StatefulSession
+{
+    /** A method that returns its arg */
+    public String echo(String arg);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatefulSession.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-public interface StatelessSession
-{
-    /** A method that returns its arg */
-    public String echo(String arg);
-    /** A method that does nothing but is not assiged a
-     method-permission in the ejb-jar.xml descriptor
-    */
-    public void noop();
-    /** A method that looks up the StatelessSession bean located at
-     java:comp/env/ejb/Session and invokes echo(echoArg) on the
-     bean and returns the result.
-    */
-    public String forward(String echoArg);
-    /** A method that throws a NullPointerException */
-    public void npeError();
-    /** A method that is assigned the method-permission/unchecked tag
-     to allow any authenticated user call the method.
-     */
-    public void unchecked();
-
-    /** A method that is assigned to the exclude-list tag
-     to indicate that no users should be allowed to call it.
-     */
-    public void excluded();
-    
-    public void testGetBusinessObject();
-    
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+public interface StatelessSession
+{
+    /** A method that returns its arg */
+    public String echo(String arg);
+    /** A method that does nothing but is not assiged a
+     method-permission in the ejb-jar.xml descriptor
+    */
+    public void noop();
+    /** A method that looks up the StatelessSession bean located at
+     java:comp/env/ejb/Session and invokes echo(echoArg) on the
+     bean and returns the result.
+    */
+    public String forward(String echoArg);
+    /** A method that throws a NullPointerException */
+    public void npeError();
+    /** A method that is assigned the method-permission/unchecked tag
+     to allow any authenticated user call the method.
+     */
+    public void unchecked();
+
+    /** A method that is assigned to the exclude-list tag
+     to indicate that no users should be allowed to call it.
+     */
+    public void excluded();
+    
+    public void testGetBusinessObject();
+    
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSession.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,127 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
-import org.jboss.logging.Logger;
-
-/** A SessionBean that access the Entity bean to test Principal
-identity propagation.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
- at Stateless(name="StatelessSession")
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.StatelessSession")
- at SecurityDomain("spec-test")
-public class StatelessSessionBean
-{
-   private static final Logger log = Logger
-   .getLogger(StatelessSessionBean.class);
-   
-   @Resource SessionContext sessionContext;
-    
-    public void testGetBusinessObject()
-    {
-       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
-       ss.noop();
-    }
-
-    @RolesAllowed({"Echo"})
-    public String echo(String arg)
-    {
-        log.info("echo, arg="+arg);
-
-        // This call should fail if the bean is not secured
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("echo, callerPrincipal="+p);
-        
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
-            echo = bean.echo(arg);
-        }
-        catch(Exception e)
-        {
-            throw new EJBException("Stateful.echo failed", e);
-        }
-        
-        return echo;
-    }
-
-    public String forward(String echoArg)
-    {
-        log.info("forward, echoArg="+echoArg);
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatelessSession bean = (StatelessSession)ctx.lookup("java:comp/env/ejb/Session");
-            echo = bean.echo(echoArg);
-        }
-        catch(Exception e)
-        {
-            log.info("StatelessSession.echo failed", e);
-            throw new EJBException("StatelessSession.echo failed", e);
-        }
-        return echo;
-    }
-
-    public void noop()
-    {
-        log.info("noop");
-    }
-
-    public void npeError()
-    {
-        log.info("npeError");
-        Object obj = null;
-        obj.toString();
-    }
-    public void unchecked()
-    {
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
-    }
-
-    public void excluded()
-    {
-        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import javax.annotation.security.RolesAllowed;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+
+import org.jboss.logging.Logger;
+
+/** A SessionBean that access the Entity bean to test Principal
+identity propagation.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$
+*/
+ at Stateless(name="StatelessSession")
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.StatelessSession")
+ at SecurityDomain("spec-test")
+public class StatelessSessionBean
+{
+   private static final Logger log = Logger
+   .getLogger(StatelessSessionBean.class);
+   
+   @Resource SessionContext sessionContext;
+    
+    public void testGetBusinessObject()
+    {
+       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
+       ss.noop();
+    }
+
+    @RolesAllowed({"Echo"})
+    public String echo(String arg)
+    {
+        log.info("echo, arg="+arg);
+
+        // This call should fail if the bean is not secured
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("echo, callerPrincipal="+p);
+        
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
+            echo = bean.echo(arg);
+        }
+        catch(Exception e)
+        {
+            throw new EJBException("Stateful.echo failed", e);
+        }
+        
+        return echo;
+    }
+
+    public String forward(String echoArg)
+    {
+        log.info("forward, echoArg="+echoArg);
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatelessSession bean = (StatelessSession)ctx.lookup("java:comp/env/ejb/Session");
+            echo = bean.echo(echoArg);
+        }
+        catch(Exception e)
+        {
+            log.info("StatelessSession.echo failed", e);
+            throw new EJBException("StatelessSession.echo failed", e);
+        }
+        return echo;
+    }
+
+    public void noop()
+    {
+        log.info("noop");
+    }
+
+    public void npeError()
+    {
+        log.info("npeError");
+        Object obj = null;
+        obj.toString();
+    }
+    public void unchecked()
+    {
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
+    }
+
+    public void excluded()
+    {
+        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,126 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
-
-/** A SessionBean that access the Entity bean to test Principal
-identity propagation.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
- at Stateless(name="StatelessSession2")
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.StatelessSession2")
- at RolesAllowed({"Echo"})
- at SecurityDomain("spec-test")
- at EJBs({@EJB(name="Session", beanInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
-public class StatelessSessionBean2
-{
-   private static final Logger log = Logger
-   .getLogger(StatelessSessionBean2.class);
-   
-   @Resource SessionContext sessionContext;
-    
-    public void testGetBusinessObject()
-    {
-       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
-       ss.noop();
-    }
-
-    public String echo(String arg)
-    {
-        log.info("echo, arg="+arg);
- 
-        // This call should fail if the bean is not secured
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("echo, callerPrincipal="+p);
-        
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
-            echo = bean.echo(arg);
-        }
-        catch(Exception e)
-        {
-            throw new EJBException("Stateful.echo failed", e);
-        }
-        
-        return echo;
-    }
-
-    public String forward(String echoArg)
-    {
-        log.info("forward, echoArg="+echoArg);
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatelessSession bean = (StatelessSession)ctx.lookup(Container.ENC_CTX_NAME + "/env/ejb/Session");
-            echo = bean.echo(echoArg);
-        }
-        catch(Exception e)
-        {
-            log.info("StatelessSession.echo failed", e);
-            throw new EJBException("StatelessSession.echo failed", e);
-        }
-        return echo;
-    }
-
-    public void noop()
-    {
-        log.info("noop");
-    }
-
-    public void npeError()
-    {
-        log.info("npeError");
-        Object obj = null;
-        obj.toString();
-    }
-    public void unchecked()
-    {
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
-    }
-
-    public void excluded()
-    {
-        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
+
+/** A SessionBean that access the Entity bean to test Principal
+identity propagation.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$
+*/
+ at Stateless(name="StatelessSession2")
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.StatelessSession2")
+ at RolesAllowed({"Echo"})
+ at SecurityDomain("spec-test")
+ at EJBs({@EJB(name="Session", beanInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
+public class StatelessSessionBean2
+{
+   private static final Logger log = Logger
+   .getLogger(StatelessSessionBean2.class);
+   
+   @Resource SessionContext sessionContext;
+    
+    public void testGetBusinessObject()
+    {
+       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
+       ss.noop();
+    }
+
+    public String echo(String arg)
+    {
+        log.info("echo, arg="+arg);
+ 
+        // This call should fail if the bean is not secured
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("echo, callerPrincipal="+p);
+        
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
+            echo = bean.echo(arg);
+        }
+        catch(Exception e)
+        {
+            throw new EJBException("Stateful.echo failed", e);
+        }
+        
+        return echo;
+    }
+
+    public String forward(String echoArg)
+    {
+        log.info("forward, echoArg="+echoArg);
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatelessSession bean = (StatelessSession)ctx.lookup(Container.ENC_CTX_NAME + "/env/ejb/Session");
+            echo = bean.echo(echoArg);
+        }
+        catch(Exception e)
+        {
+            log.info("StatelessSession.echo failed", e);
+            throw new EJBException("StatelessSession.echo failed", e);
+        }
+        return echo;
+    }
+
+    public void noop()
+    {
+        log.info("noop");
+    }
+
+    public void npeError()
+    {
+        log.info("npeError");
+        Object obj = null;
+        obj.toString();
+    }
+    public void unchecked()
+    {
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
+    }
+
+    public void excluded()
+    {
+        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,131 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.rmi.RemoteException;
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.test.security.StatelessSession;
-import org.jboss.logging.Logger;
-
-
-/** A SessionBean that accesses an Entity bean in its echo() method to test runAs
- identity propagation. It also access its own excluded() method to test that the runAs
- identity is also see on methods of this bean that are invoked through the
- remote interface.
- 
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
- at Stateless
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.RunAsStatelessSession")
- at SecurityDomain("spec-test")
- at RunAs("InternalRole")
-public class StatelessSessionBean3
-{
-   private static final Logger log = Logger
-   .getLogger(StatelessSessionBean3.class);
-   
-   @Resource SessionContext sessionContext;
-   
-   public void testGetBusinessObject()
-   {
-      StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
-      ss.noop();
-   }
-
-   /** This method creates an instance of the entity bean bound under
-    java:comp/env/ejb/Entity and then invokes its echo method. This
-    method should be accessible by user's with a role of Echo, while
-    the Entity bean should only be accessible by the runAs role.
-    */
-   public String echo(String arg)
-   {
-      log.debug("echo, arg="+arg);
-      // This call should fail if the bean is not secured
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("echo, callerPrincipal="+p);
-      return p.getName();
-   }
-   
-   public String forward(String echoArg)
-   {
-      log.debug("forward, echoArg="+echoArg);
-      String echo = null;
-      try
-      {
-         InitialContext ctx = new InitialContext();
-         StatelessSession bean = (StatelessSession) ctx.lookup("java:comp/env/ejb/Session");
-         echo = bean.echo(echoArg);
-      }
-      catch(Exception e)
-      {
-         log.debug("failed", e);
-         throw new EJBException(e);
-      }
-      return echo;
-   }
-   
-   /** This method gets this bean's remote interface and invokes the
-    excluded() method to test that the method is accessed as the
-    runAs role.
-    */
-   public void noop()
-   {
-      log.debug("noop calling excluded...");
-      excluded();
-   }
-   
-   public void npeError()
-   {
-      log.debug("npeError");
-      Object obj = null;
-      obj.toString();
-   }
-   public void unchecked()
-   {
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("StatelessSessionBean.unchecked, callerPrincipal="+p);
-   }
-   
-   /** This method should be assigned access to the runAs role and no user
-    should have this role.
-    */
-   public void excluded()
-   {
-      log.debug("excluded, accessed");
-      // This call should fail if the bean is not secured
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("excluded, callerPrincipal="+p);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.rmi.RemoteException;
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.test.security.StatelessSession;
+import org.jboss.logging.Logger;
+
+
+/** A SessionBean that accesses an Entity bean in its echo() method to test runAs
+ identity propagation. It also access its own excluded() method to test that the runAs
+ identity is also see on methods of this bean that are invoked through the
+ remote interface.
+ 
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+ at Stateless
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.RunAsStatelessSession")
+ at SecurityDomain("spec-test")
+ at RunAs("InternalRole")
+public class StatelessSessionBean3
+{
+   private static final Logger log = Logger
+   .getLogger(StatelessSessionBean3.class);
+   
+   @Resource SessionContext sessionContext;
+   
+   public void testGetBusinessObject()
+   {
+      StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
+      ss.noop();
+   }
+
+   /** This method creates an instance of the entity bean bound under
+    java:comp/env/ejb/Entity and then invokes its echo method. This
+    method should be accessible by user's with a role of Echo, while
+    the Entity bean should only be accessible by the runAs role.
+    */
+   public String echo(String arg)
+   {
+      log.debug("echo, arg="+arg);
+      // This call should fail if the bean is not secured
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("echo, callerPrincipal="+p);
+      return p.getName();
+   }
+   
+   public String forward(String echoArg)
+   {
+      log.debug("forward, echoArg="+echoArg);
+      String echo = null;
+      try
+      {
+         InitialContext ctx = new InitialContext();
+         StatelessSession bean = (StatelessSession) ctx.lookup("java:comp/env/ejb/Session");
+         echo = bean.echo(echoArg);
+      }
+      catch(Exception e)
+      {
+         log.debug("failed", e);
+         throw new EJBException(e);
+      }
+      return echo;
+   }
+   
+   /** This method gets this bean's remote interface and invokes the
+    excluded() method to test that the method is accessed as the
+    runAs role.
+    */
+   public void noop()
+   {
+      log.debug("noop calling excluded...");
+      excluded();
+   }
+   
+   public void npeError()
+   {
+      log.debug("npeError");
+      Object obj = null;
+      obj.toString();
+   }
+   public void unchecked()
+   {
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("StatelessSessionBean.unchecked, callerPrincipal="+p);
+   }
+   
+   /** This method should be assigned access to the runAs role and no user
+    should have this role.
+    */
+   public void excluded()
+   {
+      log.debug("excluded, accessed");
+      // This call should fail if the bean is not secured
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("excluded, callerPrincipal="+p);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,130 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-/** A SessionBean that access the Entity bean to test Principal
-identity propagation.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
- at Stateless(name="StatelessSessionInDomain")
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.StatelessSessionInDomain")
- at SecurityDomain("spec-test-domain")
-public class StatelessSessionBeanInDomain
-{
-   private static final Logger log = Logger
-   .getLogger(StatelessSessionBean3.class);
-   
-   @Resource SessionContext sessionContext;
-    
-    public void testGetBusinessObject()
-    {
-       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
-       ss.noop();
-    }
-
-    @RolesAllowed({"Echo"})
-    public String echo(String arg)
-    {
-        log.info("echo, arg="+arg);
-  
-        // This call should fail if the bean is not secured
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("echo, callerPrincipal="+p);
-        
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
-            echo = bean.echo(arg);
-        }
-        catch(Exception e)
-        {
- //           e.fillInStackTrace();
-            throw new EJBException("Stateful.echo failed", e);
-        }
-        
-        return echo;
-    }
-
-    public String forward(String echoArg)
-    {
-        log.info("forward, echoArg="+echoArg);
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatelessSession bean = (StatelessSession)ctx.lookup("java:comp/env/ejb/Session");
-            echo = bean.echo(echoArg);
-        }
-        catch(Exception e)
-        {
-            log.info("StatelessSession.echo failed", e);
-  //          e.fillInStackTrace();
-            throw new EJBException("StatelessSession.echo failed", e);
-        }
-        return echo;
-    }
-
-    public void noop()
-    {
-        log.info("noop");
-    }
-
-    public void npeError()
-    {
-        log.info("npeError");
-        Object obj = null;
-        obj.toString();
-    }
-    public void unchecked()
-    {
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
-    }
-
-    @DenyAll
-    public void excluded()
-    {
-        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.RolesAllowed;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/** A SessionBean that access the Entity bean to test Principal
+identity propagation.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$
+*/
+ at Stateless(name="StatelessSessionInDomain")
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.StatelessSessionInDomain")
+ at SecurityDomain("spec-test-domain")
+public class StatelessSessionBeanInDomain
+{
+   private static final Logger log = Logger
+   .getLogger(StatelessSessionBean3.class);
+   
+   @Resource SessionContext sessionContext;
+    
+    public void testGetBusinessObject()
+    {
+       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
+       ss.noop();
+    }
+
+    @RolesAllowed({"Echo"})
+    public String echo(String arg)
+    {
+        log.info("echo, arg="+arg);
+  
+        // This call should fail if the bean is not secured
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("echo, callerPrincipal="+p);
+        
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
+            echo = bean.echo(arg);
+        }
+        catch(Exception e)
+        {
+ //           e.fillInStackTrace();
+            throw new EJBException("Stateful.echo failed", e);
+        }
+        
+        return echo;
+    }
+
+    public String forward(String echoArg)
+    {
+        log.info("forward, echoArg="+echoArg);
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatelessSession bean = (StatelessSession)ctx.lookup("java:comp/env/ejb/Session");
+            echo = bean.echo(echoArg);
+        }
+        catch(Exception e)
+        {
+            log.info("StatelessSession.echo failed", e);
+  //          e.fillInStackTrace();
+            throw new EJBException("StatelessSession.echo failed", e);
+        }
+        return echo;
+    }
+
+    public void noop()
+    {
+        log.info("noop");
+    }
+
+    public void npeError()
+    {
+        log.info("npeError");
+        Object obj = null;
+        obj.toString();
+    }
+    public void unchecked()
+    {
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
+    }
+
+    @DenyAll
+    public void excluded()
+    {
+        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,126 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
-/** A SessionBean that access the Entity bean to test Principal
-identity propagation.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
- at Stateless(name="org/jboss/test/security/ejb/StatelessSession_test")
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.StatelessSession_test")
- at SecurityDomain("spec-test")
-public class StatelessSessionBean_test
-{
-   org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
-   
-   @Resource SessionContext sessionContext;
-    
-    public void testGetBusinessObject()
-    {
-       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
-       ss.noop();
-    }
-
-    @RolesAllowed({"Echo"})
-    public String echo(String arg)
-    {
-        // This call should fail if the bean is not secured
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("echo, callerPrincipal="+p);
-        
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
-            echo = bean.echo(arg);
-        }
-        catch(Exception e)
-        {
-            e.fillInStackTrace();
-            throw new EJBException("Stateful.echo failed", e);
-        }
-        
-        return echo;
-    }
-
-    public String forward(String echoArg)
-    {
-        log.info("forward, echoArg="+echoArg);
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatelessSession bean = (StatelessSession)ctx.lookup("java:comp/env/ejb/Session");
-            echo = bean.echo(echoArg);
-        }
-        catch(Exception e)
-        {
-            log.info("StatelessSession.echo failed", e);
-            e.fillInStackTrace();
-            throw new EJBException("StatelessSession.echo failed", e);
-        }
-        return echo;
-    }
-
-    public void noop()
-    {
-        log.info("noop");
-    }
-
-    public void npeError()
-    {
-        log.info("npeError");
-        Object obj = null;
-        obj.toString();
-    }
-    public void unchecked()
-    {
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
-    }
-
-    @DenyAll
-    public void excluded()
-    {
-        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.RolesAllowed;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+
+/** A SessionBean that access the Entity bean to test Principal
+identity propagation.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$
+*/
+ at Stateless(name="org/jboss/test/security/ejb/StatelessSession_test")
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.StatelessSession_test")
+ at SecurityDomain("spec-test")
+public class StatelessSessionBean_test
+{
+   org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
+   
+   @Resource SessionContext sessionContext;
+    
+    public void testGetBusinessObject()
+    {
+       StatelessSession ss = (StatelessSession)sessionContext.getBusinessObject(org.jboss.ejb3.test.security.StatelessSession.class);
+       ss.noop();
+    }
+
+    @RolesAllowed({"Echo"})
+    public String echo(String arg)
+    {
+        // This call should fail if the bean is not secured
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("echo, callerPrincipal="+p);
+        
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
+            echo = bean.echo(arg);
+        }
+        catch(Exception e)
+        {
+            e.fillInStackTrace();
+            throw new EJBException("Stateful.echo failed", e);
+        }
+        
+        return echo;
+    }
+
+    public String forward(String echoArg)
+    {
+        log.info("forward, echoArg="+echoArg);
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatelessSession bean = (StatelessSession)ctx.lookup("java:comp/env/ejb/Session");
+            echo = bean.echo(echoArg);
+        }
+        catch(Exception e)
+        {
+            log.info("StatelessSession.echo failed", e);
+            e.fillInStackTrace();
+            throw new EJBException("StatelessSession.echo failed", e);
+        }
+        return echo;
+    }
+
+    public void noop()
+    {
+        log.info("noop");
+    }
+
+    public void npeError()
+    {
+        log.info("npeError");
+        Object obj = null;
+        obj.toString();
+    }
+    public void unchecked()
+    {
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
+    }
+
+    @DenyAll
+    public void excluded()
+    {
+        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.EJBException;
-import javax.ejb.EJBLocalObject;
-
-/** A simple local statless session interface.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
-public interface StatelessSessionLocal
-{
-   /** Basic test that has no arguments or return values to test the
-    bare call invocation overhead without any data serialize.
-    */
-   public void noop();
-   /** Basic test that has both argument serialization and return
-    value serialization.
-    */
-   public String echo(String arg);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.EJBException;
+import javax.ejb.EJBLocalObject;
+
+/** A simple local statless session interface.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$
+*/
+public interface StatelessSessionLocal
+{
+   /** Basic test that has no arguments or return values to test the
+    bare call invocation overhead without any data serialize.
+    */
+   public void noop();
+   /** Basic test that has both argument serialization and return
+    value serialization.
+    */
+   public String echo(String arg);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface TimerTester
-{
-   void startTimer(long pPeriod);
-
-   boolean isTimerCalled();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface TimerTester
+{
+   void startTimer(long pPeriod);
+
+   boolean isTimerCalled();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTester.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,98 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.util.Date;
-
-import javax.naming.InitialContext;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
-import org.jboss.security.SecurityAssociation;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(TimerTester.class)
- at RemoteBinding(jndiBinding="TimerTester")
- at SecurityDomain("timer-runas-test")
-public class TimerTesterBean implements TimerTester
-{
-   private static final Logger log = Logger.getLogger(TimerTesterBean.class);
-   
-   public static boolean timerCalled = false;
-
-   private @Resource TimerService timerService;
-
-   private @Resource SessionContext ctx;
-   
-   private Timer timer;
-
-   public void startTimer(long pPeriod)
-   {
-      timerCalled = false;
-      System.out.println("************ startTimer");
-      timer = timerService.createTimer(new Date(new Date().getTime() + pPeriod), "TimerSLSBean");
-      
-   }
-   
-   public boolean isTimerCalled()
-   {
-      return timerCalled;
-   }
-
-   @Timeout
-   public void timeoutHandler(Timer timer)
-   {
-      log.info("EJB TIMEOUT!!!!");
-      log.info("CallerPrincipal: "+ctx.getCallerPrincipal()+"."); 
-      log.info("PrincipalFromSecurityAssociation: "+SecurityAssociation.getPrincipal()+"."); 
-      log.info("CallerPricipalFromSecurityAssociation: "+SecurityAssociation.getCallerPrincipal()+"."); 
-
-      try 
-      {
-         UncheckedStateless tester =
-            (UncheckedStateless) new InitialContext().lookup("UncheckedStatelessBean/remote");
-         tester.unchecked();
-         timerCalled = true;
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.util.Date;
+
+import javax.naming.InitialContext;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.ejb.Timeout;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+
+import org.jboss.security.SecurityAssociation;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(TimerTester.class)
+ at RemoteBinding(jndiBinding="TimerTester")
+ at SecurityDomain("timer-runas-test")
+public class TimerTesterBean implements TimerTester
+{
+   private static final Logger log = Logger.getLogger(TimerTesterBean.class);
+   
+   public static boolean timerCalled = false;
+
+   private @Resource TimerService timerService;
+
+   private @Resource SessionContext ctx;
+   
+   private Timer timer;
+
+   public void startTimer(long pPeriod)
+   {
+      timerCalled = false;
+      System.out.println("************ startTimer");
+      timer = timerService.createTimer(new Date(new Date().getTime() + pPeriod), "TimerSLSBean");
+      
+   }
+   
+   public boolean isTimerCalled()
+   {
+      return timerCalled;
+   }
+
+   @Timeout
+   public void timeoutHandler(Timer timer)
+   {
+      log.info("EJB TIMEOUT!!!!");
+      log.info("CallerPrincipal: "+ctx.getCallerPrincipal()+"."); 
+      log.info("PrincipalFromSecurityAssociation: "+SecurityAssociation.getPrincipal()+"."); 
+      log.info("CallerPricipalFromSecurityAssociation: "+SecurityAssociation.getCallerPrincipal()+"."); 
+
+      try 
+      {
+         UncheckedStateless tester =
+            (UncheckedStateless) new InitialContext().lookup("UncheckedStatelessBean/remote");
+         tester.unchecked();
+         timerCalled = true;
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-
-/** A simple session bean for testing unchecked declarative security.
-
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
- at Stateless(name="UncheckedSessionRemote")
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.UncheckedSession")
- at SecurityDomain("spec-test")
- at PermitAll
-public class UncheckedSessionBean
-{
-   Logger log = Logger.getLogger(getClass());
-   
-   @Resource SessionContext sessionContext;
-
-   @RolesAllowed({"Echo"})
-   public String echo(String arg)
-   {
-      log.debug("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("echo, callerPrincipal=" + p);
-      boolean isCaller = sessionContext.isCallerInRole("EchoCaller");
-      log.debug("echo, isCallerInRole('EchoCaller')=" + isCaller);
-      return arg;
-   }
-
-   public String forward(String echoArg)
-   {
-      log.debug("forward, echoArg=" + echoArg);
-      return echo(echoArg);
-   }
-
-   public void noop()
-   {
-      log.debug("noop");
-   }
-
-   public void npeError()
-   {
-      log.debug("npeError");
-      Object obj = null;
-      obj.toString();
-   }
-
-   public void unchecked()
-   {
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("unchecked, callerPrincipal=" + p);
-   }
-
-   @RolesAllowed({"InternalRole"})
-   public void excluded()
-   {
-      throw new EJBException("excluded, no access should be allowed");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+
+/** A simple session bean for testing unchecked declarative security.
+
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+ at Stateless(name="UncheckedSessionRemote")
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.UncheckedSession")
+ at SecurityDomain("spec-test")
+ at PermitAll
+public class UncheckedSessionBean
+{
+   Logger log = Logger.getLogger(getClass());
+   
+   @Resource SessionContext sessionContext;
+
+   @RolesAllowed({"Echo"})
+   public String echo(String arg)
+   {
+      log.debug("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("echo, callerPrincipal=" + p);
+      boolean isCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.debug("echo, isCallerInRole('EchoCaller')=" + isCaller);
+      return arg;
+   }
+
+   public String forward(String echoArg)
+   {
+      log.debug("forward, echoArg=" + echoArg);
+      return echo(echoArg);
+   }
+
+   public void noop()
+   {
+      log.debug("noop");
+   }
+
+   public void npeError()
+   {
+      log.debug("npeError");
+      Object obj = null;
+      obj.toString();
+   }
+
+   public void unchecked()
+   {
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("unchecked, callerPrincipal=" + p);
+   }
+
+   @RolesAllowed({"InternalRole"})
+   public void excluded()
+   {
+      throw new EJBException("excluded, no access should be allowed");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-
-/** A simple session bean for testing unchecked declarative security.
-
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
- at Stateless(name="UncheckedSessionRemoteFirst")
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.UncheckedSessionRemoteFirst")
- at SecurityDomain("spec-test")
- at PermitAll
-public class UncheckedSessionBeanFirst
-{
-   Logger log = Logger.getLogger(getClass());
-   
-   @Resource SessionContext sessionContext;
-
-   @RolesAllowed({"Echo"})
-   public String echo(String arg)
-   {
-      log.debug("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("echo, callerPrincipal=" + p);
-      boolean isCaller = sessionContext.isCallerInRole("EchoCaller");
-      log.debug("echo, isCallerInRole('EchoCaller')=" + isCaller);
-      return arg;
-   }
-
-   public String forward(String echoArg)
-   {
-      log.debug("forward, echoArg=" + echoArg);
-      return echo(echoArg);
-   }
-
-   public void noop()
-   {
-      log.debug("noop");
-   }
-
-   public void npeError()
-   {
-      log.debug("npeError");
-      Object obj = null;
-      obj.toString();
-   }
-
-   public void unchecked()
-   {
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("unchecked, callerPrincipal=" + p);
-   }
-
-   @RolesAllowed({"InternalRole"})
-   public void excluded()
-   {
-      throw new EJBException("excluded, no access should be allowed");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+
+/** A simple session bean for testing unchecked declarative security.
+
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+ at Stateless(name="UncheckedSessionRemoteFirst")
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.UncheckedSessionRemoteFirst")
+ at SecurityDomain("spec-test")
+ at PermitAll
+public class UncheckedSessionBeanFirst
+{
+   Logger log = Logger.getLogger(getClass());
+   
+   @Resource SessionContext sessionContext;
+
+   @RolesAllowed({"Echo"})
+   public String echo(String arg)
+   {
+      log.debug("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("echo, callerPrincipal=" + p);
+      boolean isCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.debug("echo, isCallerInRole('EchoCaller')=" + isCaller);
+      return arg;
+   }
+
+   public String forward(String echoArg)
+   {
+      log.debug("forward, echoArg=" + echoArg);
+      return echo(echoArg);
+   }
+
+   public void noop()
+   {
+      log.debug("noop");
+   }
+
+   public void npeError()
+   {
+      log.debug("npeError");
+      Object obj = null;
+      obj.toString();
+   }
+
+   public void unchecked()
+   {
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("unchecked, callerPrincipal=" + p);
+   }
+
+   @RolesAllowed({"InternalRole"})
+   public void excluded()
+   {
+      throw new EJBException("excluded, no access should be allowed");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,97 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-
-import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-
-/** A simple session bean for testing unchecked declarative security.
-
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
- at Stateless(name="UncheckedSessionRemoteLast")
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.UncheckedSessionRemoteLast")
- at SecurityDomain("spec-test")
- at PermitAll
-public class UncheckedSessionBeanLast
-{
-   Logger log = Logger.getLogger(getClass());
-   
-   @Resource SessionContext sessionContext;
-
-   @RolesAllowed({"Echo"})
-   public String echo(String arg)
-   {
-      log.debug("echo, arg=" + arg);
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("echo, callerPrincipal=" + p);
-      boolean isCaller = sessionContext.isCallerInRole("EchoCaller");
-      log.debug("echo, isCallerInRole('EchoCaller')=" + isCaller);
-      return arg;
-   }
-
-   public String forward(String echoArg)
-   {
-      log.debug("forward, echoArg=" + echoArg);
-      return echo(echoArg);
-   }
-
-   public void noop()
-   {
-      log.debug("noop");
-   }
-
-   public void npeError()
-   {
-      log.debug("npeError");
-      Object obj = null;
-      obj.toString();
-   }
-
-   public void unchecked()
-   {
-      Principal p = sessionContext.getCallerPrincipal();
-      log.debug("unchecked, callerPrincipal=" + p);
-   }
-
-   @RolesAllowed({"InternalRole"})
-   public void excluded()
-   {
-      throw new EJBException("excluded, no access should be allowed");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+
+import org.jboss.logging.Logger;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+
+/** A simple session bean for testing unchecked declarative security.
+
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+ at Stateless(name="UncheckedSessionRemoteLast")
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.UncheckedSessionRemoteLast")
+ at SecurityDomain("spec-test")
+ at PermitAll
+public class UncheckedSessionBeanLast
+{
+   Logger log = Logger.getLogger(getClass());
+   
+   @Resource SessionContext sessionContext;
+
+   @RolesAllowed({"Echo"})
+   public String echo(String arg)
+   {
+      log.debug("echo, arg=" + arg);
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("echo, callerPrincipal=" + p);
+      boolean isCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.debug("echo, isCallerInRole('EchoCaller')=" + isCaller);
+      return arg;
+   }
+
+   public String forward(String echoArg)
+   {
+      log.debug("forward, echoArg=" + echoArg);
+      return echo(echoArg);
+   }
+
+   public void noop()
+   {
+      log.debug("noop");
+   }
+
+   public void npeError()
+   {
+      log.debug("npeError");
+      Object obj = null;
+      obj.toString();
+   }
+
+   public void unchecked()
+   {
+      Principal p = sessionContext.getCallerPrincipal();
+      log.debug("unchecked, callerPrincipal=" + p);
+   }
+
+   @RolesAllowed({"InternalRole"})
+   public void excluded()
+   {
+      throw new EJBException("excluded, no access should be allowed");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface UncheckedStateless
-{
-   void unchecked();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface UncheckedStateless
+{
+   void unchecked();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.annotation.security.PermitAll;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-import javax.annotation.security.RunAs;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at SecurityDomain("timer-runas-test")
- at Remote(UncheckedStateless.class)
- at RunAs("nobody")
-public class UncheckedStatelessBean implements UncheckedStateless
-{
-   private static final Logger log = Logger.getLogger(UncheckedStatelessBean.class);
-   
-   @PermitAll
-   public void unchecked()
-   {
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.annotation.security.PermitAll;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+import javax.annotation.security.RunAs;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at SecurityDomain("timer-runas-test")
+ at Remote(UncheckedStateless.class)
+ at RunAs("nobody")
+public class UncheckedStatelessBean implements UncheckedStateless
+{
+   private static final Logger log = Logger.getLogger(UncheckedStatelessBean.class);
+   
+   @PermitAll
+   public void unchecked()
+   {
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,111 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-
-/** A SessionBean that access the Entity bean to test Principal
-identity propagation.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
- at Stateless
- at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
- at RemoteBinding(jndiBinding = "spec.UnsecureStatelessSession2")
- at EJBs({@EJB(name="Session", beanInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
-public class UnsecuredStatelessSessionBean2
-{
-    org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
-    
-    @Resource SessionContext sessionContext;
-    
-    public String echo(String arg)
-    {
-        // This call should fail if the bean is not secured
-        Principal p = sessionContext.getCallerPrincipal();
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
-            echo = bean.echo(arg);
-        }
-        catch(Exception e)
-        {
-            e.fillInStackTrace();
-            throw new EJBException("Stateful.echo failed", e);
-        }
-        return echo;
-    }
-
-    public String forward(String echoArg)
-    {
-        log.info("forward, echoArg="+echoArg);
-        String echo = null;
-        try
-        {
-            InitialContext ctx = new InitialContext();
-            StatelessSession bean = (StatelessSession)ctx.lookup(Container.ENC_CTX_NAME + "/env/Session");
-            echo = bean.echo(echoArg);
-        }
-        catch(Exception e)
-        {
-            log.info("StatelessSession.echo failed", e);
-            e.fillInStackTrace();
-            throw new EJBException("StatelessSession.echo failed", e);
-        }
-        return echo;
-    }
-
-    public void noop()
-    {
-        log.info("noop");
-    }
-
-    public void npeError()
-    {
-        log.info("npeError");
-        Object obj = null;
-        obj.toString();
-    }
-    public void unchecked()
-    {
-        Principal p = sessionContext.getCallerPrincipal();
-        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
-    }
-
-    public void excluded()
-    {
-        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.Principal;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.Container;
+
+/** A SessionBean that access the Entity bean to test Principal
+identity propagation.
+
+ at author Scott.Stark at jboss.org
+ at version $Revision$
+*/
+ at Stateless
+ at Remote(org.jboss.ejb3.test.security.StatelessSession.class)
+ at RemoteBinding(jndiBinding = "spec.UnsecureStatelessSession2")
+ at EJBs({@EJB(name="Session", beanInterface=org.jboss.ejb3.test.security.StatelessSession.class, beanName="StatelessSession")})
+public class UnsecuredStatelessSessionBean2
+{
+    org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(getClass());
+    
+    @Resource SessionContext sessionContext;
+    
+    public String echo(String arg)
+    {
+        // This call should fail if the bean is not secured
+        Principal p = sessionContext.getCallerPrincipal();
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatefulSession bean = (StatefulSession) ctx.lookup("spec.StatefulSession");
+            echo = bean.echo(arg);
+        }
+        catch(Exception e)
+        {
+            e.fillInStackTrace();
+            throw new EJBException("Stateful.echo failed", e);
+        }
+        return echo;
+    }
+
+    public String forward(String echoArg)
+    {
+        log.info("forward, echoArg="+echoArg);
+        String echo = null;
+        try
+        {
+            InitialContext ctx = new InitialContext();
+            StatelessSession bean = (StatelessSession)ctx.lookup(Container.ENC_CTX_NAME + "/env/Session");
+            echo = bean.echo(echoArg);
+        }
+        catch(Exception e)
+        {
+            log.info("StatelessSession.echo failed", e);
+            e.fillInStackTrace();
+            throw new EJBException("StatelessSession.echo failed", e);
+        }
+        return echo;
+    }
+
+    public void noop()
+    {
+        log.info("noop");
+    }
+
+    public void npeError()
+    {
+        log.info("npeError");
+        Object obj = null;
+        obj.toString();
+    }
+    public void unchecked()
+    {
+        Principal p = sessionContext.getCallerPrincipal();
+        log.info("StatelessSessionBean.unchecked, callerPrincipal="+p);
+    }
+
+    public void excluded()
+    {
+        throw new EJBException("StatelessSessionBean.excluded, no access should be allowed");
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,73 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security;
-
-import java.security.acl.Group;
-import java.security.Principal;
-import java.util.Enumeration;
-
-import javax.security.auth.login.LoginException;
-
-import org.jboss.security.auth.spi.UsersRolesLoginModule;
-import org.jboss.security.SimpleGroup;
-import org.jboss.security.SimplePrincipal;
-
-/** A simple override of UsersRolesLoginModule used to test security domain
- * traversal. This simulates trust based on the same passwords with the
- * roles of the second domain being distinct modifications of the first
- * domains roles.
- * 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class UsersRoles2LoginModule extends UsersRolesLoginModule
-{
-   /**
-    * Override to add '2' to every role name to make the roles different
-    * @throws LoginException
-    */ 
-   protected Group[] getRoleSets() throws LoginException
-   {
-      Group[] groups = super.getRoleSets();
-      Group[] newGroups = {new SimpleGroup("Roles")};
-      Group roles = null;
-      Group newRoles = newGroups[0];
-      for(int n = 0; n < groups.length; n ++)
-      {
-         Group g = groups[n];
-         if( g.getName().equals("Roles") )
-         {
-            roles = g;
-            break;
-         }
-      }
-      if( roles != null )
-      {
-         Enumeration iter = roles.members();
-         Principal role = (Principal) iter.nextElement();
-         String name2 = role.getName() + "2";
-         SimplePrincipal role2 = new SimplePrincipal(name2);
-         newRoles.addMember(role2);
-      }
-      return newGroups;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security;
+
+import java.security.acl.Group;
+import java.security.Principal;
+import java.util.Enumeration;
+
+import javax.security.auth.login.LoginException;
+
+import org.jboss.security.auth.spi.UsersRolesLoginModule;
+import org.jboss.security.SimpleGroup;
+import org.jboss.security.SimplePrincipal;
+
+/** A simple override of UsersRolesLoginModule used to test security domain
+ * traversal. This simulates trust based on the same passwords with the
+ * roles of the second domain being distinct modifications of the first
+ * domains roles.
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class UsersRoles2LoginModule extends UsersRolesLoginModule
+{
+   /**
+    * Override to add '2' to every role name to make the roles different
+    * @throws LoginException
+    */ 
+   protected Group[] getRoleSets() throws LoginException
+   {
+      Group[] groups = super.getRoleSets();
+      Group[] newGroups = {new SimpleGroup("Roles")};
+      Group roles = null;
+      Group newRoles = newGroups[0];
+      for(int n = 0; n < groups.length; n ++)
+      {
+         Group g = groups[n];
+         if( g.getName().equals("Roles") )
+         {
+            roles = g;
+            break;
+         }
+      }
+      if( roles != null )
+      {
+         Enumeration iter = roles.members();
+         Principal role = (Principal) iter.nextElement();
+         String name2 = role.getName() + "2";
+         SimplePrincipal role2 = new SimplePrincipal(name2);
+         newRoles.addMember(role2);
+      }
+      return newGroups;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/UsersRoles2LoginModule.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/servlets)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,90 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security.servlets;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.transaction.UserTransaction;
-import org.jboss.ejb3.test.security.JobDAO;
-import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.auth.callback.UsernamePasswordHandler;
-import javax.security.auth.login.LoginContext;
-
-
-/** A servlet that accesses an EJB and tests whether the call argument
- is serialized.
-
- @author  Scott.Stark at jboss.org
- @version $Revision$
- */
-public class EJBServlet extends HttpServlet
-{
-   private static final Logger log = Logger.getLogger(EJBServlet.class);
-   
-   public void init(ServletConfig config) throws ServletException
-   {
-   }
-   
-   protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      try
-      {
-         UsernamePasswordHandler handler = new UsernamePasswordHandler("scott", "echoman"); 
-         
-         LoginContext lc = new LoginContext("client-login", handler); 
-         lc.login(); 
-         
-         InitialContext jndiContext = new InitialContext();
-         JobDAO bean = (JobDAO)jndiContext.lookup("JobDAOBean/local");
-         bean.foo();
-      } catch (Exception e)
-      {
-         e.printStackTrace();
-         throw new ServletException(e);
-      }
-
-   }
-
-   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      processRequest(request, response);
-   }
-
-   protected void doPost(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      processRequest(request, response);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.persistence.EntityManager;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.UserTransaction;
+import org.jboss.ejb3.test.security.JobDAO;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.security.auth.callback.UsernamePasswordHandler;
+import javax.security.auth.login.LoginContext;
+
+
+/** A servlet that accesses an EJB and tests whether the call argument
+ is serialized.
+
+ @author  Scott.Stark at jboss.org
+ @version $Revision$
+ */
+public class EJBServlet extends HttpServlet
+{
+   private static final Logger log = Logger.getLogger(EJBServlet.class);
+   
+   public void init(ServletConfig config) throws ServletException
+   {
+   }
+   
+   protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      try
+      {
+         UsernamePasswordHandler handler = new UsernamePasswordHandler("scott", "echoman"); 
+         
+         LoginContext lc = new LoginContext("client-login", handler); 
+         lc.login(); 
+         
+         InitialContext jndiContext = new InitialContext();
+         JobDAO bean = (JobDAO)jndiContext.lookup("JobDAOBean/local");
+         bean.foo();
+      } catch (Exception e)
+      {
+         e.printStackTrace();
+         throw new ServletException(e);
+      }
+
+   }
+
+   protected void doGet(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      processRequest(request, response);
+   }
+
+   protected void doPost(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      processRequest(request, response);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/EJBServlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,180 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security.servlets;
-
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.io.IOException;
-import java.lang.System;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.methods.OptionsMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.TraceMethod;
-import org.jboss.logging.Logger;
-
-/** Utilities for client http requests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class HttpUtils
-{
-   private static Logger log = Logger.getLogger(HttpUtils.class);
-   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
-   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
-
-   public static final int GET = 1;
-   public static final int POST = 2;
-   public static final int HEAD = 3;
-   public static final int OPTIONS = 4;
-   public static final int PUT = 5;
-   public static final int DELETE = 6;
-   public static final int TRACE = 7;
-   
-   public static String getBaseURL()
-   {
-      return baseURL;
-   }
-   public static String getBaseURL(String username, String password)
-   {
-      String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
-         + Integer.getInteger("web.port", 8080) + "/";
-      return url;
-   }
-   public static String getBaseURLNoAuth()
-   {
-      return baseURLNoAuth;
-   }
-
-   /** Perform a get on the indicated URL and assert an HTTP_OK response code
-    *
-    * @param url
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url) throws Exception
-   {
-      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
-   }
-   /** Perform a get on the indicated URL and assert that the response code
-    * matches the expectedHttpCode argument.
-    *
-    * @param url
-    * @param expectedHttpCode the http response code expected
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, int type)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null, type);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs, int type)
-      throws Exception
-   {
-      HttpClient httpConn = new HttpClient();
-      HttpMethodBase request = createMethod(url, type);
-
-      int hdrCount = hdrs != null ? hdrs.length : 0;
-      for(int n = 0; n < hdrCount; n ++)
-         request.addRequestHeader(hdrs[n]);
-      try
-      {
-         log.debug("Connecting to: "+url);
-         String userInfo = url.getUserInfo();
-
-         if( userInfo != null )
-         {
-            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
-            httpConn.getState().setCredentials(realm, url.getHost(), auth);
-         }
-         log.debug("RequestURI: "+request.getURI());
-         int responseCode = httpConn.executeMethod(request);
-         String response = request.getStatusText();
-         log.debug("responseCode="+responseCode+", response="+response);
-         String content = request.getResponseBodyAsString();
-         log.debug(content);
-         // Validate that we are seeing the requested response code
-         if( responseCode != expectedHttpCode )
-         {
-            throw new IOException("Expected reply code:"+expectedHttpCode
-               +", actual="+responseCode);
-         }
-      }
-      catch(IOException e)
-      {
-         throw e;
-      }
-      return request;
-   }
-
-   public static HttpMethodBase createMethod(URL url, int type)
-   {
-      HttpMethodBase request = null;
-      switch( type )
-      {
-         case GET:
-            request = new GetMethod(url.toString());
-            break;
-         case POST:
-            request = new PostMethod(url.toString());
-            break;
-         case HEAD:
-            request = new HeadMethod(url.toString());
-            break;
-         case OPTIONS:
-            request = new OptionsMethod(url.toString());
-            break;
-         case PUT:
-            request = new PutMethod(url.toString());
-            break;
-         case DELETE:
-            request = new DeleteMethod(url.toString());
-            break;
-         case TRACE:
-            request = new TraceMethod(url.toString());
-            break;
-      }
-      return request;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,180 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security.servlets;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.IOException;
+import java.lang.System;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.HeadMethod;
+import org.apache.commons.httpclient.methods.OptionsMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.TraceMethod;
+import org.jboss.logging.Logger;
+
+/** Utilities for client http requests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class HttpUtils
+{
+   private static Logger log = Logger.getLogger(HttpUtils.class);
+   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
+   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+
+   public static final int GET = 1;
+   public static final int POST = 2;
+   public static final int HEAD = 3;
+   public static final int OPTIONS = 4;
+   public static final int PUT = 5;
+   public static final int DELETE = 6;
+   public static final int TRACE = 7;
+   
+   public static String getBaseURL()
+   {
+      return baseURL;
+   }
+   public static String getBaseURL(String username, String password)
+   {
+      String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
+         + Integer.getInteger("web.port", 8080) + "/";
+      return url;
+   }
+   public static String getBaseURLNoAuth()
+   {
+      return baseURLNoAuth;
+   }
+
+   /** Perform a get on the indicated URL and assert an HTTP_OK response code
+    *
+    * @param url
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url) throws Exception
+   {
+      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
+   }
+   /** Perform a get on the indicated URL and assert that the response code
+    * matches the expectedHttpCode argument.
+    *
+    * @param url
+    * @param expectedHttpCode the http response code expected
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, int type)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null, type);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs, int type)
+      throws Exception
+   {
+      HttpClient httpConn = new HttpClient();
+      HttpMethodBase request = createMethod(url, type);
+
+      int hdrCount = hdrs != null ? hdrs.length : 0;
+      for(int n = 0; n < hdrCount; n ++)
+         request.addRequestHeader(hdrs[n]);
+      try
+      {
+         log.debug("Connecting to: "+url);
+         String userInfo = url.getUserInfo();
+
+         if( userInfo != null )
+         {
+            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
+            httpConn.getState().setCredentials(realm, url.getHost(), auth);
+         }
+         log.debug("RequestURI: "+request.getURI());
+         int responseCode = httpConn.executeMethod(request);
+         String response = request.getStatusText();
+         log.debug("responseCode="+responseCode+", response="+response);
+         String content = request.getResponseBodyAsString();
+         log.debug(content);
+         // Validate that we are seeing the requested response code
+         if( responseCode != expectedHttpCode )
+         {
+            throw new IOException("Expected reply code:"+expectedHttpCode
+               +", actual="+responseCode);
+         }
+      }
+      catch(IOException e)
+      {
+         throw e;
+      }
+      return request;
+   }
+
+   public static HttpMethodBase createMethod(URL url, int type)
+   {
+      HttpMethodBase request = null;
+      switch( type )
+      {
+         case GET:
+            request = new GetMethod(url.toString());
+            break;
+         case POST:
+            request = new PostMethod(url.toString());
+            break;
+         case HEAD:
+            request = new HeadMethod(url.toString());
+            break;
+         case OPTIONS:
+            request = new OptionsMethod(url.toString());
+            break;
+         case PUT:
+            request = new PutMethod(url.toString());
+            break;
+         case DELETE:
+            request = new DeleteMethod(url.toString());
+            break;
+         case TRACE:
+            request = new TraceMethod(url.toString());
+            break;
+      }
+      return request;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/servlets/HttpUtils.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,621 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security.unit;
-
-import java.util.HashSet;
-import javax.ejb.EJBException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginContext;
-import org.jboss.ejb3.test.security.AppCallbackHandler;
-import org.jboss.ejb3.test.security.CalledSession;
-import org.jboss.ejb3.test.security.SecurityContext;
-import org.jboss.ejb3.test.security.SessionFacade;
-import org.jboss.ejb3.test.security.StatefulSession;
-import org.jboss.ejb3.test.security.StatelessSession;
-import org.jboss.logging.Logger;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.auth.login.XMLLoginConfigImpl;
-import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-
-/** Test of EJB spec conformace using the security-spec.jar
- deployment unit. These test the basic role based access model.
- 
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
-public class EJBSpecUnitTestCase
-extends JBossTestCase
-{
-private static final Logger log = Logger.getLogger(EJBSpecUnitTestCase.class);
-
-static String username = "scott";
-static char[] password = "echoman".toCharArray();
-static String QUEUE_FACTORY = "ConnectionFactory";
-
-LoginContext lc;
-boolean loggedIn;
-
-public EJBSpecUnitTestCase(String name)
-{
-   super(name);
-}
-
-protected void tearDown() throws Exception
-{
-   logout();
-}
-
-/** Validate that the users have the expected logins and roles.
- * 
- * @throws Exception
- */ 
-public void testSecurityDomain() throws Exception
-{
-   log.info("+++ testSecurityDomain, domain=spec-test");
-   MBeanServerConnection conn = (MBeanServerConnection) getServer();
-   ObjectName secMgrName = new ObjectName("jboss.security:service=JaasSecurityManager");
-   JaasSecurityManagerServiceMBean secMgr = (JaasSecurityManagerServiceMBean)
-      MBeanServerInvocationHandler.newProxyInstance(conn, secMgrName,
-      JaasSecurityManagerServiceMBean.class, false);
-
-   // Test the spec-test security domain
-   String domain = "spec-test";
-   SimplePrincipal user = new SimplePrincipal("scott");
-   boolean isValid = secMgr.isValid(domain, user, password);
-   assertTrue("scott password is echoman", isValid);
-   HashSet testRole = new HashSet();
-   testRole.add(new SimplePrincipal("Echo"));
-   boolean hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
-   assertTrue("scott has Echo role", hasRole);
-   testRole.clear();
-   testRole.add(new SimplePrincipal("EchoLocal"));
-   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
-   assertTrue("scott has EchoLocal role", hasRole);
-   testRole.clear();
-   testRole.add(new SimplePrincipal("ProjectUser"));
-   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
-   assertTrue("scott has ProjectUser role", hasRole);
-
-   isValid = secMgr.isValid(domain, user, "badpass".toCharArray());
-   assertTrue("badpass is an invalid password for scott", isValid == false);
-
-   // Test the spec-test-domain security domain
-   log.info("+++ testSecurityDomain, domain=spec-test-domain");
-   domain = "spec-test-domain";
-   isValid = secMgr.isValid(domain, user, password);
-   assertTrue("scott password is echoman", isValid);
-   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
-   assertTrue("scott has Echo role", hasRole);
-   testRole.clear();
-   testRole.add(new SimplePrincipal("EchoLocal"));
-   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
-   assertTrue("scott has EchoLocal role", hasRole);
-   testRole.clear();
-   testRole.add(new SimplePrincipal("ProjectUser"));
-   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
-   assertTrue("scott has ProjectUser role", hasRole);      
-
-   isValid = secMgr.isValid(domain, user, "badpass".toCharArray());
-   assertTrue("badpass is an invalid password for scott", isValid == false);
-}
-
-/** Test that:
- 1. SecureBean returns a non-null principal when getCallerPrincipal
- is called with a security context and that this is propagated
- to its Entity bean ref.
- 
- 2. UnsecureBean throws an IllegalStateException when getCallerPrincipal
- is called without a security context.
- */
-public void testGetCallerPrincipal() throws Exception
-{   
-   log.debug("+++ testGetCallerPrincipal()");
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UnsecureStatelessSession2");
-   log.debug("Created spec.UnsecureStatelessSession2");
-   
-   try
-   {
-      // This should fail because echo calls getCallerPrincipal()
-      bean.echo("Hello from nobody?");
-      fail("Was able to call StatelessSession.echo");
-   }
-   catch(Exception e)
-   {
-      log.debug("echo failed as expected");
-   }
-   
-   login();
-   bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession2");
-   log.debug("Created spec.StatelessSession2");
-   // Test that the Entity bean sees username as its principal
-   String echo = bean.echo(username);
-   log.debug("bean.echo(username) = "+echo);
-   assertTrue("username == echo", echo.equals(username));
-   
-   logout();
-}
-
-/** Test the use of getCallerPrincipal from within the ejbCreate
- * in a stateful session bean
- */
-public void testStatefulCreateCaller() throws Exception
-{
-   log.debug("+++ testStatefulCreateCaller");
-   login();
-   InitialContext jndiContext = new InitialContext();
-  
-   StatefulSession bean = (StatefulSession)jndiContext.lookup("spec.StatefulSession");
-   // Need to invoke a method to ensure an ejbCreate call
-   bean.echo("testStatefulCreateCaller");
-   log.debug("Bean.echo(), ok");
-
-   logout();
-}
-
-/**
- * Test that a call interacting with different security domains does not
- * change the 
- * @throws Exception
- */ 
-public void testDomainInteraction() throws Exception
-{
-   logout();
-   login("testDomainInteraction", "testDomainInteraction".toCharArray());
-   log.debug("+++ testDomainInteraction()");
-   SecurityContext bean = (SecurityContext)getInitialContext().lookup("spec.UserInRoleContextSession");
-   log.debug("Created spec.UserInRoleContextSession");
-   HashSet roles = new HashSet();
-   roles.add("Role1");
-   roles.add("Role2");
-   bean.testDomainInteraction(roles);   
-}
-
-/** Test that the calling principal is propagated across bean calls.
- */
-public void testPrincipalPropagation() throws Exception
-{
-   log.debug("+++ testPrincipalPropagation");
-   logout();
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UnsecureStatelessSession2");
-   log.debug("Created spec.UnsecureStatelessSession2");
-   log.debug("Bean.forward('testPrincipalPropagation') -> "+bean.forward("testPrincipalPropagation"));
-}
-
-public void testMethodAccess() throws Exception
-{
-   log.debug("+++ testMethodAccess");
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession");
-   log.debug("Created spec.StatelessSession");
-   log.debug("Bean.echo('Hello') -> "+bean.echo("Hello"));
-
-   // This should be allowed in ejb3
-   bean.noop();
-}
-
-/** Test that the echo method is accessible by an Echo
- role. Since the excluded() method of the StatelessSession
- bean has been placed into the excluded set it should not
- accessible by any user. This uses the security domain of the
- JaasSecurityDomain service to test its use as an authentication mgr.
- */
-public void testDomainMethodAccess() throws Exception
-{
-   log.debug("+++ testDomainMethodAccess");
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSessionInDomain");
-   log.debug("Created spec.StatelessSessionInDomain");
-   log.debug("Bean.echo('testDomainMethodAccess') -> "+bean.echo("testDomainMethodAccess"));
-
-   try
-   {
-      // This should not be allowed
-      bean.excluded();
-      fail("Was able to call StatelessSession.excluded");
-   }
-   catch(Exception e)
-   {
-      log.debug("StatelessSession.excluded failed as expected");
-   }
-}
-
-/** Test that the permissions assigned to the stateless session bean:
- with ejb-name=org/jboss/test/security/ejb/StatelessSession_test
- are read correctly.
- */
-public void testMethodAccess2() throws Exception
-{
-   log.debug("+++ testMethodAccess2");
-   login();
-   InitialContext jndiContext = new InitialContext();
-   StatelessSession bean = (StatelessSession)jndiContext.lookup("spec.StatelessSession_test");
-   log.debug("Created spec.StatelessSession_test");
-   log.debug("Bean.echo('testMethodAccess2') -> "+bean.echo("testMethodAccess2"));
-}
-
-/** Test a user with Echo and EchoLocal roles can access the CalleeBean
- through its local interface by calling the CallerBean and that a user
- with only a EchoLocal cannot call the CallerBean.
- */
-public void a1testLocalMethodAccess() throws Exception
-{
-   log.debug("+++ testLocalMethodAccess");
-   login();
-   InitialContext jndiContext = new InitialContext();
-   CalledSession bean = (CalledSession)jndiContext.lookup("spec.CallerBean");
-   log.debug("Created spec.CallerBean");
-   log.debug("Bean.invokeEcho('testLocalMethodAccess') -> "+bean.invokeEcho("testLocalMethodAccess"));
-}
-
-/** Test access to a bean with a mix of remote interface permissions and
- * unchecked permissions with the unchecked permissions declared first.
- * @throws Exception
- */ 
-public void testUncheckedRemote() throws Exception
-{
-   log.debug("+++ testUncheckedRemote");
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UncheckedSessionRemoteLast");
-   log.debug("Created spec.UncheckedSessionRemoteLast");
-   log.debug("Bean.echo('testUncheckedRemote') -> "+bean.echo("testUncheckedRemote"));
-   try
-   {
-      bean.excluded();
-      fail("Was able to call UncheckedSessionRemoteLast.excluded");
-   }
-   catch(Exception e)
-   {
-      log.debug("UncheckedSessionRemoteLast.excluded failed as expected");         
-   }
-   logout();
-}
-
-/** Test access to a bean with a mix of remote interface permissions and
- * unchecked permissions with the unchecked permissions declared last.
- * @throws Exception
- */ 
-public void testRemoteUnchecked() throws Exception
-{
-   log.debug("+++ testRemoteUnchecked");
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UncheckedSessionRemoteFirst");
-   log.debug("Created spec.UncheckedSessionRemoteFirst");
-   log.debug("Bean.echo('testRemoteUnchecked') -> "+bean.echo("testRemoteUnchecked"));
-   try
-   {
-      bean.excluded();
-      fail("Was able to call UncheckedSessionRemoteFirst.excluded");
-   }
-   catch(Exception e)
-   {
-      log.debug("UncheckedSessionRemoteFirst.excluded failed as expected");         
-   }
-   logout();
-}
-
-/** Test that a user with a role that has not been assigned any
- method permissions in the ejb-jar descriptor is able to access a
- method that has been marked as unchecked.
- */
-public void testUnchecked() throws Exception
-{
-   log.debug("+++ testUnchecked");
-   // Login as scott to create the bean
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession");
-   log.debug("Created spec.StatelessSession");
-   // Logout and login back in as stark to test access to the unchecked method
-   logout();
-   login("stark", "javaman".toCharArray());
-   bean.unchecked();
-   log.debug("Called Bean.unchecked()");
-   logout();
-}
-
-/** Test that a user with a valid role is able to access a
- bean for which all methods have been marked as unchecked.
- */
-public void testUncheckedWithLogin() throws Exception
-{
-   log.debug("+++ testUncheckedWithLogin");
-   // Login as scott to see that a user with roles is allowed access
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UncheckedSession");
-   log.debug("Created spec.StatelessSession");
-   bean.unchecked();
-   log.debug("Called Bean.unchecked()");
-   logout();
-}
-
-/** Test that user scott who has the Echo role is not able to
- access the StatelessSession2.excluded method even though
- the Echo role has been granted access to all methods of
- StatelessSession2 to test that the excluded-list takes
- precendence over the method-permissions.
- */
-public void testExcluded() throws Exception
-{
-   log.debug("+++ testExcluded");
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession2");
-   log.debug("Created spec.StatelessSession2");
-   try
-   {
-      bean.excluded();
-      fail("Was able to call Bean.excluded()");
-   }
-   catch(Exception e)
-   {
-      log.debug("Bean.excluded() failed as expected");
-      // This is what we expect
-   }
-   logout();
-}
-
-/** This method tests the following call chains:
- 1. RunAsStatelessSession.echo() -> PrivateEntity.echo()
- 2. RunAsStatelessSession.noop() -> RunAsStatelessSession.excluded()
- 3. RunAsStatelessSession.forward() -> StatelessSession.echo()
- 1. Should succeed because the run-as identity of RunAsStatelessSession
- is valid for accessing PrivateEntity.
- 2. Should succeed because the run-as identity of RunAsStatelessSession
- is valid for accessing RunAsStatelessSession.excluded().
- 3. Should fail because the run-as identity of RunAsStatelessSession
- is not Echo.
- */
-public void testRunAs() throws Exception
-{
-   log.debug("+++ testRunAs");
-   login();
-   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.RunAsStatelessSession");
-   log.debug("Created spec.RunAsStatelessSession");
-   log.debug("Bean.echo('testRunAs') -> "+bean.echo("testRunAs"));
-   bean.noop();
-   log.debug("Bean.noop(), ok");
-   
-   try
-   {
-      // This should not be allowed
-      bean.forward("Hello");
-      fail("Was able to call RunAsStatelessSession.forward");
-   }
-   catch(Exception e)
-   {
-      log.debug("StatelessSession.forward failed as expected");
-   }
-   
-   logout();
-}
-
-/** This method tests the following call chain:
- Level1CallerBean.callEcho() -> Level2CallerBean.invokeEcho()
-   -> Level3CalleeBean.echo()
- The Level1CallerBean uses a run-as of InternalRole and the Level2CallerBean
- and Level3CalleeBean are only accessible by InternalRole.
- */   
-public void testDeepRunAs() throws Exception
-{
-   log.debug("+++ testDeepRunAs");
-   login();
-   CalledSession bean = (CalledSession)getInitialContext().lookup("spec.Level1CallerBean");
-   log.debug("Created spec.Level1CallerBean");
-   String principal = bean.callEcho();
-   assertEquals("scott", principal);
-   log.debug("Bean.callEcho() ok");
-}
-
-public void testRunAsSFSB() throws Exception
-{
-   log.info("+++ testRunAsSFSB");
-   login();
-   log.debug("Found CallerFacadeBean-testRunAsSFSB Home");
-   CalledSession bean = (CalledSession)getInitialContext().lookup("spec.CallerFacadeBean-testRunAsSFSB");
-   log.debug("Created spec.CallerFacadeBean-testRunAsSFSB");
-   bean.invokeEcho("testRunAsSFSB");
-   log.debug("Bean.invokeEcho() ok");
-}
-
-/**
- * Test the run-as side-effects raised in 
- * http://jira.jboss.com/jira/browse/JBAS-1852
- * 
- * @throws Exception
- */ 
-public void testJBAS1852() throws Exception
-{
-   log.info("+++ testJBAS1852");
-   login();
-   SessionFacade bean = (SessionFacade)getInitialContext().lookup("spec.PublicSessionFacade");
-   log.debug("Created PublicSessionFacade");
-   log.debug("Bean.callEcho('testJBAS1852') -> " + bean.callEcho("testJBAS1852"));
-}
-
-/** Test that an MDB with a run-as identity is able to access secure EJBs
- that require the identity.
- */
-public void a1testMDBRunAs() throws Exception
-{
-   log.debug("+++ testMDBRunAs");
-   logout();
-   QueueConnectionFactory queueFactory = (QueueConnectionFactory) getInitialContext().lookup(QUEUE_FACTORY);
-   Queue queA = (Queue) getInitialContext().lookup("queue/A");
-   Queue queB = (Queue) getInitialContext().lookup("queue/B");
-   QueueConnection queueConn = queueFactory.createQueueConnection();
-   QueueSession session = queueConn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-   Message msg = session.createMessage();
-   msg.setStringProperty("arg", "testMDBRunAs");
-   msg.setJMSReplyTo(queB);
-   QueueSender sender = session.createSender(queA);
-   sender.send(msg);
-   sender.close();
-   log.debug("Sent msg to queue/A");
-   queueConn.start();
-   QueueReceiver recv = session.createReceiver(queB);
-   msg = recv.receive(5000);
-   log.debug("Recv msg: "+msg);
-   String info = msg.getStringProperty("reply");
-   recv.close();
-   session.close();
-   queueConn.close();
-
-   if( info == null || info.startsWith("Failed") )
-   {
-      fail("Recevied exception reply, info="+info);
-   }
-}
-
-/** Test that an MDB with a run-as identity is able to access secure EJBs
- that require the identity. DeepRunAsMDB -> Level1MDBCallerBean.callEcho() ->
-   Level2CallerBean.invokeEcho() -> Level3CalleeBean.echo()
- The MDB uses a run-as of InternalRole and the Level2CallerBean
- and Level3CalleeBean are only accessible by InternalRole.
- */
-public void a1testMDBDeepRunAs() throws Exception
-{
-   log.debug("+++ testMDBDeepRunAs");
-   logout();
-   QueueConnectionFactory queueFactory = (QueueConnectionFactory) getInitialContext().lookup(QUEUE_FACTORY);
-   Queue queD = (Queue) getInitialContext().lookup("queue/D");
-   Queue queB = (Queue) getInitialContext().lookup("queue/B");
-   QueueConnection queueConn = queueFactory.createQueueConnection();
-   QueueSession session = queueConn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-   Message msg = session.createMessage();
-   msg.setStringProperty("arg", "testMDBDeepRunAs");
-   msg.setJMSReplyTo(queB);
-   QueueSender sender = session.createSender(queD);
-   sender.send(msg);
-   sender.close();
-   log.debug("Sent msg to "+queD);
-   queueConn.start();
-   QueueReceiver recv = session.createReceiver(queB);
-   msg = recv.receive(5000);
-   log.debug("Recv msg: "+msg);
-   String info = msg.getStringProperty("reply");
-   recv.close();
-   session.close();
-   queueConn.close();
-
-   if( info == null || info.startsWith("Failed") )
-   {
-      fail("Recevied exception reply, info="+info);
-   }
-}
-
-/** This method tests that the RunAsWithRolesMDB is assigned multiple roles
- * within its onMessage so that it can call into the ProjRepository session
- * bean's methods that required ProjectAdmin, CreateFolder and DeleteFolder
- * roles.
- */
-public void a1testRunAsWithRoles() throws Exception
-{
-   log.debug("+++ testRunAsWithRoles");
-   logout();
-   QueueConnectionFactory queueFactory = (QueueConnectionFactory) getInitialContext().lookup(QUEUE_FACTORY);
-   Queue queC = (Queue) getInitialContext().lookup("queue/C");
-   Queue queB = (Queue) getInitialContext().lookup("queue/B");
-   QueueConnection queueConn = queueFactory.createQueueConnection();
-   QueueSession session = queueConn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-   Message msg = session.createMessage();
-   msg.setStringProperty("name", "testRunAsWithRoles");
-   msg.setJMSReplyTo(queB);
-   QueueSender sender = session.createSender(queC);
-   sender.send(msg);
-   sender.close();
-   log.debug("Sent msg to queue/C");
-   queueConn.start();
-   QueueReceiver recv = session.createReceiver(queB);
-   msg = recv.receive(5000);
-   log.debug("Recv msg: "+msg);
-   String info = msg.getStringProperty("reply");
-   recv.close();
-   session.close();
-   queueConn.close();
-
-   if( info == null || info.startsWith("Failed") )
-   {
-      fail("Recevied exception reply, info="+info);
-   }
-}
-
-/** Login as user scott using the conf.name login config or
- 'spec-test' if conf.name is not defined.
- */
-private void login() throws Exception
-{
-   login(username, password);
-}
-private void login(String username, char[] password) throws Exception
-{
-   if( loggedIn )
-      return;
-   
-   String confName = System.getProperty("conf.name", "spec-test");
-   AppCallbackHandler handler = new AppCallbackHandler(username, password);
-   log.debug("Creating LoginContext("+confName+")");
-   lc = new LoginContext(confName, handler);
-   lc.login();
-   log.debug("Created LoginContext, subject="+lc.getSubject());
-   loggedIn = true;
-}
-private void logout() throws Exception
-{
-   if( lc != null )
-   {
-      loggedIn = false;
-      lc.logout();
-      lc = null;
-   }
-}
-
-
-/**
- * Setup the test suite.
- */
-public static Test suite() throws Exception
-{
-   try {
-      Configuration.setConfiguration(new XMLLoginConfigImpl());
-      return getDeploySetup(EJBSpecUnitTestCase.class, "security.jar");
-   }
-   catch (Exception e)
-   {
-      e.printStackTrace();
-      throw e;
-   }
-}
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,621 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security.unit;
+
+import java.util.HashSet;
+import javax.ejb.EJBException;
+import javax.jms.Message;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+import org.jboss.ejb3.test.security.AppCallbackHandler;
+import org.jboss.ejb3.test.security.CalledSession;
+import org.jboss.ejb3.test.security.SecurityContext;
+import org.jboss.ejb3.test.security.SessionFacade;
+import org.jboss.ejb3.test.security.StatefulSession;
+import org.jboss.ejb3.test.security.StatelessSession;
+import org.jboss.logging.Logger;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.security.auth.login.XMLLoginConfigImpl;
+import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+
+/** Test of EJB spec conformace using the security-spec.jar
+ deployment unit. These test the basic role based access model.
+ 
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+public class EJBSpecUnitTestCase
+extends JBossTestCase
+{
+private static final Logger log = Logger.getLogger(EJBSpecUnitTestCase.class);
+
+static String username = "scott";
+static char[] password = "echoman".toCharArray();
+static String QUEUE_FACTORY = "ConnectionFactory";
+
+LoginContext lc;
+boolean loggedIn;
+
+public EJBSpecUnitTestCase(String name)
+{
+   super(name);
+}
+
+protected void tearDown() throws Exception
+{
+   logout();
+}
+
+/** Validate that the users have the expected logins and roles.
+ * 
+ * @throws Exception
+ */ 
+public void testSecurityDomain() throws Exception
+{
+   log.info("+++ testSecurityDomain, domain=spec-test");
+   MBeanServerConnection conn = (MBeanServerConnection) getServer();
+   ObjectName secMgrName = new ObjectName("jboss.security:service=JaasSecurityManager");
+   JaasSecurityManagerServiceMBean secMgr = (JaasSecurityManagerServiceMBean)
+      MBeanServerInvocationHandler.newProxyInstance(conn, secMgrName,
+      JaasSecurityManagerServiceMBean.class, false);
+
+   // Test the spec-test security domain
+   String domain = "spec-test";
+   SimplePrincipal user = new SimplePrincipal("scott");
+   boolean isValid = secMgr.isValid(domain, user, password);
+   assertTrue("scott password is echoman", isValid);
+   HashSet testRole = new HashSet();
+   testRole.add(new SimplePrincipal("Echo"));
+   boolean hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
+   assertTrue("scott has Echo role", hasRole);
+   testRole.clear();
+   testRole.add(new SimplePrincipal("EchoLocal"));
+   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
+   assertTrue("scott has EchoLocal role", hasRole);
+   testRole.clear();
+   testRole.add(new SimplePrincipal("ProjectUser"));
+   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
+   assertTrue("scott has ProjectUser role", hasRole);
+
+   isValid = secMgr.isValid(domain, user, "badpass".toCharArray());
+   assertTrue("badpass is an invalid password for scott", isValid == false);
+
+   // Test the spec-test-domain security domain
+   log.info("+++ testSecurityDomain, domain=spec-test-domain");
+   domain = "spec-test-domain";
+   isValid = secMgr.isValid(domain, user, password);
+   assertTrue("scott password is echoman", isValid);
+   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
+   assertTrue("scott has Echo role", hasRole);
+   testRole.clear();
+   testRole.add(new SimplePrincipal("EchoLocal"));
+   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
+   assertTrue("scott has EchoLocal role", hasRole);
+   testRole.clear();
+   testRole.add(new SimplePrincipal("ProjectUser"));
+   hasRole = secMgr.doesUserHaveRole(domain, user, password, testRole);
+   assertTrue("scott has ProjectUser role", hasRole);      
+
+   isValid = secMgr.isValid(domain, user, "badpass".toCharArray());
+   assertTrue("badpass is an invalid password for scott", isValid == false);
+}
+
+/** Test that:
+ 1. SecureBean returns a non-null principal when getCallerPrincipal
+ is called with a security context and that this is propagated
+ to its Entity bean ref.
+ 
+ 2. UnsecureBean throws an IllegalStateException when getCallerPrincipal
+ is called without a security context.
+ */
+public void testGetCallerPrincipal() throws Exception
+{   
+   log.debug("+++ testGetCallerPrincipal()");
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UnsecureStatelessSession2");
+   log.debug("Created spec.UnsecureStatelessSession2");
+   
+   try
+   {
+      // This should fail because echo calls getCallerPrincipal()
+      bean.echo("Hello from nobody?");
+      fail("Was able to call StatelessSession.echo");
+   }
+   catch(Exception e)
+   {
+      log.debug("echo failed as expected");
+   }
+   
+   login();
+   bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession2");
+   log.debug("Created spec.StatelessSession2");
+   // Test that the Entity bean sees username as its principal
+   String echo = bean.echo(username);
+   log.debug("bean.echo(username) = "+echo);
+   assertTrue("username == echo", echo.equals(username));
+   
+   logout();
+}
+
+/** Test the use of getCallerPrincipal from within the ejbCreate
+ * in a stateful session bean
+ */
+public void testStatefulCreateCaller() throws Exception
+{
+   log.debug("+++ testStatefulCreateCaller");
+   login();
+   InitialContext jndiContext = new InitialContext();
+  
+   StatefulSession bean = (StatefulSession)jndiContext.lookup("spec.StatefulSession");
+   // Need to invoke a method to ensure an ejbCreate call
+   bean.echo("testStatefulCreateCaller");
+   log.debug("Bean.echo(), ok");
+
+   logout();
+}
+
+/**
+ * Test that a call interacting with different security domains does not
+ * change the 
+ * @throws Exception
+ */ 
+public void testDomainInteraction() throws Exception
+{
+   logout();
+   login("testDomainInteraction", "testDomainInteraction".toCharArray());
+   log.debug("+++ testDomainInteraction()");
+   SecurityContext bean = (SecurityContext)getInitialContext().lookup("spec.UserInRoleContextSession");
+   log.debug("Created spec.UserInRoleContextSession");
+   HashSet roles = new HashSet();
+   roles.add("Role1");
+   roles.add("Role2");
+   bean.testDomainInteraction(roles);   
+}
+
+/** Test that the calling principal is propagated across bean calls.
+ */
+public void testPrincipalPropagation() throws Exception
+{
+   log.debug("+++ testPrincipalPropagation");
+   logout();
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UnsecureStatelessSession2");
+   log.debug("Created spec.UnsecureStatelessSession2");
+   log.debug("Bean.forward('testPrincipalPropagation') -> "+bean.forward("testPrincipalPropagation"));
+}
+
+public void testMethodAccess() throws Exception
+{
+   log.debug("+++ testMethodAccess");
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession");
+   log.debug("Created spec.StatelessSession");
+   log.debug("Bean.echo('Hello') -> "+bean.echo("Hello"));
+
+   // This should be allowed in ejb3
+   bean.noop();
+}
+
+/** Test that the echo method is accessible by an Echo
+ role. Since the excluded() method of the StatelessSession
+ bean has been placed into the excluded set it should not
+ accessible by any user. This uses the security domain of the
+ JaasSecurityDomain service to test its use as an authentication mgr.
+ */
+public void testDomainMethodAccess() throws Exception
+{
+   log.debug("+++ testDomainMethodAccess");
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSessionInDomain");
+   log.debug("Created spec.StatelessSessionInDomain");
+   log.debug("Bean.echo('testDomainMethodAccess') -> "+bean.echo("testDomainMethodAccess"));
+
+   try
+   {
+      // This should not be allowed
+      bean.excluded();
+      fail("Was able to call StatelessSession.excluded");
+   }
+   catch(Exception e)
+   {
+      log.debug("StatelessSession.excluded failed as expected");
+   }
+}
+
+/** Test that the permissions assigned to the stateless session bean:
+ with ejb-name=org/jboss/test/security/ejb/StatelessSession_test
+ are read correctly.
+ */
+public void testMethodAccess2() throws Exception
+{
+   log.debug("+++ testMethodAccess2");
+   login();
+   InitialContext jndiContext = new InitialContext();
+   StatelessSession bean = (StatelessSession)jndiContext.lookup("spec.StatelessSession_test");
+   log.debug("Created spec.StatelessSession_test");
+   log.debug("Bean.echo('testMethodAccess2') -> "+bean.echo("testMethodAccess2"));
+}
+
+/** Test a user with Echo and EchoLocal roles can access the CalleeBean
+ through its local interface by calling the CallerBean and that a user
+ with only a EchoLocal cannot call the CallerBean.
+ */
+public void a1testLocalMethodAccess() throws Exception
+{
+   log.debug("+++ testLocalMethodAccess");
+   login();
+   InitialContext jndiContext = new InitialContext();
+   CalledSession bean = (CalledSession)jndiContext.lookup("spec.CallerBean");
+   log.debug("Created spec.CallerBean");
+   log.debug("Bean.invokeEcho('testLocalMethodAccess') -> "+bean.invokeEcho("testLocalMethodAccess"));
+}
+
+/** Test access to a bean with a mix of remote interface permissions and
+ * unchecked permissions with the unchecked permissions declared first.
+ * @throws Exception
+ */ 
+public void testUncheckedRemote() throws Exception
+{
+   log.debug("+++ testUncheckedRemote");
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UncheckedSessionRemoteLast");
+   log.debug("Created spec.UncheckedSessionRemoteLast");
+   log.debug("Bean.echo('testUncheckedRemote') -> "+bean.echo("testUncheckedRemote"));
+   try
+   {
+      bean.excluded();
+      fail("Was able to call UncheckedSessionRemoteLast.excluded");
+   }
+   catch(Exception e)
+   {
+      log.debug("UncheckedSessionRemoteLast.excluded failed as expected");         
+   }
+   logout();
+}
+
+/** Test access to a bean with a mix of remote interface permissions and
+ * unchecked permissions with the unchecked permissions declared last.
+ * @throws Exception
+ */ 
+public void testRemoteUnchecked() throws Exception
+{
+   log.debug("+++ testRemoteUnchecked");
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UncheckedSessionRemoteFirst");
+   log.debug("Created spec.UncheckedSessionRemoteFirst");
+   log.debug("Bean.echo('testRemoteUnchecked') -> "+bean.echo("testRemoteUnchecked"));
+   try
+   {
+      bean.excluded();
+      fail("Was able to call UncheckedSessionRemoteFirst.excluded");
+   }
+   catch(Exception e)
+   {
+      log.debug("UncheckedSessionRemoteFirst.excluded failed as expected");         
+   }
+   logout();
+}
+
+/** Test that a user with a role that has not been assigned any
+ method permissions in the ejb-jar descriptor is able to access a
+ method that has been marked as unchecked.
+ */
+public void testUnchecked() throws Exception
+{
+   log.debug("+++ testUnchecked");
+   // Login as scott to create the bean
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession");
+   log.debug("Created spec.StatelessSession");
+   // Logout and login back in as stark to test access to the unchecked method
+   logout();
+   login("stark", "javaman".toCharArray());
+   bean.unchecked();
+   log.debug("Called Bean.unchecked()");
+   logout();
+}
+
+/** Test that a user with a valid role is able to access a
+ bean for which all methods have been marked as unchecked.
+ */
+public void testUncheckedWithLogin() throws Exception
+{
+   log.debug("+++ testUncheckedWithLogin");
+   // Login as scott to see that a user with roles is allowed access
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.UncheckedSession");
+   log.debug("Created spec.StatelessSession");
+   bean.unchecked();
+   log.debug("Called Bean.unchecked()");
+   logout();
+}
+
+/** Test that user scott who has the Echo role is not able to
+ access the StatelessSession2.excluded method even though
+ the Echo role has been granted access to all methods of
+ StatelessSession2 to test that the excluded-list takes
+ precendence over the method-permissions.
+ */
+public void testExcluded() throws Exception
+{
+   log.debug("+++ testExcluded");
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.StatelessSession2");
+   log.debug("Created spec.StatelessSession2");
+   try
+   {
+      bean.excluded();
+      fail("Was able to call Bean.excluded()");
+   }
+   catch(Exception e)
+   {
+      log.debug("Bean.excluded() failed as expected");
+      // This is what we expect
+   }
+   logout();
+}
+
+/** This method tests the following call chains:
+ 1. RunAsStatelessSession.echo() -> PrivateEntity.echo()
+ 2. RunAsStatelessSession.noop() -> RunAsStatelessSession.excluded()
+ 3. RunAsStatelessSession.forward() -> StatelessSession.echo()
+ 1. Should succeed because the run-as identity of RunAsStatelessSession
+ is valid for accessing PrivateEntity.
+ 2. Should succeed because the run-as identity of RunAsStatelessSession
+ is valid for accessing RunAsStatelessSession.excluded().
+ 3. Should fail because the run-as identity of RunAsStatelessSession
+ is not Echo.
+ */
+public void testRunAs() throws Exception
+{
+   log.debug("+++ testRunAs");
+   login();
+   StatelessSession bean = (StatelessSession)getInitialContext().lookup("spec.RunAsStatelessSession");
+   log.debug("Created spec.RunAsStatelessSession");
+   log.debug("Bean.echo('testRunAs') -> "+bean.echo("testRunAs"));
+   bean.noop();
+   log.debug("Bean.noop(), ok");
+   
+   try
+   {
+      // This should not be allowed
+      bean.forward("Hello");
+      fail("Was able to call RunAsStatelessSession.forward");
+   }
+   catch(Exception e)
+   {
+      log.debug("StatelessSession.forward failed as expected");
+   }
+   
+   logout();
+}
+
+/** This method tests the following call chain:
+ Level1CallerBean.callEcho() -> Level2CallerBean.invokeEcho()
+   -> Level3CalleeBean.echo()
+ The Level1CallerBean uses a run-as of InternalRole and the Level2CallerBean
+ and Level3CalleeBean are only accessible by InternalRole.
+ */   
+public void testDeepRunAs() throws Exception
+{
+   log.debug("+++ testDeepRunAs");
+   login();
+   CalledSession bean = (CalledSession)getInitialContext().lookup("spec.Level1CallerBean");
+   log.debug("Created spec.Level1CallerBean");
+   String principal = bean.callEcho();
+   assertEquals("scott", principal);
+   log.debug("Bean.callEcho() ok");
+}
+
+public void testRunAsSFSB() throws Exception
+{
+   log.info("+++ testRunAsSFSB");
+   login();
+   log.debug("Found CallerFacadeBean-testRunAsSFSB Home");
+   CalledSession bean = (CalledSession)getInitialContext().lookup("spec.CallerFacadeBean-testRunAsSFSB");
+   log.debug("Created spec.CallerFacadeBean-testRunAsSFSB");
+   bean.invokeEcho("testRunAsSFSB");
+   log.debug("Bean.invokeEcho() ok");
+}
+
+/**
+ * Test the run-as side-effects raised in 
+ * http://jira.jboss.com/jira/browse/JBAS-1852
+ * 
+ * @throws Exception
+ */ 
+public void testJBAS1852() throws Exception
+{
+   log.info("+++ testJBAS1852");
+   login();
+   SessionFacade bean = (SessionFacade)getInitialContext().lookup("spec.PublicSessionFacade");
+   log.debug("Created PublicSessionFacade");
+   log.debug("Bean.callEcho('testJBAS1852') -> " + bean.callEcho("testJBAS1852"));
+}
+
+/** Test that an MDB with a run-as identity is able to access secure EJBs
+ that require the identity.
+ */
+public void a1testMDBRunAs() throws Exception
+{
+   log.debug("+++ testMDBRunAs");
+   logout();
+   QueueConnectionFactory queueFactory = (QueueConnectionFactory) getInitialContext().lookup(QUEUE_FACTORY);
+   Queue queA = (Queue) getInitialContext().lookup("queue/A");
+   Queue queB = (Queue) getInitialContext().lookup("queue/B");
+   QueueConnection queueConn = queueFactory.createQueueConnection();
+   QueueSession session = queueConn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+   Message msg = session.createMessage();
+   msg.setStringProperty("arg", "testMDBRunAs");
+   msg.setJMSReplyTo(queB);
+   QueueSender sender = session.createSender(queA);
+   sender.send(msg);
+   sender.close();
+   log.debug("Sent msg to queue/A");
+   queueConn.start();
+   QueueReceiver recv = session.createReceiver(queB);
+   msg = recv.receive(5000);
+   log.debug("Recv msg: "+msg);
+   String info = msg.getStringProperty("reply");
+   recv.close();
+   session.close();
+   queueConn.close();
+
+   if( info == null || info.startsWith("Failed") )
+   {
+      fail("Recevied exception reply, info="+info);
+   }
+}
+
+/** Test that an MDB with a run-as identity is able to access secure EJBs
+ that require the identity. DeepRunAsMDB -> Level1MDBCallerBean.callEcho() ->
+   Level2CallerBean.invokeEcho() -> Level3CalleeBean.echo()
+ The MDB uses a run-as of InternalRole and the Level2CallerBean
+ and Level3CalleeBean are only accessible by InternalRole.
+ */
+public void a1testMDBDeepRunAs() throws Exception
+{
+   log.debug("+++ testMDBDeepRunAs");
+   logout();
+   QueueConnectionFactory queueFactory = (QueueConnectionFactory) getInitialContext().lookup(QUEUE_FACTORY);
+   Queue queD = (Queue) getInitialContext().lookup("queue/D");
+   Queue queB = (Queue) getInitialContext().lookup("queue/B");
+   QueueConnection queueConn = queueFactory.createQueueConnection();
+   QueueSession session = queueConn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+   Message msg = session.createMessage();
+   msg.setStringProperty("arg", "testMDBDeepRunAs");
+   msg.setJMSReplyTo(queB);
+   QueueSender sender = session.createSender(queD);
+   sender.send(msg);
+   sender.close();
+   log.debug("Sent msg to "+queD);
+   queueConn.start();
+   QueueReceiver recv = session.createReceiver(queB);
+   msg = recv.receive(5000);
+   log.debug("Recv msg: "+msg);
+   String info = msg.getStringProperty("reply");
+   recv.close();
+   session.close();
+   queueConn.close();
+
+   if( info == null || info.startsWith("Failed") )
+   {
+      fail("Recevied exception reply, info="+info);
+   }
+}
+
+/** This method tests that the RunAsWithRolesMDB is assigned multiple roles
+ * within its onMessage so that it can call into the ProjRepository session
+ * bean's methods that required ProjectAdmin, CreateFolder and DeleteFolder
+ * roles.
+ */
+public void a1testRunAsWithRoles() throws Exception
+{
+   log.debug("+++ testRunAsWithRoles");
+   logout();
+   QueueConnectionFactory queueFactory = (QueueConnectionFactory) getInitialContext().lookup(QUEUE_FACTORY);
+   Queue queC = (Queue) getInitialContext().lookup("queue/C");
+   Queue queB = (Queue) getInitialContext().lookup("queue/B");
+   QueueConnection queueConn = queueFactory.createQueueConnection();
+   QueueSession session = queueConn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+   Message msg = session.createMessage();
+   msg.setStringProperty("name", "testRunAsWithRoles");
+   msg.setJMSReplyTo(queB);
+   QueueSender sender = session.createSender(queC);
+   sender.send(msg);
+   sender.close();
+   log.debug("Sent msg to queue/C");
+   queueConn.start();
+   QueueReceiver recv = session.createReceiver(queB);
+   msg = recv.receive(5000);
+   log.debug("Recv msg: "+msg);
+   String info = msg.getStringProperty("reply");
+   recv.close();
+   session.close();
+   queueConn.close();
+
+   if( info == null || info.startsWith("Failed") )
+   {
+      fail("Recevied exception reply, info="+info);
+   }
+}
+
+/** Login as user scott using the conf.name login config or
+ 'spec-test' if conf.name is not defined.
+ */
+private void login() throws Exception
+{
+   login(username, password);
+}
+private void login(String username, char[] password) throws Exception
+{
+   if( loggedIn )
+      return;
+   
+   String confName = System.getProperty("conf.name", "spec-test");
+   AppCallbackHandler handler = new AppCallbackHandler(username, password);
+   log.debug("Creating LoginContext("+confName+")");
+   lc = new LoginContext(confName, handler);
+   lc.login();
+   log.debug("Created LoginContext, subject="+lc.getSubject());
+   loggedIn = true;
+}
+private void logout() throws Exception
+{
+   if( lc != null )
+   {
+      loggedIn = false;
+      lc.logout();
+      lc = null;
+   }
+}
+
+
+/**
+ * Setup the test suite.
+ */
+public static Test suite() throws Exception
+{
+   try {
+      Configuration.setConfiguration(new XMLLoginConfigImpl());
+      return getDeploySetup(EJBSpecUnitTestCase.class, "security.jar");
+   }
+   catch (Exception e)
+   {
+      e.printStackTrace();
+      throw e;
+   }
+}
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,78 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security.unit;
-
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.Test;
-
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.dd.web.util.HttpUtils;
-
-/** Tests of servlet container integration into the JBoss server. This test
- requires than a web container be integrated into the JBoss server. The tests
- currently do NOT use the java.net.HttpURLConnection and associated http client
- and  these do not return valid HTTP error codes so if a failure occurs it
- is best to connect the webserver using a browser to look for additional error
- info.
-
- The secure access tests require a user named 'jduke' with a password of 'theduke'
- with a role of 'AuthorizedUser' in the servlet container.
- 
- @author Scott.Stark at jboss.org
- @version $Revision$
- */
-public class ServletUnitTestCase extends JBossTestCase
-{
-   private static String REALM = "JBossTest Servlets";
-   
-   public ServletUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEJBServlet() throws Exception
-   {
-      try {
-         URL url = new URL(HttpUtils.getBaseURL()+"security-web/EJBServlet");
-         HttpUtils.accessURL(url);
-      } catch (Exception e){
-         e.printStackTrace();
-         throw e;
-      }
-   }
-   
-   /**
-    * Setup the test suite.
-    */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ServletUnitTestCase.class, "security.jar, security-web.war");
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security.unit;
+
+import java.io.IOException;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.dd.web.util.HttpUtils;
+
+/** Tests of servlet container integration into the JBoss server. This test
+ requires than a web container be integrated into the JBoss server. The tests
+ currently do NOT use the java.net.HttpURLConnection and associated http client
+ and  these do not return valid HTTP error codes so if a failure occurs it
+ is best to connect the webserver using a browser to look for additional error
+ info.
+
+ The secure access tests require a user named 'jduke' with a password of 'theduke'
+ with a role of 'AuthorizedUser' in the servlet container.
+ 
+ @author Scott.Stark at jboss.org
+ @version $Revision$
+ */
+public class ServletUnitTestCase extends JBossTestCase
+{
+   private static String REALM = "JBossTest Servlets";
+   
+   public ServletUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEJBServlet() throws Exception
+   {
+      try {
+         URL url = new URL(HttpUtils.getBaseURL()+"security-web/EJBServlet");
+         HttpUtils.accessURL(url);
+      } catch (Exception e){
+         e.printStackTrace();
+         throw e;
+      }
+   }
+   
+   /**
+    * Setup the test suite.
+    */
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ServletUnitTestCase.class, "security.jar, security-web.war");
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/ServletUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,95 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.security.unit;
-
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginContext;
-
-import org.jboss.ejb3.test.security.TimerTester;
-import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.auth.callback.UsernamePasswordHandler;
-import org.jboss.security.auth.login.XMLLoginConfigImpl;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class TimerRunAsTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger
-   .getLogger(TimerRunAsTestCase.class);
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public TimerRunAsTestCase(String name)
-   {
-      super(name);
-   } 
-   
-   public void testSecurityAssociation()
-   {
-      SecurityAssociation.clear();
-      SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("bill"), "password".toCharArray());
-      assertEquals("bill", SecurityAssociation.getPrincipal().getName());
-      SecurityAssociation.popSubjectContext();
-      assertNull(SecurityAssociation.getPrincipal());
-   }
-   
-   public void testNoSecurityAssociationPrincipal() throws Exception
-   {  
-      SecurityAssociation.clear();
-      
-      AppConfigurationEntry[] entries;
-      XMLLoginConfigImpl config = new XMLLoginConfigImpl();
-      config.setConfigResource("jaas-test-config.xml");
-      config.loadConfig();
-      Configuration.setConfiguration(config);
-      
-      entries = Configuration.getConfiguration().getAppConfigurationEntry("timer-runas-test");
-      assertEquals(1, entries.length);
-      
-      UsernamePasswordHandler handler = new UsernamePasswordHandler(null, null);
-      LoginContext lc = new LoginContext("timer-runas-test", handler);
-      
-      lc.login();
-      
-      TimerTester test = (TimerTester) getInitialContext().lookup("TimerTester");
-      assertNotNull(test);
-      
-      test.startTimer(5000);
-      Thread.sleep(6000);
-      assertTrue(test.isTimerCalled());
-      
-      lc.logout();
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(TimerRunAsTestCase.class, "timer-runas-security.jar");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.security.unit;
+
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+
+import org.jboss.ejb3.test.security.TimerTester;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.security.auth.callback.UsernamePasswordHandler;
+import org.jboss.security.auth.login.XMLLoginConfigImpl;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class TimerRunAsTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger
+   .getLogger(TimerRunAsTestCase.class);
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public TimerRunAsTestCase(String name)
+   {
+      super(name);
+   } 
+   
+   public void testSecurityAssociation()
+   {
+      SecurityAssociation.clear();
+      SecurityAssociation.pushSubjectContext(null, new SimplePrincipal("bill"), "password".toCharArray());
+      assertEquals("bill", SecurityAssociation.getPrincipal().getName());
+      SecurityAssociation.popSubjectContext();
+      assertNull(SecurityAssociation.getPrincipal());
+   }
+   
+   public void testNoSecurityAssociationPrincipal() throws Exception
+   {  
+      SecurityAssociation.clear();
+      
+      AppConfigurationEntry[] entries;
+      XMLLoginConfigImpl config = new XMLLoginConfigImpl();
+      config.setConfigResource("jaas-test-config.xml");
+      config.loadConfig();
+      Configuration.setConfiguration(config);
+      
+      entries = Configuration.getConfiguration().getAppConfigurationEntry("timer-runas-test");
+      assertEquals(1, entries.length);
+      
+      UsernamePasswordHandler handler = new UsernamePasswordHandler(null, null);
+      LoginContext lc = new LoginContext("timer-runas-test", handler);
+      
+      lc.login();
+      
+      TimerTester test = (TimerTester) getInitialContext().lookup("TimerTester");
+      assertNotNull(test);
+      
+      test.startTimer(5000);
+      Thread.sleep(6000);
+      assertTrue(test.isTimerCalled());
+      
+      lc.logout();
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(TimerRunAsTestCase.class, "timer-runas-security.jar");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.securitydomain;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface SecurityDomainTest
-{
-   void testAccess();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.securitydomain;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface SecurityDomainTest
+{
+   void testAccess();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.securitydomain;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SecurityDomainTestBean
-   implements SecurityDomainTest
-{
-   private static final Logger log = Logger.getLogger(SecurityDomainTestBean.class);
-    
-   public void testAccess()
-   {
-     
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.securitydomain;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class SecurityDomainTestBean
+   implements SecurityDomainTest
+{
+   private static final Logger log = Logger.getLogger(SecurityDomainTestBean.class);
+    
+   public void testAccess()
+   {
+     
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/SecurityDomainTestBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.securitydomain.unit;
-
-import org.jboss.ejb3.test.securitydomain.SecurityDomainTest;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SecurityDomainTestCase extends JBossTestCase
-{
-  
-   public SecurityDomainTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testJBossSecurityDomain() throws Exception
-   {
-      SecurityDomainTest test = (SecurityDomainTest)getInitialContext().lookup("SecurityDomainTest");
-      assertNotNull(test);
-      
-      try
-      {
-         test.testAccess();
-         fail();
-      }
-      catch (Exception e)
-      {
-      }
-      
-      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-      SecurityAssociation.setCredential("password".toCharArray());
-      
-      test.testAccess();
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(SecurityDomainTestCase.class, "securitydomain.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.securitydomain.unit;
+
+import org.jboss.ejb3.test.securitydomain.SecurityDomainTest;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class SecurityDomainTestCase extends JBossTestCase
+{
+  
+   public SecurityDomainTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testJBossSecurityDomain() throws Exception
+   {
+      SecurityDomainTest test = (SecurityDomainTest)getInitialContext().lookup("SecurityDomainTest");
+      assertNotNull(test);
+      
+      try
+      {
+         test.testAccess();
+         fail();
+      }
+      catch (Exception e)
+      {
+      }
+      
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+      
+      test.testAccess();
+   }
+
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(SecurityDomainTestCase.class, "securitydomain.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -34,22 +34,22 @@
 @Management(ServiceFiveManagement.class)
 public class ServiceFive implements ServiceFiveManagement
 {
-   @Depends("jboss.ejb3:management=interface,with=customName,is=serviceThree")
+   @Depends("jboss.ejb3:is=serviceThree,management=interface,with=customName")
    public ServiceThreeManagement serviceThreeA;
 
-   @Depends("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceFour,type=ManagementInterface")
+   @Depends("jboss.j2ee:jar=service-test.jar,name=ServiceFour,service=EJB3,type=ManagementInterface")
    public ObjectName serviceFourA;
 
    private ServiceThreeManagement serviceThreeB;
    private ObjectName serviceFourB;
 
-   @Depends("jboss.ejb3:management=interface,with=customName,is=serviceThree")
+   @Depends("jboss.ejb3:is=serviceThree,management=interface,with=customName")
    public void setServiceThree(ServiceThreeManagement proxy)
    {
       serviceThreeB = proxy;
    }
 
-   @Depends("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceFour,type=ManagementInterface")
+   @Depends("jboss.j2ee:jar=service-test.jar,name=ServiceFour,service=EJB3,type=ManagementInterface")
    public void setServiceFour(ObjectName on)
    {
       serviceFourB = on;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -31,7 +31,7 @@
  */
 @Service
 @Management(ServiceFourManagement.class)
- at Depends ("jboss.ejb3:management=interface,with=customName,is=serviceThree")
+ at Depends ("jboss.ejb3:is=serviceThree,management=interface,with=customName")
 public class ServiceFour implements ServiceFourManagement
 {
    public void create() throws Exception

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,158 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Service
-public class ServiceSeven implements ServiceSevenLocal, ServiceSevenRemote, ServiceSevenManagement
-{
-   static int instances = 0;
-   int localMethodCalls;
-   int remoteMethodCalls;
-   int jmxAttribute;
-   int someJmxAttribute;
-   int otherJmxAttribute;
-   int readWriteOnlyAttribute;
-
-   public ServiceSeven()
-   {
-      instances++;
-   }
-
-   public int getInstances()
-   {
-      return instances;
-   }
-
-   public int getRemoteMethodCalls()
-   {
-      return remoteMethodCalls;
-   }
-
-   public void setRemoteMethodCalls(int i)
-   {
-      remoteMethodCalls = i;
-   }
-
-   public int getLocalMethodCalls()
-   {
-      return localMethodCalls;
-   }
-
-   public void setLocalMethodCalls(int i)
-   {
-      localMethodCalls = i;
-   }
-
-   public synchronized void localMethod(String s)
-   {
-      localMethodCalls++;
-   }
-
-   public synchronized void remoteMethod(String s)
-   {
-      remoteMethodCalls++;
-   }
-
-   public String jmxOperation(String s)
-   {
-      return "x" + s + "x";
-   }
-
-   public String[] jmxOperation(String[] s)
-   {
-      for (int i = 0 ; i < s.length ; i++)
-      {
-         s[i] = jmxOperation(s[i]);
-      }
-      return s;
-   }
-
-   public int getAttribute()
-   {
-      return jmxAttribute;
-   }
-
-   public void setAttribute(int i)
-   {
-      jmxAttribute = i;
-   }
-
-   public int getSomeAttr()
-   {
-      return someJmxAttribute;
-   }
-
-   public void setSomeAttr(int i)
-   {
-      someJmxAttribute = i;
-   }
-
-   public int getOtherAttr()
-   {
-      return otherJmxAttribute;
-   }
-
-   public void setOtherAttr(int i)
-   {
-      otherJmxAttribute = i;
-   }
-
-   public void setWriteOnly(int i)
-   {
-      readWriteOnlyAttribute = i;
-   }
-
-   public int getReadOnly()
-   {
-      return readWriteOnlyAttribute;
-   }
-
-
-   public void create() throws Exception
-   {
-      System.out.println("ServiceSeven - CREATE");
-  //    Tester.creates.add("1");
-   }
-
-   public void start() throws Exception
-   {
-      System.out.println("ServiceSeven - START");
-   //   Tester.starts.add("1");
-   }
-
-   public void stop()
-   {
-      System.out.println("ServiceSeven - STOP");
-   }
-
-   public void destroy()
-   {
-      System.out.println("ServiceSeven - DESTROY");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,158 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Service
+public class ServiceSeven implements ServiceSevenLocal, ServiceSevenRemote, ServiceSevenManagement
+{
+   static int instances = 0;
+   int localMethodCalls;
+   int remoteMethodCalls;
+   int jmxAttribute;
+   int someJmxAttribute;
+   int otherJmxAttribute;
+   int readWriteOnlyAttribute;
+
+   public ServiceSeven()
+   {
+      instances++;
+   }
+
+   public int getInstances()
+   {
+      return instances;
+   }
+
+   public int getRemoteMethodCalls()
+   {
+      return remoteMethodCalls;
+   }
+
+   public void setRemoteMethodCalls(int i)
+   {
+      remoteMethodCalls = i;
+   }
+
+   public int getLocalMethodCalls()
+   {
+      return localMethodCalls;
+   }
+
+   public void setLocalMethodCalls(int i)
+   {
+      localMethodCalls = i;
+   }
+
+   public synchronized void localMethod(String s)
+   {
+      localMethodCalls++;
+   }
+
+   public synchronized void remoteMethod(String s)
+   {
+      remoteMethodCalls++;
+   }
+
+   public String jmxOperation(String s)
+   {
+      return "x" + s + "x";
+   }
+
+   public String[] jmxOperation(String[] s)
+   {
+      for (int i = 0 ; i < s.length ; i++)
+      {
+         s[i] = jmxOperation(s[i]);
+      }
+      return s;
+   }
+
+   public int getAttribute()
+   {
+      return jmxAttribute;
+   }
+
+   public void setAttribute(int i)
+   {
+      jmxAttribute = i;
+   }
+
+   public int getSomeAttr()
+   {
+      return someJmxAttribute;
+   }
+
+   public void setSomeAttr(int i)
+   {
+      someJmxAttribute = i;
+   }
+
+   public int getOtherAttr()
+   {
+      return otherJmxAttribute;
+   }
+
+   public void setOtherAttr(int i)
+   {
+      otherJmxAttribute = i;
+   }
+
+   public void setWriteOnly(int i)
+   {
+      readWriteOnlyAttribute = i;
+   }
+
+   public int getReadOnly()
+   {
+      return readWriteOnlyAttribute;
+   }
+
+
+   public void create() throws Exception
+   {
+      System.out.println("ServiceSeven - CREATE");
+  //    Tester.creates.add("1");
+   }
+
+   public void start() throws Exception
+   {
+      System.out.println("ServiceSeven - START");
+   //   Tester.starts.add("1");
+   }
+
+   public void stop()
+   {
+      System.out.println("ServiceSeven - STOP");
+   }
+
+   public void destroy()
+   {
+      System.out.println("ServiceSeven - DESTROY");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import javax.ejb.Local;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Local
-public interface ServiceSevenLocal
-{
-   void localMethod(String s);
-   int getInstances();
-   int getLocalMethodCalls();
-   void setLocalMethodCalls(int i);
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+import javax.ejb.Local;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Local
+public interface ServiceSevenLocal
+{
+   void localMethod(String s);
+   int getInstances();
+   int getLocalMethodCalls();
+   void setLocalMethodCalls(int i);
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import org.jboss.annotation.ejb.Management;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Management
-public interface ServiceSevenManagement
-{
-   String jmxOperation(String s);
-   String[] jmxOperation(String[] s);
-   int getAttribute();
-   void setAttribute(int i);
-   int getSomeAttr();
-   void setSomeAttr(int i);
-   int getOtherAttr();
-   void setOtherAttr(int i);
-   void setWriteOnly(int i);
-   int getReadOnly();
-
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+import org.jboss.annotation.ejb.Management;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Management
+public interface ServiceSevenManagement
+{
+   String jmxOperation(String s);
+   String[] jmxOperation(String[] s);
+   int getAttribute();
+   void setAttribute(int i);
+   int getSomeAttr();
+   void setSomeAttr(int i);
+   int getOtherAttr();
+   void setOtherAttr(int i);
+   void setWriteOnly(int i);
+   int getReadOnly();
+
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import javax.ejb.Remote;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Remote
-public interface ServiceSevenRemote
-{
-   void remoteMethod(String s);
-   int getInstances();
-   int getRemoteMethodCalls();
-   void setRemoteMethodCalls(int i);
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+import javax.ejb.Remote;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface ServiceSevenRemote
+{
+   void remoteMethod(String s);
+   int getInstances();
+   int getRemoteMethodCalls();
+   void setRemoteMethodCalls(int i);
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,174 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import javax.ejb.Remote;
-import javax.ejb.Local;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
-import org.jboss.annotation.ejb.Service;
-import org.jboss.ejb3.Container;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ServiceSix implements ServiceSixLocal, ServiceSixRemote, ServiceSixManagement
-{
-   boolean called;
-   
-   int localMethodCalls;
-   int remoteMethodCalls;
-   int jmxAttribute;
-   int someJmxAttribute;
-   int otherJmxAttribute;
-   int readWriteOnlyAttribute;
-   
-   StatelessRemote stateless;
-   StatelessLocal statelessLocal;
-   DataSource testDatasource;
-   
-   public void setStatelessLocal(StatelessLocal statelessLocal)
-   {
-      this.statelessLocal = statelessLocal;
-   }
-   
-   public void testInjection() throws Exception
-   {
-      try 
-      {
-         stateless.test();
-         statelessLocal.testLocal();
-         testDatasource.getConnection();
-         
-         Context initCtx = new InitialContext();
-         Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
-         Object obj = myEnv.lookup("res/aQueue");
-         if ((obj instanceof javax.jms.Queue) == false)
-            throw new NamingException("res/aQueue is not a javax.jms.Queue");
-      } 
-      catch (Exception e)
-      {
-         e.printStackTrace();
-         throw e;
-      }
-   }
-
-   public boolean getCalled()
-   {
-      return called;
-   }
-
-   public void setCalled(boolean called)
-   {
-      this.called = called;
-   }
-
-   public void localMethod()
-   {
-      called = true;
-   }
-
-   public void remoteMethod()
-   {
-      called = true;
-   }
-   
-   public String jmxOperation(String s)
-   {
-      return "x" + s + "x";
-   }
-
-   public String[] jmxOperation(String[] s)
-   {
-      for (int i = 0 ; i < s.length ; i++)
-      {
-         s[i] = jmxOperation(s[i]);
-      }
-      return s;
-   }
-
-   public int getAttribute()
-   {
-      return jmxAttribute;
-   }
-
-   public void setAttribute(int i)
-   {
-      jmxAttribute = i;
-   }
-
-   public int getSomeAttr()
-   {
-      return someJmxAttribute;
-   }
-
-   public void setSomeAttr(int i)
-   {
-      someJmxAttribute = i;
-   }
-
-   public int getOtherAttr()
-   {
-      return otherJmxAttribute;
-   }
-
-   public void setOtherAttr(int i)
-   {
-      otherJmxAttribute = i;
-   }
-
-   public void setWriteOnly(int i)
-   {
-      readWriteOnlyAttribute = i;
-   }
-
-   public int getReadOnly()
-   {
-      return readWriteOnlyAttribute;
-   }
-
-
-   public void create() throws Exception
-   {
-     
-   }
-
-   public void start() throws Exception
-   {
-    
-   }
-
-   public void stop()
-   {
-    
-   }
-
-   public void destroy()
-   {
-   
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,174 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+import javax.ejb.Remote;
+import javax.ejb.Local;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.Container;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ServiceSix implements ServiceSixLocal, ServiceSixRemote, ServiceSixManagement
+{
+   boolean called;
+   
+   int localMethodCalls;
+   int remoteMethodCalls;
+   int jmxAttribute;
+   int someJmxAttribute;
+   int otherJmxAttribute;
+   int readWriteOnlyAttribute;
+   
+   StatelessRemote stateless;
+   StatelessLocal statelessLocal;
+   DataSource testDatasource;
+   
+   public void setStatelessLocal(StatelessLocal statelessLocal)
+   {
+      this.statelessLocal = statelessLocal;
+   }
+   
+   public void testInjection() throws Exception
+   {
+      try 
+      {
+         stateless.test();
+         statelessLocal.testLocal();
+         testDatasource.getConnection();
+         
+         Context initCtx = new InitialContext();
+         Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");
+         Object obj = myEnv.lookup("res/aQueue");
+         if ((obj instanceof javax.jms.Queue) == false)
+            throw new NamingException("res/aQueue is not a javax.jms.Queue");
+      } 
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         throw e;
+      }
+   }
+
+   public boolean getCalled()
+   {
+      return called;
+   }
+
+   public void setCalled(boolean called)
+   {
+      this.called = called;
+   }
+
+   public void localMethod()
+   {
+      called = true;
+   }
+
+   public void remoteMethod()
+   {
+      called = true;
+   }
+   
+   public String jmxOperation(String s)
+   {
+      return "x" + s + "x";
+   }
+
+   public String[] jmxOperation(String[] s)
+   {
+      for (int i = 0 ; i < s.length ; i++)
+      {
+         s[i] = jmxOperation(s[i]);
+      }
+      return s;
+   }
+
+   public int getAttribute()
+   {
+      return jmxAttribute;
+   }
+
+   public void setAttribute(int i)
+   {
+      jmxAttribute = i;
+   }
+
+   public int getSomeAttr()
+   {
+      return someJmxAttribute;
+   }
+
+   public void setSomeAttr(int i)
+   {
+      someJmxAttribute = i;
+   }
+
+   public int getOtherAttr()
+   {
+      return otherJmxAttribute;
+   }
+
+   public void setOtherAttr(int i)
+   {
+      otherJmxAttribute = i;
+   }
+
+   public void setWriteOnly(int i)
+   {
+      readWriteOnlyAttribute = i;
+   }
+
+   public int getReadOnly()
+   {
+      return readWriteOnlyAttribute;
+   }
+
+
+   public void create() throws Exception
+   {
+     
+   }
+
+   public void start() throws Exception
+   {
+    
+   }
+
+   public void stop()
+   {
+    
+   }
+
+   public void destroy()
+   {
+   
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ServiceSixLocal
-{
-   boolean getCalled();
-   void setCalled(boolean called);
-   void localMethod();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceSixLocal
+{
+   boolean getCalled();
+   void setCalled(boolean called);
+   void localMethod();
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Management;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ServiceSixManagement
-{
-   String jmxOperation(String s);
-   String[] jmxOperation(String[] s);
-   int getAttribute();
-   void setAttribute(int i);
-   int getSomeAttr();
-   void setSomeAttr(int i);
-   int getOtherAttr();
-   void setOtherAttr(int i);
-   void setWriteOnly(int i);
-   int getReadOnly();
-
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Management;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceSixManagement
+{
+   String jmxOperation(String s);
+   String[] jmxOperation(String[] s);
+   int getAttribute();
+   void setAttribute(int i);
+   int getSomeAttr();
+   void setSomeAttr(int i);
+   int getOtherAttr();
+   void setOtherAttr(int i);
+   void setWriteOnly(int i);
+   int getReadOnly();
+
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ServiceSixRemote
-{
-   boolean getCalled();
-   void setCalled(boolean called);
-   void remoteMethod();
-   
-   void testInjection() throws Exception;
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceSixRemote
+{
+   boolean getCalled();
+   void setCalled(boolean called);
+   void remoteMethod();
+   
+   void testInjection() throws Exception;
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -32,9 +32,10 @@
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
  */
+// note: this is a serialized name, not a canonical name
 @Service (objectName = "jboss.ejb3:management=interface,with=customName,is=serviceThree")
 @Management(ServiceThreeManagement.class)
- at Depends ({"jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceTwo","jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceOne,type=ManagementInterface"})
+ at Depends ({"jboss.j2ee:jar=service-test.jar,name=ServiceTwo,service=EJB3","jboss.j2ee:jar=service-test.jar,name=ServiceOne,service=EJB3,type=ManagementInterface"})
 public class ServiceThree implements ServiceThreeManagement
 {
    @EJB

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -35,7 +35,7 @@
 @Service
 @RemoteBinding(jndiBinding = "serviceTwo/remote")
 @LocalBinding (jndiBinding = "serviceTwo/local")
- at Depends ("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceOne,type=ManagementInterface")
+ at Depends ("jboss.j2ee:jar=service-test.jar,name=ServiceOne,service=EJB3,type=ManagementInterface")
 @Remote(ServiceTwoRemote.class)
 @Local(ServiceTwoLocal.class)
 public class ServiceTwo implements ServiceTwoLocal, ServiceTwoRemote

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/Session.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/Session.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/Session.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -34,7 +34,7 @@
 @Remote(SessionRemote.class)
 public class Session implements SessionRemote
 {
-   @Depends("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceOne,type=ManagementInterface")
+   @Depends("jboss.j2ee:jar=service-test.jar,name=ServiceOne,service=EJB3,type=ManagementInterface")
    public ObjectName serviceOne;
    
 //   @EJB StatelessRemote stateless;

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-/**
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
-public class SessionBean implements SessionRemote
-{
-   public boolean injectedDepends()
-   {
-      return false;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+/**
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision$
+ */
+public class SessionBean implements SessionRemote
+{
+   public boolean injectedDepends()
+   {
+      return false;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/SessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
- at Stateless
- at Remote(StatelessRemote.class)
- at Local(StatelessLocal.class)
-public class StatelessBean implements StatelessRemote, StatelessLocal
-{
-   public void test()
-   {
-   }
-   
-   public void testLocal()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+ at Stateless
+ at Remote(StatelessRemote.class)
+ at Local(StatelessLocal.class)
+public class StatelessBean implements StatelessRemote, StatelessLocal
+{
+   public void test()
+   {
+   }
+   
+   public void testLocal()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface StatelessLocal
-{
-   void testLocal();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface StatelessLocal
+{
+   void testLocal();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public interface StatelessRemote
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.service;
+
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public interface StatelessRemote
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import javax.annotation.Resource;
-import javax.jms.Topic;
-import javax.jms.TopicConnectionFactory;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision: 45190 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Service(objectName = "jboss.ejb3.bugs:service=TestResourceInjectionService")
- at Management(TestResourceInjectionServiceIF.class)
-public class TestResourceInjectionService implements TestResourceInjectionServiceIF {
-
-	private static Logger log = Logger.getLogger(TestResourceInjectionService.class);
-	
-	public boolean testedSuccessful = true;
-
-	@Resource(mappedName = "topic/testTopic")
-	private Topic testTopic;
-	
-	@Resource(mappedName = "ConnectionFactory")
-	private TopicConnectionFactory topicConnectionFactory;
-	
-	public boolean getTestedSuccessful() {
-		return testedSuccessful;
-	}
-
-// - Service life cycle --------------------------------------------------------
-	
-	public void create() throws Exception {
-		log.info("TestResourceInjectionService.create()");
-		testedSuccessful = testTopic != null && topicConnectionFactory != null;
-	}
-	
-	public void start() throws Exception {
-		log.info("TestResourceInjectionService.start()");
-		if(testTopic == null)
-        {
-			log.warn("Dependent resource injection 'testTopic' failed");
-            testedSuccessful = false;
-        }
-        
-		if(topicConnectionFactory == null)
-        {
-			log.warn("Dependent resource injection 'topicConnectionFactory' failed");
-            testedSuccessful = false;
-        }
-	}
-	
-	public void stop() {
-		log.info("TestResourceInjectionService.stop()");
-	}
-	
-	public void destroy() {
-		log.info("TestResourceInjectionService.destroy()");
-	}	
-	
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,84 @@
+package org.jboss.ejb3.test.service;
+
+import javax.annotation.Resource;
+import javax.jms.Topic;
+import javax.jms.TopicConnectionFactory;
+
+import org.jboss.annotation.ejb.Depends;
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.logging.Logger;
+
+/**
+ * Test EJBTHREE-587
+ * 
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Service(objectName = "jboss.ejb3.bugs:service=TestResourceInjectionService")
+ at Management(TestResourceInjectionServiceIF.class)
+ at Depends("jboss.mq.destination:name=myTestTopic,service=Topic")
+public class TestResourceInjectionService implements TestResourceInjectionServiceIF {
+
+	private static Logger log = Logger.getLogger(TestResourceInjectionService.class);
+	
+	public boolean testedSuccessful = false;
+
+	@Resource(mappedName = "topic/myTestTopic")
+	private Topic testTopic;
+	
+	@Resource(mappedName = "ConnectionFactory")
+	private TopicConnectionFactory topicConnectionFactory;
+	
+	public boolean getTestedSuccessful() {
+		return testedSuccessful;
+	}
+
+    public boolean getTestedSuccessfulNow() {
+       boolean success = true;
+       if(testTopic == null)
+       {
+           log.warn("Dependent resource injection 'testTopic' failed");
+           success = false;
+       }
+       
+       if(topicConnectionFactory == null)
+       {
+           log.warn("Dependent resource injection 'topicConnectionFactory' failed");
+           success = false;
+       }
+       return success;
+    }
+   
+// - Service life cycle --------------------------------------------------------
+	
+	public void create() throws Exception {
+		log.info("TestResourceInjectionService.create()");
+        // EJBTHREE-655: resource injection isn't done yet
+	}
+	
+	public void start() throws Exception {
+		log.info("TestResourceInjectionService.start()");
+        testedSuccessful = true;
+		if(testTopic == null)
+        {
+			log.warn("Dependent resource injection 'testTopic' failed");
+            testedSuccessful = false;
+        }
+        
+		if(topicConnectionFactory == null)
+        {
+			log.warn("Dependent resource injection 'topicConnectionFactory' failed");
+            testedSuccessful = false;
+        }
+	}
+	
+	public void stop() {
+		log.info("TestResourceInjectionService.stop()");
+	}
+	
+	public void destroy() {
+		log.info("TestResourceInjectionService.destroy()");
+	}	
+	
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.service;
-
-import org.jboss.annotation.ejb.Management;
-
-/**
- * @version <tt>$Revision: 45190 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Management
-public interface TestResourceInjectionServiceIF {
-
-	public boolean getTestedSuccessful();
-	
-// - Service life cycle --------------------------------------------------------	
-	
-	public void create() throws Exception;
-	
-	public void start() throws Exception;
-	
-	public void stop();
-	
-	public void destroy();	
-	
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,26 @@
+package org.jboss.ejb3.test.service;
+
+import org.jboss.annotation.ejb.Management;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Management
+public interface TestResourceInjectionServiceIF {
+
+	public boolean getTestedSuccessful();
+	
+    public boolean getTestedSuccessfulNow();
+    
+// - Service life cycle --------------------------------------------------------	
+	
+	public void create() throws Exception;
+	
+	public void start() throws Exception;
+	
+	public void stop();
+	
+	public void destroy();	
+	
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -138,6 +138,9 @@
       assertEquals("Wrong number of remote method calls", count * count, test.getRemoteMethodCalls());
    }
    
+   /**
+    * Was injection successful after start?
+    */
    public void testEJB3_587() throws Exception
    {
       MBeanServerConnection server = getServer();
@@ -146,6 +149,17 @@
       assertTrue(success);
    }
 
+   /**
+    * Is injection successful when getting a management attribute?
+    */
+   public void testEJB3_587_2() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName testerName = new ObjectName("jboss.ejb3.bugs:service=TestResourceInjectionService");
+      boolean success = (Boolean)server.getAttribute(testerName, "TestedSuccessfulNow");
+      assertTrue(success);
+   }
+
    public void testServiceWithDefaultLocalJNDIName() throws Exception
    {
 	  MBeanServerConnection server = getServer();
@@ -457,10 +471,11 @@
 
       for (int i = 0 ; i < expectedLength ; i++)
       {
-         int create = Integer.parseInt((String)creates.get(i));
+         // EJBTHREE-655: it's no use checking the creation order
+//         int create = Integer.parseInt((String)creates.get(i));
          int start = Integer.parseInt((String)starts.get(i));
          int expected = (i == 0) ? i + 1 : i + 2;
-         assertEquals("Creation of Service" + create + "appears at the wronmg place" + createAll, expected, create);
+//         assertEquals("Creation of Service" + create + "appears at the wronmg place" + createAll, expected, create);
          assertEquals("Start of Service" + start + "appears at the wronmg place" + startAll, expected, start);
       }
    }

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.servicedependency;
-
-/**
- * A Account.
- * 
- * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision$
- */
-public interface Account
-{
-  public void debit(String account, int amount);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.servicedependency;
+
+/**
+ * A Account.
+ * 
+ * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @version $Revision$
+ */
+public interface Account
+{
+  public void debit(String account, int amount);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Account.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-package org.jboss.ejb3.test.servicedependency;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.Depends;
-
-import org.jboss.logging.Logger;
-
-/**
- * AccountBean
- *
- * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $$Revision$$
- */
- at Stateless
- at Remote(Account.class)
-public class AccountBean implements Account {
-
-   private static final Logger log = Logger.getLogger(AccountBean.class);
-   
-   @Depends ("acme:service=uniqueid")
-   private UniqueIdMBean uniqueId;
-   
-   public void debit(String account, int amount)
-   {
-      log.info("debiting " + amount + " swiss francs from account " + account);
-      log.info("transaction id: " + uniqueId.generate());
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+package org.jboss.ejb3.test.servicedependency;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.Depends;
+
+import org.jboss.logging.Logger;
+
+/**
+ * AccountBean
+ *
+ * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @version $$Revision$$
+ */
+ at Stateless
+ at Remote(Account.class)
+public class AccountBean implements Account {
+
+   private static final Logger log = Logger.getLogger(AccountBean.class);
+   
+   @Depends ("acme:service=uniqueid")
+   private UniqueIdMBean uniqueId;
+   
+   public void debit(String account, int amount)
+   {
+      log.info("debiting " + amount + " swiss francs from account " + account);
+      log.info("transaction id: " + uniqueId.generate());
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.servicedependency;
-
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-
-/**
- * A Customer.
- * 
- * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision$
- */
-public class Customer
-{
-
-   /**
-    * FIXME Comment this
-    * 
-    * @param args
-    * @throws Exception 
-    */
-   public static void main(String[] args) throws Exception
-   {
-      Properties props = new Properties();
-      props.setProperty("java.naming.factory.initial",
-               "org.jnp.interfaces.NamingContextFactory");
-      props.setProperty("java.naming.factory.url.pkgs",
-               "org.jboss.naming:org.jnp.interfaces");
-      props.setProperty("java.naming.provider.url", "localhost:1099");
-      
-      InitialContext ctx = new InitialContext(props);
-      
-      Object ejb= ctx.lookup("AccountBean/remote");
-      Account account = (Account)PortableRemoteObject.narrow(ejb, Account.class);
-      
-      account.debit("galder", 10);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.servicedependency;
+
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+/**
+ * A Customer.
+ * 
+ * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @version $Revision$
+ */
+public class Customer
+{
+
+   /**
+    * FIXME Comment this
+    * 
+    * @param args
+    * @throws Exception 
+    */
+   public static void main(String[] args) throws Exception
+   {
+      Properties props = new Properties();
+      props.setProperty("java.naming.factory.initial",
+               "org.jnp.interfaces.NamingContextFactory");
+      props.setProperty("java.naming.factory.url.pkgs",
+               "org.jboss.naming:org.jnp.interfaces");
+      props.setProperty("java.naming.provider.url", "localhost:1099");
+      
+      InitialContext ctx = new InitialContext(props);
+      
+      Object ejb= ctx.lookup("AccountBean/remote");
+      Account account = (Account)PortableRemoteObject.narrow(ejb, Account.class);
+      
+      account.debit("galder", 10);
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.servicedependency;
-
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-
-/**
- * A PinNumberMBean.
- * 
- * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision$
- */
- at Service(objectName="acme:service=pinnumber")
- at Management(PinNumberMBean.class)
-public class PinNumber implements PinNumberMBean
-{
-   @Depends ("acme:service=uniqueid")
-   private UniqueIdMBean uniqueId;
-
-   public short createRandom()
-   {
-      return (short)uniqueId.generate().getLeastSignificantBits();    
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.servicedependency;
+
+import org.jboss.annotation.ejb.Depends;
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * A PinNumberMBean.
+ * 
+ * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @version $Revision$
+ */
+ at Service(objectName="acme:service=pinnumber")
+ at Management(PinNumberMBean.class)
+public class PinNumber implements PinNumberMBean
+{
+   @Depends ("acme:service=uniqueid")
+   private UniqueIdMBean uniqueId;
+
+   public short createRandom()
+   {
+      return (short)uniqueId.generate().getLeastSignificantBits();    
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,18 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.servicedependency;
-
-/**
- * A PinNumber.
- * 
- * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision$
- */
-public interface PinNumberMBean
-{
-  public short createRandom();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,18 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.servicedependency;
+
+/**
+ * A PinNumber.
+ * 
+ * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @version $Revision$
+ */
+public interface PinNumberMBean
+{
+  public short createRandom();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumberMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,56 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.servicedependency;
-
-import java.util.UUID;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.logging.Logger;
-
-/**
- * A UniqueIdMBean.
- * 
- * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision$
- */
- at Service(objectName="acme:service=uniqueid")
- at Management(UniqueIdMBean.class)
-public class UniqueId implements UniqueIdMBean
-{
-   private static final Logger log = Logger.getLogger(UniqueId.class);
-
-   public UUID generate()
-   {
-      return UUID.randomUUID();
-   }
-
-   public void create() throws Exception
-   {
-      log.info("create()");
-
-   }
-
-   public void start() throws Exception
-   {
-      log.info("start()");
-
-   }
-
-   public void stop() throws Exception
-   {
-      log.info("stop()");
-
-   }
-
-   public void destroy() throws Exception
-   {
-      log.info("destroy()");
-
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.servicedependency;
+
+import java.util.UUID;
+
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.logging.Logger;
+
+/**
+ * A UniqueIdMBean.
+ * 
+ * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @version $Revision$
+ */
+ at Service(objectName="acme:service=uniqueid")
+ at Management(UniqueIdMBean.class)
+public class UniqueId implements UniqueIdMBean
+{
+   private static final Logger log = Logger.getLogger(UniqueId.class);
+
+   public UUID generate()
+   {
+      return UUID.randomUUID();
+   }
+
+   public void create() throws Exception
+   {
+      log.info("create()");
+
+   }
+
+   public void start() throws Exception
+   {
+      log.info("start()");
+
+   }
+
+   public void stop() throws Exception
+   {
+      log.info("stop()");
+
+   }
+
+   public void destroy() throws Exception
+   {
+      log.info("destroy()");
+
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,26 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.servicedependency;
-
-import java.util.UUID;
-
-/**
- * A UUID.
- * 
- * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision$
- */
-public interface UniqueIdMBean
-{
-  public UUID generate();
-  
-  public void create () throws Exception;
-  public void start () throws Exception;
-  public void stop () throws Exception;
-  public void destroy () throws Exception;
-  
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.servicedependency;
+
+import java.util.UUID;
+
+/**
+ * A UUID.
+ * 
+ * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @version $Revision$
+ */
+public interface UniqueIdMBean
+{
+  public UUID generate();
+  
+  public void create () throws Exception;
+  public void start () throws Exception;
+  public void stop () throws Exception;
+  public void destroy () throws Exception;
+  
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueIdMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,72 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servicedependency.unit;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
-import org.jboss.ejb3.test.stateless.RunAsStateless;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.servicedependency.Account;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class ServiceUnitTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(ServiceUnitTestCase.class);
-
-   public ServiceUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testNoDependency() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      Account account = (Account) jndiContext.lookup("AccountBean/remote");
-      assertNotNull(account);
-      
-      account.debit("account", 1);
-   }
-   
-   public void testDependency() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName testerName = new ObjectName("acme:service=pinnumber");
-      Object[] params = {};
-      String[] sig = {};
-      server.invoke(testerName, "createRandom", params, sig);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ServiceUnitTestCase.class, "servicedependency.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servicedependency.unit;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import org.jboss.ejb3.test.stateless.RunAsStateless;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.servicedependency.Account;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class ServiceUnitTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(ServiceUnitTestCase.class);
+
+   public ServiceUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testNoDependency() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      Account account = (Account) jndiContext.lookup("AccountBean/remote");
+      assertNotNull(account);
+      
+      account.debit("account", 1);
+   }
+   
+   public void testDependency() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName testerName = new ObjectName("acme:service=pinnumber");
+      Object[] params = {};
+      String[] sig = {};
+      server.invoke(testerName, "createRandom", params, sig);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ServiceUnitTestCase.class, "servicedependency.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicedependency/unit/ServiceUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servicexmbean;
-
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Service(objectName="jboss.ejb3.test:service=ServiceOne", xmbean="resource:service-xmbean.xml")
- at Remote(ServiceOneRemote.class)
-public class ServiceOne implements ServiceOneRemote
-{
-   String stringAttribute = "";
-   
-   public ServiceOne()
-   {
-   }
-   
-   public void remoteMethod()
-   {
-   }
-   
-   public void testOperation()
-   {
-      stringAttribute = "reset";
-   }
-
-   public String getStringAttribute()
-   {
-      return stringAttribute;
-   }
-
-   public void setStringAttribute(String stringAttribute)
-   {
-      this.stringAttribute = stringAttribute;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.servicexmbean;
+
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Service(objectName="jboss.ejb3.test:service=ServiceOne", xmbean="resource:service-xmbean.xml")
+ at Remote(ServiceOneRemote.class)
+public class ServiceOne implements ServiceOneRemote
+{
+   String stringAttribute = "";
+   
+   public ServiceOne()
+   {
+   }
+   
+   public void remoteMethod()
+   {
+   }
+   
+   public void testOperation()
+   {
+      stringAttribute = "reset";
+   }
+
+   public String getStringAttribute()
+   {
+      return stringAttribute;
+   }
+
+   public void setStringAttribute(String stringAttribute)
+   {
+      this.stringAttribute = stringAttribute;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servicexmbean;
-
-import javax.ejb.Remote;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ServiceOneDeploymentDescriptor implements ServiceOneRemote
-{
-   String stringAttribute = "";
-   
-   public ServiceOneDeploymentDescriptor()
-   {
-   }
-   
-   public void remoteMethod()
-   {
-   }
-   
-   public void testOperation()
-   {
-      stringAttribute = "reset";
-   }
-
-   public String getStringAttribute()
-   {
-      return stringAttribute;
-   }
-
-   public void setStringAttribute(String stringAttribute)
-   {
-      this.stringAttribute = stringAttribute;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.servicexmbean;
+
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class ServiceOneDeploymentDescriptor implements ServiceOneRemote
+{
+   String stringAttribute = "";
+   
+   public ServiceOneDeploymentDescriptor()
+   {
+   }
+   
+   public void remoteMethod()
+   {
+   }
+   
+   public void testOperation()
+   {
+      stringAttribute = "reset";
+   }
+
+   public String getStringAttribute()
+   {
+      return stringAttribute;
+   }
+
+   public void setStringAttribute(String stringAttribute)
+   {
+      this.stringAttribute = stringAttribute;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servicexmbean;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface ServiceOneRemote
-{
-   void remoteMethod();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.servicexmbean;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceOneRemote
+{
+   void remoteMethod();
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servicexmbean.unit;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.test.service.ServiceOneRemote;
-import org.jboss.ejb3.test.service.ServiceSevenRemote;
-import org.jboss.ejb3.test.service.ServiceSixRemote;
-import org.jboss.ejb3.test.service.ServiceTwoRemote;
-import org.jboss.ejb3.test.service.SessionRemote;
-import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: ServiceUnitTestCase.java 57005 2006-09-20 13:10:12Z wolfc $
- */
-
-public class ServiceUnitTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(ServiceUnitTestCase.class);
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public ServiceUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testXMBean() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName service = new ObjectName("jboss.ejb3.test:service=ServiceOne");
-      server.setAttribute(service, new Attribute("StringAttribute", "test value"));
-      String stringAttribute = (String)server.getAttribute(service, "StringAttribute");
-      assertEquals("test value", stringAttribute);
-      server.invoke(service, "testOperation", new Object[0], new String[0]);
-      stringAttribute = (String)server.getAttribute(service, "StringAttribute");
-      assertEquals("reset", stringAttribute);
-   }
-   
-   public void testXMBeanDeploymentDescriptor() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName service = new ObjectName("jboss.ejb3.test:service=ServiceOneDeploymentDescriptor");
-      server.setAttribute(service, new Attribute("StringAttribute", "test value"));
-      String stringAttribute = (String)server.getAttribute(service, "StringAttribute");
-      assertEquals("test value", stringAttribute);
-      server.invoke(service, "testOperation", new Object[0], new String[0]);
-      stringAttribute = (String)server.getAttribute(service, "StringAttribute");
-      assertEquals("reset", stringAttribute);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ServiceUnitTestCase.class, "service-xmbean-test.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/unit/ServiceUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.servicexmbean.unit;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.test.service.ServiceOneRemote;
+import org.jboss.ejb3.test.service.ServiceSevenRemote;
+import org.jboss.ejb3.test.service.ServiceSixRemote;
+import org.jboss.ejb3.test.service.ServiceTwoRemote;
+import org.jboss.ejb3.test.service.SessionRemote;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: ServiceUnitTestCase.java 57005 2006-09-20 13:10:12Z wolfc $
+ */
+
+public class ServiceUnitTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(ServiceUnitTestCase.class);
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public ServiceUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testXMBean() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName service = new ObjectName("jboss.ejb3.test:service=ServiceOne");
+      server.setAttribute(service, new Attribute("StringAttribute", "test value"));
+      String stringAttribute = (String)server.getAttribute(service, "StringAttribute");
+      assertEquals("test value", stringAttribute);
+      server.invoke(service, "testOperation", new Object[0], new String[0]);
+      stringAttribute = (String)server.getAttribute(service, "StringAttribute");
+      assertEquals("reset", stringAttribute);
+   }
+   
+   public void testXMBeanDeploymentDescriptor() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName service = new ObjectName("jboss.ejb3.test:service=ServiceOneDeploymentDescriptor");
+      server.setAttribute(service, new Attribute("StringAttribute", "test value"));
+      String stringAttribute = (String)server.getAttribute(service, "StringAttribute");
+      assertEquals("test value", stringAttribute);
+      server.invoke(service, "testOperation", new Object[0], new String[0]);
+      stringAttribute = (String)server.getAttribute(service, "StringAttribute");
+      assertEquals("reset", stringAttribute);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ServiceUnitTestCase.class, "service-xmbean-test.jar");
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30 
-{
-   void hello();
-   
-   void goodbye();
-   
-   String access(TestObject o);
-   
-   TestObject createTestObject();
-   
-   boolean checkEqPointer(TestObject to);
-   
-   WarTestObject getWarTestObject();
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30 
+{
+   void hello();
+   
+   void goodbye();
+   
+   String access(TestObject o);
+   
+   TestObject createTestObject();
+   
+   boolean checkEqPointer(TestObject to);
+   
+   WarTestObject getWarTestObject();
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-import javax.ejb.EJB;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.LocalHome;
-import javax.ejb.RemoteHome;
-import javax.ejb.Stateless;
-
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-import org.jboss.ejb3.test.servlet.Session30;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless(name="Session30")
- at Remote(Session30.class)
- at Local(Session30.class)
- at RemoteBinding(jndiBinding = "ejb/Session30")
- at LocalBinding(jndiBinding = "ejb/Session30Local")
- at RemoteHome(Session30Home.class)
- at LocalHome(Session30LocalHome.class)
- at SecurityDomain("userinrole")
-public class Session30Bean implements Session30
-{
-   private static final Logger log = Logger.getLogger(Session30Bean.class);
-   
-   @EJB private StatefulRemote stateful;
-   
-   private TestObject testObject;
-   
-   @RolesAllowed({"allowed"}) 
-   public void hello()
-   {
-   }
-   
-   @RolesAllowed({"allowed"}) 
-   public void goodbye()
-   {
-   }
-   
-   public String access(TestObject o)
-   {
-      return stateful.access(o);
-   }
-   
-   public TestObject createTestObject()
-   {
-      testObject = new TestObject();
-      return testObject;
-   }
-   
-   public boolean checkEqPointer(TestObject to)
-   {
-      return to == testObject;
-   }
-   
-   public WarTestObject getWarTestObject()
-   {
-      return new WarTestObject();
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+import javax.ejb.EJB;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.LocalHome;
+import javax.ejb.RemoteHome;
+import javax.ejb.Stateless;
+
+import javax.annotation.security.RolesAllowed;
+
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+import org.jboss.ejb3.test.servlet.Session30;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="Session30")
+ at Remote(Session30.class)
+ at Local(Session30.class)
+ at RemoteBinding(jndiBinding = "ejb/Session30")
+ at LocalBinding(jndiBinding = "ejb/Session30Local")
+ at RemoteHome(Session30Home.class)
+ at LocalHome(Session30LocalHome.class)
+ at SecurityDomain("userinrole")
+public class Session30Bean implements Session30
+{
+   private static final Logger log = Logger.getLogger(Session30Bean.class);
+   
+   @EJB private StatefulRemote stateful;
+   
+   private TestObject testObject;
+   
+   @RolesAllowed({"allowed"}) 
+   public void hello()
+   {
+   }
+   
+   @RolesAllowed({"allowed"}) 
+   public void goodbye()
+   {
+   }
+   
+   public String access(TestObject o)
+   {
+      return stateful.access(o);
+   }
+   
+   public TestObject createTestObject()
+   {
+      testObject = new TestObject();
+      return testObject;
+   }
+   
+   public boolean checkEqPointer(TestObject to)
+   {
+      return to == testObject;
+   }
+   
+   public WarTestObject getWarTestObject()
+   {
+      return new WarTestObject();
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-import javax.ejb.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30Home extends EJBHome
-{
-  public Session30 create() throws javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+import javax.ejb.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30Home extends EJBHome
+{
+  public Session30 create() throws javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Home.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-import javax.ejb.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface Session30LocalHome extends EJBLocalHome
-{
-  public Session30 create() throws javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+import javax.ejb.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Session30LocalHome extends EJBLocalHome
+{
+  public Session30 create() throws javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30LocalHome.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateful(name="Stateful")
- at Remote(StatefulRemote.class)
- at Local(StatefulLocal.class)
- at RemoteBinding(jndiBinding = "StatefulRemote")
- at LocalBinding(jndiBinding = "StatefulLocal")
- at SecurityDomain("userinrole")
-public class StatefulBean implements StatefulRemote, StatefulLocal
-{
-   private static final Logger log = Logger.getLogger(Session30Bean.class);
-   
-   public String access(TestObject o)
-   {
-      return "Session30";
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateful(name="Stateful")
+ at Remote(StatefulRemote.class)
+ at Local(StatefulLocal.class)
+ at RemoteBinding(jndiBinding = "StatefulRemote")
+ at LocalBinding(jndiBinding = "StatefulLocal")
+ at SecurityDomain("userinrole")
+public class StatefulBean implements StatefulRemote, StatefulLocal
+{
+   private static final Logger log = Logger.getLogger(Session30Bean.class);
+   
+   public String access(TestObject o)
+   {
+      return "Session30";
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatefulLocal
-{
-   String access(TestObject o);
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulLocal
+{
+   String access(TestObject o);
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,32 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatefulRemote
-{
-   String access(TestObject o);
-}
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulRemote
+{
+   String access(TestObject o);
+}
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-
-public class TestObject implements java.io.Serializable
-{
-   public TestObject()
-   {
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+
+public class TestObject implements java.io.Serializable
+{
+   public TestObject()
+   {
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/TestObject.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-
-public class WarTestObject implements java.io.Serializable
-{
-   public WarTestObject()
-   {
-   }
-   
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+
+public class WarTestObject implements java.io.Serializable
+{
+   public WarTestObject()
+   {
+   }
+   
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/WarTestObject.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,139 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet.servlets;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
-import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.test.servlet.Session30;
-import org.jboss.ejb3.test.servlet.Session30LocalHome;
-import org.jboss.ejb3.test.servlet.Session30Home;
-import org.jboss.ejb3.test.servlet.TestObject;
-import org.jboss.ejb3.test.servlet.WarTestObject;
-import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-/** A servlet that accesses an EJB and tests whether the call argument
- is serialized.
-
- @author  Scott.Stark at jboss.org
- @version $Revision$
- */
-public class EJBServlet extends HttpServlet
-{
-   private static final Logger log = Logger.getLogger(EJBServlet.class);
-   
-   protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      try
-      {
-         SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
-         SecurityAssociation.setCredential("password".toCharArray());
-         
-         InitialContext ctx = new InitialContext();
-        
-         Session30 session = (Session30)ctx.lookup("ejb/Session30");
-         
-         session.hello();
-         session.goodbye();
-         
-         TestObject o = new TestObject();
-         session.access(o);
-         o = session.createTestObject();
-         
-         session = (Session30)ctx.lookup("ejb/Session30Local");
-         o = new TestObject();
-         session.access(o);
-         o = session.createTestObject();
-         
-         WarTestObject warObject = (WarTestObject)session.getWarTestObject();
-         
-         Session30Home home = (Session30Home)ctx.lookup("ejb/Session30Home");
-         session = home.create();
-         session.access(o);
-         
-         Session30LocalHome localHome = (Session30LocalHome)ctx.lookup("ejb/Session30LocalHome");
-         session = localHome.create();
-         session.access(o);
-         
-         home = (Session30Home)ctx.lookup("java:comp/env/ejb/remote/Session30");
-         session = home.create();
-         session.access(o);
-         
-         localHome = (Session30LocalHome)ctx.lookup("java:comp/env/ejb/local/Session30");
-         session = localHome.create();
-         session.access(o);
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-        
-         throw new ServletException("Failed to call OptimizedEJB/Session30 through remote and local interfaces", e);
-      }
-      response.setContentType("text/html");
-      PrintWriter out = response.getWriter();
-      out.println("<html>");
-      out.println("<head><title>EJBServlet</title></head>");
-      out.println("<body>Tests passed<br></body>");
-      out.println("</html>");
-      out.close();
-   }
-   
-   private void lookup(String name)
-   {
-      log.info("lookup " + name);
-      try {
-         InitialContext jndiContext = new InitialContext();
-         NamingEnumeration names = jndiContext.list(name);
-         if (names != null){
-            while (names.hasMore()){
-               log.info("  " + names.next());
-            }
-         }
-      } catch (Exception e){
-      }
-   }
-
-   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      processRequest(request, response);
-   }
-
-   protected void doPost(HttpServletRequest request, HttpServletResponse response)
-         throws ServletException, IOException
-   {
-      processRequest(request, response);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.test.servlet.Session30;
+import org.jboss.ejb3.test.servlet.Session30LocalHome;
+import org.jboss.ejb3.test.servlet.Session30Home;
+import org.jboss.ejb3.test.servlet.TestObject;
+import org.jboss.ejb3.test.servlet.WarTestObject;
+import org.jboss.logging.Logger;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+/** A servlet that accesses an EJB and tests whether the call argument
+ is serialized.
+
+ @author  Scott.Stark at jboss.org
+ @version $Revision$
+ */
+public class EJBServlet extends HttpServlet
+{
+   private static final Logger log = Logger.getLogger(EJBServlet.class);
+   
+   protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      try
+      {
+         SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+         SecurityAssociation.setCredential("password".toCharArray());
+         
+         InitialContext ctx = new InitialContext();
+        
+         Session30 session = (Session30)ctx.lookup("ejb/Session30");
+         
+         session.hello();
+         session.goodbye();
+         
+         TestObject o = new TestObject();
+         session.access(o);
+         o = session.createTestObject();
+         
+         session = (Session30)ctx.lookup("ejb/Session30Local");
+         o = new TestObject();
+         session.access(o);
+         o = session.createTestObject();
+         
+         WarTestObject warObject = (WarTestObject)session.getWarTestObject();
+         
+         Session30Home home = (Session30Home)ctx.lookup("ejb/Session30Home");
+         session = home.create();
+         session.access(o);
+         
+         Session30LocalHome localHome = (Session30LocalHome)ctx.lookup("ejb/Session30LocalHome");
+         session = localHome.create();
+         session.access(o);
+         
+         home = (Session30Home)ctx.lookup("java:comp/env/ejb/remote/Session30");
+         session = home.create();
+         session.access(o);
+         
+         localHome = (Session30LocalHome)ctx.lookup("java:comp/env/ejb/local/Session30");
+         session = localHome.create();
+         session.access(o);
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+        
+         throw new ServletException("Failed to call OptimizedEJB/Session30 through remote and local interfaces", e);
+      }
+      response.setContentType("text/html");
+      PrintWriter out = response.getWriter();
+      out.println("<html>");
+      out.println("<head><title>EJBServlet</title></head>");
+      out.println("<body>Tests passed<br></body>");
+      out.println("</html>");
+      out.close();
+   }
+   
+   private void lookup(String name)
+   {
+      log.info("lookup " + name);
+      try {
+         InitialContext jndiContext = new InitialContext();
+         NamingEnumeration names = jndiContext.list(name);
+         if (names != null){
+            while (names.hasMore()){
+               log.info("  " + names.next());
+            }
+         }
+      } catch (Exception e){
+      }
+   }
+
+   protected void doGet(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      processRequest(request, response);
+   }
+
+   protected void doPost(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException
+   {
+      processRequest(request, response);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,70 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet.unit;
-
-import javax.management.Attribute;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/** 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class AUnitTestCase extends JBossTestCase
-{
-   private static final String USE_JBOSS = "UseJBossWebLoader";
-   
-   public AUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEJBServlet() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
-      
-      try {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
-         
-         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
-      }
-      finally
-      {
- //        server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
-      }
-   }
-   
-   /**
-    * Setup the test suite.
-    */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(AUnitTestCase.class, "");
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet.unit;
+
+import javax.management.Attribute;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/** 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class AUnitTestCase extends JBossTestCase
+{
+   private static final String USE_JBOSS = "UseJBossWebLoader";
+   
+   public AUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEJBServlet() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
+      
+      try {
+         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
+         
+         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
+      }
+      finally
+      {
+ //        server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
+      }
+   }
+   
+   /**
+    * Setup the test suite.
+    */
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(AUnitTestCase.class, "");
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/AUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet.unit;
-
-import java.net.URL;
-
-import javax.management.Attribute;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/** 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class EarServletUnitTestCase extends JBossTestCase
-{
-   private static String REALM = "JBossTest Servlets";
-   private String baseURL = HttpUtils.getBaseURL("somebody", "password"); 
-   private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth(); 
-   
-   private static final String USE_JBOSS = "UseJBossWebLoader";
-   
-   public EarServletUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEJBServlet() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
-      
-      try {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
-         
-         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
-         
-         URL url = new URL(baseURL+"servlet/EJBServlet");
-         HttpUtils.accessURL(url);
-      }
-      finally
-      {
-  //       server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
-      }
-   }
-   
-   /**
-    * Setup the test suite.
-    */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EarServletUnitTestCase.class, "servlet.ear");
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet.unit;
+
+import java.net.URL;
+
+import javax.management.Attribute;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/** 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EarServletUnitTestCase extends JBossTestCase
+{
+   private static String REALM = "JBossTest Servlets";
+   private String baseURL = HttpUtils.getBaseURL("somebody", "password"); 
+   private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth(); 
+   
+   private static final String USE_JBOSS = "UseJBossWebLoader";
+   
+   public EarServletUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEJBServlet() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
+      
+      try {
+         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
+         
+         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
+         
+         URL url = new URL(baseURL+"servlet/EJBServlet");
+         HttpUtils.accessURL(url);
+      }
+      finally
+      {
+  //       server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
+      }
+   }
+   
+   /**
+    * Setup the test suite.
+    */
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EarServletUnitTestCase.class, "servlet.ear");
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,180 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet.unit;
-
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.io.IOException;
-import java.lang.System;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.methods.OptionsMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.TraceMethod;
-import org.jboss.logging.Logger;
-
-/** Utilities for client http requests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class HttpUtils
-{
-   private static Logger log = Logger.getLogger(HttpUtils.class);
-   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
-   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
-
-   public static final int GET = 1;
-   public static final int POST = 2;
-   public static final int HEAD = 3;
-   public static final int OPTIONS = 4;
-   public static final int PUT = 5;
-   public static final int DELETE = 6;
-   public static final int TRACE = 7;
-   
-   public static String getBaseURL()
-   {
-      return baseURL;
-   }
-   public static String getBaseURL(String username, String password)
-   {
-      String url = "http://"+username+":"+password+"@localhost:"
-         + Integer.getInteger("web.port", 8080) + "/";
-      return url;
-   }
-   public static String getBaseURLNoAuth()
-   {
-      return baseURLNoAuth;
-   }
-
-   /** Perform a get on the indicated URL and assert an HTTP_OK response code
-    *
-    * @param url
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url) throws Exception
-   {
-      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
-   }
-   /** Perform a get on the indicated URL and assert that the response code
-    * matches the expectedHttpCode argument.
-    *
-    * @param url
-    * @param expectedHttpCode the http response code expected
-    * @return The commons HttpClient used to perform the get
-    * @throws Exception on any failure
-    */
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, int type)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, null, type);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs)
-      throws Exception
-   {
-      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
-   }
-   public static HttpMethodBase accessURL(URL url, String realm,
-      int expectedHttpCode, Header[] hdrs, int type)
-      throws Exception
-   {
-      HttpClient httpConn = new HttpClient();
-      HttpMethodBase request = createMethod(url, type);
-
-      int hdrCount = hdrs != null ? hdrs.length : 0;
-      for(int n = 0; n < hdrCount; n ++)
-         request.addRequestHeader(hdrs[n]);
-      try
-      {
-         log.debug("Connecting to: "+url);
-         String userInfo = url.getUserInfo();
-
-         if( userInfo != null )
-         {
-            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
-            httpConn.getState().setCredentials(realm, url.getHost(), auth);
-         }
-         log.debug("RequestURI: "+request.getURI());
-         int responseCode = httpConn.executeMethod(request);
-         String response = request.getStatusText();
-         log.debug("responseCode="+responseCode+", response="+response);
-         String content = request.getResponseBodyAsString();
-         log.debug(content);
-         // Validate that we are seeing the requested response code
-         if( responseCode != expectedHttpCode )
-         {
-            throw new IOException("Expected reply code:"+expectedHttpCode
-               +", actual="+responseCode);
-         }
-      }
-      catch(IOException e)
-      {
-         throw e;
-      }
-      return request;
-   }
-
-   public static HttpMethodBase createMethod(URL url, int type)
-   {
-      HttpMethodBase request = null;
-      switch( type )
-      {
-         case GET:
-            request = new GetMethod(url.toString());
-            break;
-         case POST:
-            request = new PostMethod(url.toString());
-            break;
-         case HEAD:
-            request = new HeadMethod(url.toString());
-            break;
-         case OPTIONS:
-            request = new OptionsMethod(url.toString());
-            break;
-         case PUT:
-            request = new PutMethod(url.toString());
-            break;
-         case DELETE:
-            request = new DeleteMethod(url.toString());
-            break;
-         case TRACE:
-            request = new TraceMethod(url.toString());
-            break;
-      }
-      return request;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,180 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet.unit;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.IOException;
+import java.lang.System;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.HeadMethod;
+import org.apache.commons.httpclient.methods.OptionsMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.TraceMethod;
+import org.jboss.logging.Logger;
+
+/** Utilities for client http requests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class HttpUtils
+{
+   private static Logger log = Logger.getLogger(HttpUtils.class);
+   private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
+   private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+
+   public static final int GET = 1;
+   public static final int POST = 2;
+   public static final int HEAD = 3;
+   public static final int OPTIONS = 4;
+   public static final int PUT = 5;
+   public static final int DELETE = 6;
+   public static final int TRACE = 7;
+   
+   public static String getBaseURL()
+   {
+      return baseURL;
+   }
+   public static String getBaseURL(String username, String password)
+   {
+      String url = "http://"+username+":"+password+"@localhost:"
+         + Integer.getInteger("web.port", 8080) + "/";
+      return url;
+   }
+   public static String getBaseURLNoAuth()
+   {
+      return baseURLNoAuth;
+   }
+
+   /** Perform a get on the indicated URL and assert an HTTP_OK response code
+    *
+    * @param url
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url) throws Exception
+   {
+      return accessURL(url, "JBossTest Servlets", HttpURLConnection.HTTP_OK);
+   }
+   /** Perform a get on the indicated URL and assert that the response code
+    * matches the expectedHttpCode argument.
+    *
+    * @param url
+    * @param expectedHttpCode the http response code expected
+    * @return The commons HttpClient used to perform the get
+    * @throws Exception on any failure
+    */
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, int type)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, null, type);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs)
+      throws Exception
+   {
+      return accessURL(url, realm, expectedHttpCode, hdrs, GET);
+   }
+   public static HttpMethodBase accessURL(URL url, String realm,
+      int expectedHttpCode, Header[] hdrs, int type)
+      throws Exception
+   {
+      HttpClient httpConn = new HttpClient();
+      HttpMethodBase request = createMethod(url, type);
+
+      int hdrCount = hdrs != null ? hdrs.length : 0;
+      for(int n = 0; n < hdrCount; n ++)
+         request.addRequestHeader(hdrs[n]);
+      try
+      {
+         log.debug("Connecting to: "+url);
+         String userInfo = url.getUserInfo();
+
+         if( userInfo != null )
+         {
+            UsernamePasswordCredentials auth = new UsernamePasswordCredentials(userInfo);
+            httpConn.getState().setCredentials(realm, url.getHost(), auth);
+         }
+         log.debug("RequestURI: "+request.getURI());
+         int responseCode = httpConn.executeMethod(request);
+         String response = request.getStatusText();
+         log.debug("responseCode="+responseCode+", response="+response);
+         String content = request.getResponseBodyAsString();
+         log.debug(content);
+         // Validate that we are seeing the requested response code
+         if( responseCode != expectedHttpCode )
+         {
+            throw new IOException("Expected reply code:"+expectedHttpCode
+               +", actual="+responseCode);
+         }
+      }
+      catch(IOException e)
+      {
+         throw e;
+      }
+      return request;
+   }
+
+   public static HttpMethodBase createMethod(URL url, int type)
+   {
+      HttpMethodBase request = null;
+      switch( type )
+      {
+         case GET:
+            request = new GetMethod(url.toString());
+            break;
+         case POST:
+            request = new PostMethod(url.toString());
+            break;
+         case HEAD:
+            request = new HeadMethod(url.toString());
+            break;
+         case OPTIONS:
+            request = new OptionsMethod(url.toString());
+            break;
+         case PUT:
+            request = new PutMethod(url.toString());
+            break;
+         case DELETE:
+            request = new DeleteMethod(url.toString());
+            break;
+         case TRACE:
+            request = new TraceMethod(url.toString());
+            break;
+      }
+      return request;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.servlet.unit;
-
-import java.net.URL;
-
-import javax.management.Attribute;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/** 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class ServletUnitTestCase extends JBossTestCase
-{
-   private static String REALM = "JBossTest Servlets";
-   private String baseURL = HttpUtils.getBaseURL("somebody", "password"); 
-   private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth(); 
-   
-   private static final String USE_JBOSS = "UseJBossWebLoader";
-   
-   public ServletUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   public void testEJBServlet() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
-      
-      try {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
-         
-         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
-         
-         URL url = new URL(baseURL+"servlet/EJBServlet");
-         HttpUtils.accessURL(url);
-      }
-      finally
-      {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
-      }
-   }
-   
-   /**
-    * Setup the test suite.
-    */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ServletUnitTestCase.class, "servlet-security-service.xml, servlet-client.jar, servlet-ejbs.jar, servlet.war");
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.servlet.unit;
+
+import java.net.URL;
+
+import javax.management.Attribute;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/** 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ServletUnitTestCase extends JBossTestCase
+{
+   private static String REALM = "JBossTest Servlets";
+   private String baseURL = HttpUtils.getBaseURL("somebody", "password"); 
+   private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth(); 
+   
+   private static final String USE_JBOSS = "UseJBossWebLoader";
+   
+   public ServletUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   public void testEJBServlet() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
+      
+      try {
+         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
+         
+         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
+         
+         URL url = new URL(baseURL+"servlet/EJBServlet");
+         HttpUtils.accessURL(url);
+      }
+      finally
+      {
+         server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
+      }
+   }
+   
+   /**
+    * Setup the test suite.
+    */
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ServletUnitTestCase.class, "servlet-security-service.xml, servlet-client.jar, servlet-ejbs.jar, servlet.war");
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -94,15 +94,15 @@
 
    public void test1() throws Exception
    {
-      assertEquals(manager.createQuery("select s from java.io.Serializable s").getResultList().size(), 0);
+      assertEquals(manager.createQuery("from java.io.Serializable").getResultList().size(), 0);
 
-      assertEquals(manager.createQuery("select p from Person p").getResultList().size(), 3);
-      assertEquals(manager.createQuery("select p from Person p where p.class = Customer").getResultList().size(), 1);
+      assertEquals(manager.createQuery("from Person").getResultList().size(), 3);
+      assertEquals(manager.createQuery("from Person p where p.class = Customer").getResultList().size(), 1);
    }
 
    public void test2() throws Exception
    {
-      List customers = manager.createQuery("select c from Customer c left join fetch c.salesperson").getResultList();
+      List customers = manager.createQuery("from Customer c left join fetch c.salesperson").getResultList();
       for (Iterator iter = customers.iterator(); iter.hasNext();)
       {
          Customer c = (Customer) iter.next();
@@ -113,7 +113,7 @@
 
    public void test3() throws Exception
    {
-      List customers = manager.createQuery("select c from Customer c").getResultList();
+      List customers = manager.createQuery("from Customer").getResultList();
       for (Iterator iter = customers.iterator(); iter.hasNext();)
       {
          Customer c = (Customer) iter.next();
@@ -129,10 +129,10 @@
       Person yomomma = manager.find(Person.class, new Long(ids[2]));
 
       mark.setZip("30306");
-      assertEquals(manager.createQuery("select p from Person p where p.zip = '30306'").getResultList().size(), 1);
+      assertEquals(manager.createQuery("from Person p where p.zip = '30306'").getResultList().size(), 1);
       manager.remove(mark);
       manager.remove(joe);
       manager.remove(yomomma);
-      assertTrue(manager.createQuery("select p from Person p").getResultList().isEmpty());
+      assertTrue(manager.createQuery("from Person").getResultList().isEmpty());
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -35,7 +35,7 @@
 public class EntityUnitTestCase
         extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/BusinessInterface.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/BusinessInterface.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/BusinessInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssl;
 
 

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssl;
 
 import javax.ejb.Remote;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssl;
 
 import java.io.Serializable;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssl;
 
 import javax.ejb.Stateless;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssl;
 
 import java.io.Serializable;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/unit/SSLUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/unit/SSLUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssl/unit/SSLUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 public class SSLUnitTestCase
         extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
 
    public SSLUnitTestCase(String name)

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/BusinessInterface.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/BusinessInterface.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/BusinessInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssladvanced;
 
 

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.ssladvanced;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision: 45009 $
- */
- at Stateful
- at Clustered
- at Remote(BusinessInterface.class)
-public class OverrideStatefulClusteredBean implements BusinessInterface
-{
-   public String echo(String s)
-   {
-      return s;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.ssladvanced;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at Clustered
+ at Remote(BusinessInterface.class)
+public class OverrideStatefulClusteredBean implements BusinessInterface
+{
+   public String echo(String s)
+   {
+      return s;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssladvanced;
 
 import javax.ejb.Remote;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssladvanced;
 
 import java.io.Serializable;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssladvanced;
 
 import javax.ejb.Stateless;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -19,6 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
+
 package org.jboss.ejb3.test.ssladvanced;
 
 import java.io.Serializable;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/unit/SSLUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/unit/SSLUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/unit/SSLUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 public class SSLUnitTestCase
         extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
 
    public SSLUnitTestCase(String name)

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import javax.ejb.Stateless;
-import javax.interceptor.Interceptors;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CalculatorBean implements CalculatorLocal, CalculatorRemote
-{
-   public static boolean test = false;
-
-   public int add(int x, int y)
-   {
-      if (test && StupidInterceptor.count != 1)
-      {
-         System.out.println("Throwing count exception");
-         throw new RuntimeException("count is wrong: " + StupidInterceptor.count);
-      }
-      return x + y;
-   }
-
-   public int sub(int x, int y)
-   {
-      return x - y;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import javax.ejb.Stateless;
+import javax.interceptor.Interceptors;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CalculatorBean implements CalculatorLocal, CalculatorRemote
+{
+   public static boolean test = false;
+
+   public int add(int x, int y)
+   {
+      if (test && StupidInterceptor.count != 1)
+      {
+         System.out.println("Throwing count exception");
+         throw new RuntimeException("count is wrong: " + StupidInterceptor.count);
+      }
+      return x + y;
+   }
+
+   public int sub(int x, int y)
+   {
+      return x - y;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import javax.ejb.Local;
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CalculatorLocal
-{
-   int add(int x, int y);
-   int sub(int x, int y);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import javax.ejb.Local;
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CalculatorLocal
+{
+   int add(int x, int y);
+   int sub(int x, int y);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import javax.ejb.Remote;
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CalculatorRemote
-{
-   int add(int x, int y);
-   int sub(int x, int y);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import javax.ejb.Remote;
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CalculatorRemote
+{
+   int add(int x, int y);
+   int sub(int x, int y);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CalculatorRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer
-{
-   private long id;
-   private String name;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public long getId()
-   {
-      return id;
-   }
-
-   public void setId(long id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer
+{
+   private long id;
+   private String name;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public long getId()
+   {
+      return id;
+   }
+
+   public void setId(long id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface CustomerDAO
-{
-   long createCustomer();
-
-   Customer findCustomer(long id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface CustomerDAO
+{
+   long createCustomer();
+
+   Customer findCustomer(long id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAO.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,103 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import org.jboss.ejb3.Container;
-
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.persistence.*;
-import javax.annotation.Resource;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.util.Hashtable;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at PersistenceUnit(name="emf/pu", unitName="tempdb")
- at PersistenceContext(name="em/pc", unitName="tempdb")
- at PersistenceUnits(
-        @PersistenceUnit(name="emf/pus", unitName="tempdb")
-)
- at PersistenceContexts(
-        @PersistenceContext(name="em/pcs", unitName="tempdb")
-)
-public class CustomerDAOBean implements CustomerDAO
-{
-   @PersistenceContext private EntityManager manager;
-   @Resource SessionContext ctx;
-
-   public long createCustomer()
-   {
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      manager.persist(cust);
-      return cust.getId();
-   }
-
-   public Customer findCustomer(long id)
-   {
-      EntityManagerFactory emf = null;
-      Hashtable props = new Hashtable();
-      props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.LocalOnlyContextFactory");
-      try
-      {
-         InitialContext initialContext = new InitialContext(props);
-         emf = (EntityManagerFactory)initialContext.lookup(Container.ENC_CTX_NAME + "/env/emf/pu");
-         emf = (EntityManagerFactory)initialContext.lookup(Container.ENC_CTX_NAME + "/env/emf/pus");
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      emf = (EntityManagerFactory)ctx.lookup("emf/pu");
-      if (emf == null) throw new RuntimeException("Could not locate enc registered pu");
-      emf = (EntityManagerFactory)ctx.lookup("emf/pus");
-      if (emf == null) throw new RuntimeException("Could not locate enc registered pu");
-
-      EntityManager em = null;
-      try
-      {
-         InitialContext initialContext = new InitialContext(props);
-         em = (EntityManager)initialContext.lookup(Container.ENC_CTX_NAME + "/env/em/pc");
-         em = (EntityManager)initialContext.lookup(Container.ENC_CTX_NAME + "/env/em/pcs");
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      em = (EntityManager)ctx.lookup("em/pc");
-      if (em == null) throw new RuntimeException("Could not locate enc registered pc");
-      em = (EntityManager)ctx.lookup("em/pcs");
-      if (em == null) throw new RuntimeException("Could not locate enc registered pc");
-
-
-      return manager.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import org.jboss.ejb3.Container;
+
+import javax.ejb.Stateless;
+import javax.ejb.SessionContext;
+import javax.persistence.*;
+import javax.annotation.Resource;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.Hashtable;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at PersistenceUnit(name="emf/pu", unitName="tempdb")
+ at PersistenceContext(name="em/pc", unitName="tempdb")
+ at PersistenceUnits(
+        @PersistenceUnit(name="emf/pus", unitName="tempdb")
+)
+ at PersistenceContexts(
+        @PersistenceContext(name="em/pcs", unitName="tempdb")
+)
+public class CustomerDAOBean implements CustomerDAO
+{
+   @PersistenceContext private EntityManager manager;
+   @Resource SessionContext ctx;
+
+   public long createCustomer()
+   {
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      manager.persist(cust);
+      return cust.getId();
+   }
+
+   public Customer findCustomer(long id)
+   {
+      EntityManagerFactory emf = null;
+      Hashtable props = new Hashtable();
+      props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.LocalOnlyContextFactory");
+      try
+      {
+         InitialContext initialContext = new InitialContext(props);
+         emf = (EntityManagerFactory)initialContext.lookup(Container.ENC_CTX_NAME + "/env/emf/pu");
+         emf = (EntityManagerFactory)initialContext.lookup(Container.ENC_CTX_NAME + "/env/emf/pus");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      emf = (EntityManagerFactory)ctx.lookup("emf/pu");
+      if (emf == null) throw new RuntimeException("Could not locate enc registered pu");
+      emf = (EntityManagerFactory)ctx.lookup("emf/pus");
+      if (emf == null) throw new RuntimeException("Could not locate enc registered pu");
+
+      EntityManager em = null;
+      try
+      {
+         InitialContext initialContext = new InitialContext(props);
+         em = (EntityManager)initialContext.lookup(Container.ENC_CTX_NAME + "/env/em/pc");
+         em = (EntityManager)initialContext.lookup(Container.ENC_CTX_NAME + "/env/em/pcs");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      em = (EntityManager)ctx.lookup("em/pc");
+      if (em == null) throw new RuntimeException("Could not locate enc registered pc");
+      em = (EntityManager)ctx.lookup("em/pcs");
+      if (em == null) throw new RuntimeException("Could not locate enc registered pc");
+
+
+      return manager.find(Customer.class, id);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/CustomerDAOBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.standalone;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Service(objectName="jboss.test:service=depends")
- at Management(DependsMBean.class)
-public class Depends implements DependsMBean
-{
-   private static final Logger log = Logger.getLogger(Depends.class);
-
-   public void create() throws Exception
-   {
-      log.info("create()");
-   }
-
-   public void start() throws Exception
-   {
-      log.info("start()");
-   }
-
-   public void stop() throws Exception
-   {
-      log.info("stop()");
-   }
-
-   public void destroy() throws Exception
-   {
-      log.info("destroy()");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Service(objectName="jboss.test:service=depends")
+ at Management(DependsMBean.class)
+public class Depends implements DependsMBean
+{
+   private static final Logger log = Logger.getLogger(Depends.class);
+
+   public void create() throws Exception
+   {
+      log.info("create()");
+   }
+
+   public void start() throws Exception
+   {
+      log.info("start()");
+   }
+
+   public void stop() throws Exception
+   {
+      log.info("stop()");
+   }
+
+   public void destroy() throws Exception
+   {
+      log.info("destroy()");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import javax.ejb.Stateless;
-
-import org.jboss.annotation.ejb.Depends;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless
- at Depends ("jboss.test:service=depends")
-public class DependsBean implements DependsRemote
-{
-   public void test()
-   {
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import javax.ejb.Stateless;
+
+import org.jboss.annotation.ejb.Depends;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless
+ at Depends ("jboss.test:service=depends")
+public class DependsBean implements DependsRemote
+{
+   public void test()
+   {
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,20 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.standalone;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface DependsMBean
-{
-  public void create () throws Exception;
-  public void start () throws Exception;
-  public void stop () throws Exception;
-  public void destroy () throws Exception;
-  
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,20 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface DependsMBean
+{
+  public void create () throws Exception;
+  public void start () throws Exception;
+  public void stop () throws Exception;
+  public void destroy () throws Exception;
+  
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,35 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import javax.ejb.Remote;
-
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Remote
-public interface DependsRemote
-{
-   void test();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import javax.ejb.Remote;
+
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Remote
+public interface DependsRemote
+{
+   void test();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import java.util.ArrayList;
-import javax.ejb.Remove;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface ShoppingCart
-{
-   ArrayList<String> getCart();
-
-   @Remove void checkout();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import java.util.ArrayList;
+import javax.ejb.Remove;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface ShoppingCart
+{
+   ArrayList<String> getCart();
+
+   @Remove void checkout();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCart.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,89 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import javax.ejb.EJB;
-import javax.annotation.Resource;
-import javax.ejb.Remove;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.jboss.ejb3.Container;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
-public class ShoppingCartBean implements ShoppingCart
-{
-   private ArrayList<String> cart = new ArrayList<String>();
-
-   private @EJB CalculatorLocal calculator;
-   private @EJB CalculatorRemote calculatorRemote;
-   private @Resource SessionContext ctx;
-
-   private CalculatorRemote setCalc;
-
-   @EJB
-   public void setCalculatorSetter(CalculatorRemote r)
-   {
-      setCalc = r;
-   }
-
-   public ArrayList<String> getCart()
-   {
-      return cart;
-   }
-
-   @Remove
-   public void checkout()
-   {
-      calculator.add(1, 1);
-      Hashtable props = new Hashtable();
-      props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.LocalOnlyContextFactory");
-      try
-      {
-         InitialContext initialContext = new InitialContext(props);
-         calculator = (CalculatorLocal)initialContext.lookup(Container.ENC_CTX_NAME + "/env/org.jboss.ejb3.test.standalone.ShoppingCartBean/calculator");
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      calculator.add(1, 1);
-      calculator = (CalculatorLocal)ctx.lookup("org.jboss.ejb3.test.standalone.ShoppingCartBean/calculator");
-      calculator.add(1, 1);
-      calculatorRemote.add(2, 2);
-
-      setCalc.add(3, 3);
-
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import javax.ejb.EJB;
+import javax.annotation.Resource;
+import javax.ejb.Remove;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.ejb3.Container;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+public class ShoppingCartBean implements ShoppingCart
+{
+   private ArrayList<String> cart = new ArrayList<String>();
+
+   private @EJB CalculatorLocal calculator;
+   private @EJB CalculatorRemote calculatorRemote;
+   private @Resource SessionContext ctx;
+
+   private CalculatorRemote setCalc;
+
+   @EJB
+   public void setCalculatorSetter(CalculatorRemote r)
+   {
+      setCalc = r;
+   }
+
+   public ArrayList<String> getCart()
+   {
+      return cart;
+   }
+
+   @Remove
+   public void checkout()
+   {
+      calculator.add(1, 1);
+      Hashtable props = new Hashtable();
+      props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.LocalOnlyContextFactory");
+      try
+      {
+         InitialContext initialContext = new InitialContext(props);
+         calculator = (CalculatorLocal)initialContext.lookup(Container.ENC_CTX_NAME + "/env/org.jboss.ejb3.test.standalone.ShoppingCartBean/calculator");
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+      calculator.add(1, 1);
+      calculator = (CalculatorLocal)ctx.lookup("org.jboss.ejb3.test.standalone.ShoppingCartBean/calculator");
+      calculator.add(1, 1);
+      calculatorRemote.add(2, 2);
+
+      setCalc.add(3, 3);
+
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/ShoppingCartBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,92 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.standalone;
-
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.kernel.Kernel;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class SimpleDeployer
-{
-   public static class AlreadyInstantiated extends AbstractConstructorMetaData
-   {
-      private Object bean;
-
-      public class Factory
-      {
-
-         public Object create()
-         {
-            return bean;
-         }
-      }
-
-      public AlreadyInstantiated(Object bean)
-      {
-         this.bean = bean;
-         this.setFactory(new AbstractValueMetaData(new Factory()));
-         this.setFactoryClass(Factory.class.getName());
-         this.setFactoryMethod("create");
-      }
-   }
-
-
-   private Kernel kernel;
-
-   public Kernel getKernel()
-   {
-      return kernel;
-   }
-
-   public void setKernel(Kernel kernel)
-   {
-      this.kernel = kernel;
-   }
-
-
-
-   public void create()
-   {
-      install("SOME_STUPID_BEAN", new Object());
-   }
-   private void install(String name, Object service)
-   {
-      AbstractBeanMetaData bean = new AbstractBeanMetaData(name, service.getClass().getName());
-      bean.setConstructor(new AlreadyInstantiated(service));
-      try
-      {
-         kernel.getController().install(bean);
-      }
-      catch (Throwable throwable)
-      {
-         throw new RuntimeException(throwable);
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.kernel.Kernel;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class SimpleDeployer
+{
+   public static class AlreadyInstantiated extends AbstractConstructorMetaData
+   {
+      private Object bean;
+
+      public class Factory
+      {
+
+         public Object create()
+         {
+            return bean;
+         }
+      }
+
+      public AlreadyInstantiated(Object bean)
+      {
+         this.bean = bean;
+         this.setFactory(new AbstractValueMetaData(new Factory()));
+         this.setFactoryClass(Factory.class.getName());
+         this.setFactoryMethod("create");
+      }
+   }
+
+
+   private Kernel kernel;
+
+   public Kernel getKernel()
+   {
+      return kernel;
+   }
+
+   public void setKernel(Kernel kernel)
+   {
+      this.kernel = kernel;
+   }
+
+
+
+   public void create()
+   {
+      install("SOME_STUPID_BEAN", new Object());
+   }
+   private void install(String name, Object service)
+   {
+      AbstractBeanMetaData bean = new AbstractBeanMetaData(name, service.getClass().getName());
+      bean.setConstructor(new AlreadyInstantiated(service));
+      try
+      {
+         kernel.getController().install(bean);
+      }
+      catch (Throwable throwable)
+      {
+         throw new RuntimeException(throwable);
+      }
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/SimpleDeployer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.standalone;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class StupidInterceptor
-{
-   public static int count = 0;
-
-   @AroundInvoke
-   public Object log(InvocationContext inv) throws Exception
-   {
-      count++;
-      System.out.println("hello " + count);
-      return inv.proceed();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class StupidInterceptor
+{
+   public static int count = 0;
+
+   @AroundInvoke
+   public Object log(InvocationContext inv) throws Exception
+   {
+      count++;
+      System.out.println("hello " + count);
+      return inv.proceed();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/StupidInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.embeddedjms;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
-        })
-public class QueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
-
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("QueueTestMDB onMessage");
-      TestStatusBean.queueRan = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.embeddedjms;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
+        })
+public class QueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("QueueTestMDB onMessage");
+      TestStatusBean.queueRan = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/QueueTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.embeddedjms;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/tempmdbtest")
-        })
-public class TemporaryQueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(TemporaryQueueTestMDB.class);
-
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("TemporaryQueueTestMDB onMessage");
-      TestStatusBean.temporaryQueueRan = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.embeddedjms;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/tempmdbtest")
+        })
+public class TemporaryQueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(TemporaryQueueTestMDB.class);
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("TemporaryQueueTestMDB onMessage");
+      TestStatusBean.temporaryQueueRan = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TemporaryQueueTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.embeddedjms;
-
-import javax.ejb.Remote;
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface TestStatus
-{
-   void clear();
-   
-   boolean temporaryQueueFired();
-
-   boolean queueFired();
-
-   boolean topicFired();
-
-   boolean interceptedTopic();
-
-   boolean interceptedQueue();
-
-   boolean postConstruct();
-
-   boolean preDestroy();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.embeddedjms;
+
+import javax.ejb.Remote;
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface TestStatus
+{
+   void clear();
+   
+   boolean temporaryQueueFired();
+
+   boolean queueFired();
+
+   boolean topicFired();
+
+   boolean interceptedTopic();
+
+   boolean interceptedQueue();
+
+   boolean postConstruct();
+
+   boolean preDestroy();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatus.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,88 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.embeddedjms;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class TestStatusBean implements TestStatus
-{
-   public static boolean temporaryQueueRan = false;
-   public static boolean queueRan = false;
-   public static boolean topicRan = false;
-   public static boolean interceptedTopic = false;
-   public static boolean interceptedQueue = false;
-   public static boolean postConstruct = false;
-   public static boolean preDestroy = false;
-
-   public void clear()
-   {
-      temporaryQueueRan = false;
-      queueRan = false;
-      topicRan = false;
-      interceptedTopic = false;
-      interceptedQueue = false;
-      postConstruct = false;
-      preDestroy = false;
-   }
-   
-   public boolean temporaryQueueFired()
-   {
-      return temporaryQueueRan;
-   }
-
-   public boolean queueFired()
-   {
-      return queueRan;
-   }
-
-   public boolean topicFired()
-   {
-      return topicRan;
-   }
-
-   public boolean interceptedTopic()
-   {
-      return interceptedTopic;
-   }
-
-   public boolean interceptedQueue()
-   {
-      return interceptedQueue;
-   }
-
-   public boolean postConstruct()
-   {
-      return postConstruct;
-   }
-
-   public boolean preDestroy()
-   {
-      return preDestroy;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.embeddedjms;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class TestStatusBean implements TestStatus
+{
+   public static boolean temporaryQueueRan = false;
+   public static boolean queueRan = false;
+   public static boolean topicRan = false;
+   public static boolean interceptedTopic = false;
+   public static boolean interceptedQueue = false;
+   public static boolean postConstruct = false;
+   public static boolean preDestroy = false;
+
+   public void clear()
+   {
+      temporaryQueueRan = false;
+      queueRan = false;
+      topicRan = false;
+      interceptedTopic = false;
+      interceptedQueue = false;
+      postConstruct = false;
+      preDestroy = false;
+   }
+   
+   public boolean temporaryQueueFired()
+   {
+      return temporaryQueueRan;
+   }
+
+   public boolean queueFired()
+   {
+      return queueRan;
+   }
+
+   public boolean topicFired()
+   {
+      return topicRan;
+   }
+
+   public boolean interceptedTopic()
+   {
+      return interceptedTopic;
+   }
+
+   public boolean interceptedQueue()
+   {
+      return interceptedQueue;
+   }
+
+   public boolean postConstruct()
+   {
+      return postConstruct;
+   }
+
+   public boolean preDestroy()
+   {
+      return preDestroy;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TestStatusBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.embeddedjms;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/topictest")
-        })
-public class TopicTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(TopicTestMDB.class);
-
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("TopicTestMDB onMessage");
-      TestStatusBean.topicRan = true;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.embeddedjms;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="topic/topictest")
+        })
+public class TopicTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(TopicTestMDB.class);
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("TopicTestMDB onMessage");
+      TestStatusBean.topicRan = true;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/TopicTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,190 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.embeddedjms.unit;
-
-import java.util.Hashtable;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.naming.InitialContext;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.test.standalone.embeddedjms.TestStatus;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * POJO Environment tests
- *
- * @author <a href="bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EmbeddedJmsTestCase extends TestCase
-{
-   private static boolean booted = false;
-
-   public EmbeddedJmsTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(EmbeddedJmsTestCase.class);
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
-      EJB3StandaloneBootstrap.deployXmlResource("embeddedjms/testjms.xml");
-      EJB3StandaloneBootstrap.scanClasspath("mdb.jar");
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-
-   public void testArchivesByResource() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-
-      executeQueue(ctx);
-      executeTopic(ctx);
-      executeTemporaryQueue(ctx);
-   }
-
-
-   private void executeQueue(InitialContext ctx)
-           throws Exception
-   {
-
-      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
-      status.clear();
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-
-      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
-      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createSender(queue);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      assertTrue(status.queueFired());
-   }
-   
-   private void executeTemporaryQueue(InitialContext ctx)
-      throws Exception
-   {
-      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
-      status.clear();
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-      
-      Queue queue = (Queue) getInitialContext().lookup("queue/tempmdbtest");
-      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-      
-      TextMessage msg = session.createTextMessage("Hello World");
-      
-      sender = session.createSender(queue);
-      sender.send(msg);
-      
-      Thread.sleep(1000);
-      assertTrue(status.temporaryQueueFired());
-   }
-
-   private void executeTopic(InitialContext ctx)
-           throws Exception
-   {
-
-      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
-      status.clear();
-      TopicConnection cnn = null;
-      TopicPublisher sender = null;
-      TopicSession session = null;
-
-      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
-      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createTopicConnection();
-      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createPublisher(topic);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      assertTrue(status.topicFired());
-   }
-
-   protected void configureLoggingAfterBootstrap()
-   {
-      //enableTrace("org.jboss.tm");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,190 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.embeddedjms.unit;
+
+import java.util.Hashtable;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSession;
+import javax.naming.InitialContext;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.test.standalone.embeddedjms.TestStatus;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * POJO Environment tests
+ *
+ * @author <a href="bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EmbeddedJmsTestCase extends TestCase
+{
+   private static boolean booted = false;
+
+   public EmbeddedJmsTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(EmbeddedJmsTestCase.class);
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+      EJB3StandaloneBootstrap.deployXmlResource("embeddedjms/testjms.xml");
+      EJB3StandaloneBootstrap.scanClasspath("mdb.jar");
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+
+   public void testArchivesByResource() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+
+      executeQueue(ctx);
+      executeTopic(ctx);
+      executeTemporaryQueue(ctx);
+   }
+
+
+   private void executeQueue(InitialContext ctx)
+           throws Exception
+   {
+
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      status.clear();
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
+      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      assertTrue(status.queueFired());
+   }
+   
+   private void executeTemporaryQueue(InitialContext ctx)
+      throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      status.clear();
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+      
+      Queue queue = (Queue) getInitialContext().lookup("queue/tempmdbtest");
+      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+      
+      TextMessage msg = session.createTextMessage("Hello World");
+      
+      sender = session.createSender(queue);
+      sender.send(msg);
+      
+      Thread.sleep(1000);
+      assertTrue(status.temporaryQueueFired());
+   }
+
+   private void executeTopic(InitialContext ctx)
+           throws Exception
+   {
+
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      status.clear();
+      TopicConnection cnn = null;
+      TopicPublisher sender = null;
+      TopicSession session = null;
+
+      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
+      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createTopicConnection();
+      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createPublisher(topic);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      assertTrue(status.topicFired());
+   }
+
+   protected void configureLoggingAfterBootstrap()
+   {
+      //enableTrace("org.jboss.tm");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/embeddedjms/unit/EmbeddedJmsTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Entity1 implements Serializable
-{
-   private int id;
-   private String string;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getString()
-   {
-      return string;
-   }
-
-   public void setString(String string)
-   {
-      this.string = string;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Entity1 implements Serializable
+{
+   private int id;
+   private String string;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getString()
+   {
+      return string;
+   }
+
+   public void setString(String string)
+   {
+      this.string = string;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity1.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Entity2 implements Serializable
-{
-   private int id;
-   private String string;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getString()
-   {
-      return string;
-   }
-
-   public void setString(String string)
-   {
-      this.string = string;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Entity2 implements Serializable
+{
+   private int id;
+   private String string;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getString()
+   {
+      return string;
+   }
+
+   public void setString(String string)
+   {
+      this.string = string;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Entity2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Session1
-{
-   int create1FromManager();
-
-   int create1FromFactory();
-
-   int create2FromManager();
-
-   int create2FromFactory();
-
-   void doUtil(Util u);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Session1
+{
+   int create1FromManager();
+
+   int create1FromFactory();
+
+   int create2FromManager();
+
+   int create2FromFactory();
+
+   void doUtil(Util u);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,95 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-import org.hibernate.SessionFactory;
-import org.hibernate.Session;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(Session1.class)
-public class Session1Bean implements Session1
-{
-   @PersistenceContext(unitName="manager1") Session manager1;
-   @PersistenceContext(unitName="../flushmodenever-session2.jar#manager2") EntityManager manager2;
-   @PersistenceUnit(unitName="manager1") SessionFactory factory1;
-   @PersistenceUnit(unitName="../flushmodenever-session2.jar#manager2") EntityManagerFactory factory2;
-   @EJB Session2 session2;
-
-   public int create1FromManager()
-   {
-      Entity1 one = new Entity1();
-      one.setString("oneManager");
-      manager1.save(one);
-      return one.getId();
-   }
-   public int create1FromFactory()
-   {
-      Entity1 one = new Entity1();
-      Session m = factory1.openSession();
-      m.save(one);
-      // leak m.close();
-      return one.getId();
-   }
-
-   public int create2FromManager()
-   {
-      Entity2 two = new Entity2();
-      two.setString("twoManager");
-      manager2.persist(two);
-      return two.getId();
-   }
-   public int create2FromFactory()
-   {
-      Entity2 two = new Entity2();
-      EntityManager m = factory2.createEntityManager();
-      m.persist(two);
-      // leak m.close();
-      return two.getId();
-   }
-
-   public void doUtil(Util ux)
-   {
-      Util u = new Util();
-      u.setId(1);
-      u.setName("one");
-      manager1.persist(u);
-
-      u = new Util();
-      u.setId(2);
-      u.setName("two");
-      manager2.persist(u);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.ejb.EJB;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import org.hibernate.SessionFactory;
+import org.hibernate.Session;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(Session1.class)
+public class Session1Bean implements Session1
+{
+   @PersistenceContext(unitName="manager1") Session manager1;
+   @PersistenceContext(unitName="../flushmodenever-session2.jar#manager2") EntityManager manager2;
+   @PersistenceUnit(unitName="manager1") SessionFactory factory1;
+   @PersistenceUnit(unitName="../flushmodenever-session2.jar#manager2") EntityManagerFactory factory2;
+   @EJB Session2 session2;
+
+   public int create1FromManager()
+   {
+      Entity1 one = new Entity1();
+      one.setString("oneManager");
+      manager1.save(one);
+      return one.getId();
+   }
+   public int create1FromFactory()
+   {
+      Entity1 one = new Entity1();
+      Session m = factory1.openSession();
+      m.save(one);
+      // leak m.close();
+      return one.getId();
+   }
+
+   public int create2FromManager()
+   {
+      Entity2 two = new Entity2();
+      two.setString("twoManager");
+      manager2.persist(two);
+      return two.getId();
+   }
+   public int create2FromFactory()
+   {
+      Entity2 two = new Entity2();
+      EntityManager m = factory2.createEntityManager();
+      m.persist(two);
+      // leak m.close();
+      return two.getId();
+   }
+
+   public void doUtil(Util ux)
+   {
+      Util u = new Util();
+      u.setId(1);
+      u.setName("one");
+      manager1.persist(u);
+
+      u = new Util();
+      u.setId(2);
+      u.setName("two");
+      manager2.persist(u);
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session1Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Session2
-{
-   Entity1 find1FromManager(int id);
-
-   void find1FromFactory(int id);
-
-   Entity2 find2FromManager(int id);
-
-   void find2FromFactory(int id);
-
-   Util findUtil1FromManager(int id);
-
-   Util findUtil2FromManager(int id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Session2
+{
+   Entity1 find1FromManager(int id);
+
+   void find1FromFactory(int id);
+
+   Entity2 find2FromManager(int id);
+
+   void find2FromFactory(int id);
+
+   Util findUtil1FromManager(int id);
+
+   Util findUtil2FromManager(int id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,91 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-import org.jboss.annotation.IgnoreDependency;
-
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(Session2.class)
-public class Session2Bean implements Session2
-{
-   @PersistenceContext(unitName="manager2") EntityManager manager2;
-   @PersistenceContext(unitName="../flushmodenever-session1.jar#manager1") EntityManager manager1;
-   @PersistenceUnit(unitName="manager2") EntityManagerFactory factory2;
-   @PersistenceUnit(unitName="../flushmodenever-session1.jar#manager1") EntityManagerFactory factory1;
-   @EJB @IgnoreDependency Session1 session1;
-
-   //@Resource SessionContext ctx;
-
-   public Entity1 find1FromManager(int id)
-   {
-      return manager1.find(Entity1.class, id);
-   }
-   public void find1FromFactory(int id)
-   {
-      EntityManager m = factory1.createEntityManager();
-      Entity1 one = m.find(Entity1.class, id);
-      try
-      {
-         if (one == null) throw new RuntimeException("NOT FOUND");
-      }
-      finally
-      {
-         m.close();
-      }
-
-   }
-   public Entity2 find2FromManager(int id)
-   {
-      return manager2.find(Entity2.class, id);
-   }
-   public void find2FromFactory(int id)
-   {
-      EntityManager m = factory2.createEntityManager();
-      Entity2 two = m.find(Entity2.class, id);
-      if (two == null) throw new RuntimeException("NOT FOUND");
-      // leak m.close();
-   }
-
-   public Util findUtil1FromManager(int id)
-   {
-      return manager1.find(Util.class, id);
-   }
-
-   public Util findUtil2FromManager(int id)
-   {
-      return manager2.find(Util.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+import org.jboss.annotation.IgnoreDependency;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(Session2.class)
+public class Session2Bean implements Session2
+{
+   @PersistenceContext(unitName="manager2") EntityManager manager2;
+   @PersistenceContext(unitName="../flushmodenever-session1.jar#manager1") EntityManager manager1;
+   @PersistenceUnit(unitName="manager2") EntityManagerFactory factory2;
+   @PersistenceUnit(unitName="../flushmodenever-session1.jar#manager1") EntityManagerFactory factory1;
+   @EJB @IgnoreDependency Session1 session1;
+
+   //@Resource SessionContext ctx;
+
+   public Entity1 find1FromManager(int id)
+   {
+      return manager1.find(Entity1.class, id);
+   }
+   public void find1FromFactory(int id)
+   {
+      EntityManager m = factory1.createEntityManager();
+      Entity1 one = m.find(Entity1.class, id);
+      try
+      {
+         if (one == null) throw new RuntimeException("NOT FOUND");
+      }
+      finally
+      {
+         m.close();
+      }
+
+   }
+   public Entity2 find2FromManager(int id)
+   {
+      return manager2.find(Entity2.class, id);
+   }
+   public void find2FromFactory(int id)
+   {
+      EntityManager m = factory2.createEntityManager();
+      Entity2 two = m.find(Entity2.class, id);
+      if (two == null) throw new RuntimeException("NOT FOUND");
+      // leak m.close();
+   }
+
+   public Util findUtil1FromManager(int id)
+   {
+      return manager1.find(Util.class, id);
+   }
+
+   public Util findUtil2FromManager(int id)
+   {
+      return manager2.find(Util.class, id);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Stateful1
-{
-   int create1();
-
-   int create2();
-
-   void update1();
-
-   void update2();
-
-   void never();
-
-   void checkout();
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   void never2(Entity1 uno, Entity2 dos);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Stateful1
+{
+   int create1();
+
+   int create2();
+
+   void update1();
+
+   void update2();
+
+   void never();
+
+   void checkout();
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   void never2(Entity1 uno, Entity2 dos);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,124 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.transaction.SystemException;
-import org.jboss.annotation.JndiInject;
-import org.jboss.ejb3.entity.ExtendedEntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at Remote(Stateful1.class)
-public class Stateful1Bean implements Stateful1, java.io.Serializable
-{
-   @PersistenceContext(unitName="manager1", type =PersistenceContextType.EXTENDED) EntityManager manager1;
-   @PersistenceContext(unitName = "../flushmodenever-session2.jar#manager2", type =PersistenceContextType.EXTENDED) EntityManager manager2;
-
-   Entity1 one;
-   Entity2 two;
-
-   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
-
-   public int create1()
-   {
-      one = new Entity1();
-      one.setString("oneManager");
-      if (!(manager1 instanceof ExtendedEntityManager)) throw new RuntimeException("assert failed");
-      manager1.persist(one);
-      return one.getId();
-   }
-
-   public int create2()
-   {
-      two = new Entity2();
-      two.setString("twoManager");
-      manager2.persist(two);
-      return two.getId();
-   }
-
-   public void update1()
-   {
-      if (!manager1.contains(one)) throw new RuntimeException("assert failed");
-      one.setString("changed");
-   }
-
-   public void update2()
-   {
-      if (!manager2.contains(two)) throw new RuntimeException("assert failed");
-      two.setString("changed");
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never()
-   {
-      one.setString("never");
-      two.setString("never");
-   }
-
-   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-   public void never2(Entity1 uno, Entity2 dos)
-   {
-      Transaction tx = null;
-      try
-      {
-         tx = tm.getTransaction();
-      }
-      catch (SystemException e)
-      {
-         throw new RuntimeException(e);
-      }
-      if (tx != null) throw new RuntimeException("TRANSACTION IS NOT NULL!");
-      if (manager1.merge(uno) != one) throw new RuntimeException("NOT EQUAL!!");
-      if (!uno.getString().equals("never2")) throw new RuntimeException("NOT_EQUAL");
-      if (manager2.merge(dos) != two) throw new RuntimeException("NOT EQUAL!");
-      if (!dos.getString().equals("never2")) throw new RuntimeException("NOT_EQUAL");
-   }
-
-   @Remove
-   public void checkout()
-   {
-      /*
-      Entity1 uno = manager1.find(Entity1.class, one.getId());
-      if (uno != one) throw new RuntimeException("NOT EQUAL");
-      if (!uno.equals("never2")) throw new RuntimeException("NOT EQUAL");
-      manager1.flush();
-      manager2.flush();
-      */
-   }
-
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import javax.transaction.TransactionManager;
+import javax.transaction.Transaction;
+import javax.transaction.SystemException;
+import org.jboss.annotation.JndiInject;
+import org.jboss.ejb3.entity.ExtendedEntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at Remote(Stateful1.class)
+public class Stateful1Bean implements Stateful1, java.io.Serializable
+{
+   @PersistenceContext(unitName="manager1", type =PersistenceContextType.EXTENDED) EntityManager manager1;
+   @PersistenceContext(unitName = "../flushmodenever-session2.jar#manager2", type =PersistenceContextType.EXTENDED) EntityManager manager2;
+
+   Entity1 one;
+   Entity2 two;
+
+   @JndiInject(jndiName="java:/TransactionManager") TransactionManager tm;
+
+   public int create1()
+   {
+      one = new Entity1();
+      one.setString("oneManager");
+      if (!(manager1 instanceof ExtendedEntityManager)) throw new RuntimeException("assert failed");
+      manager1.persist(one);
+      return one.getId();
+   }
+
+   public int create2()
+   {
+      two = new Entity2();
+      two.setString("twoManager");
+      manager2.persist(two);
+      return two.getId();
+   }
+
+   public void update1()
+   {
+      if (!manager1.contains(one)) throw new RuntimeException("assert failed");
+      one.setString("changed");
+   }
+
+   public void update2()
+   {
+      if (!manager2.contains(two)) throw new RuntimeException("assert failed");
+      two.setString("changed");
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never()
+   {
+      one.setString("never");
+      two.setString("never");
+   }
+
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   public void never2(Entity1 uno, Entity2 dos)
+   {
+      Transaction tx = null;
+      try
+      {
+         tx = tm.getTransaction();
+      }
+      catch (SystemException e)
+      {
+         throw new RuntimeException(e);
+      }
+      if (tx != null) throw new RuntimeException("TRANSACTION IS NOT NULL!");
+      if (manager1.merge(uno) != one) throw new RuntimeException("NOT EQUAL!!");
+      if (!uno.getString().equals("never2")) throw new RuntimeException("NOT_EQUAL");
+      if (manager2.merge(dos) != two) throw new RuntimeException("NOT EQUAL!");
+      if (!dos.getString().equals("never2")) throw new RuntimeException("NOT_EQUAL");
+   }
+
+   @Remove
+   public void checkout()
+   {
+      /*
+      Entity1 uno = manager1.find(Entity1.class, one.getId());
+      if (uno != one) throw new RuntimeException("NOT EQUAL");
+      if (!uno.equals("never2")) throw new RuntimeException("NOT EQUAL");
+      manager1.flush();
+      manager2.flush();
+      */
+   }
+
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Util implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Util implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Util.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,224 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.flushmodenever.unit;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityManager;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.test.standalone.flushmodenever.Entity1;
-import org.jboss.ejb3.test.standalone.flushmodenever.Entity2;
-import org.jboss.ejb3.test.standalone.flushmodenever.Session2;
-import org.jboss.ejb3.test.standalone.flushmodenever.Stateful1;
-import org.jboss.ejb3.test.standalone.flushmodenever.Util;
-import org.jboss.ejb3.test.standalone.flushmodenever.Session1;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class FactoryUnitTestCase
-        extends TestCase
-{
-
-   public FactoryUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-   public void testUserTransaction() throws Exception
-   {
-      UserTransaction tx = (UserTransaction)getInitialContext().lookup("UserTransaction");
-      EntityManagerFactory factory1 = (EntityManagerFactory)getInitialContext().lookup("java:/Manager1Factory");
-
-      tx.begin();
-      Entity1 one = new Entity1();
-      one.setString("UserTransaction");
-      EntityManager em1 = factory1.createEntityManager();
-      em1.persist(one);
-      tx.commit();
-      em1.close();
-
-      EntityManager em = factory1.createEntityManager();
-      one = em.find(Entity1.class, one.getId());
-      assertNotNull(one);
-      em.close();
-      
-   }
-
-   public void testMe() throws Exception
-   {
-      Session1 session1 = (Session1) this.getInitialContext().lookup("Session1Bean/remote");
-      Session2 session2 = (Session2) this.getInitialContext().lookup("Session2Bean/remote");
-
-      int oneF = session1.create1FromFactory();
-      int oneM = session1.create1FromManager();
-      int twoF = session1.create2FromFactory();
-      int twoM = session1.create2FromManager();
-      session1.doUtil(new Util());
-
-      session2.find1FromFactory(oneF);
-      assertNotNull(session2.find1FromManager(oneM));
-      session2.find2FromFactory(twoF);
-      assertNotNull(session2.find2FromManager(twoM));
-      assertNotNull(session2.findUtil1FromManager(1));
-      assertNotNull(session2.findUtil2FromManager(2));
-
-   }
-
-   public void testExtended() throws Exception
-   {
-      Stateful1 stateful1 = (Stateful1) this.getInitialContext().lookup("Stateful1Bean/remote");
-      Session2 session2 = (Session2) this.getInitialContext().lookup("Session2Bean/remote");
-
-      int oneId = stateful1.create1();
-      int twoId = stateful1.create2();
-
-      stateful1.update1();
-      stateful1.update2();
-
-      {
-         Entity1 one = session2.find1FromManager(oneId);
-         assertEquals(one.getString(), "changed");
-
-         Entity2 two = session2.find2FromManager(twoId);
-         assertEquals(two.getString(), "changed");
-      }
-
-      stateful1.never();
-
-      {
-         Entity1 one = session2.find1FromManager(oneId);
-         assertEquals(one.getString(), "changed");
-
-         Entity2 two = session2.find2FromManager(twoId);
-         assertEquals(two.getString(), "changed");
-      }
-
-      stateful1.checkout();
-
-      {
-         Entity1 one = session2.find1FromManager(oneId);
-         assertEquals(one.getString(), "never");
-
-         Entity2 two = session2.find2FromManager(twoId);
-         assertEquals(two.getString(), "never");
-      }
-   }
-
-   public void testExtended2() throws Exception
-   {
-      Stateful1 stateful1 = (Stateful1) this.getInitialContext().lookup("Stateful1Bean/remote");
-      Session2 session2 = (Session2) this.getInitialContext().lookup("Session2Bean/remote");
-
-      int oneId = stateful1.create1();
-      int twoId = stateful1.create2();
-
-      stateful1.update1();
-      stateful1.update2();
-
-      Entity1 one = session2.find1FromManager(oneId);
-      assertEquals(one.getString(), "changed");
-
-      Entity2 two = session2.find2FromManager(twoId);
-      assertEquals(two.getString(), "changed");
-      one.setString("never2");
-      two.setString("never2");
-      stateful1.never2(one, two);
-
-
-
-      {
-         Entity1 uno = session2.find1FromManager(oneId);
-         assertEquals(uno.getString(), "changed");
-
-         Entity2 dos = session2.find2FromManager(twoId);
-         assertEquals(dos.getString(), "changed");
-      }
-
-      stateful1.checkout();
-
-      {
-         Entity1 uno = session2.find1FromManager(oneId);
-         assertEquals(uno.getString(), "never2");
-
-         Entity2 dos = session2.find2FromManager(twoId);
-         assertEquals(dos.getString(), "never2");
-      }
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(FactoryUnitTestCase.class);
-
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-         EJB3StandaloneBootstrap.boot(null);
-         EJB3StandaloneBootstrap.scanClasspath("flushmodenever-session1.jar, flushmodenever-session2.jar");
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,224 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.flushmodenever.unit;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import javax.transaction.UserTransaction;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityManager;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.test.standalone.flushmodenever.Entity1;
+import org.jboss.ejb3.test.standalone.flushmodenever.Entity2;
+import org.jboss.ejb3.test.standalone.flushmodenever.Session2;
+import org.jboss.ejb3.test.standalone.flushmodenever.Stateful1;
+import org.jboss.ejb3.test.standalone.flushmodenever.Util;
+import org.jboss.ejb3.test.standalone.flushmodenever.Session1;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class FactoryUnitTestCase
+        extends TestCase
+{
+
+   public FactoryUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+   public void testUserTransaction() throws Exception
+   {
+      UserTransaction tx = (UserTransaction)getInitialContext().lookup("UserTransaction");
+      EntityManagerFactory factory1 = (EntityManagerFactory)getInitialContext().lookup("java:/Manager1Factory");
+
+      tx.begin();
+      Entity1 one = new Entity1();
+      one.setString("UserTransaction");
+      EntityManager em1 = factory1.createEntityManager();
+      em1.persist(one);
+      tx.commit();
+      em1.close();
+
+      EntityManager em = factory1.createEntityManager();
+      one = em.find(Entity1.class, one.getId());
+      assertNotNull(one);
+      em.close();
+      
+   }
+
+   public void testMe() throws Exception
+   {
+      Session1 session1 = (Session1) this.getInitialContext().lookup("Session1Bean/remote");
+      Session2 session2 = (Session2) this.getInitialContext().lookup("Session2Bean/remote");
+
+      int oneF = session1.create1FromFactory();
+      int oneM = session1.create1FromManager();
+      int twoF = session1.create2FromFactory();
+      int twoM = session1.create2FromManager();
+      session1.doUtil(new Util());
+
+      session2.find1FromFactory(oneF);
+      assertNotNull(session2.find1FromManager(oneM));
+      session2.find2FromFactory(twoF);
+      assertNotNull(session2.find2FromManager(twoM));
+      assertNotNull(session2.findUtil1FromManager(1));
+      assertNotNull(session2.findUtil2FromManager(2));
+
+   }
+
+   public void testExtended() throws Exception
+   {
+      Stateful1 stateful1 = (Stateful1) this.getInitialContext().lookup("Stateful1Bean/remote");
+      Session2 session2 = (Session2) this.getInitialContext().lookup("Session2Bean/remote");
+
+      int oneId = stateful1.create1();
+      int twoId = stateful1.create2();
+
+      stateful1.update1();
+      stateful1.update2();
+
+      {
+         Entity1 one = session2.find1FromManager(oneId);
+         assertEquals(one.getString(), "changed");
+
+         Entity2 two = session2.find2FromManager(twoId);
+         assertEquals(two.getString(), "changed");
+      }
+
+      stateful1.never();
+
+      {
+         Entity1 one = session2.find1FromManager(oneId);
+         assertEquals(one.getString(), "changed");
+
+         Entity2 two = session2.find2FromManager(twoId);
+         assertEquals(two.getString(), "changed");
+      }
+
+      stateful1.checkout();
+
+      {
+         Entity1 one = session2.find1FromManager(oneId);
+         assertEquals(one.getString(), "never");
+
+         Entity2 two = session2.find2FromManager(twoId);
+         assertEquals(two.getString(), "never");
+      }
+   }
+
+   public void testExtended2() throws Exception
+   {
+      Stateful1 stateful1 = (Stateful1) this.getInitialContext().lookup("Stateful1Bean/remote");
+      Session2 session2 = (Session2) this.getInitialContext().lookup("Session2Bean/remote");
+
+      int oneId = stateful1.create1();
+      int twoId = stateful1.create2();
+
+      stateful1.update1();
+      stateful1.update2();
+
+      Entity1 one = session2.find1FromManager(oneId);
+      assertEquals(one.getString(), "changed");
+
+      Entity2 two = session2.find2FromManager(twoId);
+      assertEquals(two.getString(), "changed");
+      one.setString("never2");
+      two.setString("never2");
+      stateful1.never2(one, two);
+
+
+
+      {
+         Entity1 uno = session2.find1FromManager(oneId);
+         assertEquals(uno.getString(), "changed");
+
+         Entity2 dos = session2.find2FromManager(twoId);
+         assertEquals(dos.getString(), "changed");
+      }
+
+      stateful1.checkout();
+
+      {
+         Entity1 uno = session2.find1FromManager(oneId);
+         assertEquals(uno.getString(), "never2");
+
+         Entity2 dos = session2.find2FromManager(twoId);
+         assertEquals(dos.getString(), "never2");
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(FactoryUnitTestCase.class);
+
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+         EJB3StandaloneBootstrap.boot(null);
+         EJB3StandaloneBootstrap.scanClasspath("flushmodenever-session1.jar, flushmodenever-session2.jar");
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/unit/FactoryUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,53 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.jms;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
-        })
-public class QueueTestMDB implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
-
-
-
-   public void onMessage(Message recvMsg)
-   {
-      System.out.println("QueueTestMDB onMessage");
-      TestStatusBean.queueRan = true;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.jms;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
+        })
+public class QueueTestMDB implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(QueueTestMDB.class);
+
+
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("QueueTestMDB onMessage");
+      TestStatusBean.queueRan = true;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/QueueTestMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.jms;
-
-import javax.ejb.Remote;
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface TestStatus
-{
-   void clear();
-
-   boolean queueFired();
-
-   boolean topicFired();
-
-   boolean interceptedTopic();
-
-   boolean interceptedQueue();
-
-   boolean postConstruct();
-
-   boolean preDestroy();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.jms;
+
+import javax.ejb.Remote;
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface TestStatus
+{
+   void clear();
+
+   boolean queueFired();
+
+   boolean topicFired();
+
+   boolean interceptedTopic();
+
+   boolean interceptedQueue();
+
+   boolean postConstruct();
+
+   boolean preDestroy();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatus.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,81 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.jms;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class TestStatusBean implements TestStatus
-{
-   public static boolean queueRan = false;
-   public static boolean topicRan = false;
-   public static boolean interceptedTopic = false;
-   public static boolean interceptedQueue = false;
-   public static boolean postConstruct = false;
-   public static boolean preDestroy = false;
-
-   public void clear()
-   {
-      queueRan = false;
-      topicRan = false;
-      interceptedTopic = false;
-      interceptedQueue = false;
-      postConstruct = false;
-      preDestroy = false;
-   }
-
-   public boolean queueFired()
-   {
-      return queueRan;
-   }
-
-   public boolean topicFired()
-   {
-      return topicRan;
-   }
-
-   public boolean interceptedTopic()
-   {
-      return interceptedTopic;
-   }
-
-   public boolean interceptedQueue()
-   {
-      return interceptedQueue;
-   }
-
-   public boolean postConstruct()
-   {
-      return postConstruct;
-   }
-
-   public boolean preDestroy()
-   {
-      return preDestroy;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.jms;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class TestStatusBean implements TestStatus
+{
+   public static boolean queueRan = false;
+   public static boolean topicRan = false;
+   public static boolean interceptedTopic = false;
+   public static boolean interceptedQueue = false;
+   public static boolean postConstruct = false;
+   public static boolean preDestroy = false;
+
+   public void clear()
+   {
+      queueRan = false;
+      topicRan = false;
+      interceptedTopic = false;
+      interceptedQueue = false;
+      postConstruct = false;
+      preDestroy = false;
+   }
+
+   public boolean queueFired()
+   {
+      return queueRan;
+   }
+
+   public boolean topicFired()
+   {
+      return topicRan;
+   }
+
+   public boolean interceptedTopic()
+   {
+      return interceptedTopic;
+   }
+
+   public boolean interceptedQueue()
+   {
+      return interceptedQueue;
+   }
+
+   public boolean postConstruct()
+   {
+      return postConstruct;
+   }
+
+   public boolean preDestroy()
+   {
+      return preDestroy;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/TestStatusBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,152 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.jms.unit;
-
-import java.util.Hashtable;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.PatternLayout;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.test.standalone.jms.TestStatus;
-import org.jboss.test.JBossTestCase;
-
-/**
- * POJO Environment tests
- * 
- * @author <a href="bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class MDBUnitTestCase extends JBossTestCase
-{
-   private static boolean booted = false;
-
-   public MDBUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   protected void setUp() throws Exception
-   {
-      // set bad properties to make sure that we're injecting InitialContext correct
-//      System.setProperty("java.naming.factory.initial", "ERROR");
-//      System.setProperty("java.naming.factory.url.pkgs", "ERROR");
-
-      super.setUp();
-      BasicConfigurator.resetConfiguration();
-      PatternLayout layout = new PatternLayout("%r %-5p [%c{1}] %m%n");
-      ConsoleAppender appender = new ConsoleAppender(layout);
-      BasicConfigurator.configure(appender);
-      String file = System.getProperty("org.jboss.test.logfile");
-      if (file != null)
-      {
-         FileAppender fileAppender = new FileAppender(layout, file);
-         BasicConfigurator.configure(fileAppender);
-      }
-      long start = System.currentTimeMillis();
-      log.info("Starting");
-      try
-      {
-         if (!booted)
-         {
-            booted = true;
-            EJB3StandaloneBootstrap.boot("");
-            EJB3StandaloneBootstrap.scanClasspath("jms.jar");
-         }
-      }
-      catch (Exception e)
-      {
-         throw e;
-      }
-      catch (Throwable t)
-      {
-         throw new RuntimeException(t);
-      }
-      log.info("setup took: " + (System.currentTimeMillis() - start));
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      super.tearDown();
-      EJB3StandaloneBootstrap.shutdown();
-   }
-   
-
-   protected InitialContext getLocalInitialContext() throws Exception
-   {
-      return new InitialContext(getLocalInitialContextProperties());
-   }
-
-   protected Hashtable getLocalInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-   public void testQueue() throws Throwable
-   {
-      InitialContext ctx = getLocalInitialContext();
-
-      executeEJBs(ctx);
-   }
-
-   private void executeEJBs(InitialContext ctx)
-           throws Exception
-   {
-      TestStatus status = (TestStatus) getLocalInitialContext().lookup("TestStatusBean/remote");
-      status.clear();
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-
-      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
-      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createSender(queue);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      assertTrue(status.queueFired());
-   }
-
-   protected void configureLoggingAfterBootstrap()
-   {
-      //enableTrace("org.jboss.tm");
-   }
- /*
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(MDBUnitTestCase.class, "mdbtest-service.xml");
-   }
-   */
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.jms.unit;
+
+import java.util.Hashtable;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.PatternLayout;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.test.standalone.jms.TestStatus;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * POJO Environment tests
+ * 
+ * @author <a href="bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class MDBUnitTestCase extends JBossTestCase
+{
+   private static boolean booted = false;
+
+   public MDBUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   protected void setUp() throws Exception
+   {
+      // set bad properties to make sure that we're injecting InitialContext correct
+//      System.setProperty("java.naming.factory.initial", "ERROR");
+//      System.setProperty("java.naming.factory.url.pkgs", "ERROR");
+
+      super.setUp();
+      BasicConfigurator.resetConfiguration();
+      PatternLayout layout = new PatternLayout("%r %-5p [%c{1}] %m%n");
+      ConsoleAppender appender = new ConsoleAppender(layout);
+      BasicConfigurator.configure(appender);
+      String file = System.getProperty("org.jboss.test.logfile");
+      if (file != null)
+      {
+         FileAppender fileAppender = new FileAppender(layout, file);
+         BasicConfigurator.configure(fileAppender);
+      }
+      long start = System.currentTimeMillis();
+      log.info("Starting");
+      try
+      {
+         if (!booted)
+         {
+            booted = true;
+            EJB3StandaloneBootstrap.boot("");
+            EJB3StandaloneBootstrap.scanClasspath("jms.jar");
+         }
+      }
+      catch (Exception e)
+      {
+         throw e;
+      }
+      catch (Throwable t)
+      {
+         throw new RuntimeException(t);
+      }
+      log.info("setup took: " + (System.currentTimeMillis() - start));
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      EJB3StandaloneBootstrap.shutdown();
+   }
+   
+
+   protected InitialContext getLocalInitialContext() throws Exception
+   {
+      return new InitialContext(getLocalInitialContextProperties());
+   }
+
+   protected Hashtable getLocalInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+   public void testQueue() throws Throwable
+   {
+      InitialContext ctx = getLocalInitialContext();
+
+      executeEJBs(ctx);
+   }
+
+   private void executeEJBs(InitialContext ctx)
+           throws Exception
+   {
+      TestStatus status = (TestStatus) getLocalInitialContext().lookup("TestStatusBean/remote");
+      status.clear();
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
+      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      assertTrue(status.queueFired());
+   }
+
+   protected void configureLoggingAfterBootstrap()
+   {
+      //enableTrace("org.jboss.tm");
+   }
+ /*
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(MDBUnitTestCase.class, "mdbtest-service.xml");
+   }
+   */
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/jms/unit/MDBUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.standalone.security;
-
-import javax.annotation.security.RolesAllowed;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface Secured
-{
-   @RolesAllowed("somebody")
-   String echo(String echo);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.security;
+
+import javax.annotation.security.RolesAllowed;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface Secured
+{
+   @RolesAllowed("somebody")
+   String echo(String echo);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/Secured.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.standalone.security;
-
-import org.jboss.annotation.security.SecurityDomain;
-
-import javax.ejb.Stateless;
-import javax.annotation.security.RolesAllowed;
-
-import javax.annotation.security.RunAs;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at SecurityDomain("other")
- at RunAs("blah")
-public class SecuredBean implements Secured
-{
-   @RolesAllowed("somebody")
-   public String echo(String echo)
-   {
-      System.out.println("echo: " + echo);
-      return echo;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.security;
+
+import org.jboss.annotation.security.SecurityDomain;
+
+import javax.ejb.Stateless;
+import javax.annotation.security.RolesAllowed;
+
+import javax.annotation.security.RunAs;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at SecurityDomain("other")
+ at RunAs("blah")
+public class SecuredBean implements Secured
+{
+   @RolesAllowed("somebody")
+   public String echo(String echo)
+   {
+      System.out.println("echo: " + echo);
+      return echo;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,114 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.standalone.security.unit;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.test.standalone.security.Secured;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.ejb.EJBAccessException;
-import java.util.Hashtable;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class SecurityUnitTestCase
-        extends TestCase
-{
-
-   public SecurityUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testSecurity() throws Exception
-   {
-      Hashtable env = new Hashtable();
-      env.put(Context.SECURITY_PRINCIPAL, "bill");
-      env.put(Context.SECURITY_CREDENTIALS, "password");
-      env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
-      InitialContext ctx = new InitialContext(env);
-      Secured test = (Secured)ctx.lookup("SecuredBean/local");
-      boolean exceptionThrown = false;
-      try
-      {
-         test.echo("bill");
-      }
-      catch (EJBAccessException e)
-      {
-         exceptionThrown = true;
-         e.printStackTrace();
-      }
-      assertTrue(exceptionThrown);
-      env.put(Context.SECURITY_PRINCIPAL, "kabir");
-      env.put(Context.SECURITY_CREDENTIALS, "password");
-      ctx = new InitialContext(env);
-      test.echo("bill");
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(SecurityUnitTestCase.class);
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            SecurityUnitTestCase.startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            SecurityUnitTestCase.shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
-      EJB3StandaloneBootstrap.scanClasspath("embedded-security.jar");
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.security.unit;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.test.standalone.security.Secured;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.ejb.EJBAccessException;
+import java.util.Hashtable;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class SecurityUnitTestCase
+        extends TestCase
+{
+
+   public SecurityUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testSecurity() throws Exception
+   {
+      Hashtable env = new Hashtable();
+      env.put(Context.SECURITY_PRINCIPAL, "bill");
+      env.put(Context.SECURITY_CREDENTIALS, "password");
+      env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      InitialContext ctx = new InitialContext(env);
+      Secured test = (Secured)ctx.lookup("SecuredBean/local");
+      boolean exceptionThrown = false;
+      try
+      {
+         test.echo("bill");
+      }
+      catch (EJBAccessException e)
+      {
+         exceptionThrown = true;
+         e.printStackTrace();
+      }
+      assertTrue(exceptionThrown);
+      env.put(Context.SECURITY_PRINCIPAL, "kabir");
+      env.put(Context.SECURITY_CREDENTIALS, "password");
+      ctx = new InitialContext(env);
+      test.echo("bill");
+   }
+
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(SecurityUnitTestCase.class);
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            SecurityUnitTestCase.startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            SecurityUnitTestCase.shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
+      EJB3StandaloneBootstrap.scanClasspath("embedded-security.jar");
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/security/unit/SecurityUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.servicepojo;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Service
-public class ServiceOneBean implements ServiceOneLocal, ServiceOneManagement
-{
-   int state = 0;
-   int attribute;
-
-   public void setAttribute(int attribute)
-   {
-      this.attribute = attribute;
-   }
-
-   public int getAttribute()
-   {
-      return this.attribute;
-   }
-
-   public int getState()
-   {
-      return state;
-   }
-   
-   public String sayHello(String name)
-   {
-      return "Hello " + name;
-   }
-
-   // Lifecycle methods
-   public void create() throws Exception
-   {
-      System.out.println("ServiceOne - Creating");
-      state++;
-   }
-
-   public void start() throws Exception
-   {
-      System.out.println("ServiceOne - Starting");
-      state++;
-   }
-
-   public void stop()
-   {
-      System.out.println("ServiceOne - Stopping");
-      state--;
-   }
-
-   public void destroy()
-   {
-      System.out.println("ServiceOne - Destroying");
-      state--;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.servicepojo;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Service
+public class ServiceOneBean implements ServiceOneLocal, ServiceOneManagement
+{
+   int state = 0;
+   int attribute;
+
+   public void setAttribute(int attribute)
+   {
+      this.attribute = attribute;
+   }
+
+   public int getAttribute()
+   {
+      return this.attribute;
+   }
+
+   public int getState()
+   {
+      return state;
+   }
+   
+   public String sayHello(String name)
+   {
+      return "Hello " + name;
+   }
+
+   // Lifecycle methods
+   public void create() throws Exception
+   {
+      System.out.println("ServiceOne - Creating");
+      state++;
+   }
+
+   public void start() throws Exception
+   {
+      System.out.println("ServiceOne - Starting");
+      state++;
+   }
+
+   public void stop()
+   {
+      System.out.println("ServiceOne - Stopping");
+      state--;
+   }
+
+   public void destroy()
+   {
+      System.out.println("ServiceOne - Destroying");
+      state--;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.servicepojo;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Local
-public interface ServiceOneLocal
-{
-   int getAttribute();
-   void setAttribute(int attribute);
-   
-   int getState();
-   
-   String sayHello(String name);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.servicepojo;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Local
+public interface ServiceOneLocal
+{
+   int getAttribute();
+   void setAttribute(int attribute);
+   
+   int getState();
+   
+   String sayHello(String name);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.servicepojo;
-
-import org.jboss.annotation.ejb.Management;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Management
-public interface ServiceOneManagement
-{
-   void setAttribute(int attribute);
-   int getAttribute();
-   String sayHello(String name);
-
-   void create() throws Exception;
-   void start() throws Exception;
-   void stop();
-   void destroy();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.servicepojo;
+
+import org.jboss.annotation.ejb.Management;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Management
+public interface ServiceOneManagement
+{
+   void setAttribute(int attribute);
+   int getAttribute();
+   String sayHello(String name);
+
+   void create() throws Exception;
+   void start() throws Exception;
+   void stop();
+   void destroy();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.servicepojo;
-
-import org.jboss.annotation.ejb.Service;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Service
-public class ServiceTwoBean implements ServiceTwoLocal, ServiceTwoManagement
-{
-   int state = 0;
-   int attribute;
-
-   public void setAttribute(int attribute)
-   {
-      this.attribute = attribute;
-   }
-
-   public int getAttribute()
-   {
-      return this.attribute;
-   }
-
-   public int getState()
-   {
-      return state;  
-   }
-   
-   public String sayHello(String name)
-   {
-      return "Hello " + name;
-   }
-
-   // Lifecycle methods
-   public void create() throws Exception
-   {
-      System.out.println("ServiceTwo - Creating");
-      state++;
-   }
-
-   public void start() throws Exception
-   {
-      System.out.println("ServiceTwo - Starting");
-      state++;
-   }
-
-   public void stop()
-   {
-      System.out.println("ServiceTwo - Stopping");
-      state--;
-   }
-
-   public void destroy()
-   {
-      System.out.println("ServiceTwo - Destroying");
-      state--;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.servicepojo;
+
+import org.jboss.annotation.ejb.Service;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Service
+public class ServiceTwoBean implements ServiceTwoLocal, ServiceTwoManagement
+{
+   int state = 0;
+   int attribute;
+
+   public void setAttribute(int attribute)
+   {
+      this.attribute = attribute;
+   }
+
+   public int getAttribute()
+   {
+      return this.attribute;
+   }
+
+   public int getState()
+   {
+      return state;  
+   }
+   
+   public String sayHello(String name)
+   {
+      return "Hello " + name;
+   }
+
+   // Lifecycle methods
+   public void create() throws Exception
+   {
+      System.out.println("ServiceTwo - Creating");
+      state++;
+   }
+
+   public void start() throws Exception
+   {
+      System.out.println("ServiceTwo - Starting");
+      state++;
+   }
+
+   public void stop()
+   {
+      System.out.println("ServiceTwo - Stopping");
+      state--;
+   }
+
+   public void destroy()
+   {
+      System.out.println("ServiceTwo - Destroying");
+      state--;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.servicepojo;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Local
-public interface ServiceTwoLocal
-{
-   int getAttribute();
-   void setAttribute(int attribute);
-   
-   int getState();
-   
-   String sayHello(String name);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.servicepojo;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Local
+public interface ServiceTwoLocal
+{
+   int getAttribute();
+   void setAttribute(int attribute);
+   
+   int getState();
+   
+   String sayHello(String name);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.servicepojo;
-
-import org.jboss.annotation.ejb.Management;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at Management
-public interface ServiceTwoManagement
-{
-   void setAttribute(int attribute);
-   int getAttribute();
-   String sayHello(String name);
-
-   void start() throws Exception;
-   void stop();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.servicepojo;
+
+import org.jboss.annotation.ejb.Management;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Management
+public interface ServiceTwoManagement
+{
+   void setAttribute(int attribute);
+   int getAttribute();
+   String sayHello(String name);
+
+   void start() throws Exception;
+   void stop();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,125 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.standalone.servicepojo.unit;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.test.standalone.servicepojo.ServiceOneLocal;
-import org.jboss.ejb3.test.standalone.servicepojo.ServiceTwoLocal;
-import org.jboss.mx.util.MBeanServerLocator;
-
-public class ServicePOJOTestCase extends TestCase
-{
-   public ServicePOJOTestCase(String name)
-   {
-      super(name);
-   }
-   
-   private static MBeanServerConnection getServer()
-   {
-      return MBeanServerLocator.locate();
-   }
-   
-   public void testLocalInterface() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      ServiceOneLocal service = (ServiceOneLocal) ctx.lookup("ServiceOneBean/local");
-      service.setAttribute(1);
-   }
-   
-   public void testManagementInterface() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName name = new ObjectName("jboss.j2ee:jar=embedded-servicepojo,name=ServiceOneBean,service=EJB3,type=ManagementInterface");
-      Object params[] = { "me" };
-      String signature[] = { String.class.getName() };
-      String result = (String) server.invoke(name, "sayHello", params, signature);
-      assertEquals("Hello me", result);
-   }
-   
-   public void testPartialManagementInterface() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName name = new ObjectName("jboss.j2ee:jar=embedded-servicepojo,name=ServiceTwoBean,service=EJB3,type=ManagementInterface");
-      Object params[] = { "me" };
-      String signature[] = { String.class.getName() };
-      String result = (String) server.invoke(name, "sayHello", params, signature);
-      assertEquals("Hello me", result);
-   }
-   
-   public void testStateOne() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      ServiceOneLocal service = (ServiceOneLocal) ctx.lookup("ServiceOneBean/local");
-      int actualState = service.getState();
-      assertEquals(2, actualState);
-   }
-   
-   public void testStateTwo() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      ServiceTwoLocal service = (ServiceTwoLocal) ctx.lookup("ServiceTwoBean/local");
-      int actualState = service.getState();
-      assertEquals(1, actualState);
-   }
-   
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(ServicePOJOTestCase.class);
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.scanClasspath("embedded-servicepojo.jar");
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,125 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.servicepojo.unit;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.test.standalone.servicepojo.ServiceOneLocal;
+import org.jboss.ejb3.test.standalone.servicepojo.ServiceTwoLocal;
+import org.jboss.mx.util.MBeanServerLocator;
+
+public class ServicePOJOTestCase extends TestCase
+{
+   public ServicePOJOTestCase(String name)
+   {
+      super(name);
+   }
+   
+   private static MBeanServerConnection getServer()
+   {
+      return MBeanServerLocator.locate();
+   }
+   
+   public void testLocalInterface() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      ServiceOneLocal service = (ServiceOneLocal) ctx.lookup("ServiceOneBean/local");
+      service.setAttribute(1);
+   }
+   
+   public void testManagementInterface() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName name = new ObjectName("jboss.j2ee:jar=embedded-servicepojo,name=ServiceOneBean,service=EJB3,type=ManagementInterface");
+      Object params[] = { "me" };
+      String signature[] = { String.class.getName() };
+      String result = (String) server.invoke(name, "sayHello", params, signature);
+      assertEquals("Hello me", result);
+   }
+   
+   public void testPartialManagementInterface() throws Exception
+   {
+      MBeanServerConnection server = getServer();
+      ObjectName name = new ObjectName("jboss.j2ee:jar=embedded-servicepojo,name=ServiceTwoBean,service=EJB3,type=ManagementInterface");
+      Object params[] = { "me" };
+      String signature[] = { String.class.getName() };
+      String result = (String) server.invoke(name, "sayHello", params, signature);
+      assertEquals("Hello me", result);
+   }
+   
+   public void testStateOne() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      ServiceOneLocal service = (ServiceOneLocal) ctx.lookup("ServiceOneBean/local");
+      int actualState = service.getState();
+      assertEquals(2, actualState);
+   }
+   
+   public void testStateTwo() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      ServiceTwoLocal service = (ServiceTwoLocal) ctx.lookup("ServiceTwoBean/local");
+      int actualState = service.getState();
+      assertEquals(1, actualState);
+   }
+   
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(ServicePOJOTestCase.class);
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.scanClasspath("embedded-servicepojo.jar");
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,156 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.unit;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Properties;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-import org.jboss.ejb3.test.standalone.DependsRemote;
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.extensions.TestSetup;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DependencyTestCase extends TestCase
-{
-   private static boolean booted = false;
-
-   public DependencyTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(DeployerTestCase.class);
-
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.boot(null);
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-   private Properties getDefaultPersistenceProperties()
-           throws IOException
-   {
-      InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
-      assertNotNull(is);
-      Properties defaults = new Properties();
-      defaults.load(is);
-      return defaults;
-   }
-
-   public void testDepends() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-
-      URL res = Thread.currentThread().getContextClassLoader().getResource("marker.txt");
-      URL archive = EJB3StandaloneDeployer.getContainingUrlFromResource(res, "marker.txt");
-      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
-      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
-      deployer.setJndiProperties(getInitialContextProperties());
-      deployer.getArchives().add(archive);
-
-      completeTest(deployer, ctx);
-
-   }
-   
-   public void testCleanup() throws Throwable
-   {
-      boolean exceptionThrown = false;
-      try
-      {
-         executeEJBs(getInitialContext());
-      }
-      catch (Exception e)
-      {
-         exceptionThrown = true;
-      }
-      assertTrue(exceptionThrown);
-
-   }
-
-   private void completeTest(EJB3StandaloneDeployer deployer, InitialContext ctx)
-           throws Exception
-   {
-      deployer.create();
-      deployer.start();
-
-      executeEJBs(ctx);
-
-      deployer.stop();
-      deployer.destroy();
-   }
-
-   private void executeEJBs(InitialContext ctx)
-           throws NamingException
-   {
-      DependsRemote stateless = (DependsRemote)ctx.lookup("DependsBean/remote");
-      assertNotNull(stateless);
-      stateless.test();
-     
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.unit;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.Properties;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+import org.jboss.ejb3.test.standalone.DependsRemote;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.extensions.TestSetup;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class DependencyTestCase extends TestCase
+{
+   private static boolean booted = false;
+
+   public DependencyTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(DeployerTestCase.class);
+
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.boot(null);
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+   private Properties getDefaultPersistenceProperties()
+           throws IOException
+   {
+      InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
+      assertNotNull(is);
+      Properties defaults = new Properties();
+      defaults.load(is);
+      return defaults;
+   }
+
+   public void testDepends() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+
+      URL res = Thread.currentThread().getContextClassLoader().getResource("marker.txt");
+      URL archive = EJB3StandaloneDeployer.getContainingUrlFromResource(res, "marker.txt");
+      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
+      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
+      deployer.setJndiProperties(getInitialContextProperties());
+      deployer.getArchives().add(archive);
+
+      completeTest(deployer, ctx);
+
+   }
+   
+   public void testCleanup() throws Throwable
+   {
+      boolean exceptionThrown = false;
+      try
+      {
+         executeEJBs(getInitialContext());
+      }
+      catch (Exception e)
+      {
+         exceptionThrown = true;
+      }
+      assertTrue(exceptionThrown);
+
+   }
+
+   private void completeTest(EJB3StandaloneDeployer deployer, InitialContext ctx)
+           throws Exception
+   {
+      deployer.create();
+      deployer.start();
+
+      executeEJBs(ctx);
+
+      deployer.stop();
+      deployer.destroy();
+   }
+
+   private void executeEJBs(InitialContext ctx)
+           throws NamingException
+   {
+      DependsRemote stateless = (DependsRemote)ctx.lookup("DependsBean/remote");
+      assertNotNull(stateless);
+      stateless.test();
+     
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DependencyTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,244 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.unit;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Properties;
-import javax.ejb.NoSuchEJBException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployment;
-import org.jboss.ejb3.test.standalone.CalculatorRemote;
-import org.jboss.ejb3.test.standalone.Customer;
-import org.jboss.ejb3.test.standalone.CustomerDAO;
-import org.jboss.ejb3.test.standalone.ShoppingCart;
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.extensions.TestSetup;
-
-/**
- * POJO Environment tests
- * 
- * @author <a href="bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class DeployerTestCase extends TestCase
-{
-   private static boolean booted = false;
-
-   public DeployerTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(DeployerTestCase.class);
-
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-         EJB3StandaloneBootstrap.boot(null);
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-
-   private Properties getDefaultPersistenceProperties()
-           throws IOException
-   {
-      InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
-      assertNotNull(is);
-      Properties defaults = new Properties();
-      defaults.load(is);
-      return defaults;
-   }
-
-   public void testArchives() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-
-      URL res = Thread.currentThread().getContextClassLoader().getResource("marker.txt");
-      URL archive = EJB3StandaloneDeployer.getContainingUrlFromResource(res, "marker.txt");
-      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
-      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
-      deployer.setJndiProperties(getInitialContextProperties());
-      deployer.getArchives().add(archive);
-
-      completeTest(deployer, ctx);
-
-   }
-
-   public void testDeploy() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-
-      URL res = Thread.currentThread().getContextClassLoader().getResource("marker.txt");
-      URL deployDir = EJB3StandaloneDeployer.getDeployDirFromResource(res, "marker.txt");
-      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
-      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
-      deployer.setJndiProperties(getInitialContextProperties());
-      deployer.setDefaultPersistenceProperties(getDefaultPersistenceProperties());
-      System.out.println("deployDir = " + deployDir);
-      deployer.getDeployDirs().add(deployDir);
-
-      completeTest(deployer, ctx);
-
-   }
-
-   public void testArchivesByResource() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-
-      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
-      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
-      deployer.setJndiProperties(getInitialContextProperties());
-      deployer.setDefaultPersistenceProperties(getDefaultPersistenceProperties());
-      deployer.getArchivesByResource().add("marker.txt");
-
-      completeTest(deployer, ctx);
-
-   }
-
-   public void testDeployByResource() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-
-      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
-      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
-      deployer.setJndiProperties(getInitialContextProperties());
-      deployer.setDefaultPersistenceProperties(getDefaultPersistenceProperties());
-      deployer.getDeployDirsByResource().add("marker.txt");
-
-      completeTest(deployer, ctx);
-
-   }
-
-   public void testCleanup() throws Throwable
-   {
-      boolean exceptionThrown = false;
-      try
-      {
-         executeEJBs(getInitialContext());
-      }
-      catch (Exception e)
-      {
-         exceptionThrown = true;
-      }
-      assertTrue(exceptionThrown);
-
-   }
-
-   private void completeTest(EJB3StandaloneDeployer deployer, InitialContext ctx)
-           throws Exception
-   {
-      deployer.create();
-      deployer.start();
-
-      executeEJBs(ctx);
-
-      deployer.stop();
-      deployer.destroy();
-      
-      deployer.create();
-      deployer.start();
-
-      executeEJBs(ctx);
-
-      deployer.stop();
-      deployer.destroy();
-   }
-
-   private void executeEJBs(InitialContext ctx)
-           throws NamingException
-   {
-      CustomerDAO local = (CustomerDAO)ctx.lookup("CustomerDAOBean/local");
-      long id = local.createCustomer();
-      Customer cust = local.findCustomer(id);
-      assertEquals("Bill", cust.getName());
-
-      ShoppingCart cart = (ShoppingCart)ctx.lookup("ShoppingCartBean/local");
-      cart.getCart().add("beer");
-      cart.getCart().add("wine");
-      assertEquals(2, cart.getCart().size());
-
-      cart.checkout();
-
-      boolean exceptionThrown = false;
-      try
-      {
-         cart.getCart();
-      }
-      catch (NoSuchEJBException e)
-      {
-         exceptionThrown = true;
-      }
-
-      assertTrue(exceptionThrown);
-
-      CalculatorRemote calc = (CalculatorRemote)ctx.lookup("CalculatorBean/remote");
-      assertEquals(2, calc.add(1, 1));
-   }
-
-   protected void configureLoggingAfterBootstrap()
-   {
-      //enableTrace("org.jboss.tm");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,244 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.unit;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.Properties;
+import javax.ejb.NoSuchEJBException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployment;
+import org.jboss.ejb3.test.standalone.CalculatorRemote;
+import org.jboss.ejb3.test.standalone.Customer;
+import org.jboss.ejb3.test.standalone.CustomerDAO;
+import org.jboss.ejb3.test.standalone.ShoppingCart;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.extensions.TestSetup;
+
+/**
+ * POJO Environment tests
+ * 
+ * @author <a href="bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class DeployerTestCase extends TestCase
+{
+   private static boolean booted = false;
+
+   public DeployerTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(DeployerTestCase.class);
+
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+         EJB3StandaloneBootstrap.boot(null);
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+
+   private Properties getDefaultPersistenceProperties()
+           throws IOException
+   {
+      InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
+      assertNotNull(is);
+      Properties defaults = new Properties();
+      defaults.load(is);
+      return defaults;
+   }
+
+   public void testArchives() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+
+      URL res = Thread.currentThread().getContextClassLoader().getResource("marker.txt");
+      URL archive = EJB3StandaloneDeployer.getContainingUrlFromResource(res, "marker.txt");
+      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
+      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
+      deployer.setJndiProperties(getInitialContextProperties());
+      deployer.getArchives().add(archive);
+
+      completeTest(deployer, ctx);
+
+   }
+
+   public void testDeploy() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+
+      URL res = Thread.currentThread().getContextClassLoader().getResource("marker.txt");
+      URL deployDir = EJB3StandaloneDeployer.getDeployDirFromResource(res, "marker.txt");
+      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
+      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
+      deployer.setJndiProperties(getInitialContextProperties());
+      deployer.setDefaultPersistenceProperties(getDefaultPersistenceProperties());
+      System.out.println("deployDir = " + deployDir);
+      deployer.getDeployDirs().add(deployDir);
+
+      completeTest(deployer, ctx);
+
+   }
+
+   public void testArchivesByResource() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+
+      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
+      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
+      deployer.setJndiProperties(getInitialContextProperties());
+      deployer.setDefaultPersistenceProperties(getDefaultPersistenceProperties());
+      deployer.getArchivesByResource().add("marker.txt");
+
+      completeTest(deployer, ctx);
+
+   }
+
+   public void testDeployByResource() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+
+      EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
+      deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
+      deployer.setJndiProperties(getInitialContextProperties());
+      deployer.setDefaultPersistenceProperties(getDefaultPersistenceProperties());
+      deployer.getDeployDirsByResource().add("marker.txt");
+
+      completeTest(deployer, ctx);
+
+   }
+
+   public void testCleanup() throws Throwable
+   {
+      boolean exceptionThrown = false;
+      try
+      {
+         executeEJBs(getInitialContext());
+      }
+      catch (Exception e)
+      {
+         exceptionThrown = true;
+      }
+      assertTrue(exceptionThrown);
+
+   }
+
+   private void completeTest(EJB3StandaloneDeployer deployer, InitialContext ctx)
+           throws Exception
+   {
+      deployer.create();
+      deployer.start();
+
+      executeEJBs(ctx);
+
+      deployer.stop();
+      deployer.destroy();
+      
+      deployer.create();
+      deployer.start();
+
+      executeEJBs(ctx);
+
+      deployer.stop();
+      deployer.destroy();
+   }
+
+   private void executeEJBs(InitialContext ctx)
+           throws NamingException
+   {
+      CustomerDAO local = (CustomerDAO)ctx.lookup("CustomerDAOBean/local");
+      long id = local.createCustomer();
+      Customer cust = local.findCustomer(id);
+      assertEquals("Bill", cust.getName());
+
+      ShoppingCart cart = (ShoppingCart)ctx.lookup("ShoppingCartBean/local");
+      cart.getCart().add("beer");
+      cart.getCart().add("wine");
+      assertEquals(2, cart.getCart().size());
+
+      cart.checkout();
+
+      boolean exceptionThrown = false;
+      try
+      {
+         cart.getCart();
+      }
+      catch (NoSuchEJBException e)
+      {
+         exceptionThrown = true;
+      }
+
+      assertTrue(exceptionThrown);
+
+      CalculatorRemote calc = (CalculatorRemote)ctx.lookup("CalculatorBean/remote");
+      assertEquals(2, calc.add(1, 1));
+   }
+
+   protected void configureLoggingAfterBootstrap()
+   {
+      //enableTrace("org.jboss.tm");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,154 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.unit;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.test.standalone.CalculatorBean;
-import org.jboss.ejb3.test.standalone.CalculatorRemote;
-import org.jboss.ejb3.test.standalone.Customer;
-import org.jboss.ejb3.test.standalone.CustomerDAO;
-import org.jboss.ejb3.test.standalone.ShoppingCart;
-import org.jboss.ejb3.test.standalone.StupidInterceptor;
-
-import javax.ejb.NoSuchEJBException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.util.Hashtable;
-
-/**
- * POJO Environment tests
- *
- * @author <a href="bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class JavaClassPathTestCase extends TestCase
-{
-   public JavaClassPathTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(JavaClassPathTestCase.class);
-
-      // setup test so that embedded JBoss is started/stopped once for all tests here.
-      TestSetup wrapper = new TestSetup(suite)
-      {
-         protected void setUp()
-         {
-            startupEmbeddedJboss();
-         }
-
-         protected void tearDown()
-         {
-            shutdownEmbeddedJboss();
-         }
-      };
-
-      return wrapper;
-   }
-
-   public static void startupEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.scanClasspath("standalone.jar");
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-
-   public void testJavaClassPath() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-
-      executeEJBs(ctx);
-   }
-
-   private void executeEJBs(InitialContext ctx)
-           throws NamingException
-   {
-      CustomerDAO local = (CustomerDAO) ctx.lookup("CustomerDAOBean/local");
-      long id = local.createCustomer();
-      Customer cust = local.findCustomer(id);
-      assertEquals("Bill", cust.getName());
-
-      ShoppingCart cart = (ShoppingCart) ctx.lookup("ShoppingCartBean/local");
-      cart.getCart().add("beer");
-      cart.getCart().add("wine");
-      assertEquals(2, cart.getCart().size());
-
-      cart.checkout();
-
-      boolean exceptionThrown = false;
-      try
-      {
-         cart.getCart();
-      }
-      catch (NoSuchEJBException e)
-      {
-         exceptionThrown = true;
-      }
-
-      assertTrue(exceptionThrown);
-
-      CalculatorRemote calc = (CalculatorRemote) ctx.lookup("CalculatorBean/remote");
-      StupidInterceptor.count = 0;
-      CalculatorBean.test = true;
-      try
-      {
-         assertEquals(2, calc.add(1, 1));
-         assertEquals(1, StupidInterceptor.count);
-         StupidInterceptor.count = 0;
-         CalculatorBean.test = true;
-         assertEquals(0, calc.sub(1, 1));
-         assertEquals(1, StupidInterceptor.count);
-      }
-      finally
-      {
-         CalculatorBean.test = false;
-      }
-   }
-
-   protected void configureLoggingAfterBootstrap()
-   {
-      //enableTrace("org.jboss.tm");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.unit;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.test.standalone.CalculatorBean;
+import org.jboss.ejb3.test.standalone.CalculatorRemote;
+import org.jboss.ejb3.test.standalone.Customer;
+import org.jboss.ejb3.test.standalone.CustomerDAO;
+import org.jboss.ejb3.test.standalone.ShoppingCart;
+import org.jboss.ejb3.test.standalone.StupidInterceptor;
+
+import javax.ejb.NoSuchEJBException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.Hashtable;
+
+/**
+ * POJO Environment tests
+ *
+ * @author <a href="bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class JavaClassPathTestCase extends TestCase
+{
+   public JavaClassPathTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(JavaClassPathTestCase.class);
+
+      // setup test so that embedded JBoss is started/stopped once for all tests here.
+      TestSetup wrapper = new TestSetup(suite)
+      {
+         protected void setUp()
+         {
+            startupEmbeddedJboss();
+         }
+
+         protected void tearDown()
+         {
+            shutdownEmbeddedJboss();
+         }
+      };
+
+      return wrapper;
+   }
+
+   public static void startupEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.scanClasspath("standalone.jar");
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+
+   public void testJavaClassPath() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+
+      executeEJBs(ctx);
+   }
+
+   private void executeEJBs(InitialContext ctx)
+           throws NamingException
+   {
+      CustomerDAO local = (CustomerDAO) ctx.lookup("CustomerDAOBean/local");
+      long id = local.createCustomer();
+      Customer cust = local.findCustomer(id);
+      assertEquals("Bill", cust.getName());
+
+      ShoppingCart cart = (ShoppingCart) ctx.lookup("ShoppingCartBean/local");
+      cart.getCart().add("beer");
+      cart.getCart().add("wine");
+      assertEquals(2, cart.getCart().size());
+
+      cart.checkout();
+
+      boolean exceptionThrown = false;
+      try
+      {
+         cart.getCart();
+      }
+      catch (NoSuchEJBException e)
+      {
+         exceptionThrown = true;
+      }
+
+      assertTrue(exceptionThrown);
+
+      CalculatorRemote calc = (CalculatorRemote) ctx.lookup("CalculatorBean/remote");
+      StupidInterceptor.count = 0;
+      CalculatorBean.test = true;
+      try
+      {
+         assertEquals(2, calc.add(1, 1));
+         assertEquals(1, StupidInterceptor.count);
+         StupidInterceptor.count = 0;
+         CalculatorBean.test = true;
+         assertEquals(0, calc.sub(1, 1));
+         assertEquals(1, StupidInterceptor.count);
+      }
+      finally
+      {
+         CalculatorBean.test = false;
+      }
+   }
+
+   protected void configureLoggingAfterBootstrap()
+   {
+      //enableTrace("org.jboss.tm");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.unit;
-
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import junit.framework.TestCase;
-
-/**
- * POJO Environment tests
- * 
- * @author <a href="bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class KernelTestCase extends TestCase
-{
-   private static boolean booted = false;
-
-   public KernelTestCase(String name)
-   {
-      super(name);
-   }
-
-    public void testArchives() throws Throwable
-   {
-      EJB3StandaloneBootstrap.createKernel();
-      try
-      {
-         EJB3StandaloneBootstrap.deployXmlResource("kernel-test.xml");
-      }
-      finally
-      {
-         EJB3StandaloneBootstrap.shutdown();
-      }
-   }
-   protected void configureLoggingAfterBootstrap()
-   {
-      //enableTrace("org.jboss.tm");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.unit;
+
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import junit.framework.TestCase;
+
+/**
+ * POJO Environment tests
+ * 
+ * @author <a href="bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class KernelTestCase extends TestCase
+{
+   private static boolean booted = false;
+
+   public KernelTestCase(String name)
+   {
+      super(name);
+   }
+
+    public void testArchives() throws Throwable
+   {
+      EJB3StandaloneBootstrap.createKernel();
+      try
+      {
+         EJB3StandaloneBootstrap.deployXmlResource("kernel-test.xml");
+      }
+      finally
+      {
+         EJB3StandaloneBootstrap.shutdown();
+      }
+   }
+   protected void configureLoggingAfterBootstrap()
+   {
+      //enableTrace("org.jboss.tm");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/KernelTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,205 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.unit;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
-
-/**
- * POJO Environment tests
- * 
- * @TODO XMLKernelDeployer -> BeanXMLDeployer
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class POJOEnvironmentTestCase extends TestCase
-{
-   private static boolean booted = false;
-
-   public POJOEnvironmentTestCase(String name)
-   {
-      super(name);
-   }
-
-   protected void setUp() throws Exception
-   {
-      // set bad properties to make sure that we're injecting InitialContext correct
-//      System.setProperty("java.naming.factory.initial", "ERROR");
-//      System.setProperty("java.naming.factory.url.pkgs", "ERROR");
-
-      super.setUp();
-      long start = System.currentTimeMillis();
-      try
-      {
-         if (!booted)
-         {
-            booted = true;
-            EJB3StandaloneBootstrap.boot("");
-         }
-      }
-      catch (Exception e)
-      {
-         throw e;
-      }
-      catch (Throwable t)
-      {
-         throw new RuntimeException(t);
-      }
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      super.tearDown();
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-
-   protected void configureLoggingAfterBootstrap()
-   {
-   }
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-
-   public void testTxDataSource() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-      DataSource ds = (DataSource) ctx.lookup("java:/DefaultDS");
-      TransactionManager tm = (TransactionManager) ctx.lookup("java:/TransactionManager");
-
-      Connection c = ds.getConnection();
-      try
-      {
-         Statement s = c.createStatement();
-         s.execute("create table test (key integer, value char(50))");
-      }
-      finally
-      {
-         c.close();
-      }
-
-      tm.begin();
-      try
-      {
-         c = ds.getConnection();
-         try
-         {
-            Statement s = c.createStatement();
-            s.execute("insert into test (key, value) values(1, 'Hello')");
-         }
-         finally
-         {
-            c.close();
-         }
-      }
-      finally
-      {
-         tm.rollback();
-      }
-
-      c = ds.getConnection();
-      try
-      {
-         Statement s = c.createStatement();
-         ResultSet r = s.executeQuery("select count(*) from test");
-         if (r.next())
-         {
-            assertEquals(0, r.getInt(1));
-         }
-         else
-            fail("Should not be here");
-      }
-      finally
-      {
-         c.close();
-      }
-
-      tm.begin();
-      try
-      {
-         c = ds.getConnection();
-         try
-         {
-            Statement s = c.createStatement();
-            s.execute("insert into test (key, value) values(1, 'Goodbye')");
-         }
-         finally
-         {
-            c.close();
-         }
-      }
-      finally
-      {
-         tm.commit();
-      }
-
-      c = ds.getConnection();
-      try
-      {
-         Statement s = c.createStatement();
-         ResultSet r = s.executeQuery("select value from test where key=1");
-         if (r.next())
-         {
-            assertEquals("Goodbye", r.getString(1));
-         }
-         else
-            fail("Should not be here");
-      }
-      finally
-      {
-         c.close();
-      }
-   }
-
-   public static void main(String[] args)
-   {
-      TestRunner.run(suite());
-   }
-
-   public static Test suite()
-   {
-      TestSuite suite = new TestSuite("POJOEnvironment");
-      suite.addTestSuite(POJOEnvironmentTestCase.class);
-      return suite;
-   }
-
-
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,205 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.unit;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * POJO Environment tests
+ * 
+ * @TODO XMLKernelDeployer -> BeanXMLDeployer
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class POJOEnvironmentTestCase extends TestCase
+{
+   private static boolean booted = false;
+
+   public POJOEnvironmentTestCase(String name)
+   {
+      super(name);
+   }
+
+   protected void setUp() throws Exception
+   {
+      // set bad properties to make sure that we're injecting InitialContext correct
+//      System.setProperty("java.naming.factory.initial", "ERROR");
+//      System.setProperty("java.naming.factory.url.pkgs", "ERROR");
+
+      super.setUp();
+      long start = System.currentTimeMillis();
+      try
+      {
+         if (!booted)
+         {
+            booted = true;
+            EJB3StandaloneBootstrap.boot("");
+         }
+      }
+      catch (Exception e)
+      {
+         throw e;
+      }
+      catch (Throwable t)
+      {
+         throw new RuntimeException(t);
+      }
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+
+   protected void configureLoggingAfterBootstrap()
+   {
+   }
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+
+   public void testTxDataSource() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+      DataSource ds = (DataSource) ctx.lookup("java:/DefaultDS");
+      TransactionManager tm = (TransactionManager) ctx.lookup("java:/TransactionManager");
+
+      Connection c = ds.getConnection();
+      try
+      {
+         Statement s = c.createStatement();
+         s.execute("create table test (key integer, value char(50))");
+      }
+      finally
+      {
+         c.close();
+      }
+
+      tm.begin();
+      try
+      {
+         c = ds.getConnection();
+         try
+         {
+            Statement s = c.createStatement();
+            s.execute("insert into test (key, value) values(1, 'Hello')");
+         }
+         finally
+         {
+            c.close();
+         }
+      }
+      finally
+      {
+         tm.rollback();
+      }
+
+      c = ds.getConnection();
+      try
+      {
+         Statement s = c.createStatement();
+         ResultSet r = s.executeQuery("select count(*) from test");
+         if (r.next())
+         {
+            assertEquals(0, r.getInt(1));
+         }
+         else
+            fail("Should not be here");
+      }
+      finally
+      {
+         c.close();
+      }
+
+      tm.begin();
+      try
+      {
+         c = ds.getConnection();
+         try
+         {
+            Statement s = c.createStatement();
+            s.execute("insert into test (key, value) values(1, 'Goodbye')");
+         }
+         finally
+         {
+            c.close();
+         }
+      }
+      finally
+      {
+         tm.commit();
+      }
+
+      c = ds.getConnection();
+      try
+      {
+         Statement s = c.createStatement();
+         ResultSet r = s.executeQuery("select value from test where key=1");
+         if (r.next())
+         {
+            assertEquals("Goodbye", r.getString(1));
+         }
+         else
+            fail("Should not be here");
+      }
+      finally
+      {
+         c.close();
+      }
+   }
+
+   public static void main(String[] args)
+   {
+      TestRunner.run(suite());
+   }
+
+   public static Test suite()
+   {
+      TestSuite suite = new TestSuite("POJOEnvironment");
+      suite.addTestSuite(POJOEnvironmentTestCase.class);
+      return suite;
+   }
+
+
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/POJOEnvironmentTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,251 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.unit;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-
-
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.extensions.TestSetup;
-
-import org.jboss.logging.Logger;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class StandardTestCase extends TestCase
-{
-   private static final Logger log = Logger
-   .getLogger(StandardTestCase.class);
-   
-   private static boolean booted = false;
-   
-   private static List tests = new LinkedList();
-   
-   static
-   {
-      tests.add(new StandardTestCaseTest("org.jboss.ejb3.test.jca.inflowmdb.unit.InflowUnitTestCase", "jmsinflowmdb.jar", "testJMS", "standard/jca-inflowmdb-beans.xml"));
-      tests.add(new StandardTestCaseTest("org.jboss.ejb3.test.mdb.unit.MDBUnitTestCase", "mdb-test.jar", null, "security-beans.xml,standard/testjms.xml"));
-   }
-
-   public StandardTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      TestSuite suite = new TestSuite();
-      suite.addTestSuite(StandardTestCase.class);
-      
-      return suite;
-   }
-
-   public static void startupEmbeddedJboss(StandardTestCaseTest test)
-   {
-      EJB3StandaloneBootstrap.boot(null);
-      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
-      
-      if (test.xmlResources != null)
-      {
-         StringTokenizer tokenizer = new StringTokenizer(test.xmlResources, ",");
-         while (tokenizer.hasMoreTokens())
-         {
-            String testXml = tokenizer.nextToken();
-            EJB3StandaloneBootstrap.deployXmlResource(testXml);
-         }
-      }
-   }
-
-   public static void shutdownEmbeddedJboss()
-   {
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-   private Properties getDefaultPersistenceProperties()
-           throws IOException
-   {
-      InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
-      assertNotNull(is);
-      Properties defaults = new Properties();
-      defaults.load(is);
-      return defaults;
-   }
-
-   public void testStandardTests() throws Throwable
-   {  
-      Iterator standardTests = tests.iterator();
-      while (standardTests.hasNext())
-      {
-         StandardTestCaseTest test = (StandardTestCaseTest)standardTests.next();
-         
-         System.out.println("Testing standard test " + test.testClass);
-         
-         startupEmbeddedJboss(test);
-         EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
-         deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
-         deployer.setJndiProperties(getInitialContextProperties());
-         
-         if (test.deployments != null)
-         {
-            StringTokenizer tokenizer = new StringTokenizer(test.deployments, ",");
-            while (tokenizer.hasMoreTokens())
-            {
-               String testJar = tokenizer.nextToken();
-               URL archive = Thread.currentThread().getContextClassLoader().getResource(testJar);
-               deployer.getArchives().add(archive);
-            }
-         }
-         
-         if (test.testMethods != null)
-            runTest(deployer, test.testClass, test.testMethods);
-         else
-            runTest(deployer, test.testClass);
-         
-         shutdownEmbeddedJboss();
-      }
-   }
-   
-   private void runTest(EJB3StandaloneDeployer deployer, String testClassName, String methods)
-      throws Exception
-   {   
-      startTest(deployer);
-           
-      Class testClass = Thread.currentThread().getContextClassLoader().loadClass(testClassName);
-      String[] constructorParams = {testClass.getName()};
-      Class[] constructorSignature = {String.class};
-      Constructor constructor = testClass.getConstructor(constructorSignature);
-      Object testCase = constructor.newInstance(constructorParams);
-      
-      Class[] signature = new Class[0];
-      StringTokenizer methodTokenizer = new StringTokenizer(methods, ",");
-      Object[] params = new Object[0];
-      while (methodTokenizer.hasMoreTokens())
-      {
-         String methodName = methodTokenizer.nextToken();
-         Method method = testClass.getMethod(methodName, signature);
-         System.out.println("-- executing method " + method.getName());
-         method.invoke(testCase, params);
-      }
-   
-      stopTest(deployer);
-   }
-   
-   private void runTest(EJB3StandaloneDeployer deployer, String testClassName)
-      throws Exception
-   {     
-      startTest(deployer);
-       
-      Class testClass = Thread.currentThread().getContextClassLoader().loadClass(testClassName);
-      String[] constructorParams = {testClass.getName()};
-      Class[] signature = {String.class};
-      Constructor constructor = testClass.getConstructor(signature);
-      Object testCase = constructor.newInstance(constructorParams);
-      
-      Object[] params = new Object[0];
-      for (Method method: testClass.getMethods())
-      {
-         if (method.getName().startsWith("test") && method.getParameterTypes().length == 0)
-         {
-            System.out.println("-- executing method " + method.getName());
-            method.invoke(testCase, params);
-         }
-      }
-
-      stopTest(deployer);
-   }
-   
-   private void startTest(EJB3StandaloneDeployer deployer)
-      throws Exception
-   {
-      deployer.create();
-      deployer.start();
-   }
-   
-   private void stopTest(EJB3StandaloneDeployer deployer)
-      throws Exception
-   {
-      deployer.stop();
-      deployer.destroy();
-   }
-   
-   private void lookup(String name)
-   {
-      System.out.println("lookup " + name);
-      try {
-         InitialContext jndiContext = new InitialContext();
-         NamingEnumeration names = jndiContext.list(name);
-         if (names != null){
-            while (names.hasMore()){
-               System.out.println("  " + names.next());
-            }
-         }
-      } catch (Exception e){
-      }
-   }
-   
-   static class StandardTestCaseTest
-   {
-      public String testClass;
-      public String deployments;
-      public String testMethods;
-      public String xmlResources;
-      
-      public StandardTestCaseTest(String testClass, String deployments, String testMethods, String xmlResources)
-      {
-         this.testClass = testClass;
-         this.deployments = deployments;
-         this.testMethods = testMethods;
-         this.xmlResources = xmlResources;
-      }
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,251 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.unit;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.URL;
+
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+
+
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.extensions.TestSetup;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class StandardTestCase extends TestCase
+{
+   private static final Logger log = Logger
+   .getLogger(StandardTestCase.class);
+   
+   private static boolean booted = false;
+   
+   private static List tests = new LinkedList();
+   
+   static
+   {
+      tests.add(new StandardTestCaseTest("org.jboss.ejb3.test.jca.inflowmdb.unit.InflowUnitTestCase", "jmsinflowmdb.jar", "testJMS", "standard/jca-inflowmdb-beans.xml"));
+      tests.add(new StandardTestCaseTest("org.jboss.ejb3.test.mdb.unit.MDBUnitTestCase", "mdb-test.jar", null, "security-beans.xml,standard/testjms.xml"));
+   }
+
+   public StandardTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      TestSuite suite = new TestSuite();
+      suite.addTestSuite(StandardTestCase.class);
+      
+      return suite;
+   }
+
+   public static void startupEmbeddedJboss(StandardTestCaseTest test)
+   {
+      EJB3StandaloneBootstrap.boot(null);
+      EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+      
+      if (test.xmlResources != null)
+      {
+         StringTokenizer tokenizer = new StringTokenizer(test.xmlResources, ",");
+         while (tokenizer.hasMoreTokens())
+         {
+            String testXml = tokenizer.nextToken();
+            EJB3StandaloneBootstrap.deployXmlResource(testXml);
+         }
+      }
+   }
+
+   public static void shutdownEmbeddedJboss()
+   {
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+   private Properties getDefaultPersistenceProperties()
+           throws IOException
+   {
+      InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("default.persistence.properties");
+      assertNotNull(is);
+      Properties defaults = new Properties();
+      defaults.load(is);
+      return defaults;
+   }
+
+   public void testStandardTests() throws Throwable
+   {  
+      Iterator standardTests = tests.iterator();
+      while (standardTests.hasNext())
+      {
+         StandardTestCaseTest test = (StandardTestCaseTest)standardTests.next();
+         
+         System.out.println("Testing standard test " + test.testClass);
+         
+         startupEmbeddedJboss(test);
+         EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
+         deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
+         deployer.setJndiProperties(getInitialContextProperties());
+         
+         if (test.deployments != null)
+         {
+            StringTokenizer tokenizer = new StringTokenizer(test.deployments, ",");
+            while (tokenizer.hasMoreTokens())
+            {
+               String testJar = tokenizer.nextToken();
+               URL archive = Thread.currentThread().getContextClassLoader().getResource(testJar);
+               deployer.getArchives().add(archive);
+            }
+         }
+         
+         if (test.testMethods != null)
+            runTest(deployer, test.testClass, test.testMethods);
+         else
+            runTest(deployer, test.testClass);
+         
+         shutdownEmbeddedJboss();
+      }
+   }
+   
+   private void runTest(EJB3StandaloneDeployer deployer, String testClassName, String methods)
+      throws Exception
+   {   
+      startTest(deployer);
+           
+      Class testClass = Thread.currentThread().getContextClassLoader().loadClass(testClassName);
+      String[] constructorParams = {testClass.getName()};
+      Class[] constructorSignature = {String.class};
+      Constructor constructor = testClass.getConstructor(constructorSignature);
+      Object testCase = constructor.newInstance(constructorParams);
+      
+      Class[] signature = new Class[0];
+      StringTokenizer methodTokenizer = new StringTokenizer(methods, ",");
+      Object[] params = new Object[0];
+      while (methodTokenizer.hasMoreTokens())
+      {
+         String methodName = methodTokenizer.nextToken();
+         Method method = testClass.getMethod(methodName, signature);
+         System.out.println("-- executing method " + method.getName());
+         method.invoke(testCase, params);
+      }
+   
+      stopTest(deployer);
+   }
+   
+   private void runTest(EJB3StandaloneDeployer deployer, String testClassName)
+      throws Exception
+   {     
+      startTest(deployer);
+       
+      Class testClass = Thread.currentThread().getContextClassLoader().loadClass(testClassName);
+      String[] constructorParams = {testClass.getName()};
+      Class[] signature = {String.class};
+      Constructor constructor = testClass.getConstructor(signature);
+      Object testCase = constructor.newInstance(constructorParams);
+      
+      Object[] params = new Object[0];
+      for (Method method: testClass.getMethods())
+      {
+         if (method.getName().startsWith("test") && method.getParameterTypes().length == 0)
+         {
+            System.out.println("-- executing method " + method.getName());
+            method.invoke(testCase, params);
+         }
+      }
+
+      stopTest(deployer);
+   }
+   
+   private void startTest(EJB3StandaloneDeployer deployer)
+      throws Exception
+   {
+      deployer.create();
+      deployer.start();
+   }
+   
+   private void stopTest(EJB3StandaloneDeployer deployer)
+      throws Exception
+   {
+      deployer.stop();
+      deployer.destroy();
+   }
+   
+   private void lookup(String name)
+   {
+      System.out.println("lookup " + name);
+      try {
+         InitialContext jndiContext = new InitialContext();
+         NamingEnumeration names = jndiContext.list(name);
+         if (names != null){
+            while (names.hasMore()){
+               System.out.println("  " + names.next());
+            }
+         }
+      } catch (Exception e){
+      }
+   }
+   
+   static class StandardTestCaseTest
+   {
+      public String testClass;
+      public String deployments;
+      public String testMethods;
+      public String xmlResources;
+      
+      public StandardTestCaseTest(String testClass, String deployments, String testMethods, String xmlResources)
+      {
+         this.testClass = testClass;
+         this.deployments = deployments;
+         this.testMethods = testMethods;
+         this.xmlResources = xmlResources;
+      }
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,154 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.standalone.unit;
-
-import java.util.Hashtable;
-import javax.ejb.NoSuchEJBException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.ejb3.test.standalone.CalculatorRemote;
-import org.jboss.ejb3.test.standalone.Customer;
-import org.jboss.ejb3.test.standalone.CustomerDAO;
-import org.jboss.ejb3.test.standalone.ShoppingCart;
-import junit.framework.TestCase;
-
-/**
- * POJO Environment tests
- * 
- * @author <a href="bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class XmlDeployerTestCase extends TestCase
-{
-   private static boolean booted = false;
-
-   public XmlDeployerTestCase(String name)
-   {
-      super(name);
-   }
-
-   protected void setUp() throws Exception
-   {
-      // set bad properties to make sure that we're injecting InitialContext correct
-//      System.setProperty("java.naming.factory.initial", "ERROR");
-//      System.setProperty("java.naming.factory.url.pkgs", "ERROR");
-
-      super.setUp();
-      long start = System.currentTimeMillis();
-      try
-      {
-         if (!booted)
-         {
-            booted = true;
-            EJB3StandaloneBootstrap.boot("");
-         }
-      }
-      catch (Exception e)
-      {
-         throw e;
-      }
-      catch (Throwable t)
-      {
-         throw new RuntimeException(t);
-      }
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      super.tearDown();
-      EJB3StandaloneBootstrap.shutdown();
-   }
-
-   protected InitialContext getInitialContext() throws Exception
-   {
-      return new InitialContext(getInitialContextProperties());
-   }
-
-   protected Hashtable getInitialContextProperties()
-   {
-      return EJB3StandaloneBootstrap.getInitialContextProperties();
-   }
-
-
-   public void testXmlDeployer() throws Throwable
-   {
-      InitialContext ctx = getInitialContext();
-      EJB3StandaloneBootstrap.deployXmlResource("deployer.xml");
-
-      executeEJBs(ctx);
-
-      EJB3StandaloneBootstrap.getKernel().getController().uninstall("EJBDeployment");
-   }
-
-   public void testCleanup() throws Throwable
-   {
-      boolean exceptionThrown = false;
-      try
-      {
-         executeEJBs(getInitialContext());
-      }
-      catch (Exception e)
-      {
-         exceptionThrown = true;
-      }
-      assertTrue(exceptionThrown);
-
-   }
-
-   private void executeEJBs(InitialContext ctx)
-           throws NamingException
-   {
-      CustomerDAO local = (CustomerDAO)ctx.lookup("CustomerDAOBean/local");
-      long id = local.createCustomer();
-      Customer cust = local.findCustomer(id);
-      assertEquals("Bill", cust.getName());
-
-      ShoppingCart cart = (ShoppingCart)ctx.lookup("ShoppingCartBean/local");
-      cart.getCart().add("beer");
-      cart.getCart().add("wine");
-      assertEquals(2, cart.getCart().size());
-
-      cart.checkout();
-
-      boolean exceptionThrown = false;
-      try
-      {
-         cart.getCart();
-      }
-      catch (NoSuchEJBException e)
-      {
-         exceptionThrown = true;
-      }
-
-      assertTrue(exceptionThrown);
-
-      CalculatorRemote calc = (CalculatorRemote)ctx.lookup("CalculatorBean/remote");
-      assertEquals(2, calc.add(1, 1));
-   }
-
-   protected void configureLoggingAfterBootstrap()
-   {
-      //enableTrace("org.jboss.tm");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.standalone.unit;
+
+import java.util.Hashtable;
+import javax.ejb.NoSuchEJBException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
+import org.jboss.ejb3.test.standalone.CalculatorRemote;
+import org.jboss.ejb3.test.standalone.Customer;
+import org.jboss.ejb3.test.standalone.CustomerDAO;
+import org.jboss.ejb3.test.standalone.ShoppingCart;
+import junit.framework.TestCase;
+
+/**
+ * POJO Environment tests
+ * 
+ * @author <a href="bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class XmlDeployerTestCase extends TestCase
+{
+   private static boolean booted = false;
+
+   public XmlDeployerTestCase(String name)
+   {
+      super(name);
+   }
+
+   protected void setUp() throws Exception
+   {
+      // set bad properties to make sure that we're injecting InitialContext correct
+//      System.setProperty("java.naming.factory.initial", "ERROR");
+//      System.setProperty("java.naming.factory.url.pkgs", "ERROR");
+
+      super.setUp();
+      long start = System.currentTimeMillis();
+      try
+      {
+         if (!booted)
+         {
+            booted = true;
+            EJB3StandaloneBootstrap.boot("");
+         }
+      }
+      catch (Exception e)
+      {
+         throw e;
+      }
+      catch (Throwable t)
+      {
+         throw new RuntimeException(t);
+      }
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      EJB3StandaloneBootstrap.shutdown();
+   }
+
+   protected InitialContext getInitialContext() throws Exception
+   {
+      return new InitialContext(getInitialContextProperties());
+   }
+
+   protected Hashtable getInitialContextProperties()
+   {
+      return EJB3StandaloneBootstrap.getInitialContextProperties();
+   }
+
+
+   public void testXmlDeployer() throws Throwable
+   {
+      InitialContext ctx = getInitialContext();
+      EJB3StandaloneBootstrap.deployXmlResource("deployer.xml");
+
+      executeEJBs(ctx);
+
+      EJB3StandaloneBootstrap.getKernel().getController().uninstall("EJBDeployment");
+   }
+
+   public void testCleanup() throws Throwable
+   {
+      boolean exceptionThrown = false;
+      try
+      {
+         executeEJBs(getInitialContext());
+      }
+      catch (Exception e)
+      {
+         exceptionThrown = true;
+      }
+      assertTrue(exceptionThrown);
+
+   }
+
+   private void executeEJBs(InitialContext ctx)
+           throws NamingException
+   {
+      CustomerDAO local = (CustomerDAO)ctx.lookup("CustomerDAOBean/local");
+      long id = local.createCustomer();
+      Customer cust = local.findCustomer(id);
+      assertEquals("Bill", cust.getName());
+
+      ShoppingCart cart = (ShoppingCart)ctx.lookup("ShoppingCartBean/local");
+      cart.getCart().add("beer");
+      cart.getCart().add("wine");
+      assertEquals(2, cart.getCart().size());
+
+      cart.checkout();
+
+      boolean exceptionThrown = false;
+      try
+      {
+         cart.getCart();
+      }
+      catch (NoSuchEJBException e)
+      {
+         exceptionThrown = true;
+      }
+
+      assertTrue(exceptionThrown);
+
+      CalculatorRemote calc = (CalculatorRemote)ctx.lookup("CalculatorBean/remote");
+      assertEquals(2, calc.add(1, 1));
+   }
+
+   protected void configureLoggingAfterBootstrap()
+   {
+      //enableTrace("org.jboss.tm");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,45 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ClusteredStateful extends ConcurrentStateful
+{
+   boolean interceptorAccessed();
+
+   boolean testSessionContext();
+   
+   boolean wasPassivated();
+   String getInterceptorState();
+   void setInterceptorState(String param);
+   
+   void testThrownException() throws Exception;
+   
+   void testExceptionCause() throws Exception;
+   void testSerializedState(String state);
+   
+   void removeBean();
+   
+   void testResources() throws Exception;
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,208 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+import java.io.ObjectOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.annotation.Resources;
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+import javax.ejb.PrePassivate;
+import javax.ejb.PostActivate;
+import javax.interceptor.Interceptors;
+import javax.naming.InitialContext;
+
+import org.jboss.ejb3.Container;
+
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+import org.jboss.serial.io.JBossObjectOutputStream;
+import org.jboss.serial.io.JBossObjectInputStream;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateful(name="ClusteredStatefulBean")
+ at Remote(org.jboss.ejb3.test.stateful.ClusteredStateful.class)
+ at Local(org.jboss.ejb3.test.stateful.StatefulLocal.class)
+ at RemoteBinding(jndiBinding = "ClusteredStateful",
+               interceptorStack="RemoteBindingStatefulSessionClientInterceptors",
+               factory = org.jboss.ejb3.test.stateful.StatefulRemoteProxyFactory.class)
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1, name="jboss.cache:service=EJB3SFSBClusteredCache")
+ at SecurityDomain("test")
+ at Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
+ at Clustered
+public class ClusteredStatefulBean implements ClusteredStateful
+{
+   private static final Logger log = Logger.getLogger(ClusteredStatefulBean.class);
+   
+   @Resource
+   private SessionContext sessionContext;
+   
+//   @Resource(mappedName="java:/DefaultDS")
+//   private transient javax.sql.DataSource datasource;
+   
+//   @Resource(mappedName="java:/ConnectionFactory")
+//   public transient javax.jms.QueueConnectionFactory connectionFactory; 
+
+   private String state;
+   private int stuff;
+   private boolean wasPassivated = false;
+
+   @Interceptors(MyInterceptor.class)
+   public String getInterceptorState()
+   {
+      throw new RuntimeException("NOT REACHABLE");
+   }
+
+   @Interceptors(MyInterceptor.class)
+   public void setInterceptorState(String param)
+   {
+      throw new RuntimeException("NOT REACHABLE");
+   }
+   
+   public boolean testSessionContext()
+   {
+      return sessionContext.isCallerInRole("role");
+   }
+   
+   public void testResources() throws Exception
+   {
+//      datasource.toString();
+//      connectionFactory.toString();
+      
+      javax.sql.DataSource ds = (javax.sql.DataSource)new InitialContext().lookup(Container.ENC_CTX_NAME + "/env/jdbc/ds");
+      ds.toString();
+   }
+
+   public String getState() throws Exception
+   {
+      Thread.sleep(1000);
+      return state;
+   }
+
+   public void setState(String state) throws Exception
+   {
+      Thread.sleep(1000);
+      this.state = state;
+   }
+
+   public boolean interceptorAccessed()
+   {
+      return RemoteBindingInterceptor.accessed;
+   }
+
+   public void testThrownException() throws Exception
+   {
+      throw new Exception();
+   }
+
+   public void testExceptionCause() throws Exception
+   {
+      Object o = null;
+      o.toString();
+   }
+
+   @PrePassivate
+   public void passivate()
+   {
+      log.info("************ passivating " + this);  
+      wasPassivated = true;
+   }
+   
+   @PostActivate
+   public void activate()
+   {
+      log.info("************ activating");
+   }
+
+   public void testSerializedState(String state)
+   {
+      this.state = state;
+
+      ClusteredStatefulBean bean = null;
+      try
+      {
+         ObjectOutputStream out;
+
+         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+         out = new JBossObjectOutputStream(baos, false);
+         out.writeObject(this);
+         out.flush();
+
+         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+
+         JBossObjectInputStream is = new JBossObjectInputStream(bais);
+         bean = (ClusteredStatefulBean)is.readObject();
+      }
+      catch (IOException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new RuntimeException(e);
+      }
+
+      if (!state.equals(bean.state)) throw new RuntimeException("failed to serialize: " + bean.state);
+   }
+
+   public boolean wasPassivated()
+   {
+	  log.info("************ wasPassivated " + wasPassivated + " " + this);  
+      return wasPassivated;
+   }
+
+   @Init
+   public void ejbCreate(Integer state)
+   {
+      this.state=state.toString();
+   }
+
+   @Init
+   public void ejbCreate(State state)
+   {
+      this.state=state.getState();
+   }
+
+   @Init
+   public void ejbCreate(String state)
+   {
+      this.state=state;
+   }
+   
+   public void removeBean()
+   {
+      
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision: 56003 $
- */
-public interface ConcurrentStateful
-{
-   String getState() throws Exception;
-
-   void setState(String state) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface ConcurrentStateful
+{
+   String getState() throws Exception;
+
+   void setState(String state) throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-import org.jboss.annotation.ejb.SerializedConcurrentAccess;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision: 56003 $
- */
- at Stateful
- at Remote(ConcurrentStateful.class)
- at RemoteBinding(jndiBinding = "ConcurrentStateful")
- at SerializedConcurrentAccess
-public class ConcurrentStatefulBean implements ConcurrentStateful
-{
-   private static final Logger log = Logger.getLogger(ConcurrentStatefulBean.class);
-
-   private String state;
-
-   public String getState() throws Exception
-   {
-      Thread.sleep(1000);
-      return state;
-   }
-
-   public void setState(String state) throws Exception
-   {
-      this.state = state;
-      Thread.sleep(1000);
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+import org.jboss.annotation.ejb.SerializedConcurrentAccess;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at Remote(ConcurrentStateful.class)
+ at RemoteBinding(jndiBinding = "ConcurrentStateful")
+ at SerializedConcurrentAccess
+public class ConcurrentStatefulBean implements ConcurrentStateful
+{
+   private static final Logger log = Logger.getLogger(ConcurrentStatefulBean.class);
+
+   private String state;
+
+   public String getState() throws Exception
+   {
+      Thread.sleep(1000);
+      return state;
+   }
+
+   public void setState(String state) throws Exception
+   {
+      this.state = state;
+      Thread.sleep(1000);
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Entity.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/Entity.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Entity.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Entity.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at javax.persistence.Entity
+ at Table(name = "ENTITY")
+public class Entity implements java.io.Serializable
+{
+   private Long id;
+   private String name;
+  
+
+   @Id
+   @GeneratedValue(strategy= GenerationType.IDENTITY)
+   public Long getId()
+   {
+      return id;
+   }
+
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacade.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacade.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacade.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacade.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface EntityFacade
+{
+   Entity createEntity(String name);
+   
+   Entity loadEntity(Long id);
+   
+   void remove();
+   
+   void removeWithTx();
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,101 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.logging.Logger;
+
+import javax.annotation.PreDestroy;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateful
+ at Remote(EntityFacade.class)
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+public class EntityFacadeBean implements EntityFacade
+{
+   private @PersistenceContext(type = PersistenceContextType.EXTENDED)
+   EntityManager manager;
+   
+   private static final Logger log = Logger.getLogger(EntityFacadeBean.class);
+
+   public Entity createEntity(String name) {
+      log.info("********* createEntity " + name);
+      Entity entity = new Entity();
+      entity.setName(name);
+	   manager.persist(entity);
+	   return entity;
+   }
+   
+   public Entity loadEntity(Long id) {
+      log.info("********* loadEntity " + id);
+      Entity entity =  manager.find(Entity.class, id);
+	   return entity;
+   }
+   
+   @PrePassivate
+   public void passivate()
+   {
+      log.info("************ passivating");  
+   }
+   
+   @PostActivate
+   public void activate()
+   {
+      log.info("************ activating");
+   }
+   
+   @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+   @Remove(retainIfException=true)
+   public void remove()
+   {
+      
+   }
+   
+   @Remove(retainIfException=true)
+   public void removeWithTx()
+   {
+      
+   }
+   
+   @PreDestroy
+   public void destroy()
+   {
+      log.info("************ destroying");  
+      // throw RuntimeException
+      Object o = null;
+      o.getClass();
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class ExtendedState extends State
-{
-   public ExtendedState(String state)
-   {
-      super("Extended_" + state);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class ExtendedState extends State
+{
+   public ExtendedState(String state)
+   {
+      super("Extended_" + state);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ExtendedState.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class MyInterceptor
-{
-   Object field;
-
-   @AroundInvoke
-   public Object invoke(InvocationContext ctx) throws Exception
-   {
-      if (ctx.getMethod().getName().startsWith("set"))
-      {
-         field = ctx.getParameters()[0];
-         return null;
-      }
-      return field;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class MyInterceptor
+{
+   Object field;
+
+   @AroundInvoke
+   public Object invoke(InvocationContext ctx) throws Exception
+   {
+      if (ctx.getMethod().getName().startsWith("set"))
+      {
+         field = ctx.getParameters()[0];
+         return null;
+      }
+      return field;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/MyInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface ProxyFactoryInterface
-{
-   String method();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface ProxyFactoryInterface
+{
+   String method();
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ProxyFactoryInterface.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class RemoteBindingInterceptor implements Interceptor, java.io.Serializable
-{
-   private static final Logger log = Logger.getLogger(RemoteBindingInterceptor.class);
-   
-   public static boolean accessed = false;
-   
-   public RemoteBindingInterceptor()
-   {
-   }
-
-   public String getName()
-   {
-      return "RemoteBindingInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      try 
-      {
-         return invocation.invokeNext();
-      } 
-      finally
-      {
-         accessed = true;
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class RemoteBindingInterceptor implements Interceptor, java.io.Serializable
+{
+   private static final Logger log = Logger.getLogger(RemoteBindingInterceptor.class);
+   
+   public static boolean accessed = false;
+   
+   public RemoteBindingInterceptor()
+   {
+   }
+
+   public String getName()
+   {
+      return "RemoteBindingInterceptor";
+   }
+
+   public Object invoke(Invocation invocation) throws Throwable
+   {
+      try 
+      {
+         return invocation.invokeNext();
+      } 
+      finally
+      {
+         accessed = true;
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteBindingInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface RemoteTx<T>
-{
-   T testMandatoryTx(T t);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoteTx.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface RemoteTx<T>
+{
+   T testMandatoryTx(T t);
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.ejb.Remove;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public interface RemoveTest
-{
-   @Remove
-   void callRollbackOnly();
-
-   @Remove
-   void removeit();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.Remove;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public interface RemoveTest
+{
+   @Remove
+   void callRollbackOnly();
+
+   @Remove
+   void removeit();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
-import javax.ejb.SessionContext;
-import javax.annotation.Resource;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
-public class RemoveTestBean implements RemoveTest
-{
-   @Resource SessionContext ctx;
-
-   @Remove
-   public void callRollbackOnly()
-   {
-      ctx.setRollbackOnly();
-   }
-
-   @Remove
-   public void removeit()
-   {
-      ctx.setRollbackOnly();
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.Stateful;
+import javax.ejb.Remove;
+import javax.ejb.SessionContext;
+import javax.annotation.Resource;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+public class RemoveTestBean implements RemoveTest
+{
+   @Resource SessionContext ctx;
+
+   @Remove
+   public void callRollbackOnly()
+   {
+      ctx.setRollbackOnly();
+   }
+
+   @Remove
+   public void removeit()
+   {
+      ctx.setRollbackOnly();
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/RemoveTestBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,53 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+
+import org.jboss.annotation.ejb.Service;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Service
+ at Remote(ServiceRemote.class)
+ at SecurityDomain("other")
+public class ServiceBean implements ServiceRemote
+{
+	private static final Logger log = Logger.getLogger(ServiceBean.class);
+	
+	@EJB
+	private Stateful stateful;
+	
+	@EJB
+	private ClusteredStateful clusteredStateful;
+	   
+	public void testInjection() throws Exception
+	{
+		stateful.getState();
+		
+		clusteredStateful.getState();
+	}
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface ServiceRemote
+{
+   void testInjection() throws Exception;
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface SmallCacheStateful
-{
-   public void setId(int id);
-
-   public int doit(int id);
-
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,12 @@
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface SmallCacheStateful
+{
+   public void setId(int id);
+
+   public int doit(int id);
+
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStateful.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * Test small maxSize for cache
- *
- * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
- * @version $Revision$
- */
- at Stateful
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
-public class SmallCacheStatefulBean implements SmallCacheStateful
-{
-   private int count;
-   private int id;
-   
-   
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-
-   public int doit(int passedId) 
-   {
-      if (passedId != id) throw new RuntimeException();
-      try
-      {
-         Thread.sleep(3000);
-      }
-      catch (InterruptedException e)
-      {
-         
-      }
-      return count++;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * Test small maxSize for cache
+ *
+ * @author <a href="mailto:bill at jboss.com">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateful
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+public class SmallCacheStatefulBean implements SmallCacheStateful
+{
+   private int count;
+   private int id;
+   
+   
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+
+   public int doit(int passedId) 
+   {
+      if (passedId != id) throw new RuntimeException();
+      try
+      {
+         Thread.sleep(3000);
+      }
+      catch (InterruptedException e)
+      {
+         
+      }
+      return count++;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class State implements java.io.Serializable
-{
-   protected String state;
-
-   public State(String state)
-   {
-      this.state = state;
-   }
-   
-   public String getState()
-   {
-      return state;
-   }
-
-   public void setState(String state)
-   {
-      this.state = state;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class State implements java.io.Serializable
+{
+   protected String state;
+
+   public State(String state)
+   {
+      this.state = state;
+   }
+   
+   public String getState()
+   {
+      return state;
+   }
+
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/State.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface Stateful extends ConcurrentStateful
-{
-   boolean interceptorAccessed();
-
-   boolean testSessionContext();
-   
-   public boolean wasPassivated();
-   public void clearPassivated();
-   public String getInterceptorState();
-   public void setInterceptorState(String param);
-   
-   public void testThrownException() throws Exception;
-   
-   public void testExceptionCause() throws Exception;
-   public void testSerializedState(String state);
-   
-   public void removeBean();
-   
-   void testResources() throws Exception;
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface Stateful extends ConcurrentStateful
+{
+   boolean interceptorAccessed();
+
+   boolean testSessionContext();
+   
+   public boolean wasPassivated();
+   public void clearPassivated();
+   public String getInterceptorState();
+   public void setInterceptorState(String param);
+   
+   public void testThrownException() throws Exception;
+   
+   public void testExceptionCause() throws Exception;
+   public void testSerializedState(String state);
+   
+   public void removeBean();
+   
+   void testResources() throws Exception;
+   
+   void lookupStateful() throws Exception;
+   void testStateful() throws Exception;
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,217 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import javax.annotation.Resource;
-import javax.annotation.Resources;
-import javax.ejb.Init;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Remove;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-import javax.interceptor.Interceptors;
-import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-
-import org.jboss.ejb3.Container;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-import org.jboss.serial.io.JBossObjectOutputStream;
-import org.jboss.serial.io.JBossObjectInputStream;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="StatefulBean")
- at Remote(org.jboss.ejb3.test.stateful.Stateful.class)
- at Local(org.jboss.ejb3.test.stateful.StatefulLocal.class)
- at RemoteBinding(jndiBinding = "Stateful",
-               interceptorStack="RemoteBindingStatefulSessionClientInterceptors",
-               factory = org.jboss.ejb3.test.stateful.StatefulRemoteProxyFactory.class)
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
- at SecurityDomain("test")
- at Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
-public class StatefulBean implements org.jboss.ejb3.test.stateful.Stateful
-{
-   private static final Logger log = Logger.getLogger(StatefulBean.class);
-   
-   @Resource
-   private SessionContext sessionContext;
-   
-   @Resource(mappedName="java:/DefaultDS")
-   private transient javax.sql.DataSource datasource;
-   
-   @Resource(mappedName="java:/ConnectionFactory")
-   public transient javax.jms.QueueConnectionFactory connectionFactory; 
-
-   private String state;
-   private int stuff;
-
-   @Interceptors(MyInterceptor.class)
-   public String getInterceptorState()
-   {
-      throw new RuntimeException("NOT REACHABLE");
-   }
-
-   @Interceptors(MyInterceptor.class)
-   public void setInterceptorState(String param)
-   {
-      throw new RuntimeException("NOT REACHABLE");
-   }
-   
-   public boolean testSessionContext()
-   {
-      return sessionContext.isCallerInRole("role");
-   }
-   
-   public void testResources() throws Exception
-   {
-      datasource.toString();
-      connectionFactory.toString();
-      
-      javax.sql.DataSource ds = (javax.sql.DataSource)new InitialContext().lookup(Container.ENC_CTX_NAME + "/env/jdbc/ds");
-      ds.toString();
-   }
-
-   public String getState() throws Exception
-   {
-      Thread.sleep(1000);
-      return state;
-   }
-
-   public void setState(String state) throws Exception
-   {
-      Thread.sleep(1000);
-      this.state = state;
-   }
-
-   public boolean interceptorAccessed()
-   {
-      return RemoteBindingInterceptor.accessed;
-   }
-
-   public void testThrownException() throws Exception
-   {
-      throw new Exception();
-   }
-
-   public void testExceptionCause() throws Exception
-   {
-      Object o = null;
-      o.toString();
-   }
-
-   @PrePassivate
-   public void passivate()
-   {
-      log.info("************ passivating");  
-      wasPassivated = true;
-   }
-   
-   @PostActivate
-   public void activate()
-   {
-      log.info("************ activating");
-   }
-
-   private static boolean wasPassivated = false;
-
-   public void testSerializedState(String state)
-   {
-      this.state = state;
-
-      StatefulBean bean = null;
-      try
-      {
-         ObjectOutputStream out;
-
-         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-         out = new JBossObjectOutputStream(baos, false);
-         out.writeObject(this);
-         out.flush();
-
-         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
-         JBossObjectInputStream is = new JBossObjectInputStream(bais);
-         bean = (StatefulBean)is.readObject();
-      }
-      catch (IOException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (ClassNotFoundException e)
-      {
-         throw new RuntimeException(e);
-      }
-
-      if (!state.equals(bean.state)) throw new RuntimeException("failed to serialize: " + bean.state);
-   }
-
-   public boolean wasPassivated()
-   {
-      return wasPassivated;
-   }
-
-   public void clearPassivated()
-   {
-      wasPassivated = false;
-   }
-
-   @Init
-   public void ejbCreate(Integer state)
-   {
-      this.state=state.toString();
-   }
-
-   @Init
-   public void ejbCreate(State state)
-   {
-      this.state=state.getState();
-   }
-
-   @Init
-   public void ejbCreate(String state)
-   {
-      this.state=state;
-   }
-   
-   @Remove
-   public void removeBean()
-   {
-      
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,227 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import java.io.ObjectOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.annotation.Resources;
+import javax.ejb.Init;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
+import javax.ejb.PrePassivate;
+import javax.ejb.PostActivate;
+import javax.interceptor.Interceptors;
+import javax.naming.InitialContext;
+
+import org.jboss.ejb3.Container;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+import org.jboss.serial.io.JBossObjectOutputStream;
+import org.jboss.serial.io.JBossObjectInputStream;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="StatefulBean")
+ at Remote(org.jboss.ejb3.test.stateful.Stateful.class)
+ at Local(org.jboss.ejb3.test.stateful.StatefulLocal.class)
+ at RemoteBinding(jndiBinding = "Stateful",
+               interceptorStack="RemoteBindingStatefulSessionClientInterceptors",
+               factory = org.jboss.ejb3.test.stateful.StatefulRemoteProxyFactory.class)
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at SecurityDomain("test")
+ at Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
+public class StatefulBean implements org.jboss.ejb3.test.stateful.Stateful
+{
+   private static final Logger log = Logger.getLogger(StatefulBean.class);
+   
+   @Resource
+   private SessionContext sessionContext;
+   
+   @Resource(mappedName="java:/DefaultDS")
+   private transient javax.sql.DataSource datasource;
+   
+   @Resource(mappedName="java:/ConnectionFactory")
+   public transient javax.jms.QueueConnectionFactory connectionFactory; 
+   
+   private StatefulLocal localStateful;
+
+   private String state;
+   private int stuff;
+   private boolean wasPassivated = false;
+   
+   public void lookupStateful() throws Exception
+   {
+      localStateful = (StatefulLocal)new InitialContext().lookup("StatefulBean/local");
+   }
+   
+   public void testStateful() throws Exception
+   {
+      localStateful.getState();
+   }
+
+   @Interceptors(MyInterceptor.class)
+   public String getInterceptorState()
+   {
+      throw new RuntimeException("NOT REACHABLE");
+   }
+
+   @Interceptors(MyInterceptor.class)
+   public void setInterceptorState(String param)
+   {
+      throw new RuntimeException("NOT REACHABLE");
+   }
+   
+   public boolean testSessionContext()
+   {
+      return sessionContext.isCallerInRole("role");
+   }
+   
+   public void testResources() throws Exception
+   {
+      datasource.toString();
+      connectionFactory.toString();
+      
+      javax.sql.DataSource ds = (javax.sql.DataSource)new InitialContext().lookup(Container.ENC_CTX_NAME + "/env/jdbc/ds");
+      ds.toString();
+   }
+
+   public String getState() throws Exception
+   {
+      Thread.sleep(1000);
+      return state;
+   }
+
+   public void setState(String state) throws Exception
+   {
+      Thread.sleep(1000);
+      this.state = state;
+   }
+
+   public boolean interceptorAccessed()
+   {
+      return RemoteBindingInterceptor.accessed;
+   }
+
+   public void testThrownException() throws Exception
+   {
+      throw new Exception();
+   }
+
+   public void testExceptionCause() throws Exception
+   {
+      Object o = null;
+      o.toString();
+   }
+
+   @PrePassivate
+   public void passivate()
+   {
+      log.info("************ passivating");  
+      wasPassivated = true;
+   }
+   
+   @PostActivate
+   public void activate()
+   {
+      log.info("************ activating");
+   }
+
+   public void testSerializedState(String state)
+   {
+      this.state = state;
+
+      StatefulBean bean = null;
+      try
+      {
+         ObjectOutputStream out;
+
+         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+         out = new JBossObjectOutputStream(baos, false);
+         out.writeObject(this);
+         out.flush();
+
+         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+
+         JBossObjectInputStream is = new JBossObjectInputStream(bais);
+         bean = (StatefulBean)is.readObject();
+      }
+      catch (IOException e)
+      {
+         throw new RuntimeException(e);
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new RuntimeException(e);
+      }
+
+      if (!state.equals(bean.state)) throw new RuntimeException("failed to serialize: " + bean.state);
+   }
+
+   public boolean wasPassivated()
+   {
+      return wasPassivated;
+   }
+
+   public void clearPassivated()
+   {
+      wasPassivated = false;
+   }
+
+   @Init
+   public void ejbCreate(Integer state)
+   {
+      this.state=state.toString();
+   }
+
+   @Init
+   public void ejbCreate(State state)
+   {
+      this.state=state.getState();
+   }
+
+   @Init
+   public void ejbCreate(String state)
+   {
+      this.state=state;
+   }
+   
+   @Remove
+   public void removeBean()
+   {
+      
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.ejb.*;
-import java.rmi.*;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public interface StatefulHome extends EJBHome {
-    
-  public Stateful create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-  
-  public Stateful create(State state) throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.*;
+import java.rmi.*;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulHome extends EJBHome {
+    
+  public Stateful create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+  
+  public Stateful create(State state) throws java.rmi.RemoteException, javax.ejb.CreateException;
+} 
+


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulHome.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision: 45088 $
- */
-public class StatefulInvoker extends Thread
-{
-   private static final Logger log = Logger.getLogger(StatefulInvoker.class);
-   
-   Exception exception = null;
-   
-   ConcurrentStateful stateful;
-   
-   public StatefulInvoker(ConcurrentStateful stateful)
-   {
-      this.stateful = stateful;
-   }
-   
-   public Exception getException()
-   {
-      return exception;
-   }
-   
-   public void run()
-   {
-      try
-      {
-         stateful.setState("state");
-         stateful.getState();
-      }
-      catch(Exception e)
-      {
-         exception = e;
-      }
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class StatefulInvoker extends Thread
+{
+   private static final Logger log = Logger.getLogger(StatefulInvoker.class);
+   
+   Exception exception = null;
+   
+   ConcurrentStateful stateful;
+   
+   public StatefulInvoker(ConcurrentStateful stateful)
+   {
+      this.stateful = stateful;
+   }
+   
+   public Exception getException()
+   {
+      return exception;
+   }
+   
+   public void run()
+   {
+      try
+      {
+         stateful.setState("state");
+         stateful.getState();
+      }
+      catch(Exception e)
+      {
+         exception = e;
+      }
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulInvoker.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatefulLocal
-{
-   String getState();
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatefulLocal
+{
+   String getState();
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class StatefulRemoteProxyFactory extends org.jboss.ejb3.stateful.StatefulRemoteProxyFactory
-{
-   private static final Logger log = Logger.getLogger(StatefulRemoteProxyFactory.class);
-   
-   protected Class[] getInterfaces()
-   {
-      Class[] remoteInterfaces = super.getInterfaces();
-
-      Class[] interfaces = new Class[remoteInterfaces.length + 1];
-
-      System.arraycopy(remoteInterfaces, 0, interfaces, 0, remoteInterfaces.length);
-      interfaces[remoteInterfaces.length] = org.jboss.ejb3.test.stateful.ProxyFactoryInterface.class;
-
-      return interfaces;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class StatefulRemoteProxyFactory extends org.jboss.ejb3.stateful.StatefulRemoteProxyFactory
+{
+   private static final Logger log = Logger.getLogger(StatefulRemoteProxyFactory.class);
+   
+   protected Class[] getInterfaces()
+   {
+      Class[] remoteInterfaces = super.getInterfaces();
+
+      Class[] interfaces = new Class[remoteInterfaces.length + 1];
+
+      System.arraycopy(remoteInterfaces, 0, interfaces, 0, remoteInterfaces.length);
+      interfaces[remoteInterfaces.length] = org.jboss.ejb3.test.stateful.ProxyFactoryInterface.class;
+
+      return interfaces;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatefulTx extends RemoteTx<State>
-{
-   boolean isGlobalTransacted() throws javax.transaction.SystemException;
-   
-   boolean isLocalTransacted() throws javax.transaction.SystemException;
-   
-   void testTxRollback();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatefulTx extends RemoteTx<State>
+{
+   boolean isGlobalTransacted() throws javax.transaction.SystemException;
+   
+   boolean isLocalTransacted() throws javax.transaction.SystemException;
+   
+   boolean testNewTx() throws javax.transaction.SystemException;
+   
+   void testTxRollback();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-import javax.transaction.TransactionManager;
-
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateful(name="StatefulTx")
- at Remote(StatefulTx.class)
- at RemoteBinding(jndiBinding = "StatefulTx")
- at TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) 
- at SecurityDomain("test")
- at DenyAll
-public class StatefulTxBean implements StatefulTx
-{
-   private static final Logger log = Logger.getLogger(StatefulTxBean.class);
-   
-   @JndiInject(jndiName="java:/TransactionManager") private TransactionManager tm;
-   
-   @RolesAllowed("allowed")
-   public boolean isGlobalTransacted() throws javax.transaction.SystemException
-   {
-      return (tm.getTransaction() != null);
-   }
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRED)
-   @RolesAllowed("allowed")
-   public boolean isLocalTransacted() throws javax.transaction.SystemException
-   {
-      return (tm.getTransaction() != null);
-   }
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRED)
-   @RolesAllowed("allowed")
-   public void testTxRollback()
-   {
-      throw new RuntimeException("test rollback");
-   }
-   
-   @TransactionAttribute(value = TransactionAttributeType.MANDATORY)
-   @RolesAllowed("allowed")
-   public State testMandatoryTx(State o)
-   {
-      return o;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateful;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.transaction.TransactionManager;
+
+import org.jboss.annotation.JndiInject;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateful(name="StatefulTx")
+ at Remote(StatefulTx.class)
+ at RemoteBinding(jndiBinding = "StatefulTx")
+ at TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) 
+ at SecurityDomain("test")
+public class StatefulTxBean implements StatefulTx
+{
+  private static final Logger log = Logger.getLogger(StatefulTxBean.class);
+   
+   @JndiInject(jndiName="java:/TransactionManager") private TransactionManager tm;
+    
+   @RolesAllowed("allowed")
+   public boolean isGlobalTransacted() throws javax.transaction.SystemException
+   {
+      return (tm.getTransaction() != null);
+   }
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRED)
+   @RolesAllowed("allowed")
+   public boolean isLocalTransacted() throws javax.transaction.SystemException
+   {
+      return (tm.getTransaction() != null);
+   }
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   @RolesAllowed("allowed")
+   public boolean testNewTx() throws javax.transaction.SystemException
+   {
+      return (tm.getTransaction() != null);
+   }
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRED)
+   @RolesAllowed("allowed")
+   public void testTxRollback()
+   {
+      throw new RuntimeException("test rollback");
+   }
+   
+   @TransactionAttribute(value = TransactionAttributeType.MANDATORY)
+   @RolesAllowed("allowed")
+   public State testMandatoryTx(State o)
+   {
+      return o;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface Stateless
+{
+   void testInjection() throws Exception;
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,55 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.ejb3.test.stateful;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+import javax.naming.InitialContext;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless(name="StatelessBean")
+ at RemoteBinding(jndiBinding = "Stateless")
+ at Remote(org.jboss.ejb3.test.stateful.Stateless.class)
+public class StatelessBean implements org.jboss.ejb3.test.stateful.Stateless
+{
+	private static final Logger log = Logger.getLogger(StatelessBean.class);
+   
+	@EJB
+	private Stateful stateful;
+	
+	@EJB
+	private ClusteredStateful clusteredStateful;
+	   
+	public void testInjection() throws Exception
+	{
+		stateful.getState();
+	   
+		clusteredStateful.getState();
+	}
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -213,4 +213,16 @@
    {
       
    }
+
+   public void lookupStateful() throws Exception
+   {
+      // FIXME: NYI
+      throw new RuntimeException("NYI");
+   }
+   
+   public void testStateful() throws Exception
+   {
+      // FIXME: NYI
+      throw new RuntimeException("NYI");
+   }
 }

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.stateful.nested;
-
-import javax.ejb.Remove;
-
-import org.jboss.logging.Logger;
-
-/**
- * Base class for a nested SFSB. Declares no class annotations,
- * giving subclasses configuration freedom.
- *
- * @author Ben Wang
- * @author Brian Stansberry
- * 
- * @version $Revision: 45372 $
- */
-public abstract class BaseNestedStatefulBean 
-   implements java.io.Serializable, NestedStateful
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-   
-   protected Logger log = Logger.getLogger(getClass());
-   private int counter = 0;
-
-   public int increment()
-   {
-      counter++;
-      log.debug("INCREMENT - counter: " + counter);
-      return counter;
-   }
-
-   public void reset()
-   {
-      counter = 0;
-   }
-   
-   @Remove
-   public void remove() 
-   {
-      log.debug("Being removed");
-   }
-
-   protected int getCounter()
-   {
-      return counter;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/BaseNestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.stateful.nested;
+
+import javax.ejb.Remove;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Base class for a nested SFSB. Declares no class annotations,
+ * giving subclasses configuration freedom.
+ *
+ * @author Ben Wang
+ * @author Brian Stansberry
+ * 
+ * @version $Revision: 45372 $
+ */
+public abstract class BaseNestedStatefulBean 
+   implements java.io.Serializable, NestedStateful
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+   
+   protected Logger log = Logger.getLogger(getClass());
+   private int counter = 0;
+
+   public int increment()
+   {
+      counter++;
+      log.debug("INCREMENT - counter: " + counter);
+      return counter;
+   }
+
+   public void reset()
+   {
+      counter = 0;
+   }
+   
+   @Remove
+   public void remove() 
+   {
+      log.debug("Being removed");
+   }
+
+   protected int getCounter()
+   {
+      return counter;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.stateful.nested;
-
-import javax.ejb.Local;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * Nested SFSB with only a local interface.
- *
- * @author Ben Wang
- * @author Brian Stansberry
- * 
- * @version $Revision: 45372 $
- */
- at Stateful(name="testLocalNestedStateful")
-// We don't want this passivated, so give it a very long timeout
- at CacheConfig(maxSize=10000, idleTimeoutSeconds=10000) 
- at Local(NestedStateful.class)
-public class LocalNestedStatefulBean extends BaseNestedStatefulBean
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++postActivateCalled;
-      log.debug("Activate with counter: " + getCounter() + " -- activate count: "
-            + postActivateCalled );
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++prePassivateCalled;
-      log.debug("Passivate with counter: " + getCounter() + " -- passivate count: "
-            + prePassivateCalled );
-   }
-
-   public int getPostActivate()
-   {
-      return postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return prePassivateCalled;
-   }
-
-   public void reset()
-   {
-      super.reset();
-      postActivateCalled = 0;
-      prePassivateCalled = 0;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/LocalNestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.stateful.nested;
+
+import javax.ejb.Local;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * Nested SFSB with only a local interface.
+ *
+ * @author Ben Wang
+ * @author Brian Stansberry
+ * 
+ * @version $Revision: 45372 $
+ */
+ at Stateful(name="testLocalNestedStateful")
+// We don't want this passivated, so give it a very long timeout
+ at CacheConfig(maxSize=10000, idleTimeoutSeconds=10000) 
+ at Local(NestedStateful.class)
+public class LocalNestedStatefulBean extends BaseNestedStatefulBean
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++postActivateCalled;
+      log.debug("Activate with counter: " + getCounter() + " -- activate count: "
+            + postActivateCalled );
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++prePassivateCalled;
+      log.debug("Passivate with counter: " + getCounter() + " -- passivate count: "
+            + prePassivateCalled );
+   }
+
+   public int getPostActivate()
+   {
+      return postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return prePassivateCalled;
+   }
+
+   public void reset()
+   {
+      super.reset();
+      postActivateCalled = 0;
+      prePassivateCalled = 0;
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,23 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.stateful.nested;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface NestedStateful extends Removable
-{
-   int increment();   
-   void reset(); 
-
-   int getPostActivate();
-   int getPrePassivate();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.stateful.nested;
+
+/**
+ * Comment
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+public interface NestedStateful extends Removable
+{
+   int increment();   
+   void reset(); 
+
+   int getPostActivate();
+   int getPrePassivate();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStateful.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.stateful.nested;
-
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-
-/**
- * Nested SFSB with a remote interface
- *
- * @author Ben Wang
- * @author Brian Stansberry
- * 
- * @version $Revision$
- */
- at Stateful(name="testNestedStateful")
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
- at Remote(NestedStateful.class)
-public class NestedStatefulBean extends BaseNestedStatefulBean
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++postActivateCalled;
-      log.debug("Activate with counter: " + getCounter() + " -- activate count: "
-            + postActivateCalled );
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++prePassivateCalled;
-      log.debug("Passivate with counter: " + getCounter() + " -- passivate count: "
-            + prePassivateCalled );
-   }
-
-   public int getPostActivate()
-   {
-      return postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return prePassivateCalled;
-   }
-
-   public void reset()
-   {
-      super.reset();
-      postActivateCalled = 0;
-      prePassivateCalled = 0;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.stateful.nested;
+
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+/**
+ * Nested SFSB with a remote interface
+ *
+ * @author Ben Wang
+ * @author Brian Stansberry
+ * 
+ * @version $Revision$
+ */
+ at Stateful(name="testNestedStateful")
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
+ at Remote(NestedStateful.class)
+public class NestedStatefulBean extends BaseNestedStatefulBean
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++postActivateCalled;
+      log.debug("Activate with counter: " + getCounter() + " -- activate count: "
+            + postActivateCalled );
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++prePassivateCalled;
+      log.debug("Passivate with counter: " + getCounter() + " -- passivate count: "
+            + prePassivateCalled );
+   }
+
+   public int getPostActivate()
+   {
+      return postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return prePassivateCalled;
+   }
+
+   public void reset()
+   {
+      super.reset();
+      postActivateCalled = 0;
+      prePassivateCalled = 0;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/NestedStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,132 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.stateful.nested;
-
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-import org.jboss.logging.Logger;
-
-import javax.ejb.*;
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-
-/**
- * Parent SFSB that contains nested SFSB
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateful(name="testParentStateful")
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1)   // this will get evicted the second time eviction thread wakes up
- at Remote(ParentStatefulRemote.class)
-public class ParentStatefulBean implements java.io.Serializable, ParentStatefulRemote
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-   
-   private Logger log = Logger.getLogger(ParentStatefulBean.class);
-   private int counter = 0;
-   private int localCounter = 0;
-   
-   @EJB(beanName="testNestedStateful")
-   private NestedStateful nested;
-
-   @EJB(beanName="testLocalNestedStateful")
-   private NestedStateful localNested;
-
-   public int increment()
-   {
-      counter = nested.increment();
-
-      log.debug("INCREMENT - counter: " + counter);
-      return counter;
-   }
-
-   public int incrementLocal()
-   {
-      localCounter = localNested.increment();
-
-      log.debug("INCREMENT - localCounter: " + localCounter);
-      return localCounter;
-   }
-
-   public static int postActivateCalled = 0;
-   public static int prePassivateCalled = 0;
-
-   /**
-    * Sleep to test
-    * @throws Exception
-    */
-   public void longRunning() throws Exception
-   {
-      log.debug("+++ longRunning() enter ");
-      Thread.sleep(10000);
-      log.debug("+++ longRunning() leave ");
-   }
-   
-   public NestedStateful getNested()
-   {
-      return nested;
-   }
-
-   public int getPostActivate()
-   {
-      return ParentStatefulBean.postActivateCalled;
-   }
-
-   public int getPrePassivate()
-   {
-      return ParentStatefulBean.prePassivateCalled;
-   }
-   
-   public int getLocalNestedPostActivate()
-   {
-      return localNested.getPostActivate();
-   }
-
-   public int getLocalNestedPrePassivate()
-   {
-      return localNested.getPrePassivate();
-   }
-
-   public void reset()
-   {
-      counter = 0;
-      ParentStatefulBean.postActivateCalled = 0;
-      ParentStatefulBean.prePassivateCalled = 0;
-      nested.reset();
-      localNested.reset();
-   }
-
-   @PostActivate
-   public void postActivate()
-   {
-      ++ParentStatefulBean.postActivateCalled;
-      log.debug("Activate with counter: " + counter);
-   }
-
-   @PrePassivate
-   public void prePassivate()
-   {
-      ++ParentStatefulBean.prePassivateCalled;
-      log.debug("Passivate with counter: " + counter);
-   }
-
-   @Remove
-   public void remove()
-   {
-      log.debug("Being removed");
-   }
-
-   @PostConstruct
-   public void ejbCreate()
-   {
-   }
-
-   // Remote Interface implementation ----------------------------------------------
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,132 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.stateful.nested;
+
+import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.logging.Logger;
+
+import javax.ejb.*;
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+
+/**
+ * Parent SFSB that contains nested SFSB
+ *
+ * @author Ben Wang
+ * @version $Revision$
+ */
+ at Stateful(name="testParentStateful")
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=1)   // this will get evicted the second time eviction thread wakes up
+ at Remote(ParentStatefulRemote.class)
+public class ParentStatefulBean implements java.io.Serializable, ParentStatefulRemote
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+   
+   private Logger log = Logger.getLogger(ParentStatefulBean.class);
+   private int counter = 0;
+   private int localCounter = 0;
+   
+   @EJB(beanName="testNestedStateful")
+   private NestedStateful nested;
+
+   @EJB(beanName="testLocalNestedStateful")
+   private NestedStateful localNested;
+
+   public int increment()
+   {
+      counter = nested.increment();
+
+      log.debug("INCREMENT - counter: " + counter);
+      return counter;
+   }
+
+   public int incrementLocal()
+   {
+      localCounter = localNested.increment();
+
+      log.debug("INCREMENT - localCounter: " + localCounter);
+      return localCounter;
+   }
+
+   public static int postActivateCalled = 0;
+   public static int prePassivateCalled = 0;
+
+   /**
+    * Sleep to test
+    * @throws Exception
+    */
+   public void longRunning() throws Exception
+   {
+      log.debug("+++ longRunning() enter ");
+      Thread.sleep(10000);
+      log.debug("+++ longRunning() leave ");
+   }
+   
+   public NestedStateful getNested()
+   {
+      return nested;
+   }
+
+   public int getPostActivate()
+   {
+      return ParentStatefulBean.postActivateCalled;
+   }
+
+   public int getPrePassivate()
+   {
+      return ParentStatefulBean.prePassivateCalled;
+   }
+   
+   public int getLocalNestedPostActivate()
+   {
+      return localNested.getPostActivate();
+   }
+
+   public int getLocalNestedPrePassivate()
+   {
+      return localNested.getPrePassivate();
+   }
+
+   public void reset()
+   {
+      counter = 0;
+      ParentStatefulBean.postActivateCalled = 0;
+      ParentStatefulBean.prePassivateCalled = 0;
+      nested.reset();
+      localNested.reset();
+   }
+
+   @PostActivate
+   public void postActivate()
+   {
+      ++ParentStatefulBean.postActivateCalled;
+      log.debug("Activate with counter: " + counter);
+   }
+
+   @PrePassivate
+   public void prePassivate()
+   {
+      ++ParentStatefulBean.prePassivateCalled;
+      log.debug("Passivate with counter: " + counter);
+   }
+
+   @Remove
+   public void remove()
+   {
+      log.debug("Being removed");
+   }
+
+   @PostConstruct
+   public void ejbCreate()
+   {
+   }
+
+   // Remote Interface implementation ----------------------------------------------
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.stateful.nested;
-
-/**
- * Parent sfsb interface
- *
- * @author Ben Wang
- * @author Brian Stansberry
- * @version $Revision$
- */
-public interface ParentStatefulRemote extends Removable
-{
-   int increment();
-
-   int incrementLocal();
-   
-   int getPostActivate();
-
-   int getPrePassivate();
-
-   void reset();
-
-   void longRunning() throws Exception;
-
-   NestedStateful getNested();
-
-   int getLocalNestedPostActivate();
-
-   int getLocalNestedPrePassivate();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.stateful.nested;
+
+/**
+ * Parent sfsb interface
+ *
+ * @author Ben Wang
+ * @author Brian Stansberry
+ * @version $Revision$
+ */
+public interface ParentStatefulRemote extends Removable
+{
+   int increment();
+
+   int incrementLocal();
+   
+   int getPostActivate();
+
+   int getPrePassivate();
+
+   void reset();
+
+   void longRunning() throws Exception;
+
+   NestedStateful getNested();
+
+   int getLocalNestedPostActivate();
+
+   int getLocalNestedPrePassivate();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/ParentStatefulRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.stateful.nested;
-
-/**
- * An SFSB with a remove method.
- * 
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
-public interface Removable
-{
-   void remove();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/Removable.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.stateful.nested;
+
+/**
+ * An SFSB with a remove method.
+ * 
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+public interface Removable
+{
+   void remove();
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,7 +21,6 @@
  */
 package org.jboss.ejb3.test.stateful.unit;
 
-import javax.ejb.EJBNoSuchObjectException;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,150 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateful.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.stateful.nested.ParentStatefulRemote;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-
-import junit.framework.Test;
-
-/**
- * Test nested SFSB for repeated passivation
- *
- * @author  Ben.Wang at jboss.org
- * @version $Revision: 45372 $
- */
-public class NestedBeanUnitTestCase extends JBossTestCase
-{
-   static boolean deployed = false;
-   public static int test = 0;
-   static Date startDate = new Date();
-
-   protected final String namingFactory =
-   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-
-   protected final String providerURL =
-   System.getProperty(Context.PROVIDER_URL);
-
-   public NestedBeanUnitTestCase (String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(NestedBeanUnitTestCase.class, "stateful-test.jar");
-   }
-
-   public void testBasic()
-   throws Exception
-   {
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Trying the context...");
-
-      // Connect to the server0 JNDI
-      InitialContext ctx = getInitialContext();
-
-      getLog().debug("Test Stateful Bean");
-      getLog().debug("==================================");
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Looking up testBasic...");
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   public void testStatefulPassivation()
-   throws Exception
-   {
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "+"Trying the context...");
-
-      InitialContext ctx = getInitialContext();
-
-      getLog().debug("Test Stateful Bean passivation");
-      getLog().debug("==================================");
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Looking up testParentStateful...");
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-      _sleep(10000);  // should passivated
-
-      assertEquals("Counter: ", 3, stateful.increment());
-      assertEquals("Counter: ", 4, stateful.increment());
-      assertEquals(1, stateful.getPrePassivate());
-      assertEquals(1, stateful.getPostActivate());
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   public void testStatefulRepeatedPassivation()
-   throws Exception
-   {
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "+"Trying the context...");
-
-      InitialContext ctx = getInitialContext();
-
-      getLog().debug("Test Stateful Bean passivation");
-      getLog().debug("==================================");
-      getLog().debug(++NestedBeanUnitTestCase.test +"- "
-              +"Looking up testParentStateful...");
-      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
-      stateful.reset();
-
-      assertEquals("Counter: ", 1, stateful.increment());
-      assertEquals("Counter: ", 2, stateful.increment());
-      _sleep(10000);  // should passivated
-
-      assertEquals("Counter: ", 3, stateful.increment());
-      assertEquals("Counter: ", 4, stateful.increment());
-      assertEquals(1, stateful.getPrePassivate());
-      assertEquals(1, stateful.getPostActivate());
-      _sleep(10000);  // should passivated
-
-      assertEquals("Counter: ", 5, stateful.increment());
-      assertEquals("Counter: ", 6, stateful.increment());
-      assertEquals(2, stateful.getPrePassivate());
-      assertEquals(2, stateful.getPostActivate());
-
-      stateful.remove();
-      getLog().debug("ok");
-   }
-
-   protected void _sleep(long time)
-   {
-      try {
-         Thread.sleep(time);
-      } catch (InterruptedException e) {
-         e.printStackTrace();
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,237 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.stateful.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.stateful.nested.NestedStateful;
+import org.jboss.ejb3.test.stateful.nested.ParentStatefulRemote;
+import org.jboss.ejb3.test.stateful.nested.Removable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+
+/**
+ * Test nested SFSB for repeated passivation
+ *
+ * @author  Ben.Wang at jboss.org
+ * @version $Revision$
+ */
+public class NestedBeanUnitTestCase extends JBossTestCase
+{
+   static boolean deployed = false;
+   public static int test = 0;
+   static Date startDate = new Date();
+
+   protected final String namingFactory =
+   System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+
+   protected final String providerURL =
+   System.getProperty(Context.PROVIDER_URL);
+
+   private Set<Removable> removables = new HashSet<Removable>();
+   
+   public NestedBeanUnitTestCase (String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(NestedBeanUnitTestCase.class, "stateful-test.jar");
+   }
+   
+   
+   @Override
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      
+      // Remove any EJBs so they don't spuriously passivate and
+      // throw off the passivation counts
+      for (Removable removable : removables)
+      {
+         try
+         {
+            removable.remove();
+         }
+         catch (Exception ignored) {}
+      }
+      
+      removables.clear();
+   }
+
+   public void testBasic()
+   throws Exception
+   {
+      ParentStatefulRemote stateful = getParentSFSB();
+      stateful.reset();
+      
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+      assertEquals("Counter: ", 1, stateful.incrementLocal());
+      assertEquals("Counter: ", 2, stateful.incrementLocal());
+      
+      removeBean(stateful);
+      
+      getLog().debug("ok");
+   }
+   
+   public void testDependentLifecycle()
+   throws Exception
+   {
+      ParentStatefulRemote stateful = getParentSFSB();
+      stateful.reset();
+      
+      assertEquals("Counter: ", 1, stateful.increment());
+       
+      NestedStateful nested = stateful.getNested();
+      removables.add(nested);
+       
+      removeBean(stateful);
+       
+      // Confirm nested still works following parent remove
+      assertEquals("Counter: :", 2 ,nested.increment());
+       
+      removeBean(nested);
+       
+      getLog().debug("ok");
+      
+   }
+
+   public void testStatefulPassivation()
+   throws Exception
+   {
+      ParentStatefulRemote stateful = getParentSFSB();
+      stateful.reset();
+      
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+      assertEquals("Counter: ", 1, stateful.incrementLocal());
+      assertEquals("Counter: ", 2, stateful.incrementLocal());
+      
+      NestedStateful nested = stateful.getNested();
+      removables.add(nested);
+      
+      _sleep(2500);  // should passivate
+
+      assertEquals(1, stateful.getPrePassivate());
+      assertEquals(1, stateful.getPostActivate());
+      assertEquals(1, nested.getPrePassivate());
+      assertEquals(1, nested.getPostActivate());
+      assertEquals(1, stateful.getLocalNestedPrePassivate());
+      assertEquals(1, stateful.getLocalNestedPostActivate());
+      assertEquals("Counter: ", 3, stateful.increment());
+      assertEquals("Counter: ", 4, stateful.increment());
+      assertEquals("Counter: ", 3, stateful.incrementLocal());
+      assertEquals("Counter: ", 4, stateful.incrementLocal());
+      
+      removeBean(stateful);
+      
+      // Confirm nested still works following parent remove
+      assertEquals("Counter: ", 5, nested.increment());
+      
+      removeBean(nested);
+      
+      getLog().debug("ok");
+   }
+
+   public void testStatefulRepeatedPassivation()
+   throws Exception
+   {
+      ParentStatefulRemote stateful = getParentSFSB();
+      stateful.reset();
+
+      assertEquals("Counter: ", 1, stateful.increment());
+      assertEquals("Counter: ", 2, stateful.increment());
+      assertEquals("Counter: ", 1, stateful.incrementLocal());
+      assertEquals("Counter: ", 2, stateful.incrementLocal());
+      
+      NestedStateful nested = stateful.getNested();
+      removables.add(nested);
+      
+      _sleep(10000);  // should passivate
+
+      assertEquals(1, stateful.getPrePassivate());
+      assertEquals(1, stateful.getPostActivate());
+      assertEquals(1, nested.getPrePassivate());
+      assertEquals(1, nested.getPostActivate());
+      assertEquals(1, stateful.getLocalNestedPrePassivate());
+      assertEquals(1, stateful.getLocalNestedPostActivate());
+      assertEquals("Counter: ", 3, stateful.increment());
+      assertEquals("Counter: ", 4, stateful.increment());
+      assertEquals("Counter: ", 3, stateful.incrementLocal());
+      assertEquals("Counter: ", 4, stateful.incrementLocal());
+      
+      
+      _sleep(10000);  // should passivate
+
+      assertEquals(2, stateful.getPrePassivate());
+      assertEquals(2, stateful.getPostActivate());
+      assertEquals(2, nested.getPrePassivate());
+      assertEquals(2, nested.getPostActivate());
+      assertEquals(2, stateful.getLocalNestedPrePassivate());
+      assertEquals(2, stateful.getLocalNestedPostActivate());
+      assertEquals("Counter: ", 5, stateful.increment());
+      assertEquals("Counter: ", 6, stateful.increment());
+      assertEquals("Counter: ", 5, stateful.incrementLocal());
+      assertEquals("Counter: ", 6, stateful.incrementLocal());
+      
+      removeBean(stateful);
+      
+      // Force the nested bean to go through another passivation
+      // to check the activation process can survive the removal 
+      // of its parent
+      _sleep(2500);
+      
+      // Confirm nested still works following parent remove
+      assertEquals("Counter: ", 7, nested.increment());
+      assertEquals(3, nested.getPrePassivate());
+      assertEquals(3, nested.getPostActivate());
+      
+      removeBean(nested);
+      
+      getLog().debug("ok");
+   }
+   
+   protected ParentStatefulRemote getParentSFSB()
+   throws Exception
+   {
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "+"Trying the context...");
+
+      InitialContext ctx = getInitialContext();
+
+      getLog().debug("Test Stateful Bean passivation");
+      getLog().debug("==================================");
+      getLog().debug(++NestedBeanUnitTestCase.test +"- "
+              +"Looking up testParentStateful...");
+      ParentStatefulRemote stateful = (ParentStatefulRemote) ctx.lookup("testParentStateful/remote");
+      removables.add(stateful);
+      
+      return stateful;
+   }
+
+   protected void _sleep(long time)
+   {
+      try {
+         Thread.sleep(time);
+      } catch (InterruptedException e) {
+         e.printStackTrace();
+      }
+   }
+   
+   private void removeBean(Removable bean)
+   {
+      bean.remove();
+      removables.remove(bean);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/NestedBeanUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,10 +21,20 @@
  */
 package org.jboss.ejb3.test.stateful.unit;
 
-import javax.ejb.EJBNoSuchObjectException;
+import java.util.Map;
+
+import javax.ejb.NoSuchEJBException;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
+import org.jboss.ejb3.ClientKernelAbstraction;
+import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.ejb3.test.stateful.ClusteredStateful;
 import org.jboss.ejb3.test.stateful.ConcurrentStateful;
+import org.jboss.ejb3.test.stateful.Entity;
+import org.jboss.ejb3.test.stateful.EntityFacade;
+import org.jboss.ejb3.test.stateful.ServiceRemote;
 import org.jboss.ejb3.test.stateful.SmallCacheStateful;
 import org.jboss.ejb3.test.stateful.Stateful;
 import org.jboss.ejb3.test.stateful.StatefulInvoker;
@@ -34,6 +44,7 @@
 import org.jboss.ejb3.test.stateful.RemoteBindingInterceptor;
 import org.jboss.ejb3.test.stateful.State;
 import org.jboss.ejb3.test.stateful.StatefulHome;
+import org.jboss.ejb3.test.stateful.Stateless;
 import org.jboss.ejb3.test.stateful.ExtendedState;
 import org.jboss.ejb3.test.stateful.Tester;
 import org.jboss.logging.Logger;
@@ -156,6 +167,8 @@
       assertTrue(transacted);
       transacted = stateful.isGlobalTransacted();
       assertFalse(transacted);
+      transacted = stateful.testNewTx();
+      assertTrue(transacted);
       
       try
       {
@@ -292,22 +305,98 @@
       assertTrue(RemoteBindingInterceptor.accessed);
    }
 
+   public void testUninstantiatedPassivation() throws Exception
+   {
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+      
+      Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
+      assertNotNull(stateful);
+      stateful.lookupStateful();
+      Thread.sleep(10 * 1000);
+      stateful.testStateful();
+      
+      stateful.lookupStateful();
+      stateful.testStateful();
+      Thread.sleep(10 * 1000);
+      stateful.testStateful();
+   }
+   
+   public void testExtendedPersistencePassivation() throws Exception
+   {
+      EntityFacade stateful = (EntityFacade)getInitialContext().lookup("EntityFacadeBean/remote");
+      Entity entity = null;
+      entity = stateful.createEntity("Kalin");
+      
+      //passivate
+      Thread.sleep(10 * 1000);
+      
+      MBeanServerConnection server = getServer();
+      ObjectName objectName = new ObjectName("jboss.jca:service=CachedConnectionManager");
+      int inUseConnections = (Integer)server.getAttribute(objectName, "InUseConnections");
+      System.out.println("inUseConnections \n" + inUseConnections);
+      assertEquals(0, inUseConnections);
+      
+      //activate
+      entity = stateful.loadEntity(entity.getId());
+      
+      inUseConnections = (Integer)server.getAttribute(objectName, "InUseConnections");
+      System.out.println("inUseConnections \n" + inUseConnections);
+      if (inUseConnections != 0)
+         printStats(server);
+      assertEquals(0, inUseConnections);
+      
+      entity = stateful.createEntity("Kalin" + entity.getId());
+      
+      inUseConnections = (Integer)server.getAttribute(objectName, "InUseConnections");
+      System.out.println("inUseConnections \n" + inUseConnections);
+      
+      if (inUseConnections != 0)
+         printStats(server);
+      assertEquals(0, inUseConnections);
+   }
+   
+   protected void printStats(MBeanServerConnection server) throws Exception
+   {
+      ObjectName objectName = new ObjectName("jboss.jca:service=CachedConnectionManager");
+      Object[] params = {};
+      String[] sig = {};
+      Map result = (Map)server.invoke(objectName, "listInUseConnections", params, sig);
+      System.out.println(result);
+      
+      objectName = new ObjectName("jboss:service=TransactionManager");
+      long activeTransactions = (Long)server.getAttribute(objectName, "TransactionCount");
+      System.out.println("activeTransactions \n" + activeTransactions);
+      
+      objectName = new ObjectName("jboss.jca:service=ManagedConnectionPool,name=DefaultDS");
+      long inUseConnectionCount = (Long)server.getAttribute(objectName, "InUseConnectionCount");
+      System.out.println("inUseConnectionCount \n" + inUseConnectionCount);
+      
+      long maxConnectionsInUseCount = (Long)server.getAttribute(objectName, "MaxConnectionsInUseCount");
+      System.out.println("maxConnectionsInUseCount \n" + maxConnectionsInUseCount); 
+   }
+
    public void testPassivation() throws Exception
    {
       SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
       SecurityAssociation.setCredential("password".toCharArray());
       
       System.out.println("testPassivation");
+      Stateless stateless = (Stateless)getInitialContext().lookup("Stateless");
+      stateless.testInjection();
+      
+      ServiceRemote service = (ServiceRemote) getInitialContext().lookup("ServiceBean/remote");
+      service.testInjection();
+      
       Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
       assertNotNull(stateful);
       stateful.setState("state");
       assertEquals("state", stateful.getState());
       stateful.testSerializedState("state");
-      stateful.clearPassivated();
       assertEquals(null, stateful.getInterceptorState());
       stateful.setInterceptorState("hello world");
       assertFalse(stateful.testSessionContext());
-      Thread.sleep(5 * 1000);
+      Thread.sleep(10 * 1000);
       assertTrue(stateful.wasPassivated());
       
       assertEquals("state", stateful.getState());
@@ -322,8 +411,54 @@
       assertFalse(stateful.testSessionContext());
       
       stateful.testResources();
+      
+      stateless.testInjection();
+      
+      service.testInjection();
    }
    
+   public void testClusteredPassivation() throws Exception
+   {
+      SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+      SecurityAssociation.setCredential("password".toCharArray());
+      
+      System.out.println("testPassivation");
+      Stateless stateless = (Stateless)getInitialContext().lookup("Stateless");
+      stateless.testInjection();
+      
+      ServiceRemote service = (ServiceRemote) getInitialContext().lookup("ServiceBean/remote");
+      service.testInjection();
+      
+      ClusteredStateful stateful = (ClusteredStateful)getInitialContext().lookup("ClusteredStateful");
+      assertNotNull(stateful);
+      stateful.setState("state");
+      assertEquals("state", stateful.getState());
+      stateful.testSerializedState("state");
+      assertEquals(null, stateful.getInterceptorState());
+      stateful.setInterceptorState("hello world");
+      assertFalse(stateful.testSessionContext());
+      Thread.sleep(10 * 1000);
+      assertTrue(stateful.wasPassivated());
+      
+      assertEquals("state", stateful.getState());
+      assertEquals("hello world", stateful.getInterceptorState());
+
+      Stateful another = (Stateful)getInitialContext().lookup("Stateful");
+      assertEquals(null, another.getInterceptorState());
+      another.setInterceptorState("foo");
+      assertEquals("foo", another.getInterceptorState());
+      assertEquals("hello world", stateful.getInterceptorState());
+      
+      assertFalse(stateful.testSessionContext());
+      
+      stateful.testResources();
+      
+      stateless.testInjection();
+      
+      service.testInjection();
+   }
+
+   
    public void testRemove() throws Exception
    {
       SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
@@ -340,7 +475,7 @@
       {
          stateful.getState();
          fail("Bean should have been removed");
-      } catch (EJBNoSuchObjectException e)
+      } catch (NoSuchEJBException e)
       {
          
       }
@@ -429,7 +564,46 @@
 
       assertTrue(wasConcurrentException);
    }
+   
+   public void testJmxName() throws Exception
+   {
+      ObjectName deployment = new ObjectName("test.ejb3:name=Bill,service=EJB3");
 
+      ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
+      kernel.invoke(deployment, "stop", new Object[0], new String[0]);
+      kernel.invoke(deployment, "start", new Object[0], new String[0]);
+   }
+   
+   public void testDestroyException() throws Exception
+   {
+      EntityFacade stateful = (EntityFacade)getInitialContext().lookup("EntityFacadeBean/remote");
+      assertNotNull(stateful);
+      stateful.createEntity("Kalin");
+      
+      try
+      {
+         stateful.remove();
+         fail("should catch RuntimeException");
+      }
+      catch (RuntimeException e)
+      {
+      }
+      
+      stateful.createEntity("Cabernet");
+      
+      try
+      {
+         stateful.removeWithTx();
+         fail("should catch RuntimeException");
+      }
+      catch (RuntimeException e)
+      {
+      }
+      
+      stateful.createEntity("Bailey");
+      
+   }
+
    public static Test suite() throws Exception
    {
       return getDeploySetup(RemoteUnitTestCase.class, "stateful-test.jar");

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateless;
-
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface AnonymousStateless
-{
-   int method(int i) throws NamingException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless;
+
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface AnonymousStateless
+{
+   int method(int i) throws NamingException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateless;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.naming.NamingException;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at SecurityDomain("other")
- at Remote(AnonymousStateless.class)
-public class AnonymousStatelessBean implements AnonymousStateless
-{
-   private static final Logger log = Logger.getLogger(AnonymousStatelessBean.class);
-   
-   @EJB CheckedStateless stateless;
-   
-   public int method(int i) throws NamingException
-   {
-      return stateless.method(i);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.naming.NamingException;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at SecurityDomain("other")
+ at Remote(AnonymousStateless.class)
+public class AnonymousStatelessBean implements AnonymousStateless
+{
+   private static final Logger log = Logger.getLogger(AnonymousStatelessBean.class);
+   
+   @EJB CheckedStateless stateless;
+   
+   public int method(int i) throws NamingException
+   {
+      return stateless.method(i);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateless;
-
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface RunAsStateless2
-{
-   int method2(int i) throws NamingException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless;
+
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface RunAsStateless2
+{
+   int method2(int i) throws NamingException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStateless2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateless;
-
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface UnsecuredStateless
-{
-   int method(int i) throws NamingException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless;
+
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface UnsecuredStateless
+{
+   int method(int i) throws NamingException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStateless.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.stateless;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.naming.NamingException;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at Remote(UnsecuredStateless.class)
-public class UnsecuredStatelessBean implements UnsecuredStateless
-{
-   private static final Logger log = Logger.getLogger(UnsecuredStatelessBean.class);
-   
-   @EJB CheckedStateless stateless;
-   
-   public int method(int i) throws NamingException
-   {
-      return stateless.method(i);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.naming.NamingException;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Remote(UnsecuredStateless.class)
+public class UnsecuredStatelessBean implements UnsecuredStateless
+{
+   private static final Logger log = Logger.getLogger(UnsecuredStatelessBean.class);
+   
+   @EJB CheckedStateless stateless;
+   
+   public int method(int i) throws NamingException
+   {
+      return stateless.method(i);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/UnsecuredStatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.stateless14;
-
-public interface Calculator
-{
-   int add(int x, int y);
-
-   int subtract(int x, int y);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless14;
+
+public interface Calculator
+{
+   int add(int x, int y);
+
+   int subtract(int x, int y);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/Calculator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.stateless14;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
- at Stateless
- at Local(CalculatorLocal.class)
- at Remote(CalculatorRemote.class)
-public class CalculatorBean implements CalculatorRemote, CalculatorLocal
-{
-   public int add(int x, int y)
-   {
-      return x + y;
-   }
-
-   public int subtract(int x, int y)
-   {
-      return x - y;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless14;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+ at Stateless
+ at Local(CalculatorLocal.class)
+ at Remote(CalculatorRemote.class)
+public class CalculatorBean implements CalculatorRemote, CalculatorLocal
+{
+   public int add(int x, int y)
+   {
+      return x + y;
+   }
+
+   public int subtract(int x, int y)
+   {
+      return x - y;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,26 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.stateless14;
-
-public interface CalculatorLocal extends Calculator
-{
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless14;
+
+public interface CalculatorLocal extends Calculator
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,27 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.stateless14;
-
-public interface CalculatorRemote extends Calculator
-{
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless14;
+
+public interface CalculatorRemote extends Calculator
+{
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/CalculatorRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.stateless14.unit;
-
-import javax.naming.InitialContext;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import org.jboss.ejb3.test.stateless14.Calculator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class StatelessTestCase extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(StatelessTestCase.class);
-
-   public StatelessTestCase(String name)
-   {
-      super(name);
-   }
- 
-   public void testCallerPrincipal() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
-      assertNotNull(calculator);
-
-      log.info("1 + 1 = " + calculator.add(1, 1));
-      log.info("1 - 1 = " + calculator.subtract(1, 1));
-   }
-
-   public static Test suite() throws Exception
-   {
-      return new TestSuite(StatelessTestCase.class);
-      //return getDeploySetup(StatelessTestCase.class, "stateless14-test.jar");
-   }
-}
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.stateless14.unit;
+
+import javax.naming.InitialContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.stateless14.Calculator;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class StatelessTestCase extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(StatelessTestCase.class);
+
+   public StatelessTestCase(String name)
+   {
+      super(name);
+   }
+ 
+   public void testCallerPrincipal() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      Calculator calculator = (Calculator) ctx.lookup("CalculatorBean/remote");
+      assertNotNull(calculator);
+
+      log.info("1 + 1 = " + calculator.add(1, 1));
+      log.info("1 - 1 = " + calculator.subtract(1, 1));
+   }
+
+   public static Test suite() throws Exception
+   {
+      return new TestSuite(StatelessTestCase.class);
+      //return getDeploySetup(StatelessTestCase.class, "stateless14-test.jar");
+   }
+}
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless14/unit/StatelessTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,79 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.strictpool;
-
-import org.jboss.ejb3.AbstractPool;
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-
-
-/**
- * @version <tt>$Revision: 45045 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class BogusPool
-        extends AbstractPool
-{
-   public void initialize(Container container, Class contextClass, Class beanClass, int maxSize, long timeout)
-   {
-      throw new RuntimeException("Bogus");
-   }
-
-   public BeanContext get()
-   {
-      throw new RuntimeException("Bogus");
-   }
-
-   public BeanContext get(Class[] initTypes, Object[] initValues)
-   {
-      throw new RuntimeException("Bogus");
-   }
-
-   public void release(BeanContext ctx)
-   {
-      throw new RuntimeException("Bogus");
-   }
-
-   public void discard(BeanContext ctx)
-   {
-      throw new RuntimeException("Bogus");
-   }
-   
-   public int getCurrentSize()
-   {
-	   return -1;
-   }
-   
-   public int getAvailableCount()
-   {
-	   return -1;
-   }
-   
-   public int getMaxSize()
-   {
-	   return -1;
-   }
-
-   public void setMaxSize(int maxSize)
-   {
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.strictpool;
+
+import org.jboss.ejb3.AbstractPool;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.Container;
+
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public class BogusPool
+        extends AbstractPool
+{
+   public void initialize(Container container, Class contextClass, Class beanClass, int maxSize, long timeout)
+   {
+      throw new RuntimeException("Bogus");
+   }
+
+   public BeanContext get()
+   {
+      throw new RuntimeException("Bogus");
+   }
+
+   public BeanContext get(Class[] initTypes, Object[] initValues)
+   {
+      throw new RuntimeException("Bogus");
+   }
+
+   public void release(BeanContext ctx)
+   {
+      throw new RuntimeException("Bogus");
+   }
+
+   public void discard(BeanContext ctx)
+   {
+      throw new RuntimeException("Bogus");
+   }
+
+   public int getCurrentSize()
+   {
+	   return -1;
+   }
+   
+   public int getAvailableCount()
+   {
+	   return -1;
+   }
+   
+   public int getMaxSize()
+   {
+	   return -1;
+   }
+
+   public void setMaxSize(int maxSize)
+   {
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/BogusPool.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.strictpool;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface Counter
-{
-   int getCount();
-
-   void clear();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.strictpool;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface Counter
+{
+   int getCount();
+
+   void clear();
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/Counter.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.strictpool;
-
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CounterBean implements Counter
-{
-   public static int count = 0;
-
-   public int getCount() { return count; }
-   public void clear() { count = 0; }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.strictpool;
+
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CounterBean implements Counter
+{
+   public static int count = 0;
+
+   public int getCount() { return count; }
+   public void clear() { count = 0; }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/CounterBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/MDBInvoker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -30,7 +30,7 @@
 import javax.jms.ObjectMessage;
 
 import EDU.oswego.cs.dl.util.concurrent.CountDown;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
 
 /**
  * Adapted from the EJB 2.1 tests (org.jboss.test.cts.test.SessionInvoker)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,159 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.strictpool;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-
-import org.jboss.annotation.ejb.PoolClass;
-import org.jboss.annotation.ejb.PoolClass;
-
-/**
- * @version <tt>$Revision: 46471 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/overrideQueueA"),
-        @ActivationConfigProperty(propertyName="maxMessages", propertyValue="10"),
-        @ActivationConfigProperty(propertyName="minSession", propertyValue="10"),
-        @ActivationConfigProperty(propertyName="maxSession", propertyValue="10")
-        })
- at PoolClass (value=org.jboss.ejb3.test.strictpool.BogusPool.class, maxSize=0, timeout=0)
-public class OverrideStrictlyPooledMDB implements MessageListener
-{
-   /** The class wide max count of instances allows */
-   public static final int maxActiveCount = 2;
-   /** The class wide count of instances active in business code */
-   private static int activeCount;
-
-   private MessageDrivenContext ctx = null;
-   private QueueConnection queConn;
-   private QueueSession session;
-   private QueueSender sender;
-
-   private static synchronized int incActiveCount()
-   {
-      return activeCount ++;
-   }
-   private static synchronized int decActiveCount()
-   {
-      return activeCount --;
-   }
-
-   @Resource public void setMessageDrivenContext(MessageDrivenContext ctx)
-      throws EJBException
-   {
-      System.out.println("setMessageDrivenContext()");
-      this.ctx = ctx;
-      try
-      {
-         InitialContext iniCtx = new InitialContext();
-         QueueConnectionFactory factory = (QueueConnectionFactory) iniCtx.lookup("java:/ConnectionFactory");
-         queConn = factory.createQueueConnection();
-         session = queConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-         Queue queue = (Queue) iniCtx.lookup("queue/overrideQueueB");
-         sender = session.createSender(queue);
-      }
-      catch(Exception e)
-      {
-         System.out.println("Setup failure");
-         e.printStackTrace();
-         throw new EJBException("Setup failure", e);
-      }
-   }
-
-   public void ejbCreate()
-   {
-   }
-
-   public void ejbRemove()
-   {
-      try
-      {
-         if( sender != null )
-            sender.close();
-         if( session != null )
-            session.close();
-         if( queConn != null )
-            queConn.close();
-      }
-      catch(Exception e)
-      {
-         System.out.println("Failed to close JMS resources");
-         e.printStackTrace();
-      }
-   }
-
-   public void onMessage(Message message)
-   {
-      int count = incActiveCount();
-      System.out.println("Begin onMessage, activeCount="+count+", ctx="+ctx);
-      try
-      {
-         Message reply = null;
-         if( count > maxActiveCount )
-         {
-            String msg = "IllegalState, activeCount > maxActiveCount, "
-                  + count + " > " + maxActiveCount;
-            // Send an exception
-            Exception e = new IllegalStateException(msg);
-            reply = session.createObjectMessage(e);
-         }
-         else
-         {
-            TextMessage tm = (TextMessage) message;
-            // Send an ack
-            reply = session.createTextMessage("Recevied msg="+tm.getText());
-         }
-         Thread.currentThread().sleep(1000);
-         sender.send(reply);
-      }
-      catch(JMSException e)
-      {
-         System.out.println("Failed to send error message");
-         e.printStackTrace();
-      }
-      catch(InterruptedException e)
-      {
-      }
-      finally
-      {
-         count = decActiveCount();
-         System.out.println("End onMessage, activeCount="+count+", ctx="+ctx);
-      }
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.strictpool;
+
+import javax.annotation.Resource;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.EJBException;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.annotation.ejb.PoolClass;
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/overrideQueueA"),
+        @ActivationConfigProperty(propertyName="maxMessages", propertyValue="10"),
+        @ActivationConfigProperty(propertyName="minSession", propertyValue="10"),
+        @ActivationConfigProperty(propertyName="maxSession", propertyValue="10")
+        })
+ at PoolClass (value=org.jboss.ejb3.test.strictpool.BogusPool.class, maxSize=0, timeout=0)
+public class OverrideStrictlyPooledMDB implements MessageListener
+{
+   /** The class wide max count of instances allows */
+   public static final int maxActiveCount = 2;
+   /** The class wide count of instances active in business code */
+   private static int activeCount;
+
+   private MessageDrivenContext ctx = null;
+   private QueueConnection queConn;
+   private QueueSession session;
+   private QueueSender sender;
+
+   private static synchronized int incActiveCount()
+   {
+      return activeCount ++;
+   }
+   private static synchronized int decActiveCount()
+   {
+      return activeCount --;
+   }
+
+   @Resource public void setMessageDrivenContext(MessageDrivenContext ctx)
+      throws EJBException
+   {
+      System.out.println("setMessageDrivenContext()");
+      this.ctx = ctx;
+      try
+      {
+         InitialContext iniCtx = new InitialContext();
+         QueueConnectionFactory factory = (QueueConnectionFactory) iniCtx.lookup("java:/ConnectionFactory");
+         queConn = factory.createQueueConnection();
+         session = queConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+         Queue queue = (Queue) iniCtx.lookup("queue/overrideQueueB");
+         sender = session.createSender(queue);
+      }
+      catch(Exception e)
+      {
+         System.out.println("Setup failure");
+         e.printStackTrace();
+         throw new EJBException("Setup failure", e);
+      }
+   }
+
+   public void ejbCreate()
+   {
+   }
+
+   public void ejbRemove()
+   {
+      try
+      {
+         if( sender != null )
+            sender.close();
+         if( session != null )
+            session.close();
+         if( queConn != null )
+            queConn.close();
+      }
+      catch(Exception e)
+      {
+         System.out.println("Failed to close JMS resources");
+         e.printStackTrace();
+      }
+   }
+
+   public void onMessage(Message message)
+   {
+      int count = incActiveCount();
+      System.out.println("Begin onMessage, activeCount="+count+", ctx="+ctx);
+      try
+      {
+         Message reply = null;
+         if( count > maxActiveCount )
+         {
+            String msg = "IllegalState, activeCount > maxActiveCount, "
+                  + count + " > " + maxActiveCount;
+            // Send an exception
+            Exception e = new IllegalStateException(msg);
+            reply = session.createObjectMessage(e);
+         }
+         else
+         {
+            TextMessage tm = (TextMessage) message;
+            // Send an ack
+            reply = session.createTextMessage("Recevied msg="+tm.getText());
+         }
+         Thread.currentThread().sleep(1000);
+         sender.send(reply);
+      }
+      catch(JMSException e)
+      {
+         System.out.println("Failed to send error message");
+         e.printStackTrace();
+      }
+      catch(InterruptedException e)
+      {
+      }
+      finally
+      {
+         count = decActiveCount();
+         System.out.println("End onMessage, activeCount="+count+", ctx="+ctx);
+      }
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.strictpool;
-
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.PoolClass;
-
-
-/**
- * @version <tt>$Revision: 55512 $</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
- at Stateless
- at PoolClass(value=org.jboss.ejb3.test.strictpool.BogusPool.class, maxSize=0, timeout=0)
- at Remote(StrictlyPooledSession.class)
-public class OverrideStrictlyPooledSessionBean implements StrictlyPooledSession
-{
-   /** The class wide max count of instances allows */
-   public static final int maxActiveCount = 5;
-   /** The class wide count of instances active in business code */
-   private static int activeCount;
-
-   private SessionContext ctx;
-
-   @Resource public void setSessionContext(SessionContext ctx)
-   {
-      System.out.println("setSessionContext()");
-      this.ctx = ctx;
-   }
-
-   public void methodA()
-   {
-      int count = incActiveCount();
-      System.out.println("Begin methodA, activeCount="+count+", ctx="+ctx);
-      try
-      {
-         if( count > maxActiveCount )
-         {
-            String msg = "IllegalState, activeCount > maxActiveCount, "
-                  + count + " > " + maxActiveCount;
-            throw new EJBException(msg);
-         }
-         // Sleep to let the client thread pile up
-         Thread.currentThread().sleep(1000);
-      }
-      catch(InterruptedException e)
-      {
-      }
-      finally
-      {
-         count = decActiveCount();
-         System.out.println("End methodA, activeCount="+count+", ctx="+ctx);
-      }
-   }
-
-   private static synchronized int incActiveCount()
-   {
-      return activeCount ++;
-   }
-   private static synchronized int decActiveCount()
-   {
-      return activeCount --;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.strictpool;
+
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import org.jboss.annotation.ejb.PoolClass;
+
+
+/**
+ * @version <tt>$Revision$</tt>
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless
+ at PoolClass(value=org.jboss.ejb3.test.strictpool.BogusPool.class, maxSize=0, timeout=0)
+ at Remote(StrictlyPooledSession.class)
+public class OverrideStrictlyPooledSessionBean implements StrictlyPooledSession
+{
+   /** The class wide max count of instances allows */
+   public static final int maxActiveCount = 5;
+   /** The class wide count of instances active in business code */
+   private static int activeCount;
+
+   private SessionContext ctx;
+
+   @Resource public void setSessionContext(SessionContext ctx)
+   {
+      System.out.println("setSessionContext()");
+      this.ctx = ctx;
+   }
+
+   public void methodA()
+   {
+      int count = incActiveCount();
+      System.out.println("Begin methodA, activeCount="+count+", ctx="+ctx);
+      try
+      {
+         if( count > maxActiveCount )
+         {
+            String msg = "IllegalState, activeCount > maxActiveCount, "
+                  + count + " > " + maxActiveCount;
+            throw new EJBException(msg);
+         }
+         // Sleep to let the client thread pile up
+         Thread.currentThread().sleep(1000);
+      }
+      catch(InterruptedException e)
+      {
+      }
+      finally
+      {
+         count = decActiveCount();
+         System.out.println("End methodA, activeCount="+count+", ctx="+ctx);
+      }
+   }
+
+   private static synchronized int incActiveCount()
+   {
+      return activeCount ++;
+   }
+   private static synchronized int decActiveCount()
+   {
+      return activeCount --;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/SessionInvoker.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,7 +21,7 @@
  */
 package org.jboss.ejb3.test.strictpool;
 
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
 import EDU.oswego.cs.dl.util.concurrent.CountDown;
 
 /** Invoker thread for StatelessSession tests.

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.strictpool;
-
-import org.jboss.annotation.ejb.PoolClass;
-import org.jboss.logging.Logger;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-import javax.jms.MessageListener;
-import javax.jms.Message;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at MessageDriven(activationConfig =
-        {
-        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/queueC")
-        })
- at PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=1, timeout=500)
-public class StrictlyPooledMDB2 implements MessageListener
-{
-   private static final Logger log = Logger.getLogger(StrictlyPooledMDB2.class);
-
-   public void onMessage(Message message)
-   {
-      try
-      {
-         log.info("PROCESSING!!!!!");
-         Thread.sleep(2000);
-         CounterBean.count++;
-      }
-      catch (InterruptedException e)
-      {
-         throw new RuntimeException(e);
-      }
-
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.strictpool;
+
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.logging.Logger;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+import javax.jms.MessageListener;
+import javax.jms.Message;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at MessageDriven(activationConfig =
+        {
+        @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/queueC")
+        })
+ at PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=1, timeout=500)
+public class StrictlyPooledMDB2 implements MessageListener
+{
+   private static final Logger log = Logger.getLogger(StrictlyPooledMDB2.class);
+
+   public void onMessage(Message message)
+   {
+      try
+      {
+         log.info("PROCESSING!!!!!");
+         Thread.sleep(2000);
+         CounterBean.count++;
+      }
+      catch (InterruptedException e)
+      {
+         throw new RuntimeException(e);
+      }
+
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -100,14 +100,14 @@
 
    public void test1() throws Exception
    {
-      assertEquals(manager.createQuery("select s from java.io.Serializable s").getResultList().size(), 0);
+      assertEquals(manager.createQuery("from java.io.Serializable").getResultList().size(), 0);
 
-      assertEquals(manager.createQuery("select p from Person p").getResultList().size(), 3);
+      assertEquals(manager.createQuery("from Person").getResultList().size(), 3);
    }
 
    public void test2() throws Exception
    {
-      List customers = manager.createQuery("select c from Customer c left join fetch c.salesperson").getResultList();
+      List customers = manager.createQuery("from Customer c left join fetch c.salesperson").getResultList();
       for (Iterator iter = customers.iterator(); iter.hasNext();)
       {
          Customer c = (Customer) iter.next();
@@ -118,7 +118,7 @@
 
    public void test3() throws Exception
    {
-      List customers = manager.createQuery("select c from Customer c").getResultList();
+      List customers = manager.createQuery("from Customer").getResultList();
       for (Iterator iter = customers.iterator(); iter.hasNext();)
       {
          Customer c = (Customer) iter.next();
@@ -134,10 +134,10 @@
       Person yomomma = manager.find(Person.class, new Long(ids[2]));
 
       mark.setZip("30306");
-      assertEquals(manager.createQuery("select p from Person p where p.zip = '30306'").getResultList().size(), 1);
+      assertEquals(manager.createQuery("from Person p where p.zip = '30306'").getResultList().size(), 1);
       manager.remove(mark);
       manager.remove(joe);
       manager.remove(yomomma);
-      assertTrue(manager.createQuery("select p from Person p").getResultList().isEmpty());
+      assertTrue(manager.createQuery("from Person").getResultList().isEmpty());
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -35,7 +35,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.timer;
-
-import java.util.Date;
-
-import javax.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-import org.jboss.logging.Logger;
-
-/**
- * This class forms the base of both an EJB3 timer tester bean and
- * an EJB 2.1 timer tester bean.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
- * @version $Revision: 56264 $
- */
-public abstract class BaseTimerTesterBean
-{
-   @SuppressWarnings("unused")
-   private static final Logger log = Logger.getLogger(BaseTimerTesterBean.class);
-   
-   protected static boolean timerCalled = false;
-
-   private @Resource TimerService timerService;
-
-   protected @Resource SessionContext ctx;
-   
-   // TODO: fix this state in the stateless bean
-   private static Timer timer;
-
-   @TransactionAttribute(TransactionAttributeType.MANDATORY)
-   public void checkMandatoryTransaction()
-   {
-      
-   }
-   
-   private void reset()
-   {
-      timerCalled = false;
-      timer = null;
-   }
-   
-   public void setTimer(Date expiration)
-   {
-      reset();
-      System.out.println("************ set timer " + expiration);
-      timer = timerService.createTimer(expiration, "TimerSLSBean");
-   }
-   
-   public void startTimer(long pPeriod)
-   {
-      reset();
-      System.out.println("************ startTimer");
-      timer = timerService.createTimer(new Date(new Date().getTime() + pPeriod), "TimerSLSBean");
-   }
-
-   public void startTimerAndRollback(long pPeriod)
-   {
-      reset();
-      System.out.println("************ startTimerAndRollback");
-      timer = ctx.getTimerService().createTimer(pPeriod, "TimerSLSBean");
-      ctx.setRollbackOnly();
-   }
-
-   public void startTimerViaEJBContext(long pPeriod)
-   {
-      reset();
-      System.out.println("************ startTimerViaEJBContext");
-      timer = ctx.getTimerService().createTimer(new Date(new Date().getTime() + pPeriod), "TimerSLSBean");
-   }
-
-   public void accessTimer()
-   {
-      //Access timer to make sure we have pushed the AllowedOperationsAssociation
-      timer.getTimeRemaining();
-      timer.getHandle();
-      timer.getInfo();
-   }
-   
-   public boolean isTimerCalled()
-   {
-      return timerCalled;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timer;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+import javax.ejb.SessionContext;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+import org.jboss.logging.Logger;
+
+/**
+ * This class forms the base of both an EJB3 timer tester bean and
+ * an EJB 2.1 timer tester bean.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author <a href="mailto:carlo at nerdnet.nl">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public abstract class BaseTimerTesterBean
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(BaseTimerTesterBean.class);
+   
+   protected static boolean timerCalled = false;
+
+   private @Resource TimerService timerService;
+
+   protected @Resource SessionContext ctx;
+   
+   // TODO: fix this state in the stateless bean
+   private static Timer timer;
+
+   @TransactionAttribute(TransactionAttributeType.MANDATORY)
+   public void checkMandatoryTransaction()
+   {
+      
+   }
+   
+   private void reset()
+   {
+      timerCalled = false;
+      timer = null;
+   }
+   
+   public void setTimer(Date expiration)
+   {
+      reset();
+      System.out.println("************ set timer " + expiration);
+      timer = timerService.createTimer(expiration, "TimerSLSBean");
+   }
+   
+   public void startTimer(long pPeriod)
+   {
+      reset();
+      System.out.println("************ startTimer");
+      timer = timerService.createTimer(new Date(new Date().getTime() + pPeriod), "TimerSLSBean");
+   }
+
+   public void startTimerAndRollback(long pPeriod)
+   {
+      reset();
+      System.out.println("************ startTimerAndRollback");
+      timer = ctx.getTimerService().createTimer(pPeriod, "TimerSLSBean");
+      ctx.setRollbackOnly();
+   }
+
+   public void startTimerViaEJBContext(long pPeriod)
+   {
+      reset();
+      System.out.println("************ startTimerViaEJBContext");
+      timer = ctx.getTimerService().createTimer(new Date(new Date().getTime() + pPeriod), "TimerSLSBean");
+   }
+
+   public void accessTimer()
+   {
+      //Access timer to make sure we have pushed the AllowedOperationsAssociation
+      timer.getTimeRemaining();
+      timer.getHandle();
+      timer.getInfo();
+   }
+   
+   public boolean isTimerCalled()
+   {
+      return timerCalled;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/BaseTimerTesterBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.timer;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at RemoteBinding(jndiBinding="TimerTesterBean21")
- at Remote(TimerTester.class)
-public class TimerTesterBean21 extends BaseTimerTesterBean implements TimerTester, TimedObject
-{
-   private static final Logger log = Logger.getLogger(TimerTesterBean21.class);
-   
-   public void ejbTimeout(Timer timer)
-   {
-      log.info("EJB TIMEOUT!!!!");
-      timerCalled = true;
-      //timer.cancel();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timer;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.ejb.TimedObject;
+import javax.ejb.Timer;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at RemoteBinding(jndiBinding="TimerTesterBean21")
+ at Remote(TimerTester.class)
+public class TimerTesterBean21 extends BaseTimerTesterBean implements TimerTester, TimedObject
+{
+   private static final Logger log = Logger.getLogger(TimerTesterBean21.class);
+   
+   public void ejbTimeout(Timer timer)
+   {
+      log.info("EJB TIMEOUT!!!!");
+      timerCalled = true;
+      //timer.cancel();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.timer;
-
-import javax.ejb.Remote;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-
-import org.jboss.annotation.ejb.Service;
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: 46184 $
- */
- at Remote(TimerTester.class)
- at Service
-public class TimerTesterService extends BaseTimerTesterBean
-{
-   private static final Logger log = Logger.getLogger(TimerTesterService.class);
-   
-   @Timeout
-   public void timeoutHandler(Timer timer)
-   {
-      log.info("EJB TIMEOUT!!!!");
-      timerCalled = true;
-      //timer.cancel();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timer;
+
+import javax.ejb.Remote;
+import javax.ejb.Timeout;
+import javax.ejb.Timer;
+
+import org.jboss.annotation.ejb.Service;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Remote(TimerTester.class)
+ at Service
+public class TimerTesterService extends BaseTimerTesterBean
+{
+   private static final Logger log = Logger.getLogger(TimerTesterService.class);
+   
+   @Timeout
+   public void timeoutHandler(Timer timer)
+   {
+      log.info("EJB TIMEOUT!!!!");
+      timerCalled = true;
+      //timer.cancel();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.timer;
-
-import javax.annotation.Resource;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-import org.jboss.logging.Logger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(TimerTester.class)
-public class TransactionalTimerTesterBean extends BaseTimerTesterBean
-{
-   private static final Logger log = Logger.getLogger(TransactionalTimerTesterBean.class);
-   
-   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-   @Timeout
-   public void timeoutHandler(Timer timer)
-   {
-      log.info("EJB TIMEOUT!!!!");
-      timerCalled = true;
-      
-      TimerTester me = (TimerTester) ctx.getBusinessObject(TimerTester.class);
-      me.checkMandatoryTransaction();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/TransactionalTimerTesterBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timer;
+
+import javax.annotation.Resource;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.ejb.Timeout;
+import javax.ejb.Timer;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateless
+ at Remote(TimerTester.class)
+public class TransactionalTimerTesterBean extends BaseTimerTesterBean
+{
+   private static final Logger log = Logger.getLogger(TransactionalTimerTesterBean.class);
+   
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   @Timeout
+   public void timeoutHandler(Timer timer)
+   {
+      log.info("EJB TIMEOUT!!!!");
+      timerCalled = true;
+      
+      TimerTester me = (TimerTester) ctx.getBusinessObject(TimerTester.class);
+      me.checkMandatoryTransaction();
+   }
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/unit/RemoteUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/unit/RemoteUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timer/unit/RemoteUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -37,7 +37,7 @@
 public class RemoteUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,92 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.timerdependency;
-
-import javax.ejb.EJB;
-
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Service (objectName="telcordia.smg:service=InitTimer")
- at Management(InitTimerMBean.class)
- at Depends(value="jboss.j2ee:jar=timerdependency.jar,name=TimerTestBean,service=EJB3")
-public class InitTimer implements InitTimerMBean
-{
-   private static final Logger log = Logger.getLogger(InitTimer.class);
-   
-    @EJB
-    TimerTest timer;
-    
-    private long intervalDuration_ = 1;	
-    
-    public void start()
-	{
-    	log.info("called start");
-	    startTimer();
-	}
-
-	public void create()
-	{
-       log.info("called create");
-	}
-	
-	public void stop()
-	{
-       log.info("called stop");
-	}
-	
-	public void destroy()
-	{
-		
-	}
-	
-	public long getInterval() {
-		// TODO Auto-generated method stub
-		return intervalDuration_;
-	}
-
-	public void setInterval(long interval) {
-		// TODO Auto-generated method stub
-		intervalDuration_ = interval;
-		//startTimer();
-	}	
-	
-	void startTimer()
-	{
-	      try {
-             log.info("Creating a timer with an interval duration of " +
-	            		intervalDuration_ + " ms.");
-             log.info("is timer valid: " + timer);
-	            timer.createTimer(intervalDuration_);
-	        } catch (Exception ex) {
-               log.error("Caught an unexpected exception.");
-	            ex.printStackTrace();
-	        }		
-	}
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timerdependency;
+
+import javax.ejb.EJB;
+
+import org.jboss.annotation.ejb.Management;
+import org.jboss.annotation.ejb.Service;
+import org.jboss.annotation.ejb.Depends;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Service (objectName="telcordia.smg:service=InitTimer")
+ at Management(InitTimerMBean.class)
+ at Depends(value="jboss.j2ee:jar=timerdependency.jar,name=TimerTestBean,service=EJB3")
+public class InitTimer implements InitTimerMBean
+{
+   private static final Logger log = Logger.getLogger(InitTimer.class);
+   
+    @EJB
+    TimerTest timer;
+    
+    private long intervalDuration_ = 1;	
+    
+    public void start()
+	{
+    	log.info("called start");
+	    startTimer();
+	}
+
+	public void create()
+	{
+       log.info("called create");
+	}
+	
+	public void stop()
+	{
+       log.info("called stop");
+	}
+	
+	public void destroy()
+	{
+		
+	}
+	
+	public long getInterval() {
+		// TODO Auto-generated method stub
+		return intervalDuration_;
+	}
+
+	public void setInterval(long interval) {
+		// TODO Auto-generated method stub
+		intervalDuration_ = interval;
+		//startTimer();
+	}	
+	
+	void startTimer()
+	{
+	      try {
+             log.info("Creating a timer with an interval duration of " +
+	            		intervalDuration_ + " ms.");
+             log.info("is timer valid: " + timer);
+	            timer.createTimer(intervalDuration_);
+	        } catch (Exception ex) {
+               log.error("Caught an unexpected exception.");
+	            ex.printStackTrace();
+	        }		
+	}
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.timerdependency;
-
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface InitTimerMBean
-{
-	public long getInterval();
-	
-	public void setInterval(long interval);
-	
-	// Life cycle method
-	public void create() throws Exception;
-	
-	public void start() throws Exception;
-    
-	public void stop() throws Exception;
-    
-    public void destroy() throws Exception;
-	
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timerdependency;
+
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface InitTimerMBean
+{
+	public long getInterval();
+	
+	public void setInterval(long interval);
+	
+	// Life cycle method
+	public void create() throws Exception;
+	
+	public void start() throws Exception;
+    
+	public void stop() throws Exception;
+    
+    public void destroy() throws Exception;
+	
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimerMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,34 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.timerdependency;
-
-import javax.ejb.Timer;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface TimerTest {
-    public void createTimer(long intervalDuration);
-
-    public void timeout(Timer timer);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timerdependency;
+
+import javax.ejb.Timer;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface TimerTest {
+    public void createTimer(long intervalDuration);
+
+    public void timeout(Timer timer);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.timerdependency;
-
-
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * TimerBean is a stateless session bean that creates a timer and prints out a
- * message when a timeout occurs.
- * 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless
- at Local ({TimerTest.class})
-public class TimerTestBean implements TimerTest {
-    @Resource
-    TimerService timerService;
-    
-    private static final Logger log = Logger.getLogger(TimerTestBean.class);
-
-    public void createTimer(long intervalDuration) {
-        timerService.createTimer(intervalDuration, "Created new timer");
-        log.info("created timer in TimerTestBean");
-    }
-
-    @Timeout
-    public void timeout(Timer timer) {
-       log.info("TimerTestBean: timeout occurred");
-    }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timerdependency;
+
+
+import javax.annotation.Resource;
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.ejb.Timeout;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+
+import org.jboss.logging.Logger;
+
+
+/**
+ * TimerBean is a stateless session bean that creates a timer and prints out a
+ * message when a timeout occurs.
+ * 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at Local ({TimerTest.class})
+public class TimerTestBean implements TimerTest {
+    @Resource
+    TimerService timerService;
+    
+    private static final Logger log = Logger.getLogger(TimerTestBean.class);
+
+    public void createTimer(long intervalDuration) {
+        timerService.createTimer(intervalDuration, "Created new timer");
+        log.info("created timer in TimerTestBean");
+    }
+
+    @Timeout
+    public void timeout(Timer timer) {
+       log.info("TimerTestBean: timeout occurred");
+    }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/TimerTestBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.timerdependency.unit;
-
-import org.jboss.ejb3.test.stateful.unit.RemoteUnitTestCase;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
-* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-
-public class TimerUnitTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(TimerUnitTestCase.class);
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public TimerUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void test() throws Exception
-   {
-      Thread.sleep(5000);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(TimerUnitTestCase.class, "timerdependency.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.timerdependency.unit;
+
+import org.jboss.ejb3.test.stateful.unit.RemoteUnitTestCase;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+
+public class TimerUnitTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(TimerUnitTestCase.class);
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public TimerUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void test() throws Exception
+   {
+      Thread.sleep(5000);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(TimerUnitTestCase.class, "timerdependency.jar");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/timerdependency/unit/TimerUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.txexceptions;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class DeploymentDescriptorAppException extends Exception
-{
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.txexceptions;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class DeploymentDescriptorAppException extends Exception
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorAppException.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.txexceptions;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class DeploymentDescriptorCheckedRollbackException extends Exception
-{
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.txexceptions;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class DeploymentDescriptorCheckedRollbackException extends Exception
+{
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/DeploymentDescriptorCheckedRollbackException.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.txexceptions;
-
-import org.jboss.ejb3.tx.TxUtil;
-
-import javax.persistence.EntityManager;
-import javax.naming.InitialContext;
-import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class RequiresNewTest
-{
-   public static void doit() throws Exception
-   {
-      InitialContext ctx = new InitialContext();
-      EntityManager em = (EntityManager)ctx.lookup("java:/SimpleEntityManager");
-      TransactionManager tm = TxUtil.getTransactionManager();
-
-      tm.begin();
-      SimpleEntity entity = new SimpleEntity();
-      entity.setStuff("hello");
-      entity.setId(11223123);
-      em.persist(entity);
-      em.flush();
-
-      Transaction tx = tm.suspend();
-      tm.begin();
-      if (em.contains(entity)) throw new RuntimeException("entity should not be managed as we should have a different session");
-      tm.commit();
-      tm.resume(tx);
-      tm.commit();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.txexceptions;
+
+import org.jboss.ejb3.tx.TxUtil;
+
+import javax.persistence.EntityManager;
+import javax.naming.InitialContext;
+import javax.transaction.TransactionManager;
+import javax.transaction.Transaction;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class RequiresNewTest
+{
+   public static void doit() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      EntityManager em = (EntityManager)ctx.lookup("java:/SimpleEntityManager");
+      TransactionManager tm = TxUtil.getTransactionManager();
+
+      tm.begin();
+      SimpleEntity entity = new SimpleEntity();
+      entity.setStuff("hello");
+      entity.setId(11223123);
+      em.persist(entity);
+      em.flush();
+
+      Transaction tx = tm.suspend();
+      tm.begin();
+      if (em.contains(entity)) throw new RuntimeException("entity should not be managed as we should have a different session");
+      tm.commit();
+      tm.resume(tx);
+      tm.commit();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/RequiresNewTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/unit/TxExceptionsTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/unit/TxExceptionsTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/txexceptions/unit/TxExceptionsTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -42,7 +42,7 @@
  */
 public class TxExceptionsTestCase extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.unauthenticatedprincipal;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 1.1 $</tt>
- */
-public class StatelessBean
-   implements StatelessRemote
-{
-   private static final Logger log = Logger.getLogger(StatelessBean.class);
-    
-   public void testAccess()
-   {
-     
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.unauthenticatedprincipal;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision: 1.1 $</tt>
+ */
+public class StatelessBean
+   implements StatelessRemote
+{
+   private static final Logger log = Logger.getLogger(StatelessBean.class);
+    
+   public void testAccess()
+   {
+     
+   }
+}

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,31 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.unauthenticatedprincipal;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 1.0 $</tt>
- */
-public interface StatelessRemote
-{
-   void testAccess();
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.unauthenticatedprincipal;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision: 1.0 $</tt>
+ */
+public interface StatelessRemote
+{
+   void testAccess();
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,54 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.unauthenticatedprincipal.unit;
-
-import org.jboss.ejb3.test.unauthenticatedprincipal.StatelessRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 1.0 $</tt>
- */
-public class UnauthenticatedPrincipalTestCase extends JBossTestCase
-{
-  
-   public UnauthenticatedPrincipalTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testUnauthenticatedPrincipal() throws Exception
-   {
-      StatelessRemote test = (StatelessRemote)getInitialContext().lookup("StatelessBean/remote");
-      assertNotNull(test);
-      
-      test.testAccess();
-   }
-
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(UnauthenticatedPrincipalTestCase.class, "unauthenticatedprincipal.jar");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/unauthenticatedprincipal/unit/UnauthenticatedPrincipalTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.unauthenticatedprincipal.unit;
+
+import org.jboss.ejb3.test.unauthenticatedprincipal.StatelessRemote;
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision: 1.0 $</tt>
+ */
+public class UnauthenticatedPrincipalTestCase extends JBossTestCase
+{
+  
+   public UnauthenticatedPrincipalTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testUnauthenticatedPrincipal() throws Exception
+   {
+      StatelessRemote test = (StatelessRemote)getInitialContext().lookup("StatelessBean/remote");
+      assertNotNull(test);
+      
+      test.testAccess();
+   }
+
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(UnauthenticatedPrincipalTestCase.class, "unauthenticatedprincipal.jar");
+   }
+
+}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.webservices;
-
-import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
- at WebService(endpointInterface = "org.jboss.ejb3.test.webservices.SomeEndpointInterface")
-public class SomeBean implements SomeEndpointInterface
-{
-   
-   @WebMethod
-   public String echo(String echo)
-   {
-      return echo;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+ at WebService(endpointInterface = "org.jboss.ejb3.test.webservices.SomeEndpointInterface")
+public class SomeBean implements SomeEndpointInterface
+{
+   
+   @WebMethod
+   public String echo(String echo)
+   {
+      return echo;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.webservices;
-
-import javax.jws.WebService;
-import javax.jws.WebMethod;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at WebService
-public interface SomeEndpointInterface
-{
-   @WebMethod String echo(String ec);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices;
+
+import javax.jws.WebService;
+import javax.jws.WebMethod;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at WebService
+public interface SomeEndpointInterface
+{
+   @WebMethod String echo(String ec);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/SomeEndpointInterface.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181 (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,48 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.webservices.jsr181;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
- at Remote(EJB3RemoteInterface.class)
- at RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
- at Stateless
-public class EJB3Bean implements EJB3RemoteInterface
-{
-   @WebMethod
-   public String echo(String input)
-   {
-      return input;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices.jsr181;
+
+import org.jboss.annotation.ejb.RemoteBinding;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+ at Remote(EJB3RemoteInterface.class)
+ at RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
+ at Stateless
+public class EJB3Bean implements EJB3RemoteInterface
+{
+   @WebMethod
+   public String echo(String input)
+   {
+      return input;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,33 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.webservices.jsr181;
-
-/**
- * An EJB3 remote interface
- *
- * @author Thomas.Diesler at jboss.org
- * @since 10-May-2005
- */
-public interface EJB3RemoteInterface
-{
-   String echo(String input);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices.jsr181;
+
+/**
+ * An EJB3 remote interface
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 10-May-2005
+ */
+public interface EJB3RemoteInterface
+{
+   String echo(String input);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3RemoteInterface.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,37 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.webservices.jsr181;
-
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * Test the JSR-181 javax.jws.WebService annotation on an SEI
- *
- * @author Thomas.Diesler at jboss.org
- * @since 29-Apr-2005
- */
-public interface EndpointInterface extends Remote
-{
-   String echo(String input) throws RemoteException;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices.jsr181;
+
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * Test the JSR-181 javax.jws.WebService annotation on an SEI
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 29-Apr-2005
+ */
+public interface EndpointInterface extends Remote
+{
+   String echo(String input) throws RemoteException;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,138 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.webservices.jsr181;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.rpc.Service;
-import javax.xml.ws.WebServiceRef;
-import org.jboss.logging.Logger;
-
-import org.jboss.ejb3.Container;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Stateless(name="StatelessBean")
- at Remote(StatelessRemote.class)
-public class StatelessBean implements StatelessRemote
-{
-   private static final Logger log = Logger.getLogger(StatelessBean.class);
-   
-   @WebServiceRef(mappedName="jbossws-client/service/TestService")
-   EndpointInterface endpoint1;
-   
-   EndpointInterface endpoint2;
-   
-   EndpointInterface endpoint3;
-   
-   EndpointInterface endpoint4;
-   
-   @WebServiceRef(mappedName="jbossws-client/service/TestService")
-   javax.xml.rpc.Service service1;
-   
-   javax.xml.rpc.Service service2;
-   
-   javax.xml.rpc.Service service3;
-   
-   javax.xml.rpc.Service service4;
-   
-   @WebServiceRef(mappedName="jbossws-client/service/TestService")
-   public void setEndpoint2(EndpointInterface endpoint2)
-   {
-      this.endpoint2 = endpoint2;
-   }
-   
-   public void setEndpoint4(EndpointInterface endpoint4)
-   {
-      this.endpoint4 = endpoint4;
-   }
-   
-   @WebServiceRef(mappedName="jbossws-client/service/TestService")
-   public void setService2(javax.xml.rpc.Service service2)
-   {
-      this.service2 = service2;
-   }
-   
-   public void setService4(javax.xml.rpc.Service service4)
-   {
-      this.service4 = service4;
-   }
-   
-   public String echo1(String string) throws Exception
-   {
-     return endpoint1.echo(string);
-   }
-   
-   public String echo2(String string) throws Exception
-   {
-     return endpoint2.echo(string);
-   }
-   
-   public String echo3(String string) throws Exception
-   {
-     return endpoint3.echo(string);
-   }
-   
-   public String echo4(String string) throws Exception
-   {
-     return endpoint4.echo(string);
-   }
-   
-   public String echo5(String string) throws Exception
-   {
-      EndpointInterface endpoint = (EndpointInterface)service1.getPort(EndpointInterface.class);
-      return endpoint.echo(string);
-   }
-   
-   public String echo6(String string) throws Exception
-   {
-      EndpointInterface endpoint = (EndpointInterface)service2.getPort(EndpointInterface.class);
-      return endpoint.echo(string);
-   }
-   
-   public String echo7(String string) throws Exception
-   {
-      EndpointInterface endpoint = (EndpointInterface)service3.getPort(EndpointInterface.class);
-      return endpoint.echo(string);
-   }
-   
-   public String echo8(String string) throws Exception
-   {
-      EndpointInterface endpoint = (EndpointInterface)service4.getPort(EndpointInterface.class);
-      return endpoint.echo(string);
-   }
-   
-   public String echo9(String string) throws Exception
-   {
-      InitialContext iniCtx = new InitialContext();
-      javax.xml.rpc.Service service = (Service)iniCtx.lookup(Container.ENC_CTX_NAME + "/env/service/Service3");
-      
-      EndpointInterface endpoint = (EndpointInterface)service.getPort(EndpointInterface.class);
-      return endpoint.echo(string);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices.jsr181;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.xml.rpc.Service;
+import javax.xml.ws.WebServiceRef;
+import org.jboss.logging.Logger;
+
+import org.jboss.ejb3.Container;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+ at Stateless(name="StatelessBean")
+ at Remote(StatelessRemote.class)
+public class StatelessBean implements StatelessRemote
+{
+   private static final Logger log = Logger.getLogger(StatelessBean.class);
+   
+   @WebServiceRef(mappedName="jbossws-client/service/TestService")
+   EndpointInterface endpoint1;
+   
+   EndpointInterface endpoint2;
+   
+   EndpointInterface endpoint3;
+   
+   EndpointInterface endpoint4;
+   
+   @WebServiceRef(mappedName="jbossws-client/service/TestService")
+   javax.xml.rpc.Service service1;
+   
+   javax.xml.rpc.Service service2;
+   
+   javax.xml.rpc.Service service3;
+   
+   javax.xml.rpc.Service service4;
+   
+   @WebServiceRef(mappedName="jbossws-client/service/TestService")
+   public void setEndpoint2(EndpointInterface endpoint2)
+   {
+      this.endpoint2 = endpoint2;
+   }
+   
+   public void setEndpoint4(EndpointInterface endpoint4)
+   {
+      this.endpoint4 = endpoint4;
+   }
+   
+   @WebServiceRef(mappedName="jbossws-client/service/TestService")
+   public void setService2(javax.xml.rpc.Service service2)
+   {
+      this.service2 = service2;
+   }
+   
+   public void setService4(javax.xml.rpc.Service service4)
+   {
+      this.service4 = service4;
+   }
+   
+   public String echo1(String string) throws Exception
+   {
+     return endpoint1.echo(string);
+   }
+   
+   public String echo2(String string) throws Exception
+   {
+     return endpoint2.echo(string);
+   }
+   
+   public String echo3(String string) throws Exception
+   {
+     return endpoint3.echo(string);
+   }
+   
+   public String echo4(String string) throws Exception
+   {
+     return endpoint4.echo(string);
+   }
+   
+   public String echo5(String string) throws Exception
+   {
+      EndpointInterface endpoint = (EndpointInterface)service1.getPort(EndpointInterface.class);
+      return endpoint.echo(string);
+   }
+   
+   public String echo6(String string) throws Exception
+   {
+      EndpointInterface endpoint = (EndpointInterface)service2.getPort(EndpointInterface.class);
+      return endpoint.echo(string);
+   }
+   
+   public String echo7(String string) throws Exception
+   {
+      EndpointInterface endpoint = (EndpointInterface)service3.getPort(EndpointInterface.class);
+      return endpoint.echo(string);
+   }
+   
+   public String echo8(String string) throws Exception
+   {
+      EndpointInterface endpoint = (EndpointInterface)service4.getPort(EndpointInterface.class);
+      return endpoint.echo(string);
+   }
+   
+   public String echo9(String string) throws Exception
+   {
+      InitialContext iniCtx = new InitialContext();
+      javax.xml.rpc.Service service = (Service)iniCtx.lookup(Container.ENC_CTX_NAME + "/env/service/Service3");
+      
+      EndpointInterface endpoint = (EndpointInterface)service.getPort(EndpointInterface.class);
+      return endpoint.echo(string);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.webservices.jsr181;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public interface StatelessRemote
-{
-   String echo1(String string) throws Exception;
-   
-   String echo2(String string) throws Exception;
-   
-   String echo3(String string) throws Exception;
-   
-   String echo4(String string) throws Exception;
-   
-   String echo5(String string) throws Exception;
-   
-   String echo6(String string) throws Exception;
-   
-   String echo7(String string) throws Exception;
-   
-   String echo8(String string) throws Exception;
-   
-   String echo9(String string) throws Exception;
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices.jsr181;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatelessRemote
+{
+   String echo1(String string) throws Exception;
+   
+   String echo2(String string) throws Exception;
+   
+   String echo3(String string) throws Exception;
+   
+   String echo4(String string) throws Exception;
+   
+   String echo5(String string) throws Exception;
+   
+   String echo6(String string) throws Exception;
+   
+   String echo7(String string) throws Exception;
+   
+   String echo8(String string) throws Exception;
+   
+   String echo9(String string) throws Exception;
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,119 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.ejb3.test.webservices.unit;
-
-import junit.framework.Test;
-import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteInterface;
-import org.jboss.ejb3.test.webservices.jsr181.EndpointInterface;
-import org.jboss.ejb3.test.webservices.jsr181.StatelessRemote;
-import org.jboss.test.JBossTestCase;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.rpc.Service;
-import java.util.Hashtable;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class JSR181TestCase extends JBossTestCase
-{
-   public JSR181TestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testRemoteAccess() throws Exception
-   {
-      InitialContext iniCtx = getInitialContext();
-      EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface");
-
-      String helloWorld = "Hello world!";
-      Object retObj = ejb3Remote.echo(helloWorld);
-      assertEquals(helloWorld, retObj);
-   }
-
-   public void testWebService() throws Exception
-   {
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
-      EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
-
-      String helloWorld = "Hello world!";
-      Object retObj = port.echo(helloWorld);
-      assertEquals(helloWorld, retObj);
-   }
-   
-   public void testWebServiceRef() throws Exception
-   {
-      InitialContext jndiContext = new InitialContext();
-      StatelessRemote stateless = (StatelessRemote)jndiContext.lookup("StatelessBean/remote");
-      assertNotNull(stateless);
-      
-      assertEquals("Hello", stateless.echo1("Hello"));
-      
-      assertEquals("Hello", stateless.echo2("Hello"));
-      
-      assertEquals("Hello", stateless.echo3("Hello"));
-      
-      assertEquals("Hello", stateless.echo4("Hello"));
-      
-      assertEquals("Hello", stateless.echo5("Hello"));
-      
-      assertEquals("Hello", stateless.echo6("Hello"));
-      
-      assertEquals("Hello", stateless.echo7("Hello"));
-      
-      assertEquals("Hello", stateless.echo8("Hello"));
-      
-      assertEquals("Hello", stateless.echo9("Hello"));
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(JSR181TestCase.class, "jsr181-client.jar, jsr181.jar");
-   }
-   
-   protected InitialContext getInitialContext(String clientName) throws NamingException
-   {
-      InitialContext iniCtx = new InitialContext();
-      Hashtable env = iniCtx.getEnvironment();
-      env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
-      env.put("j2ee.clientName", clientName);
-      return new InitialContext(env);
-   }
-
-   /** Get the client's env context
-    */
-   protected InitialContext getInitialContext() throws NamingException
-   {
-      return getInitialContext("jbossws-client");
-   }
-   
-   public String getServerHost()
-   {
-      String hostName = System.getProperty("jbosstest.server.host", "localhost");
-      return hostName;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices.unit;
+
+import junit.framework.Test;
+import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteInterface;
+import org.jboss.ejb3.test.webservices.jsr181.EndpointInterface;
+import org.jboss.ejb3.test.webservices.jsr181.StatelessRemote;
+import org.jboss.test.JBossTestCase;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.xml.rpc.Service;
+import java.util.Hashtable;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public class JSR181TestCase extends JBossTestCase
+{
+   public JSR181TestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testRemoteAccess() throws Exception
+   {
+      InitialContext iniCtx = getInitialContext();
+      EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface");
+
+      String helloWorld = "Hello world!";
+      Object retObj = ejb3Remote.echo(helloWorld);
+      assertEquals(helloWorld, retObj);
+   }
+
+   public void testWebService() throws Exception
+   {
+      InitialContext iniCtx = getInitialContext();
+      Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+      EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
+
+      String helloWorld = "Hello world!";
+      Object retObj = port.echo(helloWorld);
+      assertEquals(helloWorld, retObj);
+   }
+   
+   public void testWebServiceRef() throws Exception
+   {
+      InitialContext jndiContext = new InitialContext();
+      StatelessRemote stateless = (StatelessRemote)jndiContext.lookup("StatelessBean/remote");
+      assertNotNull(stateless);
+      
+      assertEquals("Hello", stateless.echo1("Hello"));
+      
+      assertEquals("Hello", stateless.echo2("Hello"));
+      
+      assertEquals("Hello", stateless.echo3("Hello"));
+      
+      assertEquals("Hello", stateless.echo4("Hello"));
+      
+      assertEquals("Hello", stateless.echo5("Hello"));
+      
+      assertEquals("Hello", stateless.echo6("Hello"));
+      
+      assertEquals("Hello", stateless.echo7("Hello"));
+      
+      assertEquals("Hello", stateless.echo8("Hello"));
+      
+      assertEquals("Hello", stateless.echo9("Hello"));
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(JSR181TestCase.class, "jsr181-client.jar, jsr181.jar");
+   }
+   
+   protected InitialContext getInitialContext(String clientName) throws NamingException
+   {
+      InitialContext iniCtx = new InitialContext();
+      Hashtable env = iniCtx.getEnvironment();
+      env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
+      env.put("j2ee.clientName", clientName);
+      return new InitialContext(env);
+   }
+
+   /** Get the client's env context
+    */
+   protected InitialContext getInitialContext() throws NamingException
+   {
+      return getInitialContext("jbossws-client");
+   }
+   
+   public String getServerHost()
+   {
+      String hostName = System.getProperty("jbosstest.server.host", "localhost");
+      return hostName;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,82 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ejb3.test.webservices.unit;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.test.stateful.unit.RemoteUnitTestCase;
-import org.jboss.ejb3.test.stateful.*;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-import javax.ejb.NoSuchEJBException;
-
-import junit.framework.Test;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id$
- */
-
-public class WsUnitTestCase
-extends JBossTestCase
-{
-   private static final Logger log = Logger.getLogger(WsUnitTestCase.class);
-
-   static boolean deployed = false;
-   static int test = 0;
-
-   public WsUnitTestCase(String name)
-   {
-
-      super(name);
-
-   }
-
-   public void testDeployment() throws Exception
-   {
-      try
-      {
-         deploy("webservices-ejb3.jar");
-      }
-      finally
-      {
-         try
-         {
-            undeploy("webservices-ejb3.jar");
-         }
-         catch (Exception e)
-         {
-            throw new RuntimeException(e);
-         }
-      }
-
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(WsUnitTestCase.class, "");
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.webservices.unit;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.logging.Logger;
+import org.jboss.ejb3.test.stateful.unit.RemoteUnitTestCase;
+import org.jboss.ejb3.test.stateful.*;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+import javax.ejb.NoSuchEJBException;
+
+import junit.framework.Test;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id$
+ */
+
+public class WsUnitTestCase
+extends JBossTestCase
+{
+   private static final Logger log = Logger.getLogger(WsUnitTestCase.class);
+
+   static boolean deployed = false;
+   static int test = 0;
+
+   public WsUnitTestCase(String name)
+   {
+
+      super(name);
+
+   }
+
+   public void testDeployment() throws Exception
+   {
+      try
+      {
+         deploy("webservices-ejb3.jar");
+      }
+      finally
+      {
+         try
+         {
+            undeploy("webservices-ejb3.jar");
+         }
+         catch (Exception e)
+         {
+            throw new RuntimeException(e);
+         }
+      }
+
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(WsUnitTestCase.class, "");
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.wls.embeddedwar;
-
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Entity
-public class Customer implements Serializable
-{
-   private int id;
-   private String name;
-
-   @Id @GeneratedValue(strategy=GenerationType.AUTO)
-   public int getId()
-   {
-      return id;
-   }
-
-   public void setId(int id)
-   {
-      this.id = id;
-   }
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.wls.embeddedwar;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Entity
+public class Customer implements Serializable
+{
+   private int id;
+   private String name;
+
+   @Id @GeneratedValue(strategy=GenerationType.AUTO)
+   public int getId()
+   {
+      return id;
+   }
+
+   public void setId(int id)
+   {
+      this.id = id;
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/Customer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.wls.embeddedwar;
-
-import javax.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Stateless
-public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
-{
-   @PersistenceContext(unitName="custdb") private EntityManager em;
-
-   public int createCustomer(String name)
-   {
-      try 
-      {
-         java.lang.reflect.Method[] methods = EntityManager.class.getDeclaredMethods();
-         Customer cust = new Customer();
-         cust.setName(name);
-         em.persist(cust);
-         return cust.getId();
-      }
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      }
-      
-      return -1;
-   }
-
-   public Customer findCustomer(int id)
-   {
-      return em.find(Customer.class, id);
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.wls.embeddedwar;
+
+import javax.ejb.Stateless;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class CustomerDAOBean implements CustomerDAOLocal, CustomerDAORemote
+{
+   @PersistenceContext(unitName="custdb") private EntityManager em;
+
+   public int createCustomer(String name)
+   {
+      try 
+      {
+         java.lang.reflect.Method[] methods = EntityManager.class.getDeclaredMethods();
+         Customer cust = new Customer();
+         cust.setName(name);
+         em.persist(cust);
+         return cust.getId();
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+      }
+      
+      return -1;
+   }
+
+   public Customer findCustomer(int id)
+   {
+      return em.find(Customer.class, id);
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.wls.embeddedwar;
-
-import javax.ejb.Local;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Local
-public interface CustomerDAOLocal
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.wls.embeddedwar;
+
+import javax.ejb.Local;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Local
+public interface CustomerDAOLocal
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAOLocal.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.wls.embeddedwar;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Remote
-public interface CustomerDAORemote
-{
-   int createCustomer(String name);
-
-   Customer findCustomer(int id);
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.wls.embeddedwar;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface CustomerDAORemote
+{
+   int createCustomer(String name);
+
+   Customer findCustomer(int id);
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/CustomerDAORemote.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,110 +0,0 @@
-<%@ page import="java.util.Hashtable,
-                 javax.jms.Queue" %>
-<%@ page import="javax.jms.QueueConnection" %>
-<%@ page import="javax.jms.QueueConnectionFactory" %>
-<%@ page import="javax.jms.QueueSender" %>
-<%@ page import="javax.jms.QueueSession" %>
-<%@ page import="javax.jms.TextMessage" %>
-<%@ page import="javax.jms.Topic" %>
-<%@ page import="javax.jms.TopicConnection" %>
-<%@ page import="javax.jms.TopicConnectionFactory" %>
-<%@ page import="javax.jms.TopicPublisher" %>
-<%@ page import="javax.jms.TopicSession" %>
-<%@ page import="javax.naming.InitialContext" %>
-<%@ page import="org.jboss.ejb3.test.wls.embeddedwar.Customer" %>
-<%@ page import="org.jboss.ejb3.test.wls.embeddedwar.CustomerDAOLocal" %>
-<%@ page import="org.jboss.ejb3.test.wls.embeddedwar.CustomerDAORemote" %>
-
-<%!
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-  //	  return new InitialContext();
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      return props;
-   }
-      
-   private static void executeQueue()
-           throws Exception
-   {
-
-      QueueConnection cnn = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-
-      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
-      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createQueueConnection();
-      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createSender(queue);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      session.close();
-      cnn.close();
-   }
-
-   private static void executeTopic()
-           throws Exception
-   {
-
-      TopicConnection cnn = null;
-      TopicPublisher sender = null;
-      TopicSession session = null;
-
-      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
-      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
-      cnn = factory.createTopicConnection();
-      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-      TextMessage msg = session.createTextMessage("Hello World");
-
-      sender = session.createPublisher(topic);
-      sender.send(msg);
-
-      Thread.sleep(1000);
-      session.close();
-      cnn.close();
-   }
-%>
-
-<html>
-<body>
-<%
-   InitialContext ctx = getInitialContext();
-   CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup(CustomerDAOLocal.class.getName());
-   CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup(CustomerDAORemote.class.getName());
-
-   int id = local.createCustomer("Gavin");
-   Customer cust = local.findCustomer(id);
-%>
-<p>
-   Successfully created and found Gavin from @Local interface: <%=cust.getName()%>
-</p>
-<%
-   id = remote.createCustomer("Emmanuel");
-   cust = remote.findCustomer(id);
-%>
-
-<p>
-   Successfully created and found Emmanuel from @Remote interface
-</p>
-
-<%
-   executeQueue();
-   executeTopic();
-%>
-DONE!
-</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,110 @@
+<%@ page import="java.util.Hashtable,
+                 javax.jms.Queue" %>
+<%@ page import="javax.jms.QueueConnection" %>
+<%@ page import="javax.jms.QueueConnectionFactory" %>
+<%@ page import="javax.jms.QueueSender" %>
+<%@ page import="javax.jms.QueueSession" %>
+<%@ page import="javax.jms.TextMessage" %>
+<%@ page import="javax.jms.Topic" %>
+<%@ page import="javax.jms.TopicConnection" %>
+<%@ page import="javax.jms.TopicConnectionFactory" %>
+<%@ page import="javax.jms.TopicPublisher" %>
+<%@ page import="javax.jms.TopicSession" %>
+<%@ page import="javax.naming.InitialContext" %>
+<%@ page import="org.jboss.ejb3.test.wls.embeddedwar.Customer" %>
+<%@ page import="org.jboss.ejb3.test.wls.embeddedwar.CustomerDAOLocal" %>
+<%@ page import="org.jboss.ejb3.test.wls.embeddedwar.CustomerDAORemote" %>
+
+<%!
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+  //	  return new InitialContext();
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      return props;
+   }
+      
+   private static void executeQueue()
+           throws Exception
+   {
+
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
+      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      session.close();
+      cnn.close();
+   }
+
+   private static void executeTopic()
+           throws Exception
+   {
+
+      TopicConnection cnn = null;
+      TopicPublisher sender = null;
+      TopicSession session = null;
+
+      Topic topic = (Topic) getInitialContext().lookup("topic/topictest");
+      TopicConnectionFactory factory = (TopicConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
+      cnn = factory.createTopicConnection();
+      session = cnn.createTopicSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+
+      sender = session.createPublisher(topic);
+      sender.send(msg);
+
+      Thread.sleep(1000);
+      session.close();
+      cnn.close();
+   }
+%>
+
+<html>
+<body>
+<%
+   InitialContext ctx = getInitialContext();
+   CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup(CustomerDAOLocal.class.getName());
+   CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup(CustomerDAORemote.class.getName());
+
+   int id = local.createCustomer("Gavin");
+   Customer cust = local.findCustomer(id);
+%>
+<p>
+   Successfully created and found Gavin from @Local interface: <%=cust.getName()%>
+</p>
+<%
+   id = remote.createCustomer("Emmanuel");
+   cust = remote.findCustomer(id);
+%>
+
+<p>
+   Successfully created and found Emmanuel from @Remote interface
+</p>
+
+<%
+   executeQueue();
+   executeTopic();
+%>
+DONE!
+</body>
+</html>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/EmbeddedEJB3.jsp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-<%@ page import="javax.naming.*" %>
-
-<%!
-	private static void testJndi()
-		throws Exception
-   	{
-   		InitialContext jndiContext = new InitialContext();
-   		String object = new String("Yippee");
-   		jndiContext.bind("TestJndiName", object);
-		object = (String)jndiContext.lookup("TestJndiName");
-		System.out.println("!! found " + object);
-		
-		lookup("");
-   	}
-   	
-	private static void lookup(String name)
-		throws Exception
-	{
-		System.out.println("!!lookup " + name);
-	   
-	    InitialContext jndiContext = new InitialContext();
-		NamingEnumeration names = jndiContext.list(name);
-		if (names != null){
-			while (names.hasMore()){
-				System.out.println("  " + names.next());
-			}
-		}
-	}
-%>
-
-<html>
-<body>
-
-<%
-   testJndi();
-%>
-DONE!
-</body>
-</html>
\ No newline at end of file

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+<%@ page import="javax.naming.*" %>
+
+<%!
+	private static void testJndi()
+		throws Exception
+   	{
+   		InitialContext jndiContext = new InitialContext();
+   		String object = new String("Yippee");
+   		jndiContext.bind("TestJndiName", object);
+		object = (String)jndiContext.lookup("TestJndiName");
+		System.out.println("!! found " + object);
+		
+		lookup("");
+   	}
+   	
+	private static void lookup(String name)
+		throws Exception
+	{
+		System.out.println("!!lookup " + name);
+	   
+	    InitialContext jndiContext = new InitialContext();
+		NamingEnumeration names = jndiContext.list(name);
+		if (names != null){
+			while (names.hasMore()){
+				System.out.println("  " + names.next());
+			}
+		}
+	}
+%>
+
+<html>
+<body>
+
+<%
+   testJndi();
+%>
+DONE!
+</body>
+</html>
\ No newline at end of file


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/JndiTest.jsp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit)

Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java
===================================================================
--- branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java	2007-02-02 10:15:51 UTC (rev 60191)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,104 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.ejb3.test.wls.embeddedwar.unit;
-
-import java.util.Hashtable;
-import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
-import javax.transaction.TransactionManager;
-
-import junit.framework.TestCase;
-
-import org.jboss.ejb3.test.wls.embeddedwar.*;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class EmbeddedEjb3TestCase
-   extends TestCase
-{
-   public static void main(String[] args) throws Exception
-   {
-      EmbeddedEjb3TestCase test = new EmbeddedEjb3TestCase();
-      test.testEJBs();
-      test.testEntityManager();
-   }
-   
-   public EmbeddedEjb3TestCase()
-   {
-   }
-
-   public void testEJBs() throws Exception
-   {
-
-      InitialContext ctx = getInitialContext();
-      CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup("CustomerDAOBean/local");
-      CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup("CustomerDAOBean/remote");
-
-      System.out.println("----------------------------------------------------------");
-      System.out.println("This test scans the System Property java.class.path for all annotated EJB3 classes");
-      System.out.print("    ");
-
-      int id = local.createCustomer("Gavin");
-      Customer cust = local.findCustomer(id);
-      System.out.println("Successfully created and found Gavin from @Local interface");
-
-      id = remote.createCustomer("Emmanuel");
-      cust = remote.findCustomer(id);
-      System.out.println("Successfully created and found Emmanuel from @Remote interface");
-      System.out.println("----------------------------------------------------------");
-   }
-
-   public void testEntityManager() throws Exception
-   {
-      // This is a transactionally aware EntityManager and must be accessed within a JTA transaction
-      // Why aren't we using javax.persistence.Persistence?  Well, our persistence.xml file uses
-      // jta-datasource which means that it is created by the EJB container/embedded JBoss.
-      // using javax.persistence.Persistence will just cause us an error
-      EntityManager em = (EntityManager) getInitialContext().lookup("java:/EntityManagers/custdb");
-
-      // Obtain JBoss transaction
-      TransactionManager tm = (TransactionManager) getInitialContext().lookup("java:/TransactionManager");
-
-      tm.begin();
-
-      Customer cust = new Customer();
-      cust.setName("Bill");
-      em.persist(cust);
-      
-      int id = cust.getId();
-
-      System.out.println("created bill in DB with id: " + id);
-
-      tm.commit();
-
-      tm.begin();
-      cust = em.find(Customer.class, id);
- 
-      tm.commit();
-   }
-
-   public static InitialContext getInitialContext() throws Exception
-   {
-      Hashtable props = getInitialContextProperties();
-      return new InitialContext(props);
-   }
-
-   private static Hashtable getInitialContextProperties()
-   {
-      Hashtable props = new Hashtable();
- //     props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- //     props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      props.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      props.put("java.naming.provider.url", "jnp://localhost:1099");
-      return props;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ejb3.test.wls.embeddedwar.unit;
+
+import java.util.Hashtable;
+import javax.naming.InitialContext;
+import javax.persistence.EntityManager;
+import javax.transaction.TransactionManager;
+
+import junit.framework.TestCase;
+
+import org.jboss.ejb3.test.wls.embeddedwar.*;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class EmbeddedEjb3TestCase
+   extends TestCase
+{
+   public static void main(String[] args) throws Exception
+   {
+      EmbeddedEjb3TestCase test = new EmbeddedEjb3TestCase();
+      test.testEJBs();
+      test.testEntityManager();
+   }
+   
+   public EmbeddedEjb3TestCase()
+   {
+   }
+
+   public void testEJBs() throws Exception
+   {
+
+      InitialContext ctx = getInitialContext();
+      CustomerDAOLocal local = (CustomerDAOLocal) ctx.lookup("CustomerDAOBean/local");
+      CustomerDAORemote remote = (CustomerDAORemote) ctx.lookup("CustomerDAOBean/remote");
+
+      System.out.println("----------------------------------------------------------");
+      System.out.println("This test scans the System Property java.class.path for all annotated EJB3 classes");
+      System.out.print("    ");
+
+      int id = local.createCustomer("Gavin");
+      Customer cust = local.findCustomer(id);
+      System.out.println("Successfully created and found Gavin from @Local interface");
+
+      id = remote.createCustomer("Emmanuel");
+      cust = remote.findCustomer(id);
+      System.out.println("Successfully created and found Emmanuel from @Remote interface");
+      System.out.println("----------------------------------------------------------");
+   }
+
+   public void testEntityManager() throws Exception
+   {
+      // This is a transactionally aware EntityManager and must be accessed within a JTA transaction
+      // Why aren't we using javax.persistence.Persistence?  Well, our persistence.xml file uses
+      // jta-datasource which means that it is created by the EJB container/embedded JBoss.
+      // using javax.persistence.Persistence will just cause us an error
+      EntityManager em = (EntityManager) getInitialContext().lookup("java:/EntityManagers/custdb");
+
+      // Obtain JBoss transaction
+      TransactionManager tm = (TransactionManager) getInitialContext().lookup("java:/TransactionManager");
+
+      tm.begin();
+
+      Customer cust = new Customer();
+      cust.setName("Bill");
+      em.persist(cust);
+      
+      int id = cust.getId();
+
+      System.out.println("created bill in DB with id: " + id);
+
+      tm.commit();
+
+      tm.begin();
+      cust = em.find(Customer.class, id);
+ 
+      tm.commit();
+   }
+
+   public static InitialContext getInitialContext() throws Exception
+   {
+      Hashtable props = getInitialContextProperties();
+      return new InitialContext(props);
+   }
+
+   private static Hashtable getInitialContextProperties()
+   {
+      Hashtable props = new Hashtable();
+ //     props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+ //     props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      props.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
+      props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+      props.put("java.naming.provider.url", "jnp://localhost:1099");
+      return props;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/wls/embeddedwar/unit/EmbeddedEjb3TestCase.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/xmlcfg/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/xmlcfg/unit/EntityUnitTestCase.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/xmlcfg/unit/EntityUnitTestCase.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -36,7 +36,7 @@
 public class EntityUnitTestCase
 extends JBossTestCase
 {
-   org.apache.log4j.Category log = getLog();
+   org.apache.log4j.Logger log = getLog();
 
    static boolean deployed = false;
    static int test = 0;


Property changes on: branches/Branch_4_2/ejb3x
___________________________________________________________________
Name: svn:ignore
   - output
build.log
.settings

   + output
build.log

Name: subclipse:tags
   + 60181,Branch_4_2,/branches/Branch_4_2,branch
60191,JBoss_5_EJB3_RC10,/branches/JBoss_5_EJB3_RC10,branch

Modified: branches/Branch_4_2/ejb3x/.classpath
===================================================================
--- branches/Branch_4_2/ejb3x/.classpath	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/.classpath	2007-02-03 10:13:23 UTC (rev 60233)
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/Branch_4_2/ejb3x/.cvsignore
===================================================================
--- branches/Branch_4_2/ejb3x/.cvsignore	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/.cvsignore	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,3 +1,2 @@
 output
 build.log
-.settings

Modified: branches/Branch_4_2/ejb3x/build.sh
===================================================================
--- branches/Branch_4_2/ejb3x/build.sh	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/build.sh	2007-02-03 10:13:23 UTC (rev 60233)
@@ -144,9 +144,8 @@
 	die "Ant file is not executable: $ANT"
     fi
 
-
     # need to specify planet57/buildmagic protocol handler package
-    ANT_OPTS="$ANT_OPTS -Djava.protocol.handler.pkgs=org.jboss.net.protocol"
+    ANT_OPTS="-Djava.protocol.handler.pkgs=org.jboss.net.protocol"
 
     # setup some build properties
     ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"

Modified: branches/Branch_4_2/ejb3x/build.xml
===================================================================
--- branches/Branch_4_2/ejb3x/build.xml	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/build.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -85,8 +85,7 @@
 
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
-       <path refid="jboss.common.classpath"/>
-       <!-- this is for org.jboss.lang.Enum -->
+      <!-- this is for org.jboss.lang.Enum -->
        <path refid="jboss.aop.classpath"/>
        <path refid="jboss.j2ee.classpath"/>
     </path>

Copied: branches/Branch_4_2/ejb3x/component-info.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/component-info.xml)
===================================================================
--- branches/Branch_4_2/ejb3x/component-info.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/component-info.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,16 @@
+<project name="ejb3x-component-info">
+   <!-- ============================================================ -->
+   <!-- ejb3x                                                        -->
+   <!-- ============================================================ -->
+
+   <component id="ejb3x"
+              module="jboss-ejb3x"
+              version="4.2-SNAPSHOT"
+   >
+      <artifact id="jboss-ejb3x.jar"/>   
+      
+      <export>
+         <include input="jboss-ejb3x.jar"/>      
+      </export>
+   </component>
+</project>


Property changes on: branches/Branch_4_2/ejb3x/component-info.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3x/jbossbuild.xml (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/jbossbuild.xml)
===================================================================
--- branches/Branch_4_2/ejb3x/jbossbuild.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/jbossbuild.xml	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+
+<!--
+ JBoss, the OpenSource J2EE webOS
+ 
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
+
+<!-- ================================================================== -->
+<!-- ejb3x  component definition                                        -->
+<!-- ================================================================== -->
+
+<project name="project" 
+         default="build" 
+         basedir="."
+>
+   <!-- The main build -->
+   <import file="../tools/etc/jbossbuild/tasks.xml"/>
+   <import file="component-info.xml"/>
+
+   <!-- =============================================================== -->
+   <!-- The component definition                                        -->
+   <!-- =============================================================== -->
+
+   <componentdef component="ejb3x" 
+                 description="ejb3x Integration Module">
+
+      <!-- ============================================================ -->
+      <!-- The main source                                              -->
+      <!-- ============================================================ -->
+
+      <source id="main" requiredJDK="1.5" jvmSource="1.5" jvmTarget="1.5">
+         <include component="sun-jaf"/>
+         <include component="sun-servlet"/>
+         <include component="common"/>
+         <include component="aop"/>
+         <include component="j2ee"/>
+      </source>
+
+      <!-- ============================================================ -->
+      <!-- jboss-ejb3x.jar                                                -->
+      <!-- ============================================================ -->
+
+      <artifactdef artifact="jboss-ejb3x.jar" requiredJDK="1.5">
+         <include input="main">
+            <include pattern="javax/**"/>
+         </include>
+      </artifactdef>
+
+
+   </componentdef>
+
+   <!-- Generate the targets -->   
+   <generate generate="ejb3x"/>
+
+</project>


Property changes on: branches/Branch_4_2/ejb3x/jbossbuild.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3x/src/main/javax/annotation/Generated.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/annotation/Generated.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/Generated.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/Generated.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+/**
+ * The Generated annoation is used to mark source code that has been generated. 
+ * It can also be used to differentiate user written code from generated code in 
+ * a single file. When used, the value element must have the name of the code 
+ * generator. The recommended convention is to use the fully qualified name of 
+ * the code generator in the value field . For example: com.company.package.classname. 
+ * The date element is used to indicate the date the source was generated. The 
+ * date element must follow the ISO 8601 standard. For example the date element 
+ * would have the following value 2001-07-04T12:08:56.235-0700 which represents 
+ * 2001-07-04 12:08:56 local time in the U.S. Pacific Time time zone. The comment 
+ * element is a place holder for any comments that the code generator may want to 
+ * include in the generated code.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ * @since Common Annotations 1.0
+ */
+ at Documented
+ at Retention(SOURCE)
+ at Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER})
+public @interface Generated {
+   /**
+    * This is used by the code generator to mark the generated classes and methods.
+    */
+   String[] value();
+   
+   /**
+    * A place holder for any comments that the code generator may want to include in the generated code.
+    */
+   String comments() default "";
+   
+   /**
+    * Date when the source was generated.
+    */
+   String date() default "";
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.annotation;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * The PostConstruct method is invoked on the newly constructed instance, after
- * any dependency injection has been performed by the container and before the
- * first business method is invoked on the bean.
- * 
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Target({METHOD}) @Retention(RUNTIME)
-   public @interface PostConstruct
-{
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/annotation/PostConstruct.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/PostConstruct.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+/**
+ * The PostConstruct method is invoked on the newly constructed instance, after
+ * any dependency injection has been performed by the container and before the
+ * first business method is invoked on the bean.
+ * 
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision: 57283 $
+ */
+ at Documented
+ at Target({METHOD})
+ at Retention(RUNTIME)
+public @interface PostConstruct
+{
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.annotation;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * The PreDestroy method will execute after any method annotated with the Remove
- * annotation has completed.
- * 
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
- */
- at Target({METHOD}) @Retention(RUNTIME)
-   public @interface PreDestroy
-{
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/annotation/PreDestroy.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/PreDestroy.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+/**
+ * The PreDestroy method will execute after any method annotated with the Remove
+ * annotation has completed.
+ * 
+ * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @version $Revision: 57283 $
+ */
+ at Documented
+ at Target({METHOD})
+ at Retention(RUNTIME)
+public @interface PreDestroy
+{
+}

Modified: branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resource.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resource.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resource.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,7 +21,7 @@
  */
 package javax.annotation;
 
-import java.lang.annotation.ElementType;
+import static java.lang.annotation.ElementType.*;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -37,14 +37,12 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
- at Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME)
-   public @interface Resource
+ at Target({TYPE, FIELD, METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Resource
 {
    /**
     * Enums for whether the container or bean is to perform authentication.
-    *
-    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
-    * @version $Revision$
     */
    public enum AuthenticationType
    {

Modified: branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resources.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resources.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/Resources.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,6 +21,7 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -33,7 +34,9 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
- at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+ at Documented
+ at Target({ElementType.TYPE}) 
+ at Retention(RetentionPolicy.RUNTIME)
 public @interface Resources
 {
    Resource[] value();

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.annotation.security;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The Bean Provider is responsible for using the RolesReferenced metadata
- * annotation or the security-role-ref elements of the deployment descriptor to
- * declare all the security role names used in the enterprise bean code. The
- * values must be the security role name that is used as a parameter to the
- * isCallerInRole(String roleName) method.
- * 
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 45726 $
- */
- at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-   public @interface DeclareRoles
-{
-   String[] value();
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/annotation/security/DeclareRoles.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.annotation.security;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The Bean Provider is responsible for using the RolesReferenced metadata
+ * annotation or the security-role-ref elements of the deployment descriptor to
+ * declare all the security role names used in the enterprise bean code. The
+ * values must be the security role name that is used as a parameter to the
+ * isCallerInRole(String roleName) method.
+ * 
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ at Documented
+ at Target({ElementType.TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface DeclareRoles
+{
+   String[] value();
+}


Property changes on: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DeclareRoles.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.annotation.security;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The DenyAll annotation specifies that no security roles are permitted to
- * execute the specified method(s).
- * 
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-   public @interface DenyAll
-{
-}
-

Copied: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/annotation/security/DenyAll.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/DenyAll.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.annotation.security;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The DenyAll annotation specifies that no security roles are permitted to
+ * execute the specified method(s).
+ * 
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 57283 $
+ */
+ at Documented
+ at Target({ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface DenyAll
+{
+}
+

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.annotation.security;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The PermitAll annotation specifies that all security roles are permitted to
- * execute the specified method(s).
- * 
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-   public @interface PermitAll
-{
-}
-

Copied: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/annotation/security/PermitAll.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/PermitAll.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.annotation.security;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The PermitAll annotation specifies that all security roles are permitted to
+ * execute the specified method(s).
+ * 
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 57283 $
+ */
+ at Documented
+ at Target({ElementType.TYPE, ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface PermitAll
+{
+}
+

Modified: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesAllowed.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesAllowed.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesAllowed.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,6 +21,7 @@
  */
 package javax.annotation.security;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -34,8 +35,10 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
- at Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-   public @interface RolesAllowed
+ at Documented
+ at Target({ElementType.TYPE, ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface RolesAllowed
 {
    String[] value();
 }

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesReferenced.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesReferenced.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RolesReferenced.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.annotation.security;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The Bean Provider is responsible for using the RolesReferenced metadata
- * annotation or the security-role-ref elements of the deployment descriptor to
- * declare all the security role names used in the enterprise bean code. The
- * values must be the security role name that is used as a parameter to the
- * isCallerInRole(String roleName) method.
- * 
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-   public @interface RolesReferenced
-{
-   String[] value();
-}

Modified: branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RunAs.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RunAs.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/annotation/security/RunAs.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -21,6 +21,7 @@
  */
 package javax.annotation.security;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -40,8 +41,10 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
- at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
-   public @interface RunAs
+ at Documented
+ at Target(ElementType.TYPE)
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface RunAs
 {
    String value();
 }

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-/**
- * A ConcurrentAccessException indicates that the client has attempted an invocation on a 
- * stateful session bean while another invocation is in progress.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ConcurrentAccessException extends EJBException
-{
-   private static final long serialVersionUID = 1L;
-
-   public ConcurrentAccessException()
-   {
-      super();
-   }
-
-   public ConcurrentAccessException(String message)
-   {
-      super(message);
-   }
-
-   public ConcurrentAccessException(String message, Exception ex)
-   {
-      super(message, ex);
-   }
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+/**
+ * A ConcurrentAccessException indicates that the client has attempted an invocation on a 
+ * stateful session bean while another invocation is in progress.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class ConcurrentAccessException extends EJBException
+{
+   private static final long serialVersionUID = 1L;
+
+   public ConcurrentAccessException()
+   {
+      super();
+   }
+
+   public ConcurrentAccessException(String message)
+   {
+      super(message);
+   }
+
+   public ConcurrentAccessException(String message, Exception ex)
+   {
+      super(message, ex);
+   }
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The EJB annotation denotes a reference to an EJB 3.0 session bean.
- * 
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME)
-public @interface EJB
-{
-   String name() default "";
-
-   Class beanInterface() default java.lang.Object.class;
-   
-   String beanName() default "";
-   
-   String mappedName() default "";
-
-   String description() default "";
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/EJB.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJB.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The EJB annotation denotes a reference to an EJB 3.0 session bean.
+ * 
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 46096 $
+ */
+ at Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME)
+public @interface EJB
+{
+   String name() default "";
+
+   Class beanInterface() default java.lang.Object.class;
+   
+   String beanName() default "";
+   
+   String mappedName() default "";
+
+   String description() default "";
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-/**
- * A NoSuchObjectLocalException is thrown if an attempt is made to invoke
- * a method on an object that no longer exists.
- * @version $Revision$
- */
-public class EJBNoSuchObjectException extends EJBException {
-
-  /**
-   * Constructs a NoSuchObjectLocalException with no detail message.
-   */
-  public EJBNoSuchObjectException() {
-    super();
-  }
-
-  /**
-   * Constructs a NoSuchObjectLocalException with the specified detailed message.
-   *
-   * @param message - The detailed message.
-   */
-  public EJBNoSuchObjectException(String message) {
-    super(message);
-  }
-
-  /**
-   * Constructs a NoSuchObjectLocalException with the specified detail message and a
-   * nested exception.
-   *
-   * @param message - The detailed message.
-   * @param ex - The originally thrown exception.
-   */
-  public EJBNoSuchObjectException(String message, Exception ex) {
-    super(message,ex);
-  }
-}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-import javax.ejb.EJB;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The EJBs annotation is used to specify multiple EJB 3.0 session bean
- * references on a bean class.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-public @interface EJBs
-{
-   EJB[] value();
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/EJBs.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/EJBs.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+import javax.ejb.EJB;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The EJBs annotation is used to specify multiple EJB 3.0 session bean
+ * references on a bean class.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 45433 $
+ */
+ at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+public @interface EJBs
+{
+   EJB[] value();
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Bean class annotation that specifies remote interfaces of the Session bean.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.TYPE})
- at Retention(RetentionPolicy.RUNTIME)
-public @interface Local
-{
-   Class[] value() default {};
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/Local.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/Local.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Bean class annotation that specifies remote interfaces of the Session bean.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 37459 $
+ */
+ at Target({ElementType.TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Local
+{
+   Class[] value() default {};
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for specifying the local home interface for a bean
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
-public @interface LocalHome
-{
-   Class value();
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/LocalHome.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/LocalHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for specifying the local home interface for a bean
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 39861 $
+ */
+ at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+public @interface LocalHome
+{
+   Class value();
+}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/NoSuchEJBException.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/NoSuchEJBException.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/NoSuchEJBException.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/NoSuchEJBException.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+/**
+ * A NoSuchEJBException is thrown if an attempt is made to invoke
+ * a method on an object that no longer exists.
+ * @version $Revision$
+ */
+public class NoSuchEJBException extends EJBException {
+   private static final long serialVersionUID = -4861625171310593950L;
+
+  /**
+   * Constructs a NoSuchEJBException with no detail message.
+   */
+  public NoSuchEJBException() {
+    super();
+  }
+
+  /**
+   * Constructs a NoSuchEJBException with the specified detailed message.
+   *
+   * @param message - The detailed message.
+   */
+  public NoSuchEJBException(String message) {
+    super(message);
+  }
+
+  /**
+   * Constructs a NoSuchEJBException with the specified detail message and a
+   * nested exception.
+   *
+   * @param message - The detailed message.
+   * @param ex - The originally thrown exception.
+   */
+  public NoSuchEJBException(String message, Exception ex) {
+    super(message,ex);
+  }
+}


Property changes on: branches/Branch_4_2/ejb3x/src/main/javax/ejb/NoSuchEJBException.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Bean class annotation that specifies remote interfaces of the Session bean.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.TYPE})
- at Retention(RetentionPolicy.RUNTIME)
-public @interface Remote
-{
-   Class[] value() default {};
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/Remote.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/Remote.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Bean class annotation that specifies remote interfaces of the Session bean.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 37459 $
+ */
+ at Target({ElementType.TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Remote
+{
+   Class[] value() default {};
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for specifying the remote home interface for a bean
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
-public @interface RemoteHome
-{
-   Class value();
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/RemoteHome.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/RemoteHome.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for specifying the remote home interface for a bean
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 39861 $
+ */
+ at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+public @interface RemoteHome
+{
+   Class value();
+}

Deleted: branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package javax.ejb;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The TransactionManagement annotation specifies the transaction management
- * demarcation type of a session bean or message-driven bean. If the
- * TransactionManagement annotation is not specified for a session bean or
- * message-driven bean, the bean is assume to have container managed transaction
- * demarcation.
- * 
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
- at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
-   public @interface TransactionManagement
-{
-   TransactionManagementType value() default TransactionManagementType.CONTAINER;
-}

Copied: branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java (from rev 60191, branches/JBoss_5_EJB3_RC10/ejb3x/src/main/javax/ejb/TransactionManagement.java)
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3x/src/main/javax/ejb/TransactionManagement.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.ejb;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The TransactionManagement annotation specifies the transaction management
+ * demarcation type of a session bean or message-driven bean. If the
+ * TransactionManagement annotation is not specified for a session bean or
+ * message-driven bean, the bean is assume to have container managed transaction
+ * demarcation.
+ * 
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version $Revision: 37459 $
+ */
+ at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+   public @interface TransactionManagement
+{
+   TransactionManagementType value() default TransactionManagementType.CONTAINER;
+}

Modified: branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeClassInterceptors.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeClassInterceptors.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeClassInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,23 +1,8 @@
 /*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
  */
 package javax.interceptor;
 

Modified: branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/interceptor/ExcludeDefaultInterceptors.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -1,23 +1,8 @@
 /*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
  */
 package javax.interceptor;
 
@@ -33,7 +18,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
- at Target({METHOD, TYPE}) @Retention(RUNTIME)
+ at Target({TYPE, METHOD}) @Retention(RUNTIME)
 public @interface ExcludeDefaultInterceptors {
 
 }

Modified: branches/Branch_4_2/ejb3x/src/main/javax/interceptor/InvocationContext.java
===================================================================
--- branches/Branch_4_2/ejb3x/src/main/javax/interceptor/InvocationContext.java	2007-02-03 08:05:30 UTC (rev 60232)
+++ branches/Branch_4_2/ejb3x/src/main/javax/interceptor/InvocationContext.java	2007-02-03 10:13:23 UTC (rev 60233)
@@ -40,7 +40,10 @@
 
    public void setParameters(Object[] params);
 
-   public java.util.Map getContextData();
+   /**
+    * Returns the context data associated with this invocation or lifecycle callback. If there is no context data, an empty Map object will be returned.
+    */
+   public java.util.Map<String, Object> getContextData();
 
    public Object proceed() throws Exception;
 }
\ No newline at end of file